merge with tip
authorTom Henderson <tomh@tomh.org>
Mon, 28 Sep 2009 01:06:47 -0700
changeset 5272 867b0ba95374
parent 5271 30f7ef5b318a (current diff)
parent 5268 d28ac98e0ed9 (diff)
child 5274 8723fb3b377b
child 5707 d4bcda8a76ed
merge with tip
--- a/examples/multirate.cc	Mon Sep 28 01:06:21 2009 -0700
+++ b/examples/multirate.cc	Mon Sep 28 01:06:47 2009 -0700
@@ -261,7 +261,7 @@
 
   for (uint32_t i=0; i < totalNodes/3; i++)
     {
-      ApplicationSetup (c.Get(uvSrc.GetValue()), c.Get(uvDest.GetValue()) ,  1, totalTime);
+      ApplicationSetup (c.Get(uvSrc.RandomVariable::GetInteger()), c.Get(uvDest.RandomVariable::GetInteger()) ,  1, totalTime);
     }
 }
 
--- a/test.py	Mon Sep 28 01:06:21 2009 -0700
+++ b/test.py	Mon Sep 28 01:06:47 2009 -0700
@@ -21,7 +21,6 @@
 import sys
 import optparse
 import subprocess
-import multiprocessing
 import threading
 import Queue
 import signal
@@ -625,7 +624,11 @@
     jobs = 0
     threads=[]
 
-    processors = multiprocessing.cpu_count()
+    try:
+        import multiprocessing
+        processors = multiprocessing.cpu_count()
+    except ImportError:
+        processors = 1
     for i in range(processors):
         thread = worker_thread(input_queue, output_queue)
         threads.append(thread)