Changeset 1472:bbc6ac5ec16d

Timestamp:

08/27/10 05:06:10 (18 months ago)

Author:

niam

Branch:

default

Message:

[time] renamed millinow->nowMs, microSleep->sleepUs; added sleepMs

Location:

sources

Files:

• examples/pc_job/test.cc (modified) (5 diffs)
• examples/pc_process/test.cc (modified) (1 diff)
• examples/pc_workqueue/test.cc (modified) (3 diffs)
• include/libdodo/toolsOs.h (modified) (1 diff)
• include/libdodo/toolsTime.h (modified) (1 diff)
• src/pcExecutionScheduler.cc (modified) (2 diffs)
• src/toolsOs.cc (modified) (1 diff)
• src/toolsTime.cc (modified) (1 diff)

sources/examples/pc_job/test.cc

@@ -18 +18 @@
 {
     dodo_try {
-        cout << endl << (char *)data << ": " << tools::time::millinow() << endl;
+        cout << endl << (char *)data << ": " << tools::time::nowMs() << endl;
     } dodo_catch (exception::basic *e)   {
         cout << (dodo::string)*e << "\t" << e->line << "\t" << e->file << endl;
@@ -30 +30 @@
 {
     dodo_try {
-        cout << endl << ">>" << (char *)data << ": " << tools::time::millinow() << endl;
+        cout << endl << ">>" << (char *)data << ": " << tools::time::nowMs() << endl;
 
         tools::os::sleep(tools::string::stringToUL((char *)data));
 
-        cout << endl << "<<" << (char *)data << ": " << tools::time::millinow() << endl;
+        cout << endl << "<<" << (char *)data << ": " << tools::time::nowMs() << endl;
     } dodo_catch (exception::basic *e)   {
         cout << (dodo::string)*e << "\t" << e->line << "\t" << e->file << endl;
@@ -71 +71 @@
 
         cout << "Launching jobs" << endl;
-        cout << tools::time::millinow() << endl;
+        cout << tools::time::nowMs() << endl;
 
         for (int i = 0; i < amount; ++i)
@@ -79 +79 @@
             cout << "Job #"<< pos[i] << " is " << (manager.isRunning(pos[i])?"running":"not running") << endl;
 
-        cout << tools::time::millinow() << endl;
+        cout << tools::time::nowMs() << endl;
         tools::os::sleep(2);
-        cout << tools::time::millinow() << endl;
+        cout << tools::time::nowMs() << endl;
         scheduler.remove(pID);
 
@@ -88 +88 @@
 
         pID = scheduler.schedule(execution::thread(::job0, (void *)"periodic", execution::ON_DESTRUCTION_STOP), 100, true);
-        cout << tools::time::millinow() << endl;
+        cout << tools::time::nowMs() << endl;
         tools::os::sleep(2);
         scheduler.remove(pID);
-        cout << tools::time::millinow() << endl;
+        cout << tools::time::nowMs() << endl;
         tools::os::sleep(2);
-        cout << tools::time::millinow() << endl;
+        cout << tools::time::nowMs() << endl;
 
         for (int i = 0; i < amount; ++i)

sources/examples/pc_process/test.cc

@@ -38 +38 @@
 
         cout << (char *)data0.acquire(1), cout.flush();
-        tools::os::microSleep(1000);
+        tools::os::sleepMs(1);
         data0.release();
 

sources/examples/pc_workqueue/test.cc

@@ -23 +23 @@
         lock.acquire();
         ++done;
-        cout << "#" << done << ": NULL : " << tools::time::millinow() << endl, cout.flush();
+        cout << "#" << done << ": NULL : " << tools::time::nowMs() << endl, cout.flush();
         lock.release();
 
@@ -35 +35 @@
         lock.acquire();
         ++done;
-        cout << "#" << done << ": " << (char *)data << ": " << tools::time::millinow() << endl, cout.flush();
+        cout << "#" << done << ": " << (char *)data << ": " << tools::time::nowMs() << endl, cout.flush();
         lock.release();
     } dodo_catch (exception::basic *e)   {
@@ -53 +53 @@
         tools::os::sleep(1);
 
-        cout << "Launching jobs: " << tools::time::millinow() << endl;
+        cout << "Launching jobs: " << tools::time::nowMs() << endl;
 
         for (int i=0;i<100;++i)

sources/include/libdodo/toolsOs.h

@@ -216 +216 @@
 
             /**
-             * suspend
+             * suspend for given timeout
              * @param period defines time in microseconds
              */
-            static void microSleep(unsigned long period);
-
-            /**
-             * suspend
+            static void sleepUs(unsigned long period);
+
+            /**
+             * suspend for given timeout
+             * @param period defines time in milliseconds
+             */
+            static void sleepMs(unsigned long period);
+
+            /**
+             * suspend for given timeout
              * @param period defines time in seconds
              */
-            static void sleep(long period);
+            static void sleep(unsigned long period);
 
             /**

sources/include/libdodo/toolsTime.h

@@ -139 +139 @@
              * @return number of milliseconds from 00:00:00 UTC, January 1, 1970 till now
              */
-            static unsigned long millinow();
+            static unsigned long nowMs();
 
             /**

sources/src/pcExecutionScheduler.cc

@@ -177 +177 @@
 
                 scheduler::__job__ &j = i->second;
-                unsigned long ts = tools::time::millinow();
+                unsigned long ts = tools::time::nowMs();
                 if (ts - j.ts >= j.timeout) {
                     if (!j.job->isRunning()) {
@@ -278 +278 @@
     }
 
-    __job__ j = {_job, timeout, tools::time::millinow(), repeat};
+    __job__ j = {_job, timeout, tools::time::nowMs(), repeat};
 
     handles.insert(std::make_pair(counter, j));

sources/src/toolsOs.cc

@@ -605 +605 @@
 
 void
-os::microSleep(unsigned long period)
-{
-    if (period < 1000000)
-        ::usleep(period);
-    else
-        ::sleep(period / 1000000);
-}
-
-//-------------------------------------------------------------------
-
-void
-os::sleep(long period)
+os::sleepMs(unsigned long period)
+{
+    timespec ts = {period/1000, (period%1000)*1000000};
+
+    nanosleep(&ts, NULL);
+}
+
+//-------------------------------------------------------------------
+
+void
+os::sleepUs(unsigned long period)
+{
+    timespec ts = {period/1000000, (period%1000000)*1000};
+
+    nanosleep(&ts, NULL);
+}
+
+//-------------------------------------------------------------------
+
+void
+os::sleep(unsigned long period)
 {
     ::sleep(period);

sources/src/toolsTime.cc

@@ -98 +98 @@
 
 unsigned long
-tools::time::millinow()
+tools::time::nowMs()
 {
     timeval tv;