|
version 1.18, 2007/10/26 17:51:11
|
version 1.19, 2008/01/11 19:32:26
|
|
|
|
| | |
| #include <Pegasus/Common/Signal.h> | #include <Pegasus/Common/Signal.h> |
| #include <Pegasus/Common/Executor.h> | #include <Pegasus/Common/Executor.h> |
| |
#include <Pegasus/Common/AtomicInt.h> |
| |
#include <Pegasus/Common/Thread.h> |
| |
#include <Pegasus/Common/Threads.h> |
| | |
| #define MAX_WAIT_TIME 240 | #define MAX_WAIT_TIME 240 |
| | |
|
|
|
| } | } |
| | |
| | |
| |
#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) |
| |
/** |
| |
Indicates whether the Executor has been instructed to daemonize or |
| |
otherwise exit. |
| |
*/ |
| |
static AtomicInt _hasDaemonized(0); |
| |
|
| |
/** |
| |
A watchdog thread that used to allow the server start-up command to |
| |
time out and return control even if the server initialization is not |
| |
complete. |
| |
*/ |
| |
static Thread* _waitForDaemonizationThread = 0; |
| |
|
| |
/** |
| |
Wait for server start-up to complete. If the MAX_WAIT_TIME elapses |
| |
before the Executor is instructed to daemonize, then initiate the |
| |
daemonization. This is necessary to prevent a server start-up hang |
| |
from hanging the cimserver command. |
| |
*/ |
| |
static ThreadReturnType PEGASUS_THREAD_CDECL _waitForDaemonization(void* parm) |
| |
{ |
| |
Thread *myself = reinterpret_cast<Thread *>(parm); |
| |
AtomicInt* hasDaemonized = reinterpret_cast<AtomicInt*>(myself->get_parm()); |
| |
|
| |
Uint32 waitTimeMsec = MAX_WAIT_TIME * 1000; |
| |
|
| |
while (!hasDaemonized->get() && waitTimeMsec > 0) |
| |
{ |
| |
Threads::sleep(100); |
| |
waitTimeMsec -= 100; |
| |
} |
| |
|
| |
if (!hasDaemonized->get()) |
| |
{ |
| |
MessageLoaderParms parms( |
| |
"src.Service.ServerProcessUnix.CIMSERVER_START_TIMEOUT", |
| |
"The cimserver command timed out waiting for the CIM server " |
| |
"to start."); |
| |
PEGASUS_STD(cerr) << MessageLoader::getMessage(parms) << |
| |
PEGASUS_STD(endl); |
| |
*hasDaemonized = 1; |
| |
Executor::daemonizeExecutor(); |
| |
} |
| |
|
| |
myself->exit_self((ThreadReturnType)1); |
| |
return 0; |
| |
} |
| |
#endif |
| |
|
| |
|
| //constructor | //constructor |
| ServerProcess::ServerProcess() {} | ServerProcess::ServerProcess() {} |
| | |
|
|
|
| getSigHandle()->activate(SIGTERM); | getSigHandle()->activate(SIGTERM); |
| umask(S_IRWXG | S_IRWXO); | umask(S_IRWXG | S_IRWXO); |
| | |
| |
#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) |
| if (Executor::detectExecutor() == 0) | if (Executor::detectExecutor() == 0) |
| { | { |
| // We don't need to fork if we're running with Privilege Separation | // We don't need to fork if we're running with Privilege Separation |
| setsid(); | setsid(); |
| |
|
| |
_waitForDaemonizationThread = new Thread( |
| |
_waitForDaemonization, &_hasDaemonized, false); |
| |
if (_waitForDaemonizationThread->run() != PEGASUS_THREAD_OK) |
| |
{ |
| |
// Unable to start watchdog thread. |
| |
delete _waitForDaemonizationThread; |
| |
_waitForDaemonizationThread = 0; |
| |
} |
| |
|
| return 0; | return 0; |
| } | } |
| |
#endif |
| | |
| getSigHandle()->registerHandler(PEGASUS_SIGUSR1, sigUsr1Handler); | getSigHandle()->registerHandler(PEGASUS_SIGUSR1, sigUsr1Handler); |
| getSigHandle()->activate(PEGASUS_SIGUSR1); | getSigHandle()->activate(PEGASUS_SIGUSR1); |
|
|
|
| { | { |
| pid_t ppid = getppid(); | pid_t ppid = getppid(); |
| if (id) | if (id) |
| |
{ |
| kill(ppid, SIGTERM); | kill(ppid, SIGTERM); |
| |
} |
| else | else |
| |
{ |
| |
#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) |
| |
if (Executor::detectExecutor() == 0) |
| |
{ |
| |
// Note: This logic contains a race condition which may allow the |
| |
// Executor to daemonize twice. However, the Executor is expected |
| |
// to handle this condition gracefully. |
| |
if (!_hasDaemonized.get()) |
| |
{ |
| |
Executor::daemonizeExecutor(); |
| |
} |
| |
} |
| |
else |
| |
#endif |
| |
{ |
| kill(ppid, PEGASUS_SIGUSR1); | kill(ppid, PEGASUS_SIGUSR1); |
| } | } |
| |
} |
| |
|
| |
#if defined(PEGASUS_ENABLE_PRIVILEGE_SEPARATION) |
| |
if (_waitForDaemonizationThread) |
| |
{ |
| |
_hasDaemonized = 1; |
| |
delete _waitForDaemonizationThread; |
| |
_waitForDaemonizationThread = 0; |
| |
} |
| |
#endif |
| |
} |
| | |
| | |
| // Platform specific run | // Platform specific run |
Return to
ServerProcessUnix.cpp
CVS log
Up to [Pegasus] / pegasus / src / Service