pgpool2.git / summary / log / commit / refs

commit    fa035f3a1243bb4abdb5d5344ea34528f742d8c5
Author:   Tatsuo Ishii <ishii@sraoss.co.jp>
Date:     Sat Apr 09 06:05:26 2022 +0000

    Revert "Fix pgpool child process to obtain process information."
    
    This reverts commit 06f69d19030deb1d72230ce489c5a4d800ad593c.


 src/include/pool.h     | 1 -
 src/main/pgpool_main.c | 9 ---------
 src/protocol/child.c   | 7 ++-----
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/include/pool.h b/src/include/pool.h
index 8a85e0ce7..1a892fc61 100644
--- 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 e96c69755..861d9a27d 100644
--- 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 00fc11fb4..e9f84a4e2 100644
--- 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);


[parent: 06f69d19030d]