restore stock wasm

Author: pmp-p

src/Makefile.shlib

@@ -224,33 +224,6 @@ ifeq ($(SHLIB_EXPORTS),)
   override CXXFLAGS += $(CXXFLAGS_SL_MODULE)
 endif
 
-ifeq ($(PORTNAME), emscripten)
-  LINK.shared       = emsdk-shared
-  ifdef soname
-    # emscripten uses unversioned shared libraries
-    shlib     = $(shlib_bare)
-    soname        = $(shlib_bare)
-  endif
-  BUILD.exports     = ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
-  exports_file      = $(SHLIB_EXPORTS:%.txt=%.list)
-#  ifneq (,$(exports_file))
-#    LINK.shared     += -Wl,--version-script=$(exports_file)
-#  endif
-endif
-
-ifeq ($(PORTNAME), wasi)
-  LINK.shared       = wasi-shared
-  ifdef soname
-    # emscripten uses unversioned shared libraries
-    shlib     = $(shlib_bare)
-    soname        = $(shlib_bare)
-  endif
-  BUILD.exports     = ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
-  exports_file      = $(SHLIB_EXPORTS:%.txt=%.list)
-#  ifneq (,$(exports_file))
-#    LINK.shared     += -Wl,--version-script=$(exports_file)
-#  endif
-endif
 
 ##
 ## BUILD
@@ -266,11 +239,8 @@ all-lib: lib$(NAME).pc
 endif
 
 all-static-lib: $(stlib)
-ifdef wasi
-all-shared-lib: all-static-lib
-else
+
 all-shared-lib: $(shlib)
-endif
 
 # In this rule, "touch $@" works around a problem on some platforms wherein
 # ar updates the library file's mod time with a value calculated to

src/backend/libpq/pqcomm.c

@@ -320,8 +320,8 @@ PDEBUG("# 285:" __FILE__);
 	AddWaitEventToSet(FeBeWaitSet, WL_POSTMASTER_DEATH, PGINVALID_SOCKET,
 					  NULL, NULL);
 #else /* WASM */
-    PDEBUG("# 323: FIXME: socketfile");
-    #pragma message "FIXME: use socketfile when overflowing PqRecvBuffer_static"
+    PDEBUG("# 220: FIXME: socketfile");
+    #pragma message "FIXME: socketfile"
     /* because we fill before starting reading message */
     PqRecvBuffer = &PqRecvBuffer_static[0];
 #endif /* WASM */
@@ -1150,14 +1150,14 @@ pq_buffer_remaining_data(void)
  *		This must be called before any of the pq_get* functions.
  * --------------------------------
  */
-#if defined(__EMSCRIPTEN__) || defined(__wasi__)
+#if defined(I_EMSCRIPTEN) || defined(I_WASI)
 EMSCRIPTEN_KEEPALIVE void
 pq_recvbuf_fill(FILE* fp, int packetlen) {
     fread( PqRecvBuffer, packetlen, 1, fp);
     PqRecvPointer = 0;
     PqRecvLength = packetlen;
 #if PDEBUG
-        printf("# 1160: pq_recvbuf_fill cma_rsize=%d PqRecvLength=%d buf=%p reply=%p\n", cma_rsize, PqRecvLength, &PqRecvBuffer[0], &PqSendBuffer[0]);
+        printf("# 1199: pq_recvbuf_fill cma_rsize=%d PqRecvLength=%d buf=%p reply=%p\n", cma_rsize, PqRecvLength, &PqRecvBuffer[0], &PqSendBuffer[0]);
 #endif
 
 }
@@ -1175,7 +1175,7 @@ pq_startmsgread(void)
 		ereport(FATAL,
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("terminating connection because protocol synchronization was lost")));
-#if defined(__EMSCRIPTEN__) || defined(__wasi__)
+#if defined(I_EMSCRIPTEN) || defined(I_WASI)
     if (!pq_buffer_remaining_data()) {
         if (cma_rsize) {
             PqRecvPointer = 0;
@@ -1326,7 +1326,7 @@ extern int SOCKET_DATA;
 static int
 internal_putbytes(const char *s, size_t len) {
 	if (PqSendPointer >= PqSendBufferSize) {
-        fprintf(stderr, "# 1329: overflow %zu >= %d cma_rsize=%d CMA=%d\n", PqSendPointer, PqSendBufferSize,cma_rsize, CMA_MB);
+        fprintf(stderr, "# 1329: overflow %d >= %d cma_rsize=%d CMA=%d\n", PqSendPointer, PqSendBufferSize,cma_rsize, CMA_MB);
     }
 
     if (!cma_rsize) {

src/backend/utils/error/elog.c

@@ -543,18 +543,8 @@ errfinish(const char *filename, int lineno, const char *funcname)
 		 */
 
 		recursion_depth--;
-#if defined(__wasi__)
-        fprintf(stderr, "# 547: PG_RE_THROW(ERROR : %d) custom handling\n", recursion_depth);
-    	EmitErrorReport();
-	    FreeErrorDataContents(edata);
-	    errordata_stack_depth--;
-    	MemoryContextSwitchTo(oldcontext);
-    	recursion_depth--;
-        abort();
-#else
         fprintf(stderr, "# 549: PG_RE_THROW(ERROR : %d)\n", recursion_depth);
 		PG_RE_THROW();
-#endif
 	}
 
 	/* Emit the message to the right places */
@@ -603,7 +593,7 @@ errfinish(const char *filename, int lineno, const char *funcname)
 		 * worthy of panic, depending on which subprocess returns it.
 		 */
 #if defined(__EMSCRIPTEN__) || defined(__wasi__)
-        PDEBUG("# 601: proc_exit(FATAL) ignored");
+        puts("# 599: proc_exit(FATAL) ignored");
 #else
 		proc_exit(1);
 #endif
@@ -2020,13 +2010,6 @@ ReThrowError(ErrorData *edata)
 void
 pg_re_throw(void)
 {
-#if defined(__wasi__)
-	if (PG_exception_stack != NULL)
-        PDEBUG("# 2020: pg_re_throw(void) [ ex stack ! ]");
-    else
-        PDEBUG("# 2022: pg_re_throw(void) [ NO STACK ]");
-    return;
-#endif
 	/* If possible, throw the error to the next outer setjmp handler */
 	if (PG_exception_stack != NULL)
 		siglongjmp(*PG_exception_stack, 1);

src/include/port/emscripten.h

@@ -1,10 +1,10 @@
-/* src/include/port/{wasi/emscripten}.h */
+/* src/include/port/emscripten.h */
 
-#ifndef I_WASM
-#define I_WASM
+#ifndef I_EMSCRIPTEN
+#define I_EMSCRIPTEN
 
 #if !defined(__cplusplus)
-#include <sdk_port.h>
+#include <emscripten.h>
 #endif
 
 #include "/tmp/pglite/include/wasm_common.h"
@@ -14,4 +14,4 @@
 #define FD_BUFFER_MAX 16384
 
 
-#endif // I_WASM
+#endif // I_EMSCRIPTEN