pegasus/src/Server/cimserver.cpp - diff

Return to cimserver.cpp CVS log

Up to [Pegasus] / pegasus / src / Server

Diff for /pegasus/src/Server/cimserver.cpp between version 1.174 and 1.175

version 1.174, 2005/12/19 21:51:44

version 1.175, 2006/01/04 18:43:40

Line 124

# include "OS400ConvertChar.h"

#endif

#if defined(PEGASUS_OS_OS400)

# include <unistd.cleinc>

#elif defined(PEGASUS_OS_TYPE_UNIX)

# include <unistd.h>

#endif

PEGASUS_USING_PEGASUS;

PEGASUS_USING_STD;

Line 1226

Line 1233

umask(S_IRWXG|S_IRWXO);

#endif

#if defined(PEGASUS_OS_TYPE_UNIX)

// CRITICAL SECTION BEGIN

// This is the beginning of the critical section regarding the

// access to pidfile (file to indicate that the cimserver has started).

// Sometimes, when 2 or more cimserver processes are started at the same

// time, they can't detect the concurrent process execution because the

// logic fails when pidfile is accessed concurrently.

FILE *startupLockFile;

if (startupLockFile = fopen(ConfigManager::getHomedPath(CIMSERVER_LOCK_FILE).getCString(), "w"))

{

lockf(fileno(startupLockFile), F_LOCK, 0);

}

#endif

#if defined(PEGASUS_OS_HPUX) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU) \

|| defined(PEGASUS_PLATFORM_ZOS_ZSERIES_IBM) || defined(PEGASUS_OS_AIX) \

|| defined(PEGASUS_OS_SOLARIS) || defined (PEGASUS_OS_VMS)

Line 1389

Line 1415

cout << "Started. " << endl;

#endif

#if defined(PEGASUS_OS_TYPE_UNIX)

// CRITICAL SECTION END

// Here is the unlock of file 'lock_file'. It closes the

// the critical section that guarantees the non concurrent access to

// pid file (file to indicate that the cimserver has started).

if (startupLockFile)

{

lockf(fileno(startupLockFile), F_ULOCK, 0);

fclose(startupLockFile);

}

#endif

// Put server started message to the logger

Logger::put_l(Logger::STANDARD_LOG, System::CIMSERVER,

Logger::INFORMATION,

Legend:

Removed from v.1.174
changed lines
	Added in v.1.175

No CVS admin address has been configured