Changeset 1417:af5cb44c12fc

Timestamp:

11/22/09 16:42:53 (2 years ago)

Author:

niam

Branch:

default

Message:

pc::execution::scheduler: work with const-referenced objects

Location:

sources

Files:

• examples/pc_job/test.cc (modified) (2 diffs)
• include/libdodo/pcExecutionJob.h (modified) (2 diffs)
• include/libdodo/pcExecutionManagerEx.h (modified) (1 diff)
• include/libdodo/pcExecutionScheduler.h (modified) (1 diff)
• include/libdodo/pcExecutionSchedulerEx.h (modified) (2 diffs)
• src/pcExecutionManager.cc (modified) (1 diff)
• src/pcExecutionScheduler.cc (modified) (3 diffs)

sources/examples/pc_job/test.cc

@@ -49 +49 @@
         const int amount = 10;
 
-        execution::thread periodic(::job0, (void *)"periodic", execution::ON_DESTRUCTION_STOP);
-        execution::thread oneshot0(::job0, (void *)"oneshot", execution::ON_DESTRUCTION_STOP);
-        execution::process oneshot1(::job0, (void *)"oneshot", execution::ON_DESTRUCTION_STOP);
         execution::scheduler scheduler;
 
-        unsigned long pID = scheduler.schedule(&periodic, 1000, true);
-        scheduler.schedule(&oneshot0, 2000);
-        scheduler.schedule(&oneshot1, 3000);
+        unsigned long pID = scheduler.schedule(execution::thread(::job0, (void *)"periodic", execution::ON_DESTRUCTION_STOP), 1000, true);
+        scheduler.schedule(execution::thread(::job0, (void *)"oneshot thread", execution::ON_DESTRUCTION_STOP), 2000);
+        scheduler.schedule(execution::process(::job0, (void *)"oneshot process", execution::ON_DESTRUCTION_STOP), 3000);
 
         execution::manager manager;
@@ -90 +87 @@
             cout << "Job #"<< pos[i] << " is " << (manager.isRunning(pos[i])?"running":"not running") << endl;
 
-        pID = scheduler.schedule(&periodic, 100, true);
+        pID = scheduler.schedule(execution::thread(::job0, (void *)"periodic", execution::ON_DESTRUCTION_STOP), 100, true);
         cout << tools::time::millinow() << endl;
         tools::os::sleep(2);

sources/include/libdodo/pcExecutionJob.h

@@ -39 +39 @@
         namespace execution {
             class manager;
+            class scheduler;
 
             /**
@@ -62 +63 @@
             class job {
                 friend class manager;
+                friend class scheduler;
 
               public:

sources/include/libdodo/pcExecutionManagerEx.h

@@ -51 +51 @@
 #define PCEXECUTIONMANAGEREX_NOTFOUND_STR    "Job was not found"
 #define PCEXECUTIONMANAGEREX_UNKNOWNJOB_STR  "Unknown type of job"
+
             /**
              * ID of function where exception was thrown

sources/include/libdodo/pcExecutionScheduler.h

@@ -72 +72 @@
                  * @param repeat defines if job should be rescheduled again
                  */
-                unsigned long schedule(execution::job *job,
+                unsigned long schedule(const execution::job &job,
                                        unsigned long timeout,
                                        bool repeat = false);

sources/include/libdodo/pcExecutionSchedulerEx.h

@@ -39 +39 @@
         namespace execution {
             /**
+             * libdodo defined errors
+             */
+            enum schedulerExR {
+                SCHEDULEREX_UNKNOWNJOB,
+            };
+
+            /**
+             * libdodo defined errors explanation
+             */
+#define PCEXECUTIONSCHEDULEREX_UNKNOWNJOB_STR  "Unknown type of job"
+
+            /**
              * ID of function where exception was thrown
              */
@@ -44 +56 @@
                 SCHEDULEREX___MANAGER__CONSTRUCTOR,
                 SCHEDULEREX_CONSTRUCTOR,
+                SCHEDULEREX_SCHEDULE,
             };
         };

sources/src/pcExecutionManager.cc

@@ -81 +81 @@
 
         default:
-            throw exception::basic(exception::MODULE_PCEXECUTIONMANAGER, MANAGEREX_RUN, exception::ERRNO_LIBDODO, MANAGEREX_UNKNOWNJOB, PCEXECUTIONMANAGEREX_UNKNOWNJOB_STR, __LINE__, __FILE__);
+            throw exception::basic(exception::MODULE_PCEXECUTIONMANAGER, MANAGEREX_ADD, exception::ERRNO_LIBDODO, MANAGEREX_UNKNOWNJOB, PCEXECUTIONMANAGEREX_UNKNOWNJOB_STR, __LINE__, __FILE__);
     }
 

sources/src/pcExecutionScheduler.cc

@@ -77 +77 @@
 #include <libdodo/pcExecutionSchedulerEx.h>
 #include <libdodo/pcExecutionJob.h>
+#include <libdodo/pcExecutionThread.h>
+#include <libdodo/pcExecutionProcess.h>
 #include <libdodo/types.h>
 #include <libdodo/pcSyncThread.h>
@@ -249 +251 @@
 
 unsigned long
-scheduler::schedule(execution::job *job,
+scheduler::schedule(const execution::job &job,
                     unsigned long timeout,
                     bool repeat)
@@ -255 +257 @@
     pc::sync::stack tg(keeper);
 
-    __job__ j = {job, timeout, tools::time::millinow(), repeat};
+    execution::job *_job;
+
+    execution::job *orig = const_cast<execution::job *>(&job);
+
+    switch (job.type) {
+        case execution::job::TYPE_PROCESS:
+            _job = new process(*dynamic_cast<process *>(orig));
+
+            break;
+
+        case execution::job::TYPE_THREAD:
+            _job = new thread(*dynamic_cast<thread *>(orig));
+
+            break;
+
+        default:
+            throw exception::basic(exception::MODULE_PCEXECUTIONSCHEDULER, SCHEDULEREX_SCHEDULE, exception::ERRNO_LIBDODO, SCHEDULEREX_UNKNOWNJOB, PCEXECUTIONSCHEDULEREX_UNKNOWNJOB_STR, __LINE__, __FILE__);
+    }
+
+    __job__ j = {_job, timeout, tools::time::millinow(), repeat};
 
     handles.insert(std::make_pair(counter, j));