NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit5a0d31d

Michael Meskes

committed

Made new test also work without threading enabled.

1 parentb5efdba commit5a0d31dCopy full SHA for 5a0d31d

File tree

2 files changed

+21

-9

lines changed

src/interfaces/ecpg/test
- expected
  - thread-descriptor.c
- thread
  - descriptor.pgc

2 files changed

+21

-9

lines changed

`‎src/interfaces/ecpg/test/expected/thread-descriptor.c`

Lines changed: 14 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,13 +8,15 @@`
`8`	`8`	`#defineECPGdebug(X,Y) ECPGdebug((X)+100,(Y))`
`9`	`9`
`10`	`10`	`#line 1 "descriptor.pgc"`
	`11`	`+#ifdefENABLE_THREAD_SAFETY`
`11`	`12`	`#ifdefWIN32`
`12`	`13`	`#defineWIN32_LEAN_AND_MEAN`
`13`	`14`	`#include<windows.h>`
`14`	`15`	`#include<process.h>`
`15`	`16`	`#else`
`16`	`17`	`#include<pthread.h>`
`17`	`18`	`#endif`
	`19`	`+#endif`
`18`	`20`	`#include<stdio.h>`
`19`	`21`
`20`	`22`	`#defineTHREADS16`
`@@ -89,36 +91,36 @@ struct sqlca_t *ECPGget_sqlca(void);`
`89`	`91`
`90`	`92`	`#endif`
`91`	`93`
`92`		`-#line13 "descriptor.pgc"`
	`94`	`+#line15 "descriptor.pgc"`
`93`	`95`
`94`	`96`	`/* exec sql whenever sqlerror sqlprint ; */`
`95`		`-#line14 "descriptor.pgc"`
	`97`	`+#line16 "descriptor.pgc"`
`96`	`98`
`97`	`99`	`/* exec sql whenever not found sqlprint ; */`
`98`		`-#line15 "descriptor.pgc"`
	`100`	`+#line17 "descriptor.pgc"`
`99`	`101`
`100`	`102`
`101`	`103`	`#ifdefWIN32`
`102`	`104`	`staticunsignedSTDCALLfn(void*arg)`
`103`	`105`	`#else`
`104`		`-voidfn(voidarg)`
	`106`	`+staticvoidfn(voidarg)`
`105`	`107`	`#endif`
`106`	`108`	`{`
`107`	`109`	`inti;`
`108`	`110`
`109`	`111`	`for (i=1;i <=REPEATS;++i)`
`110`	`112`	`{`
`111`	`113`	`ECPGallocate_desc(__LINE__,"mydesc");`
`112`		`-#line27 "descriptor.pgc"`
	`114`	`+#line29 "descriptor.pgc"`
`113`	`115`
`114`	`116`	`if (sqlca.sqlcode<0)sqlprint();`
`115`		`-#line27 "descriptor.pgc"`
	`117`	`+#line29 "descriptor.pgc"`
`116`	`118`
`117`	`119`	`ECPGdeallocate_desc(__LINE__,"mydesc");`
`118`		`-#line28 "descriptor.pgc"`
	`120`	`+#line30 "descriptor.pgc"`
`119`	`121`
`120`	`122`	`if (sqlca.sqlcode<0)sqlprint();`
`121`		`-#line28 "descriptor.pgc"`
	`123`	`+#line30 "descriptor.pgc"`
`122`	`124`
`123`	`125`	`}`
`124`	`126`
`@@ -127,6 +129,7 @@ if (sqlca.sqlcode < 0) sqlprint();`
`127`	`129`
`128`	`130`	`intmain (intargc,char**argv)`
`129`	`131`	`{`
	`132`	`+#ifdefENABLE_THREAD_SAFETY`
`130`	`133`	`inti;`
`131`	`134`	`#ifdefWIN32`
`132`	`135`	`HANDLEthreads[THREADS];`
`@@ -150,6 +153,9 @@ int main (int argc, char** argv)`
`150`	`153`	`for (i=0;i<THREADS;++i)`
`151`	`154`	`pthread_join(threads[i],NULL);`
`152`	`155`	`#endif`
	`156`	`+#else`
	`157`	`+fn(NULL);`
	`158`	`+#endif`
`153`	`159`
`154`	`160`	`return0;`
`155`	`161`	`}`

`‎src/interfaces/ecpg/test/thread/descriptor.pgc`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,12 @@`
	`1`	`+#ifdef ENABLE_THREAD_SAFETY`
`1`	`2`	`#ifdef WIN32`
`2`	`3`	`#define WIN32_LEAN_AND_MEAN`
`3`	`4`	`#include <windows.h>`
`4`	`5`	`#include <process.h>`
`5`	`6`	`#else`
`6`	`7`	`#include <pthread.h>`
`7`	`8`	`#endif`
	`9`	`+#endif`
`8`	`10`	`#include <stdio.h>`
`9`	`11`
`10`	`12`	`#define THREADS16`
`@@ -17,7 +19,7 @@ EXEC SQL whenever not found sqlprint;`
`17`	`19`	`#ifdef WIN32`
`18`	`20`	`static unsigned STDCALL fn(void* arg)`
`19`	`21`	`#else`
`20`		`-void* fn(void* arg)`
	`22`	`+staticvoid* fn(void* arg)`
`21`	`23`	`#endif`
`22`	`24`	`{`
`23`	`25`	`int i;`
`@@ -33,6 +35,7 @@ void* fn(void* arg)`
`33`	`35`
`34`	`36`	`int main (int argc, char** argv)`
`35`	`37`	`{`
	`38`	`+#ifdef ENABLE_THREAD_SAFETY`
`36`	`39`	`int i;`
`37`	`40`	`#ifdef WIN32`
`38`	`41`	`HANDLE threads[THREADS];`
`@@ -56,6 +59,9 @@ int main (int argc, char** argv)`
`56`	`59`	`for (i = 0; i < THREADS; ++i)`
`57`	`60`	`pthread_join(threads[i], NULL);`
`58`	`61`	`#endif`
	`62`	`+#else`
	`63`	`+fn(NULL);`
	`64`	`+#endif`
`59`	`65`
`60`	`66`	`return 0;`
`61`	`67`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit5a0d31d

File tree

2 files changed

2 files changed

`‎src/interfaces/ecpg/test/expected/thread-descriptor.c`

`‎src/interfaces/ecpg/test/thread/descriptor.pgc`

0 commit comments