OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0023983: Cpulimit doesn't kill test cases

Browse Source 
Modified command cpulimit using OSD_Timer and method ElapsedTime()

Enabled elapsed time control on Linux.

Added resetting of elapsed timer.

Unused variables were removed

Definition of OSD_Timer aTimer was replaced.

Correction of thread terminating on linux.
This commit is contained in:
ski 2014-12-04 15:09:23 +03:00 committed by bugmaster
parent 368cdde60e
commit 0b309a75c4
1 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/Draw/Draw_BasicCommands.cxx
View File

@ -47,11 +47,11 @@
static clock_t CPU_CURRENT; // cpu time already used at last static clock_t CPU_CURRENT; // cpu time already used at last
// cpulimit call. (sec.) // cpulimit call. (sec.)
#else /* _WIN32 */ #else /* _WIN32 */
#include <sys/resource.h> #include <sys/resource.h>
#include <signal.h> #include <signal.h>
#include <unistd.h>
#if defined (__hpux) || defined ( HPUX ) #if defined (__hpux) || defined ( HPUX )
#define RLIM_INFINITY 0x7fffffff #define RLIM_INFINITY 0x7fffffff
@ -63,6 +63,7 @@ static clock_t CPU_CURRENT; // cpu time already used at last
extern Standard_Boolean Draw_Batch; extern Standard_Boolean Draw_Batch;
static clock_t CPU_LIMIT; // Cpu_limit in Sec. static clock_t CPU_LIMIT; // Cpu_limit in Sec.
static OSD_Timer aTimer;
//======================================================================= //=======================================================================
// chronom // chronom
@ -393,28 +394,53 @@ static Standard_Integer Draw_wait(Draw_Interpretor& , Standard_Integer n, const
#ifdef _WIN32 #ifdef _WIN32
static unsigned int __stdcall CpuFunc (void * /*param*/) static unsigned int __stdcall CpuFunc (void * /*param*/)
{ {
clock_t anElapCurrent;
clock_t aCurrent; clock_t aCurrent;
for(;;) for(;;)
{ {
Sleep (5); Sleep (5);
Standard_Real anUserSeconds, aSystemSeconds; Standard_Real anUserSeconds, aSystemSeconds;
OSD_Chronometer::GetProcessCPU (anUserSeconds, aSystemSeconds); OSD_Chronometer::GetProcessCPU (anUserSeconds, aSystemSeconds);
aCurrent = clock_t(anUserSeconds + aSystemSeconds); aCurrent = clock_t(anUserSeconds + aSystemSeconds);
anElapCurrent = clock_t(aTimer.ElapsedTime());
if ((aCurrent - CPU_CURRENT) >= CPU_LIMIT) if ((aCurrent - CPU_CURRENT) >= CPU_LIMIT)
{ {
cout << "Process killed by CPU limit (" << CPU_LIMIT << " sec)" << endl; cout << "Process killed by CPU limit (" << CPU_LIMIT << " sec)" << endl;
aTimer.Stop();
ExitProcess (2);
}
if ((anElapCurrent) >= CPU_LIMIT)
{
cout << "Process killed by elapsed limit (" << CPU_LIMIT << " sec)" << endl;
aTimer.Stop();
ExitProcess (2); ExitProcess (2);
// return 0;
} }
} }
} }
#else #else
static void CpuFunc (int) static void cpulimitSignalHandler (int)
{ {
cout << "Process killed by CPU limit (" << CPU_LIMIT << " sec)" << endl; cout << "Process killed by CPU limit (" << CPU_LIMIT << " sec)" << endl;
exit(2); exit(2);
} }
static void *CpuFunc(void* /*threadarg*/)
{
clock_t anElapCurrent;
for(;;)
{
sleep (5);
anElapCurrent = clock_t(aTimer.ElapsedTime());
if ( CPU_LIMIT < 0 )
return NULL;
if ((anElapCurrent) >= CPU_LIMIT) {
cout << "Process killed by elapsed limit (" << CPU_LIMIT << " sec)" << endl;
exit(2);
}
}
return NULL;
}
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
@ -424,23 +450,21 @@ static Standard_Integer cpulimit(Draw_Interpretor&, Standard_Integer n, const ch
static Standard_Integer cpulimit(Draw_Interpretor& di, Standard_Integer n, const char** a) static Standard_Integer cpulimit(Draw_Interpretor& di, Standard_Integer n, const char** a)
{ {
#endif #endif
static int aFirst = 1;
#ifdef _WIN32 #ifdef _WIN32
// Windows specific code // Windows specific code
static int aFirst = 1;
unsigned int __stdcall CpuFunc (void *); unsigned int __stdcall CpuFunc (void *);
unsigned aThreadID; unsigned aThreadID;
if (n <= 1) if (n <= 1){
CPU_LIMIT = RLIM_INFINITY; CPU_LIMIT = RLIM_INFINITY;
else } else {
{
CPU_LIMIT = Draw::Atoi (a[1]); CPU_LIMIT = Draw::Atoi (a[1]);
Standard_Real anUserSeconds, aSystemSeconds; Standard_Real anUserSeconds, aSystemSeconds;
OSD_Chronometer::GetProcessCPU (anUserSeconds, aSystemSeconds); OSD_Chronometer::GetProcessCPU (anUserSeconds, aSystemSeconds);
CPU_CURRENT = clock_t(anUserSeconds + aSystemSeconds); CPU_CURRENT = clock_t(anUserSeconds + aSystemSeconds);
aTimer.Reset();
aTimer.Start();
if (aFirst) // Launch the thread only at the 1st call. if (aFirst) // Launch the thread only at the 1st call.
{ {
aFirst = 0; aFirst = 0;
@ -449,9 +473,7 @@ static Standard_Integer cpulimit(Draw_Interpretor& di, Standard_Integer n, const
} }
#else #else
// Unix & Linux // Unix & Linux
rlimit rlp; rlimit rlp;
rlp.rlim_max = RLIM_INFINITY; rlp.rlim_max = RLIM_INFINITY;
if (n <= 1) if (n <= 1)
@ -468,14 +490,23 @@ static Standard_Integer cpulimit(Draw_Interpretor& di, Standard_Integer n, const
// set signal handler to print a message before death // set signal handler to print a message before death
struct sigaction act, oact; struct sigaction act, oact;
memset (&act, 0, sizeof(act)); memset (&act, 0, sizeof(act));
act.sa_handler = CpuFunc; act.sa_handler = cpulimitSignalHandler;
sigaction (SIGXCPU, &act, &oact); sigaction (SIGXCPU, &act, &oact);
// cpulimit for elapsed time
aTimer.Reset();
aTimer.Start();
pthread_t cpulimitThread;
if (aFirst) // Launch the thread only at the 1st call.
{
aFirst = 0;
pthread_create(&cpulimitThread, NULL, CpuFunc, NULL);
}
#endif #endif
return 0; return 0;
} }
//======================================================================= //=======================================================================
//function : mallochook //function : mallochook
//purpose : //purpose :