NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite3565fd

committed

Remove _configthreadlocale() calls in ecpg test suite.

This essentially reverts commitsa772624 and04fbe0e, whichadded "_configthreadlocale(_ENABLE_PER_THREAD_LOCALE)" calls to thethread-related ecpg test programs. That was nothing but a hack,because we shouldn't expect that ecpg-using applications havedone that for us; and now that we've inserted such calls intoecpglib, the tests should still pass without it.(If they don't, it would be good to know that.)HEAD only; there seems no big need to change this in theback branches.Discussion:https://postgr.es/m/22937.1548307384@sss.pgh.pa.us

1 parentd5a1fde commite3565fdCopy full SHA for e3565fd

File tree

10 files changed

+58

-118

lines changed

src/interfaces/ecpg/test
- expected
- thread

10 files changed

+58

-118

lines changed

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

Lines changed: 9 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,48 +145,42 @@ static void* fn(void* arg)`
`145`	`145`	`#line 43 "alloc.pgc"`
`146`	`146`
`147`	`147`
`148`		`-#ifdefWIN32`
`149`		`-#ifdef_MSC_VER/* requires MSVC */`
`150`		`-_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);`
`151`		`-#endif`
`152`		`-#endif`
`153`		`-`
`154`	`148`	`value= (long)arg;`
`155`	`149`	`sprintf(name,"Connection: %d",value);`
`156`	`150`
`157`	`151`	`{ECPGconnect(__LINE__,0,"ecpg1_regression" ,NULL,NULL ,name,0);`
`158`		`-#line54 "alloc.pgc"`
	`152`	`+#line48 "alloc.pgc"`
`159`	`153`
`160`	`154`	`if (sqlca.sqlcode<0)sqlprint();}`
`161`		`-#line54 "alloc.pgc"`
	`155`	`+#line48 "alloc.pgc"`
`162`	`156`
`163`	`157`	`{ECPGsetcommit(__LINE__,"on",NULL);`
`164`		`-#line55 "alloc.pgc"`
	`158`	`+#line49 "alloc.pgc"`
`165`	`159`
`166`	`160`	`if (sqlca.sqlcode<0)sqlprint();}`
`167`		`-#line55 "alloc.pgc"`
	`161`	`+#line49 "alloc.pgc"`
`168`	`162`
`169`	`163`	`for (i=1;i <=REPEATS;++i)`
`170`	`164`	`{`
`171`	`165`	`{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"select relname from pg_class where relname = 'pg_class'",ECPGt_EOIT,`
`172`	`166`	`ECPGt_char,&(r),(long)0,(long)0,(1)*sizeof(char),`
`173`	`167`	`ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EORT);`
`174`		`-#line58 "alloc.pgc"`
	`168`	`+#line52 "alloc.pgc"`
`175`	`169`
`176`	`170`	`if (sqlca.sqlcode==ECPG_NOT_FOUND)sqlprint();`
`177`		`-#line58 "alloc.pgc"`
	`171`	`+#line52 "alloc.pgc"`
`178`	`172`
`179`	`173`	`if (sqlca.sqlcode<0)sqlprint();}`
`180`		`-#line58 "alloc.pgc"`
	`174`	`+#line52 "alloc.pgc"`
`181`	`175`
`182`	`176`	`free(r);`
`183`	`177`	`r=NULL;`
`184`	`178`	`}`
`185`	`179`	`{ECPGdisconnect(__LINE__,name);`
`186`		`-#line62 "alloc.pgc"`
	`180`	`+#line56 "alloc.pgc"`
`187`	`181`
`188`	`182`	`if (sqlca.sqlcode<0)sqlprint();}`
`189`		`-#line62 "alloc.pgc"`
	`183`	`+#line56 "alloc.pgc"`
`190`	`184`
`191`	`185`
`192`	`186`	`return0;`

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

Lines changed: 4 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -108,25 +108,19 @@ static void* fn(void* arg)`
`108`	`108`	`{`
`109`	`109`	`inti;`
`110`	`110`
`111`		`-#ifdefWIN32`
`112`		`-#ifdef_MSC_VER/* requires MSVC */`
`113`		`-_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);`
`114`		`-#endif`
`115`		`-#endif`
`116`		`-`
`117`	`111`	`for (i=1;i <=REPEATS;++i)`
`118`	`112`	`{`
`119`	`113`	`ECPGallocate_desc(__LINE__,"mydesc");`
`120`		`-#line36 "descriptor.pgc"`
	`114`	`+#line30 "descriptor.pgc"`
`121`	`115`
`122`	`116`	`if (sqlca.sqlcode<0)sqlprint();`
`123`		`-#line36 "descriptor.pgc"`
	`117`	`+#line30 "descriptor.pgc"`
`124`	`118`
`125`	`119`	`ECPGdeallocate_desc(__LINE__,"mydesc");`
`126`		`-#line37 "descriptor.pgc"`
	`120`	`+#line31 "descriptor.pgc"`
`127`	`121`
`128`	`122`	`if (sqlca.sqlcode<0)sqlprint();`
`129`		`-#line37 "descriptor.pgc"`
	`123`	`+#line31 "descriptor.pgc"`
`130`	`124`
`131`	`125`	`}`
`132`	`126`

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

Lines changed: 23 additions & 29 deletions

Original file line number	Diff line number	Diff line change
`@@ -145,58 +145,52 @@ static void* fn(void* arg)`
`145`	`145`	`#line 43 "prep.pgc"`
`146`	`146`
`147`	`147`
`148`		`-#ifdefWIN32`
`149`		`-#ifdef_MSC_VER/* requires MSVC */`
`150`		`-_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);`
`151`		`-#endif`
`152`		`-#endif`
`153`		`-`
`154`	`148`	`value= (long)arg;`
`155`	`149`	`sprintf(name,"Connection: %d",value);`
`156`	`150`
`157`	`151`	`{ECPGconnect(__LINE__,0,"ecpg1_regression" ,NULL,NULL ,name,0);`
`158`		`-#line54 "prep.pgc"`
	`152`	`+#line48 "prep.pgc"`
`159`	`153`
`160`	`154`	`if (sqlca.sqlcode<0)sqlprint();}`
`161`		`-#line54 "prep.pgc"`
	`155`	`+#line48 "prep.pgc"`
`162`	`156`
`163`	`157`	`{ECPGsetcommit(__LINE__,"on",NULL);`
`164`		`-#line55 "prep.pgc"`
	`158`	`+#line49 "prep.pgc"`
`165`	`159`
`166`	`160`	`if (sqlca.sqlcode<0)sqlprint();}`
`167`		`-#line55 "prep.pgc"`
	`161`	`+#line49 "prep.pgc"`
`168`	`162`
`169`	`163`	`for (i=1;i <=REPEATS;++i)`
`170`	`164`	`{`
`171`	`165`	`{ECPGprepare(__LINE__,NULL,0,"i",query);`
`172`		`-#line58 "prep.pgc"`
	`166`	`+#line52 "prep.pgc"`
`173`	`167`
`174`	`168`	`if (sqlca.sqlcode<0)sqlprint();}`
`175`		`-#line58 "prep.pgc"`
	`169`	`+#line52 "prep.pgc"`
`176`	`170`
`177`	`171`	`{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_execute,"i",`
`178`	`172`	`ECPGt_int,&(value),(long)1,(long)1,sizeof(int),`
`179`	`173`	`ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);`
`180`		`-#line59 "prep.pgc"`
	`174`	`+#line53 "prep.pgc"`
`181`	`175`
`182`	`176`	`if (sqlca.sqlcode==ECPG_NOT_FOUND)sqlprint();`
`183`		`-#line59 "prep.pgc"`
	`177`	`+#line53 "prep.pgc"`
`184`	`178`
`185`	`179`	`if (sqlca.sqlcode<0)sqlprint();}`
`186`		`-#line59 "prep.pgc"`
	`180`	`+#line53 "prep.pgc"`
`187`	`181`
`188`	`182`	`}`
`189`	`183`	`{ECPGdeallocate(__LINE__,0,NULL,"i");`
`190`		`-#line61 "prep.pgc"`
	`184`	`+#line55 "prep.pgc"`
`191`	`185`
`192`	`186`	`if (sqlca.sqlcode<0)sqlprint();}`
`193`		`-#line61 "prep.pgc"`
	`187`	`+#line55 "prep.pgc"`
`194`	`188`
`195`	`189`	`{ECPGdisconnect(__LINE__,name);`
`196`		`-#line62 "prep.pgc"`
	`190`	`+#line56 "prep.pgc"`
`197`	`191`
`198`	`192`	`if (sqlca.sqlcode<0)sqlprint();}`
`199`		`-#line62 "prep.pgc"`
	`193`	`+#line56 "prep.pgc"`
`200`	`194`
`201`	`195`
`202`	`196`	`return0;`
`@@ -212,34 +206,34 @@ int main ()`
`212`	`206`	`#endif`
`213`	`207`
`214`	`208`	`{ECPGconnect(__LINE__,0,"ecpg1_regression" ,NULL,NULL ,NULL,0);`
`215`		`-#line76 "prep.pgc"`
	`209`	`+#line70 "prep.pgc"`
`216`	`210`
`217`	`211`	`if (sqlca.sqlcode<0)sqlprint();}`
`218`		`-#line76 "prep.pgc"`
	`212`	`+#line70 "prep.pgc"`
`219`	`213`
`220`	`214`	`{ECPGsetcommit(__LINE__,"on",NULL);`
`221`		`-#line77 "prep.pgc"`
	`215`	`+#line71 "prep.pgc"`
`222`	`216`
`223`	`217`	`if (sqlca.sqlcode<0)sqlprint();}`
`224`		`-#line77 "prep.pgc"`
	`218`	`+#line71 "prep.pgc"`
`225`	`219`
`226`	`220`	`{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"drop table if exists T",ECPGt_EOIT,ECPGt_EORT);`
`227`		`-#line78 "prep.pgc"`
	`221`	`+#line72 "prep.pgc"`
`228`	`222`
`229`	`223`	`if (sqlca.sqlcode<0)sqlprint();}`
`230`		`-#line78 "prep.pgc"`
	`224`	`+#line72 "prep.pgc"`
`231`	`225`
`232`	`226`	`{ECPGdo(__LINE__,0,1,NULL,0,ECPGst_normal,"create table T ( i int )",ECPGt_EOIT,ECPGt_EORT);`
`233`		`-#line79 "prep.pgc"`
	`227`	`+#line73 "prep.pgc"`
`234`	`228`
`235`	`229`	`if (sqlca.sqlcode<0)sqlprint();}`
`236`		`-#line79 "prep.pgc"`
	`230`	`+#line73 "prep.pgc"`
`237`	`231`
`238`	`232`	`{ECPGdisconnect(__LINE__,"CURRENT");`
`239`		`-#line80 "prep.pgc"`
	`233`	`+#line74 "prep.pgc"`
`240`	`234`
`241`	`235`	`if (sqlca.sqlcode<0)sqlprint();}`
`242`		`-#line80 "prep.pgc"`
	`236`	`+#line74 "prep.pgc"`
`243`	`237`
`244`	`238`
`245`	`239`	`#ifdefWIN32`

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

Lines changed: 11 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -153,37 +153,31 @@ void test_thread(void arg)`
`153`	`153`	`#line 105 "thread.pgc"`
`154`	`154`
`155`	`155`
`156`		`-#ifdefWIN32`
`157`		`-#ifdef_MSC_VER/* requires MSVC */`
`158`		`-_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);`
`159`		`-#endif`
`160`		`-#endif`
`161`		`-`
`162`	`156`	`/* build up connection name, and connect to database */`
`163`	`157`	`#ifndef_MSC_VER`
`164`	`158`	`snprintf(l_connection,sizeof(l_connection),"thread_%03ld",threadnum);`
`165`	`159`	`#else`
`166`	`160`	`_snprintf(l_connection,sizeof(l_connection),"thread_%03ld",threadnum);`
`167`	`161`	`#endif`
`168`	`162`	`/* exec sql whenever sqlerror sqlprint ; */`
`169`		`-#line119 "thread.pgc"`
	`163`	`+#line113 "thread.pgc"`
`170`	`164`
`171`	`165`	`{ECPGconnect(__LINE__,0,"ecpg1_regression" ,NULL,NULL ,l_connection,0);`
`172`		`-#line120 "thread.pgc"`
	`166`	`+#line114 "thread.pgc"`
`173`	`167`
`174`	`168`	`if (sqlca.sqlcode<0)sqlprint();}`
`175`		`-#line120 "thread.pgc"`
	`169`	`+#line114 "thread.pgc"`
`176`	`170`
`177`	`171`	`if(sqlca.sqlcode!=0 )`
`178`	`172`	`{`
`179`	`173`	`printf("%s: ERROR: cannot connect to database!\n",l_connection);`
`180`	`174`	`returnNULL;`
`181`	`175`	`}`
`182`	`176`	`{ECPGtrans(__LINE__,l_connection,"begin");`
`183`		`-#line126 "thread.pgc"`
	`177`	`+#line120 "thread.pgc"`
`184`	`178`
`185`	`179`	`if (sqlca.sqlcode<0)sqlprint();}`
`186`		`-#line126 "thread.pgc"`
	`180`	`+#line120 "thread.pgc"`
`187`	`181`
`188`	`182`
`189`	`183`	`/* insert into test_thread table */`
`@@ -194,27 +188,27 @@ if (sqlca.sqlcode < 0) sqlprint();}`
`194`	`188`	`ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,`
`195`	`189`	`ECPGt_int,&(l_i),(long)1,(long)1,sizeof(int),`
`196`	`190`	`ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);`
`197`		`-#line131 "thread.pgc"`
	`191`	`+#line125 "thread.pgc"`
`198`	`192`
`199`	`193`	`if (sqlca.sqlcode<0)sqlprint();}`
`200`		`-#line131 "thread.pgc"`
	`194`	`+#line125 "thread.pgc"`
`201`	`195`
`202`	`196`	`if(sqlca.sqlcode!=0 )`
`203`	`197`	`printf("%s: ERROR: insert failed!\n",l_connection);`
`204`	`198`	`}`
`205`	`199`
`206`	`200`	`/* all done */`
`207`	`201`	`{ECPGtrans(__LINE__,l_connection,"commit");`
`208`		`-#line137 "thread.pgc"`
	`202`	`+#line131 "thread.pgc"`
`209`	`203`
`210`	`204`	`if (sqlca.sqlcode<0)sqlprint();}`
`211`		`-#line137 "thread.pgc"`
	`205`	`+#line131 "thread.pgc"`
`212`	`206`
`213`	`207`	`{ECPGdisconnect(__LINE__,l_connection);`
`214`		`-#line138 "thread.pgc"`
	`208`	`+#line132 "thread.pgc"`
`215`	`209`
`216`	`210`	`if (sqlca.sqlcode<0)sqlprint();}`
`217`		`-#line138 "thread.pgc"`
	`211`	`+#line132 "thread.pgc"`
`218`	`212`
`219`	`213`	`returnNULL;`
`220`	`214`	`}`

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

Lines changed: 11 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -154,37 +154,31 @@ void test_thread(void arg)`
`154`	`154`	`#line 106 "thread_implicit.pgc"`
`155`	`155`
`156`	`156`
`157`		`-#ifdefWIN32`
`158`		`-#ifdef_MSC_VER/* requires MSVC */`
`159`		`-_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);`
`160`		`-#endif`
`161`		`-#endif`
`162`		`-`
`163`	`157`	`/* build up connection name, and connect to database */`
`164`	`158`	`#ifndef_MSC_VER`
`165`	`159`	`snprintf(l_connection,sizeof(l_connection),"thread_%03ld",threadnum);`
`166`	`160`	`#else`
`167`	`161`	`_snprintf(l_connection,sizeof(l_connection),"thread_%03ld",threadnum);`
`168`	`162`	`#endif`
`169`	`163`	`/* exec sql whenever sqlerror sqlprint ; */`
`170`		`-#line120 "thread_implicit.pgc"`
	`164`	`+#line114 "thread_implicit.pgc"`
`171`	`165`
`172`	`166`	`{ECPGconnect(__LINE__,0,"ecpg1_regression" ,NULL,NULL ,l_connection,0);`
`173`		`-#line121 "thread_implicit.pgc"`
	`167`	`+#line115 "thread_implicit.pgc"`
`174`	`168`
`175`	`169`	`if (sqlca.sqlcode<0)sqlprint();}`
`176`		`-#line121 "thread_implicit.pgc"`
	`170`	`+#line115 "thread_implicit.pgc"`
`177`	`171`
`178`	`172`	`if(sqlca.sqlcode!=0 )`
`179`	`173`	`{`
`180`	`174`	`printf("%s: ERROR: cannot connect to database!\n",l_connection);`
`181`	`175`	`returnNULL;`
`182`	`176`	`}`
`183`	`177`	`{ECPGtrans(__LINE__,NULL,"begin");`
`184`		`-#line127 "thread_implicit.pgc"`
	`178`	`+#line121 "thread_implicit.pgc"`
`185`	`179`
`186`	`180`	`if (sqlca.sqlcode<0)sqlprint();}`
`187`		`-#line127 "thread_implicit.pgc"`
	`181`	`+#line121 "thread_implicit.pgc"`
`188`	`182`
`189`	`183`
`190`	`184`	`/* insert into test_thread table */`
`@@ -195,27 +189,27 @@ if (sqlca.sqlcode < 0) sqlprint();}`
`195`	`189`	`ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,`
`196`	`190`	`ECPGt_int,&(l_i),(long)1,(long)1,sizeof(int),`
`197`	`191`	`ECPGt_NO_INDICATOR,NULL ,0L,0L,0L,ECPGt_EOIT,ECPGt_EORT);`
`198`		`-#line132 "thread_implicit.pgc"`
	`192`	`+#line126 "thread_implicit.pgc"`
`199`	`193`
`200`	`194`	`if (sqlca.sqlcode<0)sqlprint();}`
`201`		`-#line132 "thread_implicit.pgc"`
	`195`	`+#line126 "thread_implicit.pgc"`
`202`	`196`
`203`	`197`	`if(sqlca.sqlcode!=0 )`
`204`	`198`	`printf("%s: ERROR: insert failed!\n",l_connection);`
`205`	`199`	`}`
`206`	`200`
`207`	`201`	`/* all done */`
`208`	`202`	`{ECPGtrans(__LINE__,NULL,"commit");`
`209`		`-#line138 "thread_implicit.pgc"`
	`203`	`+#line132 "thread_implicit.pgc"`
`210`	`204`
`211`	`205`	`if (sqlca.sqlcode<0)sqlprint();}`
`212`		`-#line138 "thread_implicit.pgc"`
	`206`	`+#line132 "thread_implicit.pgc"`
`213`	`207`
`214`	`208`	`{ECPGdisconnect(__LINE__,l_connection);`
`215`		`-#line139 "thread_implicit.pgc"`
	`209`	`+#line133 "thread_implicit.pgc"`
`216`	`210`
`217`	`211`	`if (sqlca.sqlcode<0)sqlprint();}`
`218`		`-#line139 "thread_implicit.pgc"`
	`212`	`+#line133 "thread_implicit.pgc"`
`219`	`213`
`220`	`214`	`returnNULL;`
`221`	`215`	`}`

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

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,6 @@ static void* fn(void* arg)`
`42`	`42`	`char **r = NULL;`
`43`	`43`	`EXEC SQL END DECLARE SECTION;`
`44`	`44`
`45`		`-#ifdef WIN32`
`46`		`-#ifdef _MSC_VER /* requires MSVC */`
`47`		`-_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);`
`48`		`-#endif`
`49`		`-#endif`
`50`		`-`
`51`	`45`	`value = (long)arg;`
`52`	`46`	`sprintf(name, "Connection: %d", value);`
`53`	`47`

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

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,6 @@ static void* fn(void* arg)`
`25`	`25`	`{`
`26`	`26`	`int i;`
`27`	`27`
`28`		`-#ifdef WIN32`
`29`		`-#ifdef _MSC_VER /* requires MSVC */`
`30`		`-_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);`
`31`		`-#endif`
`32`		`-#endif`
`33`		`-`
`34`	`28`	`for (i = 1; i <= REPEATS; ++i)`
`35`	`29`	`{`
`36`	`30`	`EXEC SQL ALLOCATE DESCRIPTOR mydesc;`

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

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,6 @@ static void* fn(void* arg)`
`42`	`42`	`char query[256] = "INSERT INTO T VALUES ( ? )";`
`43`	`43`	`EXEC SQL END DECLARE SECTION;`
`44`	`44`
`45`		`-#ifdef WIN32`
`46`		`-#ifdef _MSC_VER /* requires MSVC */`
`47`		`-_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);`
`48`		`-#endif`
`49`		`-#endif`
`50`		`-`
`51`	`45`	`value = (long)arg;`
`52`	`46`	`sprintf(name, "Connection: %d", value);`
`53`	`47`

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!

Commite3565fd

File tree

10 files changed

10 files changed

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

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

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

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

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

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

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

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

0 commit comments