2012-02-14
2012-02-14 18:06:51 by Jonas Wallden <jonasw@roxen.com>
-
a9a28269dfd1772fd5c2a96bd8c6c6a7354186e1
(11 lines)
(+6/-5)
[
Show
| Annotate
]
Branch: 5.2
Thread timing must be in same base for correct calculation of elapsed time.
Rev: server/base_server/roxen.pike:1.1108
6:
// Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.
// ABS and suicide systems contributed freely by Francesco Chemolli
- constant cvs_version="$Id: roxen.pike,v 1.1107 2012/02/14 16:52:38 mast Exp $";
+ constant cvs_version="$Id: roxen.pike,v 1.1108 2012/02/14 18:06:51 jonasw Exp $";
//! @appears roxen
//!
1327: Inside #if defined(THREADS) and #if undefined(NO_SLOW_REQ_BT)
if ((monitor = slow_req_monitor) && slow_req_timeout > 0.0) {
call_out = monitor->call_out (dump_slow_req, slow_req_timeout,
this_thread(), slow_req_timeout);
- int start_hrtime = gethrtime (1);
+ int start_hrtime = gethrtime();
thread_task_start_times[this_thread()] = start_hrtime;
task_vtime = gauge {
if (task[0]) // Ignore things that have become destructed.
1335: Inside #if defined(THREADS) and #if undefined(NO_SLOW_REQ_BT)
// exactly two refs to task[0] during the call below.
task[0] (@task[1]);
};
- task_rtime = (gethrtime (1) - start_hrtime) / 1e9;
+ task_rtime = (gethrtime() - start_hrtime) / 1e6;
thread_task_start_times[this_thread()] = 0;
monitor->remove_call_out (call_out);
}
else
#endif
{
- int start_hrtime = gethrtime (1);
+ int start_hrtime = gethrtime();
thread_task_start_times[this_thread()] = start_hrtime;
task_vtime = gauge {
if (task[0])
task[0] (@task[1]);
};
- task_rtime = (gethrtime (1) - start_hrtime) / 1e9;
+ task_rtime = (gethrtime() - start_hrtime) / 1e6;
thread_task_start_times[this_thread()] = 0;
}