diff -cprN HEAD/src/interfaces/ecpg/ecpglib/connect.c ecpg-memory-8.3/src/interfaces/ecpg/ecpglib/connect.c *** HEAD/src/interfaces/ecpg/ecpglib/connect.c Wed Sep 26 19:57:00 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/ecpglib/connect.c Fri Sep 28 14:21:37 2007 *************** *** 3,15 **** #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" - #ifdef ENABLE_THREAD_SAFETY - #ifndef WIN32 - #include - #else #include "ecpg-pthread-win32.h" - #endif - #endif #include "ecpgtype.h" #include "ecpglib.h" #include "ecpgerrno.h" --- 3,9 ---- *************** *** 17,36 **** #include "sqlca.h" #ifdef ENABLE_THREAD_SAFETY #ifndef WIN32 ! static pthread_mutex_t connections_mutex = PTHREAD_MUTEX_INITIALIZER; ! static pthread_key_t actual_connection_key; ! static pthread_once_t actual_connection_key_once = PTHREAD_ONCE_INIT; ! #else ! static HANDLE connections_mutex = INVALID_HANDLE_VALUE; ! static DWORD actual_connection_key; ! #endif /* WIN32 */ #endif static struct connection *actual_connection = NULL; static struct connection *all_connections = NULL; #ifdef ENABLE_THREAD_SAFETY ! static void ecpg_actual_connection_init(void) { pthread_key_create(&actual_connection_key, NULL); --- 11,27 ---- #include "sqlca.h" #ifdef ENABLE_THREAD_SAFETY + NON_EXEC_STATIC pthread_mutex_t connections_mutex = PTHREAD_MUTEX_INITIALIZER; + static pthread_key_t actual_connection_key; #ifndef WIN32 ! static pthread_once_t actual_connection_key_once = PTHREAD_ONCE_INIT; ! #endif #endif static struct connection *actual_connection = NULL; static struct connection *all_connections = NULL; #ifdef ENABLE_THREAD_SAFETY ! NON_EXEC_STATIC void ecpg_actual_connection_init(void) { pthread_key_create(&actual_connection_key, NULL); *************** ecpg_actual_connection_init(void) *** 39,51 **** void ecpg_pthreads_init(void) { - #ifndef WIN32 pthread_once(&actual_connection_key_once, ecpg_actual_connection_init); - #else - static long has_run = 0; - if (InterlockedCompareExchange(&has_run, 1, 0) == 0) - ecpg_actual_connection_init(); - #endif } #endif --- 30,36 ---- *************** ecpg_finish(struct connection * act) *** 134,139 **** --- 119,125 ---- struct ECPGtype_information_cache *cache, *ptr; + ECPGdeallocate_all_conn(0, ECPG_COMPAT_PGSQL, act); PQfinish(act->connection); /* diff -cprN HEAD/src/interfaces/ecpg/ecpglib/extern.h ecpg-memory-8.3/src/interfaces/ecpg/ecpglib/extern.h *** HEAD/src/interfaces/ecpg/ecpglib/extern.h Wed Sep 26 19:57:00 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/ecpglib/extern.h Fri Sep 28 14:21:37 2007 *************** bool ECPGcheck_PQresult(PGresult *, int, *** 146,151 **** --- 146,152 ---- void ECPGraise(int line, int code, const char *sqlstate, const char *str); void ECPGraise_backend(int line, PGresult *result, PGconn *conn, int compat); char *ECPGprepared(const char *, struct connection *, int); + bool ECPGdeallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *conn); /* SQLSTATE values generated or processed by ecpglib (intentionally * not exported -- users should refer to the codes directly) */ diff -cprN HEAD/src/interfaces/ecpg/ecpglib/memory.c ecpg-memory-8.3/src/interfaces/ecpg/ecpglib/memory.c *** HEAD/src/interfaces/ecpg/ecpglib/memory.c Wed Nov 8 19:46:47 2006 --- ecpg-memory-8.3/src/interfaces/ecpg/ecpglib/memory.c Fri Sep 28 14:21:37 2007 *************** *** 3,8 **** --- 3,9 ---- #define POSTGRES_ECPG_INTERNAL #include "postgres_fe.h" + #include "ecpg-pthread-win32.h" #include "ecpgtype.h" #include "ecpglib.h" #include "ecpgerrno.h" *************** ECPGalloc(long size, int lineno) *** 25,31 **** return NULL; } - memset(new, '\0', size); return (new); } --- 26,31 ---- *************** ECPGstrdup(const char *string, int linen *** 62,72 **** } /* keep a list of memory we allocated for the user */ ! static struct auto_mem { void *pointer; struct auto_mem *next; ! } *auto_allocs = NULL; void ECPGadd_mem(void *ptr, int lineno) --- 62,109 ---- } /* keep a list of memory we allocated for the user */ ! struct auto_mem { void *pointer; struct auto_mem *next; ! }; ! ! #ifdef ENABLE_THREAD_SAFETY ! static pthread_key_t auto_mem_key; ! #ifndef WIN32 ! static pthread_once_t auto_mem_once = PTHREAD_ONCE_INIT; ! #endif ! ! static void ! auto_mem_destructor(void *arg) ! { ! ECPGfree_auto_mem(); ! } ! ! NON_EXEC_STATIC void ! auto_mem_key_init(void) ! { ! pthread_key_create(&auto_mem_key, auto_mem_destructor); ! } ! ! static struct auto_mem * ! get_auto_allocs(void) ! { ! pthread_once(&auto_mem_once, auto_mem_key_init); ! return (struct auto_mem *) pthread_getspecific(auto_mem_key); ! } ! ! static void ! set_auto_allocs(struct auto_mem *am) ! { ! pthread_setspecific(auto_mem_key, am); ! } ! ! #else ! static struct auto_mem *auto_allocs = NULL; ! #define get_auto_allocs() (auto_allocs) ! #define set_auto_allocs(am) do { auto_allocs = (am); } while(0) ! #endif void ECPGadd_mem(void *ptr, int lineno) *************** ECPGadd_mem(void *ptr, int lineno) *** 74,114 **** struct auto_mem *am = (struct auto_mem *) ECPGalloc(sizeof(struct auto_mem), lineno); am->pointer = ptr; ! am->next = auto_allocs; ! auto_allocs = am; } void ECPGfree_auto_mem(void) { ! struct auto_mem *am; /* free all memory we have allocated for the user */ ! for (am = auto_allocs; am;) { ! struct auto_mem *act = am; ! ! am = am->next; ! ECPGfree(act->pointer); ! ECPGfree(act); } - - auto_allocs = NULL; } void ECPGclear_auto_mem(void) { ! struct auto_mem *am; /* only free our own structure */ ! for (am = auto_allocs; am;) { ! struct auto_mem *act = am; ! ! am = am->next; ! ECPGfree(act); } - - auto_allocs = NULL; } --- 111,153 ---- struct auto_mem *am = (struct auto_mem *) ECPGalloc(sizeof(struct auto_mem), lineno); am->pointer = ptr; ! am->next = get_auto_allocs(); ! set_auto_allocs(am); } void ECPGfree_auto_mem(void) { ! struct auto_mem *am = get_auto_allocs(); /* free all memory we have allocated for the user */ ! if (am) { ! do ! { ! struct auto_mem *act = am; ! am = am->next; ! ECPGfree(act->pointer); ! ECPGfree(act); ! } while(am); ! set_auto_allocs(NULL); } } void ECPGclear_auto_mem(void) { ! struct auto_mem *am = get_auto_allocs(); /* only free our own structure */ ! if (am) { ! do ! { ! struct auto_mem *act = am; ! am = am->next; ! ECPGfree(act); ! } while(am); ! set_auto_allocs(NULL); } } diff -cprN HEAD/src/interfaces/ecpg/ecpglib/misc.c ecpg-memory-8.3/src/interfaces/ecpg/ecpglib/misc.c *** HEAD/src/interfaces/ecpg/ecpglib/misc.c Tue Aug 14 19:01:52 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/ecpglib/misc.c Fri Sep 28 14:21:37 2007 *************** *** 5,17 **** #include #include - #ifdef ENABLE_THREAD_SAFETY - #ifndef WIN32 - #include - #else #include "ecpg-pthread-win32.h" - #endif - #endif #include "ecpgtype.h" #include "ecpglib.h" #include "ecpgerrno.h" --- 5,11 ---- *************** static struct sqlca_t sqlca_init = *** 62,72 **** }; #ifdef ENABLE_THREAD_SAFETY - #ifndef WIN32 static pthread_key_t sqlca_key; static pthread_once_t sqlca_key_once = PTHREAD_ONCE_INIT; - #else - static DWORD sqlca_key; #endif #else static struct sqlca_t sqlca = --- 56,64 ---- }; #ifdef ENABLE_THREAD_SAFETY static pthread_key_t sqlca_key; + #ifndef WIN32 static pthread_once_t sqlca_key_once = PTHREAD_ONCE_INIT; #endif #else static struct sqlca_t sqlca = *************** static struct sqlca_t sqlca = *** 98,110 **** #endif #ifdef ENABLE_THREAD_SAFETY ! #ifndef WIN32 ! static pthread_mutex_t debug_mutex = PTHREAD_MUTEX_INITIALIZER; ! static pthread_mutex_t debug_init_mutex = PTHREAD_MUTEX_INITIALIZER; ! #else ! static HANDLE debug_mutex = INVALID_HANDLE_VALUE; ! static HANDLE debug_init_mutex = INVALID_HANDLE_VALUE; ! #endif /* WIN32 */ #endif static int simple_debug = 0; static FILE *debugstream = NULL; --- 90,97 ---- #endif #ifdef ENABLE_THREAD_SAFETY ! NON_EXEC_STATIC pthread_mutex_t debug_mutex = PTHREAD_MUTEX_INITIALIZER; ! NON_EXEC_STATIC pthread_mutex_t debug_init_mutex = PTHREAD_MUTEX_INITIALIZER; #endif static int simple_debug = 0; static FILE *debugstream = NULL; *************** ECPGinit(const struct connection * con, *** 135,145 **** static void ecpg_sqlca_key_destructor(void *arg) { ! if (arg != NULL) ! free(arg); /* sqlca structure allocated in ECPGget_sqlca */ } ! static void ecpg_sqlca_key_init(void) { pthread_key_create(&sqlca_key, ecpg_sqlca_key_destructor); --- 122,131 ---- static void ecpg_sqlca_key_destructor(void *arg) { ! free(arg); /* sqlca structure allocated in ECPGget_sqlca */ } ! NON_EXEC_STATIC void ecpg_sqlca_key_init(void) { pthread_key_create(&sqlca_key, ecpg_sqlca_key_destructor); *************** ECPGget_sqlca(void) *** 151,163 **** { #ifdef ENABLE_THREAD_SAFETY struct sqlca_t *sqlca; ! #ifdef WIN32 ! static long has_run = 0; ! if (InterlockedCompareExchange(&has_run, 1, 0) == 0) ! ecpg_sqlca_key_init(); ! #else pthread_once(&sqlca_key_once, ecpg_sqlca_key_init); - #endif sqlca = pthread_getspecific(sqlca_key); if (sqlca == NULL) --- 137,144 ---- { #ifdef ENABLE_THREAD_SAFETY struct sqlca_t *sqlca; ! pthread_once(&sqlca_key_once, ecpg_sqlca_key_init); sqlca = pthread_getspecific(sqlca_key); if (sqlca == NULL) *************** ECPGlog(const char *format,...) *** 263,284 **** va_list ap; struct sqlca_t *sqlca = ECPGget_sqlca(); - #ifdef ENABLE_THREAD_SAFETY - pthread_mutex_lock(&debug_mutex); - #endif - if (simple_debug) { int bufsize = strlen(format) + 100; char *f = (char *) malloc(bufsize); if (f == NULL) - { - #ifdef ENABLE_THREAD_SAFETY - pthread_mutex_unlock(&debug_mutex); - #endif return; - } /* * regression tests set this environment variable to get the same --- 244,256 ---- *************** ECPGlog(const char *format,...) *** 289,294 **** --- 261,270 ---- else snprintf(f, bufsize, "[%d]: %s", (int) getpid(), format); + #ifdef ENABLE_THREAD_SAFETY + pthread_mutex_lock(&debug_mutex); + #endif + va_start(ap, format); vfprintf(debugstream, f, ap); va_end(ap); *************** ECPGlog(const char *format,...) *** 300,311 **** fflush(debugstream); - ECPGfree(f); - } - #ifdef ENABLE_THREAD_SAFETY ! pthread_mutex_unlock(&debug_mutex); #endif } void --- 276,287 ---- fflush(debugstream); #ifdef ENABLE_THREAD_SAFETY ! pthread_mutex_unlock(&debug_mutex); #endif + + free(f); + } } void *************** ECPGis_noind_null(enum ECPGttype type, v *** 437,439 **** --- 413,437 ---- return false; } + + #ifdef WIN32 + + /* + * Initialize mutexes and call init-once functions on loading. + */ + + BOOL WINAPI + DllMain(HANDLE module, DWORD reason, LPVOID reserved) + { + if (reason == DLL_PROCESS_ATTACH) + { + connections_mutex = CreateMutex(NULL, FALSE, NULL); + debug_mutex = CreateMutex(NULL, FALSE, NULL); + debug_init_mutex = CreateMutex(NULL, FALSE, NULL); + auto_mem_key_init(); + ecpg_actual_connection_init(); + ecpg_sqlca_key_init(); + } + return TRUE; + } + #endif diff -cprN HEAD/src/interfaces/ecpg/ecpglib/prepare.c ecpg-memory-8.3/src/interfaces/ecpg/ecpglib/prepare.c *** HEAD/src/interfaces/ecpg/ecpglib/prepare.c Wed Sep 26 19:57:00 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/ecpglib/prepare.c Fri Sep 28 14:21:37 2007 *************** typedef struct *** 31,38 **** } stmtCacheEntry; static int nextStmtID = 1; ! static int stmtCacheNBuckets = 2039; /* # buckets - a prime # */ ! static int stmtCacheEntPerBucket = 8; /* # entries/bucket */ static stmtCacheEntry stmtCacheEntries[16384] = {{0,{0},0,0,0}}; static struct prepared_statement *find_prepared_statement(const char *name, --- 31,38 ---- } stmtCacheEntry; static int nextStmtID = 1; ! const static int stmtCacheNBuckets = 2039; /* # buckets - a prime # */ ! const static int stmtCacheEntPerBucket = 8; /* # entries/bucket */ static stmtCacheEntry stmtCacheEntries[16384] = {{0,{0},0,0,0}}; static struct prepared_statement *find_prepared_statement(const char *name, *************** ECPGdeallocate(int lineno, int c, const *** 263,282 **** } bool ! ECPGdeallocate_all(int lineno, int compat, const char *connection_name) { - struct connection *con; - - con = ECPGget_connection(connection_name); - /* deallocate all prepared statements */ while (con->prep_stmts) { ! if (!deallocate_one(lineno, compat, con, NULL, con->prep_stmts)) return false; } return true; } char * --- 263,284 ---- } bool ! ECPGdeallocate_all_conn(int lineno, enum COMPAT_MODE c, struct connection *con) { /* deallocate all prepared statements */ while (con->prep_stmts) { ! if (!deallocate_one(lineno, c, con, NULL, con->prep_stmts)) return false; } return true; + } + + bool + ECPGdeallocate_all(int lineno, int compat, const char *connection_name) + { + return ECPGdeallocate_all_conn(lineno, compat, ECPGget_connection(connection_name)); } char * diff -cprN HEAD/src/interfaces/ecpg/include/ecpg-pthread-win32.h ecpg-memory-8.3/src/interfaces/ecpg/include/ecpg-pthread-win32.h *** HEAD/src/interfaces/ecpg/include/ecpg-pthread-win32.h Thu Mar 29 21:02:24 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/include/ecpg-pthread-win32.h Fri Sep 28 14:21:37 2007 *************** *** 4,16 **** */ #ifndef _ECPG_PTHREAD_WIN32_H #define _ECPG_PTHREAD_WIN32_H ! #define pthread_mutex_lock(x) do { \ ! if (*x == INVALID_HANDLE_VALUE) \ ! *x = CreateMutex(NULL, FALSE, NULL); \ ! WaitForSingleObject(*x, INFINITE); \ ! } while (0); ! #define pthread_mutex_unlock(x) ReleaseMutex(*x) ! #define pthread_getspecific(x) TlsGetValue(x) ! #define pthread_setspecific(x,y) TlsSetValue(x,y) ! #define pthread_key_create(x,y) *x = TlsAlloc(); ! #endif --- 4,56 ---- */ #ifndef _ECPG_PTHREAD_WIN32_H #define _ECPG_PTHREAD_WIN32_H ! ! #ifdef ENABLE_THREAD_SAFETY ! ! #ifndef WIN32 ! ! #include ! #define NON_EXEC_STATIC static ! ! #else ! ! #define NON_EXEC_STATIC ! ! typedef HANDLE pthread_mutex_t; ! typedef DWORD pthread_key_t; ! ! #define PTHREAD_MUTEX_INITIALIZER INVALID_HANDLE_VALUE ! ! #define pthread_mutex_lock(mutex) \ ! WaitForSingleObject(*(mutex), INFINITE); ! ! #define pthread_mutex_unlock(mutex) \ ! ReleaseMutex(*(mutex)) ! ! #define pthread_getspecific(key) \ ! TlsGetValue((key)) ! ! #define pthread_setspecific(key, value) \ ! TlsSetValue((key), (value)) ! ! /* FIXME: destructor is never called in Win32. */ ! #define pthread_key_create(key, destructor) \ ! do { *(key) = TlsAlloc(); ((void)(destructor)); } while(0) ! ! /* init-once functions are always called when libecpg is loaded */ ! #define pthread_once(key, fn) \ ! ((void)0) ! ! extern pthread_mutex_t connections_mutex; ! extern pthread_mutex_t debug_mutex; ! extern pthread_mutex_t debug_init_mutex; ! extern void auto_mem_key_init(void); ! extern void ecpg_actual_connection_init(void); ! extern void ecpg_sqlca_key_init(void); ! extern BOOL WINAPI DllMain(HANDLE module, DWORD reason, LPVOID reserved); ! ! #endif /* WIN32 */ ! ! #endif /* ENABLE_THREAD_SAFETY */ ! ! #endif /* _ECPG_PTHREAD_WIN32_H */ diff -cprN HEAD/src/interfaces/ecpg/pgtypeslib/dt_common.c ecpg-memory-8.3/src/interfaces/ecpg/pgtypeslib/dt_common.c *** HEAD/src/interfaces/ecpg/pgtypeslib/dt_common.c Wed Aug 22 17:20:58 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/pgtypeslib/dt_common.c Fri Sep 28 14:21:37 2007 *************** static datetkn deltatktbl[] = { *** 496,503 **** {"yrs", UNITS, DTK_YEAR}, /* "years" relative */ }; ! static unsigned int szdatetktbl = sizeof datetktbl / sizeof datetktbl[0]; ! static unsigned int szdeltatktbl = sizeof deltatktbl / sizeof deltatktbl[0]; static datetkn *datecache[MAXDATEFIELDS] = {NULL}; --- 496,503 ---- {"yrs", UNITS, DTK_YEAR}, /* "years" relative */ }; ! static const unsigned int szdatetktbl = lengthof(datetktbl); ! static const unsigned int szdeltatktbl = lengthof(deltatktbl); static datetkn *datecache[MAXDATEFIELDS] = {NULL}; diff -cprN HEAD/src/interfaces/ecpg/test/ecpg_schedule ecpg-memory-8.3/src/interfaces/ecpg/test/ecpg_schedule *** HEAD/src/interfaces/ecpg/test/ecpg_schedule Wed Sep 26 19:57:01 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/test/ecpg_schedule Fri Sep 28 14:21:37 2007 *************** test: sql/parser *** 42,44 **** --- 42,45 ---- test: thread/thread test: thread/thread_implicit test: thread/prep + test: thread/alloc diff -cprN HEAD/src/interfaces/ecpg/test/ecpg_schedule_tcp ecpg-memory-8.3/src/interfaces/ecpg/test/ecpg_schedule_tcp *** HEAD/src/interfaces/ecpg/test/ecpg_schedule_tcp Wed Sep 26 19:57:01 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/test/ecpg_schedule_tcp Fri Sep 28 14:21:37 2007 *************** test: sql/parser *** 42,46 **** --- 42,47 ---- test: thread/thread test: thread/thread_implicit test: thread/prep + test: thread/alloc test: connect/test1 diff -cprN HEAD/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr ecpg-memory-8.3/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr *** HEAD/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr Tue Aug 14 19:01:53 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr Fri Sep 28 14:21:37 2007 *************** *** 112,116 **** --- 112,134 ---- [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGexecute line 42 Ok: DROP TABLE [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: ecpg8 + [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: ecpg7 + [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: ecpg6 + [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: ecpg5 + [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: ecpg4 + [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: i + [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: ecpg3 + [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: ecpg2 + [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: ecpg1 + [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: Connection regress1 closed. [NO_PID]: sqlca: code: 0, state: 00000 diff -cprN HEAD/src/interfaces/ecpg/test/expected/sql-execute.stderr ecpg-memory-8.3/src/interfaces/ecpg/test/expected/sql-execute.stderr *** HEAD/src/interfaces/ecpg/test/expected/sql-execute.stderr Tue Aug 14 19:01:53 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/test/expected/sql-execute.stderr Fri Sep 28 14:21:37 2007 *************** *** 146,150 **** --- 146,154 ---- [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans line 90 action = commit connection = main [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: f + [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: i + [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: Connection main closed. [NO_PID]: sqlca: code: 0, state: 00000 diff -cprN HEAD/src/interfaces/ecpg/test/expected/sql-oldexec.stderr ecpg-memory-8.3/src/interfaces/ecpg/test/expected/sql-oldexec.stderr *** HEAD/src/interfaces/ecpg/test/expected/sql-oldexec.stderr Tue Aug 14 19:01:54 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/test/expected/sql-oldexec.stderr Fri Sep 28 14:21:37 2007 *************** *** 146,150 **** --- 146,154 ---- [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ECPGtrans line 89 action = commit connection = main [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: f + [NO_PID]: sqlca: code: 0, state: 00000 + [NO_PID]: ECPGdeallocate line 0: NAME: i + [NO_PID]: sqlca: code: 0, state: 00000 [NO_PID]: ecpg_finish: Connection main closed. [NO_PID]: sqlca: code: 0, state: 00000 diff -cprN HEAD/src/interfaces/ecpg/test/expected/thread-alloc.c ecpg-memory-8.3/src/interfaces/ecpg/test/expected/thread-alloc.c *** HEAD/src/interfaces/ecpg/test/expected/thread-alloc.c Thu Jan 1 09:00:00 1970 --- ecpg-memory-8.3/src/interfaces/ecpg/test/expected/thread-alloc.c Fri Sep 28 14:34:29 2007 *************** *** 0 **** --- 1,218 ---- + /* Processed by ecpg (regression mode) */ + /* These include files are added by the preprocessor */ + #include + #include + #include + #include + /* End of automatic include section */ + #define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y)) + + #line 1 "alloc.pgc" + #include + #include "ecpg_config.h" + + #ifndef ENABLE_THREAD_SAFETY + int + main(void) + { + printf("No threading enabled.\n"); + return 0; + } + #else + #ifdef WIN32 + #define WIN32_LEAN_AND_MEAN + #include + #include + #else + #include + #endif + #include + + #define THREADS 16 + #define REPEATS 50 + + + #line 1 "sqlca.h" + #ifndef POSTGRES_SQLCA_H + #define POSTGRES_SQLCA_H + + #ifndef PGDLLIMPORT + #if defined(WIN32) || defined(__CYGWIN__) + #define PGDLLIMPORT __declspec (dllimport) + #else + #define PGDLLIMPORT + #endif /* __CYGWIN__ */ + #endif /* PGDLLIMPORT */ + + #define SQLERRMC_LEN 150 + + #ifdef __cplusplus + extern "C" + { + #endif + + struct sqlca_t + { + char sqlcaid[8]; + long sqlabc; + long sqlcode; + struct + { + int sqlerrml; + char sqlerrmc[SQLERRMC_LEN]; + } sqlerrm; + char sqlerrp[8]; + long sqlerrd[6]; + /* Element 0: empty */ + /* 1: OID of processed tuple if applicable */ + /* 2: number of rows processed */ + /* after an INSERT, UPDATE or */ + /* DELETE statement */ + /* 3: empty */ + /* 4: empty */ + /* 5: empty */ + char sqlwarn[8]; + /* Element 0: set to 'W' if at least one other is 'W' */ + /* 1: if 'W' at least one character string */ + /* value was truncated when it was */ + /* stored into a host variable. */ + + /* + * 2: if 'W' a (hopefully) non-fatal notice occurred + */ /* 3: empty */ + /* 4: empty */ + /* 5: empty */ + /* 6: empty */ + /* 7: empty */ + + char sqlstate[5]; + }; + + struct sqlca_t *ECPGget_sqlca(void); + + #ifndef POSTGRES_ECPG_INTERNAL + #define sqlca (*ECPGget_sqlca()) + #endif + + #ifdef __cplusplus + } + #endif + + #endif + + #line 24 "alloc.pgc" + + + #line 1 "regression.h" + + + + + + + #line 25 "alloc.pgc" + + + /* exec sql whenever sqlerror sqlprint ; */ + #line 27 "alloc.pgc" + + /* exec sql whenever not found sqlprint ; */ + #line 28 "alloc.pgc" + + + #ifdef WIN32 + static unsigned STDCALL fn(void* arg) + #else + static void* fn(void* arg) + #endif + { + int i; + + /* exec sql begin declare section */ + + + + + #line 39 "alloc.pgc" + int value ; + + #line 40 "alloc.pgc" + char name [ 100 ] ; + + #line 41 "alloc.pgc" + char ** r = NULL ; + /* exec sql end declare section */ + #line 42 "alloc.pgc" + + + value = (int)arg; + sprintf(name, "Connection: %d", value); + + { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , name, 0); + #line 47 "alloc.pgc" + + if (sqlca.sqlcode < 0) sqlprint();} + #line 47 "alloc.pgc" + + { ECPGsetcommit(__LINE__, "on", NULL); + #line 48 "alloc.pgc" + + if (sqlca.sqlcode < 0) sqlprint();} + #line 48 "alloc.pgc" + + for (i = 1; i <= REPEATS; ++i) + { + { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select relname from pg_class where relname = 'pg_class' ", ECPGt_EOIT, + ECPGt_char,&(r),(long)0,(long)0,(1)*sizeof(char), + ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT); + #line 51 "alloc.pgc" + + if (sqlca.sqlcode == ECPG_NOT_FOUND) sqlprint(); + #line 51 "alloc.pgc" + + if (sqlca.sqlcode < 0) sqlprint();} + #line 51 "alloc.pgc" + + free(r); + r = NULL; + } + { ECPGdisconnect(__LINE__, name); + #line 55 "alloc.pgc" + + if (sqlca.sqlcode < 0) sqlprint();} + #line 55 "alloc.pgc" + + + return 0; + } + + int main (int argc, char** argv) + { + int i; + #ifdef WIN32 + HANDLE threads[THREADS]; + #else + pthread_t threads[THREADS]; + #endif + + #ifdef WIN32 + for (i = 0; i < THREADS; ++i) + { + unsigned id; + threads[i] = (HANDLE)_beginthreadex(NULL, 0, fn, (void*)i, 0, &id); + } + + WaitForMultipleObjects(THREADS, threads, TRUE, INFINITE); + for (i = 0; i < THREADS; ++i) + CloseHandle(threads[i]); + #else + for (i = 0; i < THREADS; ++i) + pthread_create(&threads[i], NULL, fn, (void*)i); + for (i = 0; i < THREADS; ++i) + pthread_join(threads[i], NULL); + #endif + + return 0; + } + #endif + diff -cprN HEAD/src/interfaces/ecpg/test/expected/thread-alloc.stdout ecpg-memory-8.3/src/interfaces/ecpg/test/expected/thread-alloc.stdout *** HEAD/src/interfaces/ecpg/test/expected/thread-alloc.stdout Thu Jan 1 09:00:00 1970 --- ecpg-memory-8.3/src/interfaces/ecpg/test/expected/thread-alloc.stdout Fri Sep 28 14:21:37 2007 *************** *** 0 **** --- 1 ---- + No threading enabled. diff -cprN HEAD/src/interfaces/ecpg/test/expected/thread-prep.c ecpg-memory-8.3/src/interfaces/ecpg/test/expected/thread-prep.c *** HEAD/src/interfaces/ecpg/test/expected/thread-prep.c Wed Sep 26 19:57:01 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/test/expected/thread-prep.c Fri Sep 28 14:34:33 2007 *************** *** 15,21 **** int main(void) { ! printf("No threading enabled.\n"); return 0; } #else --- 15,21 ---- int main(void) { ! printf("No threading enabled.\n"); return 0; } #else *************** struct sqlca_t *ECPGget_sqlca(void); *** 123,129 **** #ifdef WIN32 static unsigned STDCALL fn(void* arg) #else ! void* fn(void* arg) #endif { int i; --- 123,129 ---- #ifdef WIN32 static unsigned STDCALL fn(void* arg) #else ! static void* fn(void* arg) #endif { int i; diff -cprN HEAD/src/interfaces/ecpg/test/thread/Makefile ecpg-memory-8.3/src/interfaces/ecpg/test/thread/Makefile *** HEAD/src/interfaces/ecpg/test/thread/Makefile Wed Sep 26 19:57:01 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/test/thread/Makefile Fri Sep 28 14:22:33 2007 *************** include $(top_srcdir)/$(subdir)/../Makef *** 6,12 **** TESTS = thread_implicit thread_implicit.c \ thread thread.c \ ! prep prep.c all: $(TESTS) --- 6,13 ---- TESTS = thread_implicit thread_implicit.c \ thread thread.c \ ! prep prep.c \ ! alloc alloc.c all: $(TESTS) diff -cprN HEAD/src/interfaces/ecpg/test/thread/alloc.pgc ecpg-memory-8.3/src/interfaces/ecpg/test/thread/alloc.pgc *** HEAD/src/interfaces/ecpg/test/thread/alloc.pgc Thu Jan 1 09:00:00 1970 --- ecpg-memory-8.3/src/interfaces/ecpg/test/thread/alloc.pgc Fri Sep 28 14:34:06 2007 *************** *** 0 **** --- 1,89 ---- + #include + #include "ecpg_config.h" + + #ifndef ENABLE_THREAD_SAFETY + int + main(void) + { + printf("No threading enabled.\n"); + return 0; + } + #else + #ifdef WIN32 + #define WIN32_LEAN_AND_MEAN + #include + #include + #else + #include + #endif + #include + + #define THREADS 16 + #define REPEATS 50 + + exec sql include sqlca; + exec sql include ../regression; + + exec sql whenever sqlerror sqlprint; + exec sql whenever not found sqlprint; + + #ifdef WIN32 + static unsigned STDCALL fn(void* arg) + #else + static void* fn(void* arg) + #endif + { + int i; + + EXEC SQL BEGIN DECLARE SECTION; + int value; + char name[100]; + char **r = NULL; + EXEC SQL END DECLARE SECTION; + + value = (int)arg; + sprintf(name, "Connection: %d", value); + + EXEC SQL CONNECT TO REGRESSDB1 AS :name; + EXEC SQL SET AUTOCOMMIT TO ON; + for (i = 1; i <= REPEATS; ++i) + { + EXEC SQL SELECT relname INTO :r FROM pg_class WHERE relname = 'pg_class'; + free(r); + r = NULL; + } + EXEC SQL DISCONNECT :name; + + return 0; + } + + int main (int argc, char** argv) + { + int i; + #ifdef WIN32 + HANDLE threads[THREADS]; + #else + pthread_t threads[THREADS]; + #endif + + #ifdef WIN32 + for (i = 0; i < THREADS; ++i) + { + unsigned id; + threads[i] = (HANDLE)_beginthreadex(NULL, 0, fn, (void*)i, 0, &id); + } + + WaitForMultipleObjects(THREADS, threads, TRUE, INFINITE); + for (i = 0; i < THREADS; ++i) + CloseHandle(threads[i]); + #else + for (i = 0; i < THREADS; ++i) + pthread_create(&threads[i], NULL, fn, (void*)i); + for (i = 0; i < THREADS; ++i) + pthread_join(threads[i], NULL); + #endif + + return 0; + } + #endif + diff -cprN HEAD/src/interfaces/ecpg/test/thread/prep.pgc ecpg-memory-8.3/src/interfaces/ecpg/test/thread/prep.pgc *** HEAD/src/interfaces/ecpg/test/thread/prep.pgc Wed Sep 26 19:57:01 2007 --- ecpg-memory-8.3/src/interfaces/ecpg/test/thread/prep.pgc Fri Sep 28 14:34:09 2007 *************** *** 5,11 **** int main(void) { ! printf("No threading enabled.\n"); return 0; } #else --- 5,11 ---- int main(void) { ! printf("No threading enabled.\n"); return 0; } #else *************** exec sql whenever not found sqlprint; *** 30,36 **** #ifdef WIN32 static unsigned STDCALL fn(void* arg) #else ! void* fn(void* arg) #endif { int i; --- 30,36 ---- #ifdef WIN32 static unsigned STDCALL fn(void* arg) #else ! static void* fn(void* arg) #endif { int i;