app: Add subtree-remove option
New mapper option to wait until a specified interface is not
present in any of the subtrees of the specified namespace.
Usage:
mapper subtree-remove <NAMESPACE>:<INTERFACE>
mapper subtree-remove /foo/namespace:bar.interface
A future change could add an additional option to wait for
interfaces to appear in a subtree of the specified path.
Note that the subtree option will look for the interface in
the subtree paths, not on the specified base namespace path.
So in order to find an interface in /base/level1/level2,
then the specified namespace path should be /base/level1/.
Change-Id: I862310d819c505c59161adcce338041a08e1218c
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
diff --git a/libmapper/app.c b/libmapper/app.c
index 7efc08c..9713835 100644
--- a/libmapper/app.c
+++ b/libmapper/app.c
@@ -137,6 +137,19 @@
exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
}
+static int subtree_main(int argc, char *argv[])
+{
+ int r = 0;
+
+ if (argc != 3) {
+ fprintf(stderr, "Usage: %s subtree-remove "
+ "NAMESPACE:INTERFACE\n", argv[0]);
+ exit(EXIT_FAILURE);
+ }
+
+ exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
/* print out the distinct dbus service name for the input dbus path */
static int get_service_main(int argc, char *argv[])
{
@@ -178,6 +191,9 @@
"\nCOMMANDS:\n"
" call invoke the specified method\n"
" wait wait for the specified objects to appear on the DBus\n"
+ " subtree-remove\n"
+ " wait until the specified interface is not present\n"
+ " in any of the subtrees of the specified namespace\n"
" get-service return the service identifier for input path\n";
if(argc < 2) {
@@ -189,6 +205,8 @@
call_main(argc, argv);
if(!strcmp(argv[1], "wait"))
wait_main(argc, argv);
+ if(!strcmp(argv[1], "subtree-remove"))
+ subtree_main(argc, argv);
if(!strcmp(argv[1], "get-service"))
get_service_main(argc, argv);