summaryrefslogtreecommitdiff
path: root/src/interfaces/ecpg/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/interfaces/ecpg/test')
-rw-r--r--src/interfaces/ecpg/test/ecpg_schedule1
-rw-r--r--src/interfaces/ecpg/test/ecpg_schedule_tcp1
-rw-r--r--src/interfaces/ecpg/test/expected/preproc-autoprep.stderr18
-rw-r--r--src/interfaces/ecpg/test/expected/sql-execute.stderr4
-rw-r--r--src/interfaces/ecpg/test/expected/sql-oldexec.stderr4
-rw-r--r--src/interfaces/ecpg/test/expected/thread-alloc.c218
-rw-r--r--src/interfaces/ecpg/test/expected/thread-alloc.stderr0
-rw-r--r--src/interfaces/ecpg/test/expected/thread-alloc.stdout0
-rw-r--r--src/interfaces/ecpg/test/expected/thread-alloc_2.stdout1
-rw-r--r--src/interfaces/ecpg/test/expected/thread-prep.c4
-rw-r--r--src/interfaces/ecpg/test/thread/Makefile3
-rw-r--r--src/interfaces/ecpg/test/thread/prep.pgc4
12 files changed, 253 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/test/ecpg_schedule b/src/interfaces/ecpg/test/ecpg_schedule
index 432a458cdef..6067db26664 100644
--- a/src/interfaces/ecpg/test/ecpg_schedule
+++ b/src/interfaces/ecpg/test/ecpg_schedule
@@ -42,3 +42,4 @@ test: sql/parser
test: thread/thread
test: thread/thread_implicit
test: thread/prep
+test: thread/alloc
diff --git a/src/interfaces/ecpg/test/ecpg_schedule_tcp b/src/interfaces/ecpg/test/ecpg_schedule_tcp
index 64fbca21179..20e322bbde3 100644
--- a/src/interfaces/ecpg/test/ecpg_schedule_tcp
+++ b/src/interfaces/ecpg/test/ecpg_schedule_tcp
@@ -42,5 +42,6 @@ test: sql/parser
test: thread/thread
test: thread/thread_implicit
test: thread/prep
+test: thread/alloc
test: connect/test1
diff --git a/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr b/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr
index ec86193d9d1..68d7ff659cf 100644
--- a/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr
+++ b/src/interfaces/ecpg/test/expected/preproc-autoprep.stderr
@@ -112,5 +112,23 @@
[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 --git a/src/interfaces/ecpg/test/expected/sql-execute.stderr b/src/interfaces/ecpg/test/expected/sql-execute.stderr
index d6c76a9b8a9..d9fbbc3497d 100644
--- a/src/interfaces/ecpg/test/expected/sql-execute.stderr
+++ b/src/interfaces/ecpg/test/expected/sql-execute.stderr
@@ -146,5 +146,9 @@
[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 --git a/src/interfaces/ecpg/test/expected/sql-oldexec.stderr b/src/interfaces/ecpg/test/expected/sql-oldexec.stderr
index 66f181d5115..c1f85b0b63f 100644
--- a/src/interfaces/ecpg/test/expected/sql-oldexec.stderr
+++ b/src/interfaces/ecpg/test/expected/sql-oldexec.stderr
@@ -146,5 +146,9 @@
[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 --git a/src/interfaces/ecpg/test/expected/thread-alloc.c b/src/interfaces/ecpg/test/expected/thread-alloc.c
new file mode 100644
index 00000000000..12a95df8f66
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/thread-alloc.c
@@ -0,0 +1,218 @@
+/* Processed by ecpg (regression mode) */
+/* These include files are added by the preprocessor */
+#include <ecpgtype.h>
+#include <ecpglib.h>
+#include <ecpgerrno.h>
+#include <sqlca.h>
+/* End of automatic include section */
+#define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
+
+#line 1 "alloc.pgc"
+#include <stdlib.h>
+#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 <windows.h>
+#include <process.h>
+#else
+#include <pthread.h>
+#endif
+#include <stdio.h>
+
+#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 --git a/src/interfaces/ecpg/test/expected/thread-alloc.stderr b/src/interfaces/ecpg/test/expected/thread-alloc.stderr
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/thread-alloc.stderr
diff --git a/src/interfaces/ecpg/test/expected/thread-alloc.stdout b/src/interfaces/ecpg/test/expected/thread-alloc.stdout
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/thread-alloc.stdout
diff --git a/src/interfaces/ecpg/test/expected/thread-alloc_2.stdout b/src/interfaces/ecpg/test/expected/thread-alloc_2.stdout
new file mode 100644
index 00000000000..75fe16bb36b
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/thread-alloc_2.stdout
@@ -0,0 +1 @@
+No threading enabled.
diff --git a/src/interfaces/ecpg/test/expected/thread-prep.c b/src/interfaces/ecpg/test/expected/thread-prep.c
index cc3129b6c9c..22b63f16fce 100644
--- a/src/interfaces/ecpg/test/expected/thread-prep.c
+++ b/src/interfaces/ecpg/test/expected/thread-prep.c
@@ -15,7 +15,7 @@
int
main(void)
{
- printf("No threading enabled.\n");
+ printf("No threading enabled.\n");
return 0;
}
#else
@@ -123,7 +123,7 @@ struct sqlca_t *ECPGget_sqlca(void);
#ifdef WIN32
static unsigned STDCALL fn(void* arg)
#else
-void* fn(void* arg)
+static void* fn(void* arg)
#endif
{
int i;
diff --git a/src/interfaces/ecpg/test/thread/Makefile b/src/interfaces/ecpg/test/thread/Makefile
index 8695a254ac1..e4df0d3cdad 100644
--- a/src/interfaces/ecpg/test/thread/Makefile
+++ b/src/interfaces/ecpg/test/thread/Makefile
@@ -6,7 +6,8 @@ include $(top_srcdir)/$(subdir)/../Makefile.regress
TESTS = thread_implicit thread_implicit.c \
thread thread.c \
- prep prep.c
+ prep prep.c \
+ alloc alloc.c
all: $(TESTS)
diff --git a/src/interfaces/ecpg/test/thread/prep.pgc b/src/interfaces/ecpg/test/thread/prep.pgc
index 1213975b163..314e24eecd2 100644
--- a/src/interfaces/ecpg/test/thread/prep.pgc
+++ b/src/interfaces/ecpg/test/thread/prep.pgc
@@ -5,7 +5,7 @@
int
main(void)
{
- printf("No threading enabled.\n");
+ printf("No threading enabled.\n");
return 0;
}
#else
@@ -30,7 +30,7 @@ exec sql whenever not found sqlprint;
#ifdef WIN32
static unsigned STDCALL fn(void* arg)
#else
-void* fn(void* arg)
+static void* fn(void* arg)
#endif
{
int i;