Merge branch 'cpp_fixes' into cpp_fixes+exceptions

SpiNNakerManchester · May 17, 2017 · 133c47d · 133c47d
2 parents a2883d4 + 755e054
commit 133c47d
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/scamp/scamp-3.c b/scamp/scamp-3.c
@@ -237,7 +237,11 @@ void proc_route_msg (uint arg1, uint arg2);
 
 void msg_queue_insert (sdp_msg_t *msg, uint srce_ip)
 {
-  event_queue_proc (proc_route_msg, (uint) msg, srce_ip, PRIO_0);
+  if (event_queue_proc (proc_route_msg, (uint) msg, srce_ip, PRIO_0) == 0)
+    {
+      // if no event is queued free SDP msg buffer
+      sark_msg_free (msg);
+    }
 }
 
 
@@ -1578,8 +1582,11 @@ void c_main (void)
 
   while (1)				// Run event loop (forever...)
     {
-      event_run (1);
-      cpu_wfi ();
+      event_run (0);
+      if (event.proc_queue->proc_head == NULL)
+        {
+          cpu_wfi ();
+	}
     }
 }