Changeset 771:eac79a449c06 in freeDiameter

Timestamp:

Oct 31, 2011, 4:57:59 AM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Making app_acct thread_safe for PGsql. NOT TESTED.

Files:

• extensions/app_acct/acct_db.c (modified) (6 diffs)
• tests/testappacct.c (modified) (2 diffs)

extensions/app_acct/acct_db.c

@@ -36 +36 @@
 /* Database interface module */
 
+/* There is one connection to the db per thread. 
+The connection is stored in the pthread_key_t variable */
+
+
 #include "app_acct.h"
 #include <libpq-fe.h>
@@ -54 +58 @@
 static 
 #endif /* TEST_DEBUG */
-PGconn *conn = NULL;
+pthread_key_t connk;
+
 
 /* Initialize the database context: connection to the DB, prepared statement to insert new records */
@@ -66 +71 @@
         int idx = 0;
         PGresult * res;
+        PGconn *conn;
         #define REALLOC_SIZE    1024    /* We extend the buffer by this amount */
         
@@ -195 +201 @@
         acct_rec_empty(&emptyrecords);
         
+        CHECK_POSIX( pthread_key_create(&connk, (void (*)(void*))PQfinish) );
+        CHECK_POSIX( pthread_setspecific(connk, conn) );
+        
         /* Ok, ready */
         return 0;
@@ -202 +211 @@
 void acct_db_free(void)
 {       
-        if (conn) {
-                /* Note: the prepared statement is automatically freed when the session terminates */
-                PQfinish(conn);
-                conn = NULL;
-        }
+        CHECK_POSIX_DO(pthread_key_delete(connk) , );
 }
 
@@ -219 +224 @@
         PGresult *res;
         struct fd_list *li;
+        PGconn *conn;
         
         TRACE_ENTRY("%p", records);
-        CHECK_PARAMS( conn && records );
+        CHECK_PARAMS( records );
+        
+        conn = pthread_getspecific(connk);
+        if (!conn) {
+                conn = PQconnectdb(acct_config->conninfo);
+                CHECK_POSIX( pthread_setspecific(connk, conn) );
+        }
         
         /* First, check if the connection with the DB has not staled, and eventually try to fix it */

tests/testappacct.c

@@ -91 +91 @@
 int main(int argc, char *argv[])
 {
-        extern PGconn *conn; /* in acct_db.c */
+        extern pthread_key_t connk; /* in acct_db.c */
+        PGconn *conn;
         extern int fd_ext_init(int major, int minor, char * conffile); /* defined in include's extension.h */
         extern void fd_ext_fini(void); /* defined in the extension itself */
@@ -122 +123 @@
                 /* Now, call the one of the extension */
                 CHECK( 0, fd_ext_init(FD_PROJECT_VERSION_MAJOR, FD_PROJECT_VERSION_MINOR,NULL) );
+                conn = pthread_getspecific(connk);
         }