deleted file mode 100644

@@ -1,96 +0,0 @@

-/*

- * Process Table

- *

- * Copyright (C) 2001-2003 FhG Fokus

- *

- * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the above

- * copyright notice and this permission notice appear in all copies.

- *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

- */

-/** Kamailio core :: internal fork functions and process table.

- * @file: pt.h

- * @ingroup core

- */

-

-#ifndef _PT_H

-#define _PT_H

-

-#include <sys/types.h>

-#include <unistd.h>

-#include <stdlib.h>

-

-#include "globals.h"

-#include "timer.h"

-#include "socket_info.h"

-#include "locking.h"

-

-#define MAX_PT_DESC			128

-

-struct process_table {

-	int pid;

-#ifdef USE_TCP

-	int unix_sock; 	/* unix socket on which tcp main listens	*/

-	int idx; 		/* tcp child index, -1 for other processes 	*/

-#endif

-	char desc[MAX_PT_DESC];

-};

-

-extern struct process_table *pt;

-extern gen_lock_t* process_lock;

-extern int *process_count;

-extern int process_no;

-

-extern struct tcp_child* tcp_children;

-

-int init_pt(int proc_no);

-int get_max_procs(void);

-int register_procs(int no);

-int get_max_open_fds(void);

-int register_fds(int no);

-

-

-int close_extra_socks(int proc_id, int proc_no);

-

-#define get_proc_no() ((process_count)?*process_count:0)

-

-/* return processes pid */

-int my_pid(void);

-

-/**

- * Forks a new process.

- * @param desc - text description for the process table

- * @param make_sock - if to create a unix socket pair for it

- * @returns the pid of the new process

- */

-int fork_process(int child_id,char *desc,int make_sock);

-

-/**

- * Forks a new TCP process.

- * @param desc - text description for the process table

- * @param r - index in the tcp_children array

- * @param *reader_fd_1 - pointer to return the reader_fd[1]

- * @returns the pid of the new process

- */

-#ifdef USE_TCP

-int fork_tcp_process(int child_id,char *desc,int r,int *reader_fd_1);

-#endif

-

-#ifdef PKG_MALLOC

-void mem_dump_pkg_cb(str *gname, str *name);

-#endif

-

-#ifdef SHM_MEM

-int mem_dump_shm_fixup(void *handle, str *gname, str *name, void **val);

-#endif

-

-unsigned int set_fork_delay(unsigned int v);

-

-#endif

@@ -1,10 +1,6 @@

 /*

- * $Id$

- *

  * Process Table

  *

- *

- *

  * Copyright (C) 2001-2003 FhG Fokus

  *

  * Permission to use, copy, modify, and distribute this software for any

@@ -19,19 +15,11 @@

  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */

-/*

- * History:

- * --------

- *  2003-04-15  added tcp_disable support (andrei)

- *  2006-06-14	added process table in shared mem (dragos)

- *  2007-07-04	added register_fds() and get_max_open_fds(() (andrei)

- */

-/** internal fork functions and process table.

+/** Kamailio core :: internal fork functions and process table.

  * @file: pt.h

  * @ingroup core

  */

-

 #ifndef _PT_H

 #define _PT_H

@@ -63,9 +63,9 @@ extern int process_no;

 extern struct tcp_child* tcp_children;

 int init_pt(int proc_no);

-int get_max_procs();

+int get_max_procs(void);

 int register_procs(int no);

-int get_max_open_fds();

+int get_max_open_fds(void);

 int register_fds(int no);

@@ -74,7 +74,7 @@ int close_extra_socks(int proc_id, int proc_no);

 #define get_proc_no() ((process_count)?*process_count:0)

 /* return processes pid */

-int my_pid();

+int my_pid(void);

 /**

  * Forks a new process.

@@ -103,4 +103,6 @@ void mem_dump_pkg_cb(str *gname, str *name);

 int mem_dump_shm_fixup(void *handle, str *gname, str *name, void **val);

 #endif

+unsigned int set_fork_delay(unsigned int v);

+

 #endif

@@ -62,7 +62,7 @@ extern int process_no;

 extern struct tcp_child* tcp_children;

-int init_pt();

+int init_pt(int proc_no);

 int get_max_procs();

 int register_procs(int no);

 int get_max_open_fds();

@@ -7,26 +7,17 @@

  *

  * Copyright (C) 2001-2003 FhG Fokus

  *

- * This file is part of ser, a free SIP server.

+ * Permission to use, copy, modify, and distribute this software for any

+ * purpose with or without fee is hereby granted, provided that the above

+ * copyright notice and this permission notice appear in all copies.

  *

- * ser 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 2 of the License, or

- * (at your option) any later version

- *

- * For a license to use the ser software under conditions

- * other than those described here, or to purchase support for this

- * software, please contact iptel.org by e-mail at the following addresses:

- *    info@iptel.org

- *

- * ser 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, write to the Free Software 

- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */

 /*

  * History:

@@ -35,6 +26,10 @@

  *  2006-06-14	added process table in shared mem (dragos)

  *  2007-07-04	added register_fds() and get_max_open_fds(() (andrei)

  */

+/** internal fork functions and process table.

+ * @file: pt.h

+ * @ingroup core

+ */

 #ifndef _PT_H

@@ -101,11 +101,11 @@ int fork_tcp_process(int child_id,char *desc,int r,int *reader_fd_1);

 #endif

 #ifdef PKG_MALLOC

-void mem_dump_pkg_cb(str *name);

+void mem_dump_pkg_cb(str *gname, str *name);

 #endif

 #ifdef SHM_MEM

-int mem_dump_shm_fixup(void *handle, str *name, void **val);

+int mem_dump_shm_fixup(void *handle, str *gname, str *name, void **val);

 #endif

 #endif

@@ -100,4 +100,12 @@ int fork_process(int child_id,char *desc,int make_sock);

 int fork_tcp_process(int child_id,char *desc,int r,int *reader_fd_1);

 #endif

+#ifdef PKG_MALLOC

+void mem_dump_pkg_cb(str *name);

+#endif

+

+#ifdef SHM_MEM

+int mem_dump_shm_fixup(void *handle, str *name, void **val);

+#endif

+

 #endif

@@ -73,6 +73,11 @@ int register_procs(int no);

 int get_max_open_fds();

 int register_fds(int no);

+

+int close_extra_socks(int proc_id, int proc_no);

+

+#define get_proc_no() ((process_count)?*process_count:0)

+

 /* return processes pid */

 int my_pid();

@@ -33,6 +33,7 @@

  * --------

  *  2003-04-15  added tcp_disable support (andrei)

  *  2006-06-14	added process table in shared mem (dragos)

+ *  2007-07-04	added register_fds() and get_max_open_fds(() (andrei)

  */

@@ -69,6 +70,8 @@ extern struct tcp_child* tcp_children;

 int init_pt();

 int get_max_procs();

 int register_procs(int no);

+int get_max_open_fds();

+int register_fds(int no);

 /* return processes pid */

 int my_pid();

@@ -66,12 +66,12 @@ extern int process_no;

 extern struct tcp_child* tcp_children;

-inline int init_pt();

+int init_pt();

 int get_max_procs();

 int register_procs(int no);

 /* return processes pid */

-inline int my_pid();

+int my_pid();

 /**

  * Forks a new process.

@@ -79,7 +79,7 @@ inline int my_pid();

  * @param make_sock - if to create a unix socket pair for it

  * @returns the pid of the new process

  */

-inline int fork_process(int child_id,char *desc,int make_sock);

+int fork_process(int child_id,char *desc,int make_sock);

 /**

  * Forks a new TCP process.

@@ -89,7 +89,7 @@ inline int fork_process(int child_id,char *desc,int make_sock);

  * @returns the pid of the new process

  */

 #ifdef USE_TCP

-inline int fork_tcp_process(int child_id,char *desc,int r,int *reader_fd_1);

+int fork_tcp_process(int child_id,char *desc,int r,int *reader_fd_1);

 #endif

 #endif

@@ -88,6 +88,8 @@ inline int fork_process(int child_id,char *desc,int make_sock);

  * @param *reader_fd_1 - pointer to return the reader_fd[1]

  * @returns the pid of the new process

  */

+#ifdef USE_TCP

 inline int fork_tcp_process(int child_id,char *desc,int r,int *reader_fd_1);

+#endif

 #endif

@@ -32,6 +32,7 @@

  * History:

  * --------

  *  2003-04-15  added tcp_disable support (andrei)

+ *  2006-06-14	added process table in shared mem (dragos)

  */

@@ -40,33 +41,53 @@

 #include <sys/types.h>

 #include <unistd.h>

+#include <stdlib.h>

 #include "globals.h"

 #include "timer.h"

 #include "socket_info.h"

+#include "locking.h"

-#define MAX_PT_DESC	128

+#define MAX_PT_DESC			128

 struct process_table {

 	int pid;

 #ifdef USE_TCP

-	int unix_sock; /* unix socket on which tcp main listens */

-	int idx; /* tcp child index, -1 for other processes */

+	int unix_sock; 	/* unix socket on which tcp main listens	*/

+	int idx; 		/* tcp child index, -1 for other processes 	*/

 #endif

 	char desc[MAX_PT_DESC];

 };

 extern struct process_table *pt;

+extern gen_lock_t* process_lock;

+extern int *process_count;

 extern int process_no;

-extern int process_count;

-extern int last_process;

+extern struct tcp_child* tcp_children;

+

+inline int init_pt();

+int get_max_procs();

+int register_procs(int no);

 /* return processes pid */

-inline static int my_pid()

-{

-	return pt ? pt[process_no].pid : getpid();

-}

+inline int my_pid();

+

+/**

+ * Forks a new process.

+ * @param desc - text description for the process table

+ * @param make_sock - if to create a unix socket pair for it

+ * @returns the pid of the new process

+ */

+inline int fork_process(int child_id,char *desc,int make_sock);

+/**

+ * Forks a new TCP process.

+ * @param desc - text description for the process table

+ * @param r - index in the tcp_children array

+ * @param *reader_fd_1 - pointer to return the reader_fd[1]

+ * @returns the pid of the new process

+ */

+inline int fork_tcp_process(int child_id,char *desc,int r,int *reader_fd_1);

 #endif

@@ -58,34 +58,8 @@ struct process_table {

 extern struct process_table *pt;

 extern int process_no;

-

-/* get number of process started by main with

-   given configuration

-*/

-inline static int process_count()

-{

-	int udp_listeners;

-	struct socket_info* si;

-	

-	for (si=udp_listen, udp_listeners=0; si; si=si->next, udp_listeners++);

-    return 

-		/* receivers and attendant */

-		(dont_fork ? 1 : children_no*udp_listeners + 1)

-		/* timer process */

-		+ 1 /* always, we need it in most cases, and we can't tell here

-			   & now if we don't need it */

-#ifdef USE_SLOW_TIMER

-		+ 1 /* slow timer process */

-#endif

-		/* fifo server */

-		+((fifo==NULL || strlen(fifo)==0) ? 0 : 1 )

-		/* unixsock server*/

-		+(unixsock_name?unixsock_children:0)

-#ifdef USE_TCP

-		+((!tcp_disable)?( 1/* tcp main */ + tcp_children_no ):0) 

-#endif

-		;

-}

+extern int process_count;

+extern int last_process;

 /* return processes pid */

@@ -74,6 +74,9 @@ inline static int process_count()

 		/* timer process */

 		+ 1 /* always, we need it in most cases, and we can't tell here

 			   & now if we don't need it */

+#ifdef USE_SLOW_TIMER

+		+ 1 /* slow timer process */

+#endif

 		/* fifo server */

 		+((fifo==NULL || strlen(fifo)==0) ? 0 : 1 )

 		/* unixsock server*/

@@ -72,18 +72,15 @@ inline static int process_count()

 		/* receivers and attendant */

 		(dont_fork ? 1 : children_no*udp_listeners + 1)

 		/* timer process */

-		+ (timer_list ? 1 : 0 )

+		+ 1 /* always, we need it in most cases, and we can't tell here

+			   & now if we don't need it */

 		/* fifo server */

 		+((fifo==NULL || strlen(fifo)==0) ? 0 : 1 )

 		/* unixsock server*/

 		+(unixsock_name?unixsock_children:0)

 #ifdef USE_TCP

-		+((!tcp_disable)?( 1/* tcp main */ + tcp_children_no + 

-							(timer_list ? 0: 1)):0) /* add the timer proc.

-													  if not already taken

-													  into account */

+		+((!tcp_disable)?( 1/* tcp main */ + tcp_children_no ):0) 

 #endif

-		

 		;

 }

@@ -5,7 +5,7 @@

  *

  *

  *

- * Copyright (C) 2001-2003 Fhg Fokus

+ * Copyright (C) 2001-2003 FhG Fokus

  *

  * This file is part of ser, a free SIP server.

  *

@@ -88,7 +88,7 @@ inline static int process_count()

 }

-/* retun processes's pid */

+/* return processes pid */

 inline static int my_pid()

 {

 	return pt ? pt[process_no].pid : getpid();

@@ -75,6 +75,8 @@ inline static int process_count()

 		+ (timer_list ? 1 : 0 )

 		/* fifo server */

 		+((fifo==NULL || strlen(fifo)==0) ? 0 : 1 )

+		/* unixsock server*/

+		+(unixsock_name?unixsock_children:0)

 #ifdef USE_TCP

 		+((!tcp_disable)?( 1/* tcp main */ + tcp_children_no + 

 							(timer_list ? 0: 1)):0) /* add the timer proc.

@@ -43,6 +43,7 @@

 #include "globals.h"

 #include "timer.h"

+#include "socket_info.h"

 #define MAX_PT_DESC	128

@@ -63,9 +64,13 @@ extern int process_no;

 */

 inline static int process_count()

 {

+	int udp_listeners;

+	struct socket_info* si;

+	

+	for (si=udp_listen, udp_listeners=0; si; si=si->next, udp_listeners++);

     return 

 		/* receivers and attendant */

-		(dont_fork ? 1 : children_no*sock_no + 1)

+		(dont_fork ? 1 : children_no*udp_listeners + 1)

 		/* timer process */

 		+ (timer_list ? 1 : 0 )

 		/* fifo server */

@@ -71,8 +71,8 @@ inline static int process_count()

 		/* fifo server */

 		+((fifo==NULL || strlen(fifo)==0) ? 0 : 1 )

 #ifdef USE_TCP

-		+ (!tcp_disable)?( 1/* tcp main */ + tcp_children_no + 

-							(timer_list ? 0: 1)):0 /* add the timer proc.

+		+((!tcp_disable)?( 1/* tcp main */ + tcp_children_no + 

+							(timer_list ? 0: 1)):0) /* add the timer proc.

 													  if not already taken

 													  into account */

 #endif

@@ -28,6 +28,11 @@

  * along with this program; if not, write to the Free Software 

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  */

+/*

+ * History:

+ * --------

+ *  2003-04-15  added tcp_disable support (andrei)

+ */

 #ifndef _PT_H

@@ -66,9 +71,10 @@ inline static int process_count()

 		/* fifo server */

 		+((fifo==NULL || strlen(fifo)==0) ? 0 : 1 )

 #ifdef USE_TCP

-		+ 1/* tcp main */ + tcp_children_no + 

-		(timer_list ? 0: 1) /* add the timer proc. if not already taken

-							   into account */

+		+ (!tcp_disable)?( 1/* tcp main */ + tcp_children_no + 

+							(timer_list ? 0: 1)):0 /* add the timer proc.

+													  if not already taken

+													  into account */

 #endif

 		;

@@ -43,6 +43,10 @@

 struct process_table {

 	int pid;

+#ifdef USE_TCP

+	int unix_sock; /* unix socket on which tcp main listens */

+	int idx; /* tcp child index, -1 for other processes */

+#endif

 	char desc[MAX_PT_DESC];

 };

@@ -60,7 +60,14 @@ inline static int process_count()

 		/* timer process */

 		+ (timer_list ? 1 : 0 )

 		/* fifo server */

-		+((fifo==NULL || strlen(fifo)==0) ? 0 : 1 );

+		+((fifo==NULL || strlen(fifo)==0) ? 0 : 1 )

+#ifdef USE_TCP

+		+ 1/* tcp main */ + tcp_children_no + 

+		(timer_list ? 0: 1) /* add the timer proc. if not already taken

+							   into account */

+#endif

+		

+		;

 }

@@ -31,6 +31,7 @@

 #ifndef _PT_H

+#define _PT_H

 #include <sys/types.h>

 #include <unistd.h>

@@ -4,8 +4,32 @@

  * Process Table

  *

  *

+ *

+ * Copyright (C) 2001-2003 Fhg Fokus

+ *

+ * This file is part of ser, a free SIP server.

+ *

+ * ser 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 2 of the License, or

+ * (at your option) any later version

+ *

+ * For a license to use the ser software under conditions

+ * other than those described here, or to purchase support for this

+ * software, please contact iptel.org by e-mail at the following addresses:

+ *    info@iptel.org

+ *

+ * ser 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, write to the Free Software 

+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

  */

+

 #ifndef _PT_H

 #include <sys/types.h>

new file mode 100644

@@ -0,0 +1,49 @@

+/*

+ * $Id$

+ *

+ * Process Table

+ *

+ *

+ */

+

+#ifndef _PT_H

+

+#include <sys/types.h>

+#include <unistd.h>

+

+#include "globals.h"

+#include "timer.h"

+

+#define MAX_PT_DESC	128

+

+struct process_table {

+	int pid;

+	char desc[MAX_PT_DESC];

+};

+

+extern struct process_table *pt;

+extern int process_no;

+

+/* get number of process started by main with

+   given configuration

+*/

+inline static int process_count()

+{

+    return 

+		/* receivers and attendant */

+		(dont_fork ? 1 : children_no*sock_no + 1)

+		/* timer process */

+		+ (timer_list ? 1 : 0 )

+		/* fifo server */

+		+((fifo==NULL || strlen(fifo)==0) ? 0 : 1 );

+}

+

+

+/* retun processes's pid */

+inline static int my_pid()

+{

+	return pt ? pt[process_no].pid : getpid();

+}

+

+

+#endif