Update internal device timestamp before processing both incoming and outgoing maps.

Author: malloch

src/device.c

@@ -92,6 +92,7 @@ struct _mpr_local_dev {
 
 /* prototypes */
 static int check_registration(mpr_local_dev dev);
+static void process_maps(mpr_local_dev dev);
 
 size_t mpr_dev_get_struct_size(int is_local)
 {
@@ -245,7 +246,7 @@ void mpr_dev_free(mpr_dev dev)
         free(sub);
     }
 
-    mpr_dev_process_maps(ldev);
+    process_maps(ldev);
 
     /* free signals owned by this device */
     list = mpr_dev_get_sigs(dev, MPR_DIR_ANY);
@@ -449,7 +450,7 @@ mpr_link mpr_dev_get_link_by_remote(mpr_dev dev, mpr_dev remote)
     return 0;
 }
 
-void mpr_dev_process_maps(mpr_local_dev dev)
+static void process_maps(mpr_local_dev dev)
 {
     mpr_list list;
     mpr_graph graph;
@@ -620,19 +621,19 @@ void mpr_dev_set_time(mpr_dev dev, mpr_time time)
     mpr_time_set(&now, MPR_NOW);
     mpr_dev_set_offset(dev, mpr_time_get_diff(time, now), dev->clk_offset ? 0.1 : 1.0);
 
+    mpr_time_set(&ldev->time, time);
+    ldev->time_is_stale = 0;
+
     if (!ldev->locked) {
         /* process any updates made under the old timestamp */
-        mpr_dev_process_maps(ldev);
+        process_maps(ldev);
     }
 
-    mpr_time_set(&ldev->time, time);
-    ldev->time_is_stale = 0;
-
     if (ldev->timed && mpr_time_get_diff(ldev->t_next, time) <= 0.001) {
         ldev->updated = MPR_DIR_ANY;
         if (!ldev->locked) {
             /* process timed maps due under the new timestamp */
-            mpr_dev_process_maps(ldev);
+            process_maps(ldev);
         }
     }
 }

src/device.h

@@ -77,8 +77,6 @@ int mpr_dev_GID_decref(mpr_local_dev dev, int group, mpr_id_map id_map);
 
 void mpr_dev_init(mpr_dev dev, int is_local, const char *name, mpr_id id);
 
-void mpr_dev_process_maps(mpr_local_dev dev);
-
 void mpr_dev_update_subscribers(mpr_local_dev dev);
 
 void mpr_dev_remove_sig(mpr_dev dev, mpr_sig sig);

src/expression/expr_evaluator.h

@@ -103,7 +103,8 @@ int mpr_expr_eval(mpr_expr expr, ebuffer buff, mpr_value *v_in, mpr_value *v_var
                   mpr_value v_out, mpr_time *time, mpr_value v_next, int inst_idx)
 {
 #if TRACE_EVAL
-    printf("evaluating expression with instance index %d\n", inst_idx);
+    printf("evaluating expression with instance index %d at time %f\n",
+           inst_idx, time ? mpr_time_as_dbl(*time) : -1);
 #endif
     estack stk = expr->stack;
     etoken_t *tok = stk->tokens, *end = tok + stk->num_tokens;

src/network.c

@@ -1007,7 +1007,7 @@ MPR_INLINE static int mpr_min(int a, int b)
     return a < b ? a : b;
 }
 
-int mpr_net_poll_internal(mpr_net net, int block_ms)
+static int mpr_net_poll_internal(mpr_net net, int block_ms)
 {
     int i, count = 0, left_ms = 0, elapsed_ms, admin_elapsed_ms = 0;
     double then;
@@ -1058,8 +1058,7 @@ int mpr_net_poll_internal(mpr_net net, int block_ms)
         }
         left_ms = 100;
         for (i = 0; i < net->num_devs; i++) {
-            int dev_left_ms = mpr_local_dev_update_maps(net->devs[i]);
-            left_ms = mpr_min(left_ms, dev_left_ms);
+            left_ms = mpr_min(left_ms, mpr_local_dev_update_maps(net->devs[i]));
 
         }