Revert "Fix pgpool child process to obtain process information."

This reverts commit 06f69d19030deb1d72230ce489c5a4d800ad593c.

diff --git a/src/include/pool.h b/src/include/pool.h
index 8a85e0ce7e34fd77f5198569817163e01c528d74..1a892fc613e960959344d5236b1d6b39a07b5a6f 100644 (file)
--- a/src/include/pool.h
+++ b/src/include/pool.h
@@ -633,7 +633,6 @@ extern BackendInfo * pool_get_node_info(int node_number);
 extern int     pool_get_node_count(void);
 extern int *pool_get_process_list(int *array_size);
 extern ProcessInfo * pool_get_process_info(pid_t pid);
-extern ProcessInfo * pool_get_process_info_by_process_id(void);
 extern void pool_sleep(unsigned int second);
 extern int     PgpoolMain(bool discard_status, bool clear_memcache_oidmaps);
 extern int     pool_send_to_frontend(char *data, int len, bool flush);

diff --git a/src/main/pgpool_main.c b/src/main/pgpool_main.c
index e96c69755a3a1bcf0121858949c1cd071a870d25..861d9a27d01e574e74160c51710c2a7952e5c2e9 100644 (file)
--- a/src/main/pgpool_main.c
+++ b/src/main/pgpool_main.c
@@ -1917,15 +1917,6 @@ pool_get_process_info(pid_t pid)
        return NULL;
 }
 
-/*
- * Get process information by process id.
- */
-ProcessInfo *
-pool_get_process_info_by_process_id(void)
-{
-       return &process_info[my_proc_id];
-}
-
 /*
  * handle SIGUSR2
  * Wakeup all processes

diff --git a/src/protocol/child.c b/src/protocol/child.c
index 00fc11fb46add8091c151650a97e3ab4d8774e5d..e9f84a4e2a0b9ffee1a8b3dab0bf23c5ae8ec4c8 100644 (file)
--- a/src/protocol/child.c
+++ b/src/protocol/child.c
@@ -156,17 +156,14 @@ do_child(int *fds)
 
        char            psbuf[NI_MAXHOST + 128];
 
-       ProcessInfo* proc_info;
-
        ereport(DEBUG2,
                        (errmsg("I am Pgpool Child process with pid: %d", getpid())));
 
+       ProcessInfo* proc_info = pool_get_process_info(getpid());
+
        /* Identify myself via ps */
        init_ps_display("", "", "", "");
 
-       /* Get my process info */
-       proc_info = pool_get_process_info_by_process_id();
-
        /* set up signal handlers */
        signal(SIGALRM, SIG_DFL);
        signal(SIGCHLD, SIG_DFL);