pg_dump: get rid of die_horribly

The old code was using exit_horribly or die_horribly other depending on
whether it had an ArchiveHandle on which to close the connection or not;
but there were places that were passing a NULL ArchiveHandle to
die_horribly, and other places that used exit_horribly while having an
AH available.  So there wasn't all that much consistency.

Improve the situation by keeping only one of the routines, and instead
of having to pass the AH down from the caller, arrange for it to be
present for an on_exit_nicely callback to operate on.

Author: Joachim Wieland
Some tweaks by me

Per a suggestion from Robert Haas, in the ongoing "parallel pg_dump"
saga.

Author: alvherre

src/bin/pg_dump/compress_io.c

@@ -256,8 +256,8 @@ EndCompressorZlib(ArchiveHandle *AH, CompressorState *cs)
 	DeflateCompressorZlib(AH, cs, true);
 
 	if (deflateEnd(zp) != Z_OK)
-		die_horribly(AH, modulename,
-					 "could not close compression stream: %s\n", zp->msg);
+		exit_horribly(modulename,
+					  "could not close compression stream: %s\n", zp->msg);
 
 	free(cs->zlibOut);
 	free(cs->zp);
@@ -274,8 +274,8 @@ DeflateCompressorZlib(ArchiveHandle *AH, CompressorState *cs, bool flush)
 	{
 		res = deflate(zp, flush ? Z_FINISH : Z_NO_FLUSH);
 		if (res == Z_STREAM_ERROR)
-			die_horribly(AH, modulename,
-						 "could not compress data: %s\n", zp->msg);
+			exit_horribly(modulename,
+						  "could not compress data: %s\n", zp->msg);
 		if ((flush && (zp->avail_out < cs->zlibOutSize))
 			|| (zp->avail_out == 0)
 			|| (zp->avail_in != 0)
@@ -295,9 +295,9 @@ DeflateCompressorZlib(ArchiveHandle *AH, CompressorState *cs, bool flush)
 				size_t		len = cs->zlibOutSize - zp->avail_out;
 
 				if (cs->writeF(AH, out, len) != len)
-					die_horribly(AH, modulename,
-								 "could not write to output file: %s\n",
-								 strerror(errno));
+					exit_horribly(modulename,
+								  "could not write to output file: %s\n",
+								  strerror(errno));
 			}
 			zp->next_out = (void *) out;
 			zp->avail_out = cs->zlibOutSize;
@@ -318,7 +318,7 @@ WriteDataToArchiveZlib(ArchiveHandle *AH, CompressorState *cs,
 
 	/*
 	 * we have either succeeded in writing dLen bytes or we have called
-	 * die_horribly()
+	 * exit_horribly()
 	 */
 	return dLen;
 }
@@ -361,8 +361,8 @@ ReadDataFromArchiveZlib(ArchiveHandle *AH, ReadFunc readF)
 
 			res = inflate(zp, 0);
 			if (res != Z_OK && res != Z_STREAM_END)
-				die_horribly(AH, modulename,
-							 "could not uncompress data: %s\n", zp->msg);
+				exit_horribly(modulename,
+							  "could not uncompress data: %s\n", zp->msg);
 
 			out[ZLIB_OUT_SIZE - zp->avail_out] = '\0';
 			ahwrite(out, 1, ZLIB_OUT_SIZE - zp->avail_out, AH);
@@ -377,16 +377,16 @@ ReadDataFromArchiveZlib(ArchiveHandle *AH, ReadFunc readF)
 		zp->avail_out = ZLIB_OUT_SIZE;
 		res = inflate(zp, 0);
 		if (res != Z_OK && res != Z_STREAM_END)
-			die_horribly(AH, modulename,
-						 "could not uncompress data: %s\n", zp->msg);
+			exit_horribly(modulename,
+						  "could not uncompress data: %s\n", zp->msg);
 
 		out[ZLIB_OUT_SIZE - zp->avail_out] = '\0';
 		ahwrite(out, 1, ZLIB_OUT_SIZE - zp->avail_out, AH);
 	}
 
 	if (inflateEnd(zp) != Z_OK)
-		die_horribly(AH, modulename,
-					 "could not close compression library: %s\n", zp->msg);
+		exit_horribly(modulename,
+					  "could not close compression library: %s\n", zp->msg);
 
 	free(buf);
 	free(out);
@@ -426,9 +426,9 @@ WriteDataToArchiveNone(ArchiveHandle *AH, CompressorState *cs,
 	 * do a check here as well...
 	 */
 	if (cs->writeF(AH, data, dLen) != dLen)
-		die_horribly(AH, modulename,
-					 "could not write to output file: %s\n",
-					 strerror(errno));
+		exit_horribly(modulename,
+					  "could not write to output file: %s\n",
+					  strerror(errno));
 	return dLen;
 }
 

src/bin/pg_dump/dumputils.c

@@ -49,6 +49,7 @@ static void AddAcl(PQExpBuffer aclbuf, const char *keyword,
 #ifdef WIN32
 static bool parallel_init_done = false;
 static DWORD tls_index;
+static DWORD mainThreadId;
 #endif
 
 void
@@ -59,6 +60,7 @@ init_parallel_dump_utils(void)
 	{
 		tls_index = TlsAlloc();
 		parallel_init_done = true;
+		mainThreadId = GetCurrentThreadId();
 	}
 #endif
 }
@@ -1320,5 +1322,9 @@ exit_nicely(int code)
 	while (--on_exit_nicely_index >= 0)
 		(*on_exit_nicely_list[on_exit_nicely_index].function)(code,
 			on_exit_nicely_list[on_exit_nicely_index].arg);
+#ifdef WIN32
+	if (parallel_init_done && GetCurrentThreadId() != mainThreadId)
+		ExitThread(code);
+#endif
 	exit(code);
 }

src/bin/pg_dump/nls.mk

@@ -2,13 +2,13 @@
 CATALOG_NAME     = pg_dump
 AVAIL_LANGUAGES  = de es fr it ja ko pt_BR sv tr zh_CN zh_TW
 GETTEXT_FILES    = pg_dump.c common.c pg_backup_archiver.c pg_backup_custom.c \
-                   pg_backup_db.c pg_backup_files.c pg_backup_null.c \
+                   pg_backup_db.c pg_backup_null.c \
                    pg_backup_tar.c pg_restore.c pg_dumpall.c \
                    ../../port/exec.c
-GETTEXT_TRIGGERS = write_msg:2 die_horribly:3 exit_horribly:2 simple_prompt \
-                   ExecuteSqlCommand:3 ahlog:3
+GETTEXT_TRIGGERS = write_msg:2 exit_horribly:2 simple_prompt \
+                   ExecuteSqlCommand:3 ahlog:3 warn_or_exit_horribly:3
 GETTEXT_FLAGS  = \
     write_msg:2:c-format \
-    die_horribly:3:c-format \
     exit_horribly:2:c-format \
-    ahlog:3:c-format
+    ahlog:3:c-format \
+    warn_or_exit_horribly:3:c-format