Updates for test suite

Author: malloch

test/test_map_timed.c

@@ -37,25 +37,28 @@ double expected = 0;
     "y = a++;"              \
     "next = now + period;"
 
-/* schedule next periodic event (explicit start time) */
-#define NOW_W_START                                                 \
-    "period = %g;"                                                  \
-    "start = 10;"                                                   \
-    "y = 1;"                                                        \
-    "next = (floor((now - start) / period) + 1) * period + start;"
+/* schedule next periodic event from current time (explicit phase)
+ * we "round up" when calculating num periods since start if closer than 0.999 */
+#define NOW_W_START                                                         \
+    "period = %g;"                                                          \
+    "start = 10;"                                                           \
+    "y = 1;"                                                                \
+    "next = (floor((now - start + 0.001) / period) + 1) * period + start;"
 
-/* schedule next periodic event (implicit start time) */
+/* better to schedule by incrementing the `next` timestamp for drift-free timing */
+/* schedule next periodic event (implicit phase) */
 #define NEXT            \
     "period = %g;"      \
     "y = 1;"            \
     "next += period;"
 
-/* better to schedule by incrementing the `next` timestamp for drift-free timing */
+/* schedule next periodic event (explicit phase)
+ * we "round up" when calculating num periods since start if closer than 0.999 */
 #define NEXT_W_START                                                \
     "period = %g;"                                                  \
     "start = 10;"                                                   \
     "y = _x;"                                                       \
-    "next = (floor((next - start) / period) + 1) * period + start;"
+    "next = (floor((next - start + 0.001) / period) + 1) * period + start;"
 
 /* if we track num_periods it is much cheaper to calculate `(n++)*period+start`
  * also have access to beat number which could be useful
@@ -112,6 +115,9 @@ double expected = 0;
     "y = period;"                                   \
     "next += period;"
 
+#define RANDOM  \
+    "p = %g; r = uniform(p) + p * 0.5; y = r; next += r;"
+
 //"new{-1}=0; period = ema(new?0.1:(t_x')
 
 /* TODO: need unmodified t_x to estimate timebase offset
@@ -167,10 +173,12 @@ test_config test_configs[] = {
     { 24, DOWNSAMPLE,   MPR_LOC_DST, 1.95, 2.05 },
     { 25, QUANTIZE,     MPR_LOC_SRC, 1.65, 1.90 },
     { 26, QUANTIZE,     MPR_LOC_DST, 1.65, 1.90 },
-//    { 21, SYNC_LOCAL,   MPR_LOC_SRC, 2.0,  2.0  },
-//    { 22, SYNC_LOCAL,   MPR_LOC_DST, 2.0,  2.0  },
-//    { 23, SYNC_REMOTE,  MPR_LOC_SRC, 2.0,  2.0  },
-//    { 24, SYNC_REMOTE,  MPR_LOC_DST, 2.0,  2.0  },
+    { 27, RANDOM,       MPR_LOC_SRC, 0.75, 1.25 },
+    { 28, RANDOM,       MPR_LOC_DST, 0.75, 1.25 },
+//    { 29, SYNC_LOCAL,   MPR_LOC_SRC, 2.0,  2.0  },
+//    { 30, SYNC_LOCAL,   MPR_LOC_DST, 2.0,  2.0  },
+//    { 31, SYNC_REMOTE,  MPR_LOC_SRC, 2.0,  2.0  },
+//    { 32, SYNC_REMOTE,  MPR_LOC_DST, 2.0,  2.0  },
 
 };
 const int NUM_TESTS = sizeof(test_configs)/sizeof(test_configs[0]);

test/testmaplocation.c

@@ -129,7 +129,8 @@ int set_map_location(mpr_loc loc)
 {
     int len;
     mpr_type type;
-    const void *val;
+    mpr_map *map_src;
+    const void *proc_loc_src, *proc_loc_dst;
 
     if (shared_graph) {
         eprintf("skipping location switch since map endpoints share a graph.\n");
@@ -147,13 +148,22 @@ int set_map_location(mpr_loc loc)
     }
     mpr_obj_push((mpr_obj)map);
 
-    /* wait until change has taken effect */
-    do {
+    map_src = mpr_dev_get_maps(src, MPR_DIR_ANY);
+    if (!map_src)
+        return 1;
+
+    /* wait until change has taken effect – check both endpoints before proceeding */
+    while (!done) {
         mpr_dev_poll(src, 10);
         mpr_dev_poll(dst, 10);
-        mpr_obj_get_prop_by_idx(map, MPR_PROP_PROCESS_LOC, NULL, &len, &type, &val, 0);
+        mpr_obj_get_prop_by_idx(map, MPR_PROP_PROCESS_LOC, NULL, &len, &type, &proc_loc_dst, 0);
+        if (1 != len || MPR_INT32 != type || *(int*)proc_loc_dst != loc)
+            continue;
+        mpr_obj_get_prop_by_idx(*map_src, MPR_PROP_PROCESS_LOC, NULL, &len, &type, &proc_loc_src, 0);
+        if (1 != len || MPR_INT32 != type || *(int*)proc_loc_src != loc)
+            continue;
+        break;
     }
-    while (!done && (1 != len || MPR_INT32 != type || *(int*)val != loc));
 
     return done;
 }
@@ -290,15 +300,15 @@ int main(int argc, char **argv)
             result = 1;
             goto done;
         }
-        eprintf("PROCESS_LOC: DST\n");
+        eprintf("PROCESS_LOC: SRC\n");
         loop();
 
         if (set_map_location(MPR_LOC_DST)) {
             eprintf("Error setting map process location. (2)\n");
             result = 1;
             goto done;
         }
-        eprintf("PROCESS_LOC: SRC\n");
+        eprintf("PROCESS_LOC: DST\n");
         loop();
     } while (!terminate && !done);