3.10.2013 - PIPeer release, PIConsole now can work as server and remote client. Remote console test program in directory "remote_console"
This commit is contained in:
21
pitimer.cpp
21
pitimer.cpp
@@ -174,7 +174,7 @@ void PITimer::start(double msecs) {
|
||||
ti = timer_create(CLOCK_REALTIME, &se, &timer);
|
||||
//cout << "***create timer " << msecs << " msecs\n";
|
||||
if (ti == -1) {
|
||||
piCout << "[PITimer] Can`t create timer for " << msecs << " msecs: " << errorString();
|
||||
piCoutObj << "[PITimer] Can`t create timer for " << msecs << " msecs: " << errorString();
|
||||
return;
|
||||
}
|
||||
timer_settime(timer, 0, &spec, 0);
|
||||
@@ -192,7 +192,7 @@ void PITimer::deferredStart(double interval_msecs, double delay_msecs) {
|
||||
ti = timer_create(CLOCK_REALTIME, &se, &timer);
|
||||
//cout << "***create timer\n";
|
||||
if (ti == -1) {
|
||||
piCout << "[PITimer] Can`t create timer for " << interval_msecs << " msecs: " << errorString();
|
||||
piCoutObj << "[PITimer] Can`t create timer for " << interval_msecs << " msecs: " << errorString();
|
||||
return;
|
||||
}
|
||||
timer_settime(timer, 0, &spec, 0);
|
||||
@@ -218,7 +218,7 @@ void PITimer::deferredStart(double interval_msecs, const PIDateTime & start_date
|
||||
ti = timer_create(CLOCK_REALTIME, &se, &timer);
|
||||
//cout << "***create timer\n";
|
||||
if (ti == -1) {
|
||||
piCout << "[PITimer] Can`t create timer for " << interval_msecs << " msecs: " << errorString();
|
||||
piCoutObj << "[PITimer] Can`t create timer for " << interval_msecs << " msecs: " << errorString();
|
||||
return;
|
||||
}
|
||||
timer_settime(timer, TIMER_ABSTIME, &spec, 0);
|
||||
@@ -246,7 +246,7 @@ void PITimer::TimerPool::begin() {
|
||||
sa.sa_handler = empty_handler;
|
||||
sigemptyset(&sa.sa_mask);
|
||||
if (sigaction(SIGALRM, &sa, 0) == -1) {
|
||||
piCout << "[PITimer] sigaction error: " << errorString();
|
||||
piCoutObj << "[PITimer] sigaction error: " << errorString();
|
||||
stop();
|
||||
return;
|
||||
}*/
|
||||
@@ -260,12 +260,12 @@ void PITimer::TimerPool::begin() {
|
||||
spec.it_value = spec.it_interval;
|
||||
//cout << "***create pool timer\n";
|
||||
if (timer_create(CLOCK_REALTIME, &se, &timer) == -1) {
|
||||
piCout << "[PITimer] Can`t create timer for pool: " << errorString();
|
||||
piCoutObj << "[PITimer] Can`t create timer for pool: " << errorString();
|
||||
stop();
|
||||
return;
|
||||
}
|
||||
if (timer_settime(timer, 0, &spec, 0) == -1) {
|
||||
piCout << "[PITimer] Can`t set timer for pool: " << errorString();
|
||||
piCoutObj << "[PITimer] Can`t set timer for pool: " << errorString();
|
||||
stop();
|
||||
return;
|
||||
}
|
||||
@@ -358,7 +358,7 @@ void PITimer::start(double msecs) {
|
||||
|
||||
|
||||
void PITimer::deferredStart(double interval_msecs, double delay_msecs) {
|
||||
//piCout << "defStart exec with" << delay_msecs << interval_msecs;
|
||||
//piCoutObj << "defStart exec with" << delay_msecs << interval_msecs;
|
||||
if (interval_msecs < 0 || running_) return;
|
||||
interval_ = interval_msecs;
|
||||
PISystemTime cst = currentSystemTime();
|
||||
@@ -367,12 +367,12 @@ void PITimer::deferredStart(double interval_msecs, double delay_msecs) {
|
||||
if (st_time < cst) st_time = cst;
|
||||
running_ = deferred_ = true;
|
||||
PIThread::start();
|
||||
//piCout << "timer start def";
|
||||
//piCoutObj << "timer start def";
|
||||
}
|
||||
|
||||
|
||||
void PITimer::deferredStart(double interval_msecs, const PIDateTime & start_datetime) {
|
||||
//piCout << "defStart exec to" << start_datetime.toString() << interval_msecs;
|
||||
//piCoutObj << "defStart exec to" << start_datetime.toString() << interval_msecs;
|
||||
if (interval_msecs < 0 || running_) return;
|
||||
interval_ = interval_msecs;
|
||||
PISystemTime cst = currentSystemTime();
|
||||
@@ -381,7 +381,7 @@ void PITimer::deferredStart(double interval_msecs, const PIDateTime & start_date
|
||||
if (st_time < cst) st_time = cst;
|
||||
running_ = deferred_ = true;
|
||||
PIThread::start();
|
||||
//piCout << "timer start def";
|
||||
//piCoutObj << "timer start def";
|
||||
}
|
||||
|
||||
|
||||
@@ -621,6 +621,7 @@ PIDateTime currentDateTime() {
|
||||
time_t rt = time(0);
|
||||
tm * pt = localtime(&rt);
|
||||
PIDateTime dt;
|
||||
dt.milliseconds = 0;
|
||||
dt.seconds = pt->tm_sec;
|
||||
dt.minutes = pt->tm_min;
|
||||
dt.hours = pt->tm_hour;
|
||||
|
||||
Reference in New Issue
Block a user