[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Myserver-commit] [2740] File processes.h renamed to process.h
From: |
Giuseppe Scrivano |
Subject: |
[Myserver-commit] [2740] File processes.h renamed to process.h |
Date: |
Wed, 06 Aug 2008 17:36:52 +0000 |
Revision: 2740
http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2740
Author: gscrivano
Date: 2008-08-06 17:36:52 +0000 (Wed, 06 Aug 2008)
Log Message:
-----------
File processes.h renamed to process.h
Modified Paths:
--------------
trunk/myserver/include/utility.h
trunk/myserver/src/process_server_manager.cpp
Added Paths:
-----------
trunk/myserver/include/process.h
Removed Paths:
-------------
trunk/myserver/include/processes.h
Copied: trunk/myserver/include/process.h (from rev 2734,
trunk/myserver/include/processes.h)
===================================================================
--- trunk/myserver/include/process.h (rev 0)
+++ trunk/myserver/include/process.h 2008-08-06 17:36:52 UTC (rev 2740)
@@ -0,0 +1,75 @@
+/*
+MyServer
+Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PROCESS_H
+#define PROCESS_H
+
+#include "../stdafx.h"
+
+#include "../include/file.h"
+#include "../include/mutex.h"
+#include "../include/stringutils.h"
+
+#include <string>
+
+/*!
+ *Structure used for start a new process.
+ */
+struct StartProcInfo
+{
+ /*! STDIN file for new process. */
+ FileHandle stdIn;
+
+ /*! STDOUT file for new process. */
+ FileHandle stdOut;
+
+ /*! STDERR file for new process. */
+ FileHandle stdError;
+
+ string cmdLine;
+ string cwd;
+
+ /*! added for unix support. */
+ string cmd;
+ string arg;
+
+ void *envString;
+};
+
+class Process
+{
+private:
+ int pid;
+public:
+#ifdef HAVE_PTHREAD
+ static Mutex forkMutex;
+ static void forkPrepare();
+ static void forkParent();
+ static void forkChild();
+#endif
+ static void initialize();
+ int execHiddenProcess(StartProcInfo* spi, u_long timeout = 0xFFFFFFFF);
+ int execConcurrentProcess(StartProcInfo* spi);
+ int terminateProcess();
+ int isProcessAlive();
+ static int setuid(u_long);
+ static int setgid(u_long);
+ static int setAdditionalGroups(u_long len, u_long *groups);
+ Process();
+ ~Process();
+};
+#endif
Property changes on: trunk/myserver/include/process.h
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:keywords
+ Author Date Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ native
Deleted: trunk/myserver/include/processes.h
===================================================================
--- trunk/myserver/include/processes.h 2008-08-06 17:31:38 UTC (rev 2739)
+++ trunk/myserver/include/processes.h 2008-08-06 17:36:52 UTC (rev 2740)
@@ -1,75 +0,0 @@
-/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef PROCESSES_H
-#define PROCESSES_H
-
-#include "../stdafx.h"
-
-#include "../include/file.h"
-#include "../include/mutex.h"
-#include "../include/stringutils.h"
-
-#include <string>
-
-/*!
- *Structure used for start a new process.
- */
-struct StartProcInfo
-{
- /*! STDIN file for new process. */
- FileHandle stdIn;
-
- /*! STDOUT file for new process. */
- FileHandle stdOut;
-
- /*! STDERR file for new process. */
- FileHandle stdError;
-
- string cmdLine;
- string cwd;
-
- /*! added for unix support. */
- string cmd;
- string arg;
-
- void *envString;
-};
-
-class Process
-{
-private:
- int pid;
-public:
-#ifdef HAVE_PTHREAD
- static Mutex forkMutex;
- static void forkPrepare();
- static void forkParent();
- static void forkChild();
-#endif
- static void initialize();
- int execHiddenProcess(StartProcInfo* spi, u_long timeout = 0xFFFFFFFF);
- int execConcurrentProcess(StartProcInfo* spi);
- int terminateProcess();
- int isProcessAlive();
- static int setuid(u_long);
- static int setgid(u_long);
- static int setAdditionalGroups(u_long len, u_long *groups);
- Process();
- ~Process();
-};
-#endif
Modified: trunk/myserver/include/utility.h
===================================================================
--- trunk/myserver/include/utility.h 2008-08-06 17:31:38 UTC (rev 2739)
+++ trunk/myserver/include/utility.h 2008-08-06 17:36:52 UTC (rev 2740)
@@ -1,6 +1,6 @@
/*
MyServer
-Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2006, 2008 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
@@ -21,10 +21,11 @@
#include "../stdafx.h"
#include "../include/file.h"
#include "../include/stringutils.h"
-#include "../include/processes.h"
+#include "../include/process.h"
#include "../include/thread.h"
#include "../include/mutex.h"
#include <string.h>
+
using namespace std;
/*!
Modified: trunk/myserver/src/process_server_manager.cpp
===================================================================
--- trunk/myserver/src/process_server_manager.cpp 2008-08-06 17:31:38 UTC
(rev 2739)
+++ trunk/myserver/src/process_server_manager.cpp 2008-08-06 17:36:52 UTC
(rev 2740)
@@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "../include/server.h"
-#include "../include/processes.h"
+#include "../include/process.h"
#include "../include/process_server_manager.h"
#include <string>
#include <sstream>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Myserver-commit] [2740] File processes.h renamed to process.h,
Giuseppe Scrivano <=