TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

secs -> ms

Browse Source
This commit is contained in:
David Rose 2009-07-15 00:27:58 +00:00
parent b292e06ff6
commit 339cb4e7a2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
direct/src/plugin/p3dSession.cxx
View File

@ -109,14 +109,14 @@ shutdown() {
// a hang. Don't need to close it yet. // a hang. Don't need to close it yet.
// _pipe_read.close(); // _pipe_read.close();
static const double max_wait_secs = 2; static const int max_wait_ms = 2000;
#ifdef _WIN32 #ifdef _WIN32
// Now give the process a chance to terminate itself cleanly. // Now give the process a chance to terminate itself cleanly.
if (WaitForSingleObject(_p3dpython_handle, 2000) == WAIT_TIMEOUT) { if (WaitForSingleObject(_p3dpython_handle, max_wait_ms) == WAIT_TIMEOUT) {
// It didn't shut down cleanly, so kill it the hard way. // It didn't shut down cleanly, so kill it the hard way.
nout << "Force-killing python process.\n" << flush; nout << "Force-killing python process.\n" << flush;
TerminateProcess(_p3dpython_handle, max_wait_secs); TerminateProcess(_p3dpython_handle, 2);
} }
CloseHandle(_p3dpython_handle); CloseHandle(_p3dpython_handle);
@ -126,7 +126,7 @@ shutdown() {
// itself. // itself.
struct timeval start; struct timeval start;
gettimeofday(&start, NULL); gettimeofday(&start, NULL);
double start_secs = start.tv_sec + start.tv_usec / 1000000.0; int start_ms = start.tv_sec * 1000 + start.tv_usec / 1000;
int status; int status;
nout << "waiting for pid " << _p3dpython_pid << "\n" << flush; nout << "waiting for pid " << _p3dpython_pid << "\n" << flush;
@ -139,15 +139,15 @@ shutdown() {
struct timeval now; struct timeval now;
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
double now_secs = now.tv_sec + now.tv_usec / 1000000.0; int now_ms = now.tv_sec * 1000 + now.tv_usec / 1000;
double elapsed = now_secs - start_secs; double elapsed = now_ms - start_ms;
if (elapsed > max_wait_secs) { if (elapsed > max_wait_ms) {
// Tired of waiting. Kill the process. // Tired of waiting. Kill the process.
nout << "Force-killing python process, pid " << _p3dpython_pid nout << "Force-killing python process, pid " << _p3dpython_pid
<< "\n" << flush; << "\n" << flush;
kill(_p3dpython_pid, SIGKILL); kill(_p3dpython_pid, SIGKILL);
start_secs = now_secs; start_ms = now_ms;
} }
// Yield the timeslice and wait some more. // Yield the timeslice and wait some more.