Replace the confusing exit_nicely() by an atexit/on_exit hook

petere · petere · commit c75163842cf9 · 2011-04-06T23:00:44.000+03:00
diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
@@ -131,7 +131,7 @@ report_clusters_compatible(void)
 		pg_log(PG_REPORT, "\n*Clusters are compatible*\n");
 		/* stops new cluster */
 		stop_postmaster(false, false);
-		exit_nicely(false);
+		exit(0);
 	}
 
 	pg_log(PG_REPORT, "\n"
diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
@@ -77,12 +77,12 @@ parseCommandLine(int argc, char *argv[])
 			strcmp(argv[1], "-?") == 0)
 		{
 			usage();
-			exit_nicely(false);
+			exit(0);
 		}
 		if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0)
 		{
 			pg_log(PG_REPORT, "pg_upgrade " PG_VERSION "\n");
-			exit_nicely(false);
+			exit(0);
 		}
 	}
 
@@ -125,7 +125,7 @@ parseCommandLine(int argc, char *argv[])
 				if ((log_opts.debug_fd = fopen(optarg, "w")) == NULL)
 				{
 					pg_log(PG_FATAL, "cannot open debug file\n");
-					exit_nicely(false);
+					exit(1);
 				}
 				break;
 
@@ -141,15 +141,15 @@ parseCommandLine(int argc, char *argv[])
 				if ((old_cluster.port = atoi(optarg)) <= 0)
 				{
 					pg_log(PG_FATAL, "invalid old port number\n");
-					exit_nicely(false);
+					exit(1);
 				}
 				break;
 
 			case 'P':
 				if ((new_cluster.port = atoi(optarg)) <= 0)
 				{
 					pg_log(PG_FATAL, "invalid new port number\n");
-					exit_nicely(false);
+					exit(1);
 				}
 				break;
 
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
@@ -363,7 +363,6 @@ void		check_for_libpq_envvars(void);
 
 /* util.c */
 
-void		exit_nicely(bool need_cleanup);
 char	   *quote_identifier(const char *s);
 int			get_user_info(char **user_name);
 void		check_ok(void);
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
@@ -23,7 +23,7 @@ static bool test_server_conn(ClusterInfo *cluster, int timeout);
  *
  *	Connects to the desired database on the designated server.
  *	If the connection attempt fails, this function logs an error
- *	message and calls exit_nicely() to kill the program.
+ *	message and calls exit() to kill the program.
  */
 PGconn *
 connectToServer(ClusterInfo *cluster, const char *db_name)
@@ -45,7 +45,8 @@ connectToServer(ClusterInfo *cluster, const char *db_name)
 		if (conn)
 			PQfinish(conn);
 
-		exit_nicely(true);
+		printf("Failure, exiting\n");
+		exit(1);
 	}
 
 	return conn;
@@ -57,7 +58,7 @@ connectToServer(ClusterInfo *cluster, const char *db_name)
  *
  *	Formats a query string from the given arguments and executes the
  *	resulting query.  If the query fails, this function logs an error
- *	message and calls exit_nicely() to kill the program.
+ *	message and calls exit() to kill the program.
  */
 PGresult *
 executeQueryOrDie(PGconn *conn, const char *fmt,...)
@@ -81,8 +82,8 @@ executeQueryOrDie(PGconn *conn, const char *fmt,...)
 			   PQerrorMessage(conn));
 		PQclear(result);
 		PQfinish(conn);
-		exit_nicely(true);
-		return NULL;			/* Never get here, but keeps compiler happy */
+		printf("Failure, exiting\n");
+		exit(1);
 	}
 	else
 		return result;
@@ -152,18 +153,41 @@ get_major_server_version(ClusterInfo *cluster)
 }
 
 
+static void
+#ifdef HAVE_ATEXIT
+stop_postmaster_atexit(void)
+#else
+stop_postmaster_on_exit(int exitstatus, void *arg)
+#endif
+{
+	stop_postmaster(true, true);
+
+}
+
+
 void
 start_postmaster(ClusterInfo *cluster, bool quiet)
 {
 	char		cmd[MAXPGPATH];
 	const char *bindir;
 	const char *datadir;
 	unsigned short port;
+	bool		exit_hook_registered = false;
 
 	bindir = cluster->bindir;
 	datadir = cluster->pgdata;
 	port = cluster->port;
 
+	if (!exit_hook_registered)
+	{
+#ifdef HAVE_ATEXIT
+		atexit(stop_postmaster_atexit);
+#else
+		on_exit(stop_postmaster_on_exit);
+#endif
+		exit_hook_registered = true;
+	}
+
 	/*
 	 * On Win32, we can't send both pg_upgrade output and pg_ctl output to the
 	 * same file because we get the error: "The process cannot access the file
diff --git a/contrib/pg_upgrade/util.c b/contrib/pg_upgrade/util.c
@@ -99,7 +99,8 @@ pg_log(eLogType type, char *fmt,...)
 		case PG_FATAL:
 			printf("%s", "\n");
 			printf("%s", _(message));
-			exit_nicely(true);
+			printf("Failure, exiting\n");
+			exit(1);
 			break;
 
 		case PG_DEBUG:
@@ -184,36 +185,6 @@ get_user_info(char **user_name)
 }
 
 
-void
-exit_nicely(bool need_cleanup)
-{
-	stop_postmaster(true, true);
-
-	pg_free(log_opts.filename);
-
-	if (log_opts.fd)
-		fclose(log_opts.fd);
-
-	if (log_opts.debug_fd)
-		fclose(log_opts.debug_fd);
-
-	/* terminate any running instance of postmaster */
-	if (os_info.postmasterPID != 0)
-		kill(os_info.postmasterPID, SIGTERM);
-	
-	if (need_cleanup)
-	{
-		printf("Failure, exiting\n");
-		/*
-		 * FIXME must delete intermediate files
-		 */
-		exit(1);
-	}
-	else
-		exit(0);
-}
-
-
 void *
 pg_malloc(int n)
 {

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ report_clusters_compatible(void)`
`131`	`131`	`pg_log(PG_REPORT, "\nClusters are compatible\n");`
`132`	`132`	`/* stops new cluster */`
`133`	`133`	`stop_postmaster(false, false);`
`134`		`- exit_nicely(false);`
	`134`	`+ exit(0);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`pg_log(PG_REPORT, "\n"`
Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,12 @@ parseCommandLine(int argc, char *argv[])`
`77`	`77`	`strcmp(argv[1], "-?") == 0)`
`78`	`78`	`{`
`79`	`79`	`usage();`
`80`		`- exit_nicely(false);`
	`80`	`+ exit(0);`
`81`	`81`	`}`
`82`	`82`	`if (strcmp(argv[1], "--version") == 0 \|\| strcmp(argv[1], "-V") == 0)`
`83`	`83`	`{`
`84`	`84`	`pg_log(PG_REPORT, "pg_upgrade " PG_VERSION "\n");`
`85`		`- exit_nicely(false);`
	`85`	`+ exit(0);`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
`@@ -125,7 +125,7 @@ parseCommandLine(int argc, char *argv[])`
`125`	`125`	`if ((log_opts.debug_fd = fopen(optarg, "w")) == NULL)`
`126`	`126`	`{`
`127`	`127`	`pg_log(PG_FATAL, "cannot open debug file\n");`
`128`		`- exit_nicely(false);`
	`128`	`+ exit(1);`
`129`	`129`	`}`
`130`	`130`	`break;`
`131`	`131`
`@@ -141,15 +141,15 @@ parseCommandLine(int argc, char *argv[])`
`141`	`141`	`if ((old_cluster.port = atoi(optarg)) <= 0)`
`142`	`142`	`{`
`143`	`143`	`pg_log(PG_FATAL, "invalid old port number\n");`
`144`		`- exit_nicely(false);`
	`144`	`+ exit(1);`
`145`	`145`	`}`
`146`	`146`	`break;`
`147`	`147`
`148`	`148`	`case 'P':`
`149`	`149`	`if ((new_cluster.port = atoi(optarg)) <= 0)`
`150`	`150`	`{`
`151`	`151`	`pg_log(PG_FATAL, "invalid new port number\n");`
`152`		`- exit_nicely(false);`
	`152`	`+ exit(1);`
`153`	`153`	`}`
`154`	`154`	`break;`
`155`	`155`