omc-commit Mailing List for OMC - Open Management with CIM

Revision: 483
          http://omc.svn.sourceforge.net/omc/?rev=483&view=rev
Author:   jcarey
Date:     2007-08-20 09:29:08 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
Removed the code that set the process to a new process group. This allow child procs to die along with the parent process.

Modified Paths:
--------------
    omccmpi/trunk/src/lib/omc/exec.c

Modified: omccmpi/trunk/src/lib/omc/exec.c
===================================================================
--- omccmpi/trunk/src/lib/omc/exec.c	2007-08-20 16:20:56 UTC (rev 482)
+++ omccmpi/trunk/src/lib/omc/exec.c	2007-08-20 16:29:08 UTC (rev 483)
@@ -259,9 +259,6 @@
 			i--;
 		}
 
-		/* Set this process and all of it's children in a new proces group */
-		setpgid(0, 0);
-
 		if (envp) 
 		{
 			execve(argv[0], argv, envp);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 482
          http://omc.svn.sourceforge.net/omc/?rev=482&view=rev
Author:   jcarey
Date:     2007-08-20 09:20:56 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
Bug fixes for typos and 64 bit issues. Thanks Mike Fritch :-)

Modified Paths:
--------------
    omccmpi/trunk/src/lib/omc/cmpiTimeServiceUtils.c
    omccmpi/trunk/src/lib/omc/exec.c
    omccmpi/trunk/src/lib/omc/ntpServer.c

Modified: omccmpi/trunk/src/lib/omc/cmpiTimeServiceUtils.c
===================================================================
--- omccmpi/trunk/src/lib/omc/cmpiTimeServiceUtils.c	2007-07-01 05:20:37 UTC (rev 481)
+++ omccmpi/trunk/src/lib/omc/cmpiTimeServiceUtils.c	2007-08-20 16:20:56 UTC (rev 482)
@@ -468,7 +468,7 @@
 		int *utcHwClock)
 {
 	FILE *file;
-	unsigned int bfrLen = 0;
+	size_t bfrLen = 0;
 	char *p = NULL, *bufPtr = NULL;
 	//char* errMsgBfr = NULL;
 	//unsigned int errMsgBfrLen = 0;

Modified: omccmpi/trunk/src/lib/omc/exec.c
===================================================================
--- omccmpi/trunk/src/lib/omc/exec.c	2007-07-01 05:20:37 UTC (rev 481)
+++ omccmpi/trunk/src/lib/omc/exec.c	2007-08-20 16:20:56 UTC (rev 482)
@@ -259,6 +259,9 @@
 			i--;
 		}
 
+		/* Set this process and all of it's children in a new proces group */
+		setpgid(0, 0);
+
 		if (envp) 
 		{
 			execve(argv[0], argv, envp);
@@ -291,7 +294,7 @@
 		/* For some reason the child never ran exec(). Must've deadlocked or
 		 * the system is *really* buzy. Brutally kill it.
 		 */
-		kill(forkrv, SIGKILL);
+		kill(-forkrv, SIGKILL); // send SIGKILL to all processes in the process group
 		errno = ETIMEDOUT;
 		cc = -1;
 	}
@@ -403,7 +406,8 @@
 				 */
 				rerrno = (wcc == 0) ? ETIMEDOUT : errno;
 				terminateChild(cpid, processStatus);
-				cpid = cc = -1;
+				//cpid = cc = -1;
+				cpid = -1;
 				break;
 			}
 
@@ -611,7 +615,7 @@
 	uint32_t waitTime,
 	int sig)
 {
-	if (kill(pid, sig) == -1) 
+	if (kill(-pid, sig) == -1) // send sig to all processes in the process group (pid of the process group leader) 
 	{
 		/* don't trust waitpid, Format ctor, etc. to leave errno alone */
 		int errnum = errno;
@@ -665,7 +669,7 @@
 		memset(pfds, 0, sizeof(pfds));
 		pfds[0].fd = fd1;
 		pfds[0].events = POLLIN;
-		pfds[1].fd = fd1;
+		pfds[1].fd = fd2;
 		pfds[1].events = POLLIN;
 		cc = poll(pfds, 2, toms);
 	} while (cc == -1 && (errno == EAGAIN || errno == EINTR));
@@ -773,7 +777,7 @@
 		{
 			return closePipe(fds, -1);
 		}
-		fdflags &= !O_NONBLOCK;
+		fdflags &= O_NONBLOCK;
 		if (fcntl(fds[i], F_SETFL, fdflags) == -1) 
 		{
 			return closePipe(fds, -1);

Modified: omccmpi/trunk/src/lib/omc/ntpServer.c
===================================================================
--- omccmpi/trunk/src/lib/omc/ntpServer.c	2007-07-01 05:20:37 UTC (rev 481)
+++ omccmpi/trunk/src/lib/omc/ntpServer.c	2007-08-20 16:20:56 UTC (rev 482)
@@ -133,7 +133,7 @@
 	DEBUGOUT("  into serverFromLine with line: %s\n", line);
 
 	unsigned int i = 0;
-	unsigned int iTokenCount = 0;
+	size_t iTokenCount = 0;
 	char** tokens = omcStrTokenize(line, " ,", &iTokenCount);
 
 	for(i = 0; i < iTokenCount; i++)
@@ -152,7 +152,7 @@
 		omcStrRTrim(pServer->serverName);
 		if(iTokenCount > 2)
 		{
-			DEBUGOUT("  iTokenCount: %d\n", iTokenCount);
+			DEBUGOUT("  iTokenCount: %d\n", (int)iTokenCount);
 			for(i = 2; i < iTokenCount; i++)
 			{
 				if(strcasecmp(tokens[i],"prefer") == 0)
@@ -227,7 +227,7 @@
 static int myNTPServerModifyLine(	const char* line,
 				FILE* const ostrm,
 				char* errMsgBfr,
-				unsigned int errMsgBfrLen)
+				size_t errMsgBfrLen)
 {
 	DEBUGOUT("myNTPServerModifyLine() called\n");
 
@@ -268,7 +268,7 @@
 static int myNTPServerDeleteLine(	const char* line,
 				FILE* const ostrm,
 				char* errMsgBfr,
-				unsigned int errMsgBfrLen)
+				size_t errMsgBfrLen)
 {
 	DEBUGOUT("myNTPServerDeleteLine() called\n");
 
@@ -364,7 +364,7 @@
 NTPServer *getNTPServers(int *pCount)
 {
 	FILE *file;
-	unsigned int bfrLen = 0;
+	size_t bfrLen = 0;
 	char *p = NULL, *bufPtr = NULL;
 	NTPServer server = {{0},0,0,0,0};
 	char* errMsgBfr = NULL;
@@ -435,7 +435,7 @@
 NTPServer *getNTPServer(const char *serverName)
 {
 	FILE *file;
-	unsigned int bfrLen = 0;
+	size_t bfrLen = 0;
 	char *p, *bufPtr = NULL;
 	NTPServer server = {{0},0,0,0,0};
 	char* errMsgBfr = NULL;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.