PGL_* fencing

Author: pmp-p

src/backend/tcop/postgres.c

@@ -105,10 +105,17 @@ int			client_connection_check_interval = 0;
 /* flags for non-system relation kinds to restrict use */
 int			restrict_nonsystem_relation_kind;
 
-#if (defined(__EMSCRIPTEN__) || defined(__wasi__)) && !defined(PATCH_MAIN)
-int cma_rsize = 0;
+#if (defined(__EMSCRIPTEN__) || defined(__wasi__))
+#if !defined(PGL_MAIN)
+    volatile int cma_rsize = 0;
+#endif // PGL_MAIN
 bool quote_all_identifiers = false;
-#endif
+FILE* SOCKET_FILE = NULL;
+int SOCKET_DATA = 0;
+#endif // WASM
+
+
+
 
 /* ----------------
  *		private typedefs etc
@@ -4081,7 +4088,7 @@ process_postgres_switches(int argc, char *argv[], GucContext ctx,
 #endif
 }
 
-#if !defined(PATCH_MAIN)
+#if !defined(PGL_MAIN)
 /*
  * PostgresSingleUserMain
  *     Entry point for single user mode. argc/argv are the command line
@@ -4977,7 +4984,7 @@ PostgresMain(const char *dbname, const char *username)
 		}
 	}							/* end of input-reading loop */
 }
-#endif /* PATCH_MAIN */
+#endif /* PGL_MAIN */
 /*
  * Throw an error if we're a WAL sender process.
  *

src/include/port/wasm_common.h

@@ -100,48 +100,42 @@ extern int	pg_valid_server_encoding_id_private(int encoding);
 #define proc_exit(arg) pg_proc_exit(arg)
 
 
+
+
+#if defined(PGL_MAIN)
+#warning "PGL_MAIN"
 /*
  * popen is routed via pg_popen to stderr or a IDB_PIPE_* file
  * link a pclose replacement when we are in exec.c ( PG_EXEC defined )
  */
 
+extern FILE * pg_popen(const char *command, const char *type);
+#define popen(command, mode) pg_popen(command, mode)
 
-#if defined(PG_EXEC)
+extern int pg_pclose(FILE *stream);
 #define pclose(stream) pg_pclose(stream)
-#include <stdio.h> // FILE
-
-EMSCRIPTEN_KEEPALIVE FILE*
-SOCKET_FILE = NULL;
 
-EMSCRIPTEN_KEEPALIVE int
-SOCKET_DATA = 0;
-
-EMSCRIPTEN_KEEPALIVE FILE*
-IDB_PIPE_FP = NULL;
+#endif
 
-EMSCRIPTEN_KEEPALIVE int
-IDB_STAGE = 0;
+#if defined(PGL_INITDB_MAIN)
 
-int pg_pclose(FILE *stream);
 
-int pg_pclose(FILE *stream) {
-    if (IDB_STAGE==1)
-        fprintf(stderr,"# pg_pclose(%s) 133:" __FILE__ "\n" , IDB_PIPE_BOOT);
-    if (IDB_STAGE==2)
-        fprintf(stderr,"# pg_pclose(%s) 135:" __FILE__ "\n" , IDB_PIPE_SINGLE);
-
-    if (IDB_PIPE_FP) {
-        fflush(IDB_PIPE_FP);
-        fclose(IDB_PIPE_FP);
-        IDB_PIPE_FP = NULL;
-    }
-    return 0;
-}
 
+// to override chmod()
+#include <sys/stat.h>
 
-#endif // PG_EXEC
+extern int pg_chmod(const char * path, int mode_t);
+// initdb chmod is not supported by wasi, so just don't use it anywhere
+// #if defined(__wasi__)
+#define chmod(path, mode) pg_chmod(path, mode)
+//#endif
 
+#endif
 
+extern FILE* IDB_PIPE_FP;
+extern int IDB_STAGE;
+extern FILE* SOCKET_FILE;
+extern int SOCKET_DATA;
 
 /*
  * OpenPipeStream : another kind of pipe open in fd.c