More revision of map instance origin block/allow scopes; improvements to mpr_tbl

Author: malloch

bindings/csharp/Libmapper.NET/Map.cs

@@ -206,30 +206,30 @@ public int GetSignalIndex(Signal signal, Location location)
     }
 
     [DllImport("mapper", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    private static extern int mpr_map_allow_instance_origin(IntPtr map, IntPtr dev);
+    private static extern int mpr_map_allow_origin(IntPtr map, IntPtr dev);
 
     /// <summary>
     ///     Add an instance origin scope to this map.
     /// </summary>
     /// <param name="device">The device to add as an instance origin scope for this map</param>
     /// <returns>The same map instance to allow for chaining</returns>
-    public Map AllowInstanceOrigin(Device device)
+    public Map AllowOrigin(Device device)
     {
-        mpr_map_allow_instance_origin(NativePtr, device.NativePtr);
+        mpr_map_allow_origin(NativePtr, device.NativePtr);
         return this;
     }
 
     [DllImport("mapper", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.StdCall)]
-    private static extern int mpr_map_block_instance_origin(IntPtr map, IntPtr dev);
+    private static extern int mpr_map_block_origin(IntPtr map, IntPtr dev);
 
     /// <summary>
     ///     Remove a signal instance origin scope from this map.
     /// </summary>
     /// <param name="device">The device to remove as a signal instance origin scope from this map</param>
     /// <returns>The same map instance to allow for chaining</returns>
-    public Map BlockInstanceOrigin(Device device)
+    public Map BlockOrigin(Device device)
     {
-        mpr_map_block_instance_origin(NativePtr, device.NativePtr);
+        mpr_map_block_origin(NativePtr, device.NativePtr);
         return this;
     }
 }

bindings/java/mapper/Map.java

@@ -34,8 +34,8 @@ public Map(mapper.Signal _source, mapper.Signal _destination) {
     public native Map refresh();
 
     /* property: instance origin scopes */
-    public native Map allowInstanceOrigin(mapper.Device dev);
-    public native Map blockInstanceOrigin(mapper.Device dev);
+    public native Map allowOrigin(mapper.Device dev);
+    public native Map blockOrigin(mapper.Device dev);
 
     /* property: ready */
     public native boolean ready();

bindings/java/mapperjni.c

@@ -1778,26 +1778,26 @@ JNIEXPORT jobject JNICALL Java_mapper_Map_refresh
     return obj;
 }
 
-JNIEXPORT jobject JNICALL Java_mapper_Map_allowInstanceOrigin
+JNIEXPORT jobject JNICALL Java_mapper_Map_allowOrigin
   (JNIEnv *env, jobject obj, jobject jdev)
 {
     mpr_map map = (mpr_map)get_mpr_obj_from_jobject(env, obj);
     if (map) {
         mpr_dev dev = (mpr_dev)get_mpr_obj_from_jobject(env, jdev);
         if (dev)
-            mpr_map_allow_instance_origin(map, dev);
+            mpr_map_allow_origin(map, dev);
     }
     return obj;
 }
 
-JNIEXPORT jobject JNICALL Java_mapper_Map_blockInstanceOrigin
+JNIEXPORT jobject JNICALL Java_mapper_Map_blockOrigin
   (JNIEnv *env, jobject obj, jobject jdev)
 {
     mpr_map map = (mpr_map)get_mpr_obj_from_jobject(env, obj);
     if (map) {
         mpr_dev dev = (mpr_dev)get_mpr_obj_from_jobject(env, jdev);
         if (dev)
-            mpr_map_block_instance_origin(map, dev);
+            mpr_map_block_origin(map, dev);
     }
     return obj;
 }

bindings/python/libmapper/mapper.py.in

@@ -1717,7 +1717,7 @@ class Map(Object):
         return 0 != mpr.mpr_map_get_is_ready(self._obj)
     ready = property(get_is_ready)
 
-    def allow_instance_origin(self, device):
+    def allow_origin(self, device):
         """
         Add a map instance origin scope
 
@@ -1735,12 +1735,12 @@ class Map(Object):
         """
 
         if isinstance(device, Device):
-            mpr.mpr_map_allow_instance_origin.argtypes = [c_void_p, c_void_p]
-            mpr.mpr_map_allow_instance_origin.restype = None
-            mpr.mpr_map_allow_instance_origin(self._obj, device._obj)
+            mpr.mpr_map_allow_origin.argtypes = [c_void_p, c_void_p]
+            mpr.mpr_map_allow_origin.restype = None
+            mpr.mpr_map_allow_origin(self._obj, device._obj)
         return self
 
-    def block_instance_origin(self, device):
+    def block_origin(self, device):
         """
         Block a map instance origin scope
 
@@ -1758,9 +1758,9 @@ class Map(Object):
         """
 
         if isinstance(device, Device):
-            mpr.mpr_map_block_instance_origin.argtypes = [c_void_p, c_void_p]
-            mpr.mpr_map_block_instance_origin.restype = None
-            mpr.mpr_map_block_instance_origin(self._obj, device._obj)
+            mpr.mpr_map_block_origin.argtypes = [c_void_p, c_void_p]
+            mpr.mpr_map_block_origin.restype = None
+            mpr.mpr_map_block_origin(self._obj, device._obj)
         return self
 
 class Graph(Object):

include/mapper/mapper.h

@@ -551,7 +551,7 @@ void mpr_map_refresh(mpr_map map);
  *  \param device       Device to allow as a scope for this map. After taking effect, this setting
  *                      will allow instance updates originating at this device to be propagated
  *                      across the map. */
-void mpr_map_allow_instance_origin(mpr_map map, mpr_dev device);
+void mpr_map_allow_origin(mpr_map map, mpr_dev device);
 
 /*! Remove an instance origin scope from this map. Map instance origin scope configures the
  *  propagation of signal instance updates across the map. Changes to remote maps will not take
@@ -560,7 +560,7 @@ void mpr_map_allow_instance_origin(mpr_map map, mpr_dev device);
  *  \param device       Device to block as an instance origin scope for this map. After taking
  *                      effect, this setting will cause instance updates originating at this device
  *                      to be blocked from propagating across the map. */
-void mpr_map_block_instance_origin(mpr_map map, mpr_dev device);
+void mpr_map_block_origin(mpr_map map, mpr_dev device);
 
 /** @} */ /* end of group Maps */
 

include/mapper/mapper_cpp.h

@@ -840,7 +840,7 @@ namespace mapper {
          *                  setting will allow instance updates originating at this device to be
          *                  propagated across the Map.
          *  \return         Self. */
-        inline Map& allow_instance_origin(const Device& dev);
+        inline Map& allow_origin(const Device& dev);
 
         /*! Remove an instance origin scope from this Map. Map instance origin scope configures the
          *  propagation of signal instance updates across the map. Changes to remote maps will not
@@ -849,7 +849,7 @@ namespace mapper {
          *                  effect, this setting will cause instance updates originating at this
          *                  device to be blocked from propagating across the Map.
          *  \return         Self. */
-        inline Map& block_instance_origin(const Device& dev);
+        inline Map& block_origin(const Device& dev);
 
         /*! Get the index of the Map endpoint matching a specific Signal.
          *  \param sig      The Signal to look for.
@@ -2641,11 +2641,11 @@ namespace mapper {
     inline signal_type::signal_type(const Signal& sig)
         { _sig = (mpr_sig)sig; }
 
-    inline Map& Map::allow_instance_origin(const Device& dev)
-        { mpr_map_allow_instance_origin(_obj, mpr_dev(dev)); RETURN_SELF }
+    inline Map& Map::allow_origin(const Device& dev)
+        { mpr_map_allow_origin(_obj, mpr_dev(dev)); RETURN_SELF }
 
-    inline Map& Map::block_instance_origin(const Device& dev)
-        { mpr_map_block_instance_origin(_obj, mpr_dev(dev)); RETURN_SELF }
+    inline Map& Map::block_origin(const Device& dev)
+        { mpr_map_block_origin(_obj, mpr_dev(dev)); RETURN_SELF }
 
     inline Device Signal::device() const
         { return Device(mpr_sig_get_dev(_obj)); }

src/device.c

@@ -143,30 +143,32 @@ void mpr_dev_init(mpr_dev dev, int is_local, const char *name, mpr_id id)
 
     /* these properties need to be added in alphabetical order */
 #define link(PROP, TYPE, DATA, FLAGS) \
-    mpr_tbl_link_value(tbl, MPR_PROP_##PROP, 1, TYPE, DATA, FLAGS | PROP_SET);
-    link(DATA,         MPR_PTR,   &dev->obj.data,     MOD_LOCAL | INDIRECT | LOCAL_ACCESS);
-    link(ID,           MPR_INT64, &dev->obj.id,       MOD_NONE);
+    mpr_tbl_link_value(tbl, MPR_PROP_##PROP, 1, TYPE, DATA, FLAGS | MPR_TBL_SET);
+    link(DATA,         MPR_PTR,   &dev->obj.data,     MPR_TBL_MOD_LOC | MPR_TBL_INDIRECT | MPR_TBL_ACC_LOC);
+    link(ID,           MPR_INT64, &dev->obj.id,       MPR_TBL_MOD_NONE);
     qry = mpr_graph_new_query(dev->obj.graph, 0, MPR_DEV, (void*)cmp_qry_linked, "v", &dev);
-    link(LINKED,       MPR_LIST,  qry,                MOD_NONE | PROP_OWNED);
-    link(NAME,         MPR_STR,   &dev->name,         MOD_NONE | INDIRECT | LOCAL_ACCESS);
-    link(NUM_MAPS_IN,  MPR_INT32, &dev->num_maps_in,  MOD_NONE);
-    link(NUM_MAPS_OUT, MPR_INT32, &dev->num_maps_out, MOD_NONE);
-    link(NUM_SIGS_IN,  MPR_INT32, &dev->num_inputs,   MOD_NONE);
-    link(NUM_SIGS_OUT, MPR_INT32, &dev->num_outputs,  MOD_NONE);
-    link(ORDINAL,      MPR_INT32, &dev->ordinal,      MOD_NONE);
+    link(LINKED,       MPR_LIST,  qry,                MPR_TBL_MOD_NONE | MPR_TBL_OWNED);
+    link(NAME,         MPR_STR,   &dev->name,         MPR_TBL_MOD_NONE | MPR_TBL_INDIRECT
+                                                      | MPR_TBL_ACC_LOC | MPR_TBL_OWNED);
+    link(NUM_MAPS_IN,  MPR_INT32, &dev->num_maps_in,  MPR_TBL_MOD_NONE);
+    link(NUM_MAPS_OUT, MPR_INT32, &dev->num_maps_out, MPR_TBL_MOD_NONE);
+    link(NUM_SIGS_IN,  MPR_INT32, &dev->num_inputs,   MPR_TBL_MOD_NONE);
+    link(NUM_SIGS_OUT, MPR_INT32, &dev->num_outputs,  MPR_TBL_MOD_NONE);
+    link(ORDINAL,      MPR_INT32, &dev->ordinal,      MPR_TBL_MOD_NONE);
     if (!is_local) {
+        // why only local devs??
         qry = mpr_graph_new_query(dev->obj.graph, 0, MPR_SIG, (void*)cmp_qry_sigs,
                                   "hi", dev->obj.id, MPR_DIR_ANY);
-        link(SIG,      MPR_LIST,  qry,                MOD_NONE | PROP_OWNED);
+        link(SIG,      MPR_LIST,  qry,                MPR_TBL_MOD_NONE | MPR_TBL_OWNED);
     }
-    link(STATUS,       MPR_INT32, &dev->obj.status,   MOD_NONE | LOCAL_ACCESS);
-    link(SYNCED,       MPR_TIME,  &dev->synced,       MOD_NONE | LOCAL_ACCESS);
-    link(VERSION,      MPR_INT32, &dev->obj.version,  MOD_NONE);
+    link(STATUS,       MPR_INT32, &dev->obj.status,   MPR_TBL_MOD_NONE | MPR_TBL_ACC_LOC);
+    link(SYNCED,       MPR_TIME,  &dev->synced,       MPR_TBL_MOD_NONE | MPR_TBL_ACC_LOC);
+    link(VERSION,      MPR_INT32, &dev->obj.version,  MPR_TBL_MOD_NONE);
 #undef link
 
     if (is_local)
-        mpr_tbl_add_record(tbl, MPR_PROP_LIBVER, NULL, 1, MPR_STR, PACKAGE_VERSION, MOD_NONE);
-    mpr_tbl_add_record(tbl, MPR_PROP_IS_LOCAL, NULL, 1, MPR_BOOL, &is_local, LOCAL_ACCESS | MOD_NONE);
+        mpr_tbl_add_record(tbl, MPR_PROP_LIBVER, NULL, 1, MPR_STR, PACKAGE_VERSION, MPR_TBL_MOD_NONE);
+    mpr_tbl_add_record(tbl, MPR_PROP_IS_LOCAL, NULL, 1, MPR_BOOL, &is_local, MPR_TBL_ACC_LOC | MPR_TBL_MOD_NONE);
 }
 
 /*! Allocate and initialize a device. This function is called to create a new
@@ -180,6 +182,8 @@ mpr_dev mpr_dev_new(const char *name_prefix, mpr_graph graph)
         ++name_prefix;
     TRACE_RETURN_UNLESS(!strchr(name_prefix, '/'), NULL, "error: character '/' "
                         "is not permitted in device name.\n");
+    TRACE_RETURN_UNLESS(!strchr(name_prefix, ' '), NULL, "error: character ' ' "
+                        "is not permitted in device name.\n");
     if (graph) {
         g = graph;
     }
@@ -299,7 +303,6 @@ void mpr_dev_free(mpr_dev dev)
 void mpr_dev_free_mem(mpr_dev dev)
 {
     FUNC_IF(free, dev->linked);
-    FUNC_IF(free, dev->name);
 }
 
 static void on_registered(mpr_local_dev dev)
@@ -319,11 +322,13 @@ static void on_registered(mpr_local_dev dev)
     qry = mpr_graph_new_query(dev->obj.graph, 0, MPR_SIG, (void*)cmp_qry_sigs,
                               "hi", dev->obj.id, MPR_DIR_ANY);
     mpr_tbl_add_record(dev->obj.props.synced, MPR_PROP_SIG, NULL,
-                       1, MPR_LIST, qry, MOD_NONE | PROP_OWNED);
+                       1, MPR_LIST, qry, MPR_TBL_MOD_NONE | MPR_TBL_OWNED);
+    /* the table makes a copy so we can free this query */
+    mpr_list_free(qry);
     dev->registered = 1;
     dev->ordinal = dev->ordinal_allocator.val;
 
-    snprintf(dev->name + dev->prefix_len + 1, dev->prefix_len + 6, "%d", dev->ordinal);
+    snprintf(dev->name + dev->prefix_len + 1, 5, "%d", dev->ordinal);
     name = strdup(dev->name);
     free(dev->name);
     dev->name = name;
@@ -1069,7 +1074,8 @@ int mpr_dev_set_from_msg(mpr_dev dev, mpr_msg msg)
                 break;
             }
             default:
-                updated += mpr_tbl_add_record_from_msg_atom(dev->obj.props.synced, atom, MOD_REMOTE);
+                updated += mpr_tbl_add_record_from_msg_atom(dev->obj.props.synced, atom,
+                                                            MPR_TBL_MOD_REM);
                 break;
         }
     }

src/graph.c

@@ -281,8 +281,8 @@ mpr_graph mpr_graph_new(int subscribe_flags)
     /* TODO: consider whether graph objects should sync properties over the network. */
     tbl = g->obj.props.synced = mpr_tbl_new();
     mpr_tbl_link_value(tbl, MPR_PROP_DATA, 1, MPR_PTR, &g->obj.data,
-                       MOD_LOCAL | INDIRECT | LOCAL_ACCESS | PROP_SET);
-    mpr_tbl_add_record(tbl, MPR_PROP_LIBVER, NULL, 1, MPR_STR, PACKAGE_VERSION, MOD_NONE);
+                       MPR_TBL_MOD_LOC | MPR_TBL_INDIRECT | MPR_TBL_ACC_LOC | MPR_TBL_SET);
+    mpr_tbl_add_record(tbl, MPR_PROP_LIBVER, NULL, 1, MPR_STR, PACKAGE_VERSION, MPR_TBL_MOD_NONE);
     /* TODO: add object queries as properties. */
 
     g->expr_eval_buff = mpr_expr_new_eval_buffer(NULL);
@@ -607,8 +607,6 @@ mpr_dev mpr_graph_get_dev_by_name(mpr_graph g, const char *name)
 mpr_sig mpr_graph_add_sig(mpr_graph g, const char *name, const char *dev_name, mpr_msg msg)
 {
     mpr_sig sig = 0;
-    int rc = 0, updated = 0;
-
     mpr_dev dev = mpr_graph_get_dev_by_name(g, dev_name);
     if (dev) {
         sig = mpr_dev_get_sig_by_name(dev, name);
@@ -618,31 +616,27 @@ mpr_sig mpr_graph_add_sig(mpr_graph g, const char *name, const char *dev_name, m
     else
         dev = mpr_graph_add_dev(g, dev_name, NULL, NULL, 1);
 
-    if (!sig) {
+    if (sig) {
+        int updated = mpr_sig_set_from_msg(sig, msg);
+#ifdef DEBUG
+        trace_graph(g, "updated %d props for signal ", updated);
+        mpr_prop_print(1, MPR_SIG, sig);
+        printf("\n");
+#endif
+        if (updated)
+            mpr_graph_call_cbs(g, (mpr_obj)sig, MPR_SIG, MPR_STATUS_MODIFIED);
+    }
+    else if ((sig = (mpr_sig)mpr_list_add_item((void**)&g->sigs, mpr_sig_get_struct_size(0), 0))) {
         int num_inst = 1;
-        sig = (mpr_sig)mpr_list_add_item((void**)&g->sigs, mpr_sig_get_struct_size(0), 0);
         mpr_obj_init((mpr_obj)sig, g, MPR_SIG);
         mpr_sig_init(sig, dev, 0, MPR_DIR_UNDEFINED, name, 0, 0, 0, 0, 0, &num_inst);
-        rc = 1;
+        mpr_sig_set_from_msg(sig, msg);
 #ifdef DEBUG
         trace_graph(g, "added signal ");
         mpr_prop_print(1, MPR_SIG, sig);
         printf("\n");
 #endif
-    }
-
-    if (sig) {
-        updated = mpr_sig_set_from_msg(sig, msg);
-#ifdef DEBUG
-        if (!rc) {
-            trace_graph(g, "updated %d props for signal ", updated);
-            mpr_prop_print(1, MPR_SIG, sig);
-            printf("\n");
-        }
-#endif
-
-        if (rc || updated)
-            mpr_graph_call_cbs(g, (mpr_obj)sig, MPR_SIG, rc ? MPR_STATUS_NEW : MPR_STATUS_MODIFIED);
+        mpr_graph_call_cbs(g, (mpr_obj)sig, MPR_SIG, MPR_STATUS_NEW);
     }
     return sig;
 }