added non thread safe code to the mysql api linker

chaos · Oct 13, 2008 · d585e3e · d585e3e
1 parent 1bbfb6e
commit d585e3e
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 15 deletions.
diff --git a/auxdir/x_ac_databases.m4 b/auxdir/x_ac_databases.m4
@@ -93,6 +93,7 @@ AC_DEFUN([X_AC_DATABASES],
             				AC_MSG_RESULT([MySQL (non-threaded) test program built properly.])
             				AC_SUBST(MYSQL_LIBS)
 					AC_SUBST(MYSQL_CFLAGS)
+					AC_DEFINE(MYSQL_NOT_THREAD_SAFE, 1, [Define to 1 if with non thread-safe code])
 					AC_DEFINE(HAVE_MYSQL, 1, [Define to 1 if using MySQL libaries])
 				else
 					MYSQL_CFLAGS=""

diff --git a/config.h.in b/config.h.in
@@ -273,6 +273,9 @@
 /* Enable multiple slurmd on one node */
 #undef MULTIPLE_SLURMD
 
+/* Define to 1 if with non thread-safe code */
+#undef MYSQL_NOT_THREAD_SAFE
+
 /* Define to 1 if you are building a production release. */
 #undef NDEBUG
 

diff --git a/configure b/configure
@@ -25633,6 +25633,11 @@ echo "${ECHO_T}MySQL (non-threaded) test program built properly." >&6; }
 
 
 
+cat >>confdefs.h <<\_ACEOF
+#define MYSQL_NOT_THREAD_SAFE 1
+_ACEOF
+
+
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_MYSQL 1
 _ACEOF

diff --git a/src/database/mysql_common.c b/src/database/mysql_common.c
@@ -43,7 +43,9 @@
 #include "src/common/timers.h"
 #include "src/common/slurm_protocol_api.h"
 
+#ifdef MYSQL_NOT_THREAD_SAFE
 pthread_mutex_t mysql_lock = PTHREAD_MUTEX_INITIALIZER;
+#endif
 
 #ifdef HAVE_MYSQL
 
@@ -184,7 +186,9 @@ static int _create_db(char *db_name, mysql_db_info_t *db_info)
 	char create_line[50];
 	MYSQL *mysql_db = NULL;
 
-//	slurm_mutex_lock(&mysql_lock);
+#ifdef MYSQL_NOT_THREAD_SAFE
+	slurm_mutex_lock(&mysql_lock);
+#endif
 	if(!(mysql_db = mysql_init(mysql_db)))
 		fatal("mysql_init failed: %s", mysql_error(mysql_db));
 
@@ -203,12 +207,16 @@ static int _create_db(char *db_name, mysql_db_info_t *db_info)
 		     "user = %s pass = %s port = %u",
 		     db_info->host, db_info->user,
 		     db_info->pass, db_info->port);
+#ifdef MYSQL_NOT_THREAD_SAFE
 		slurm_mutex_unlock(&mysql_lock);
+#endif
 		fatal("mysql_real_connect failed: %d %s\n",
 		      mysql_errno(mysql_db),
 		      mysql_error(mysql_db));
 	}
-//	slurm_mutex_unlock(&mysql_lock);
+#ifdef MYSQL_NOT_THREAD_SAFE
+	slurm_mutex_unlock(&mysql_lock);
+#endif
 	return SLURM_SUCCESS;
 }
 
@@ -292,8 +300,9 @@ extern int mysql_db_query(MYSQL *mysql_db, char *query)
 {
 	if(!mysql_db)
 		fatal("You haven't inited this storage yet.");
+#ifdef MYSQL_NOT_THREAD_SAFE
 	slurm_mutex_lock(&mysql_lock);
-
+#endif
 	/* clear out the old results so we don't get a 2014 error */
 	_clear_results(mysql_db);		
 //try_again:
@@ -306,11 +315,15 @@ extern int mysql_db_query(MYSQL *mysql_db, char *query)
 		      mysql_errno(mysql_db),
 		      mysql_error(mysql_db), query);
 		errno = mysql_errno(mysql_db);
+#ifdef MYSQL_NOT_THREAD_SAFE
 		slurm_mutex_unlock(&mysql_lock);
+#endif
 		return SLURM_ERROR;
 	}
-	slurm_mutex_unlock(&mysql_lock);
 
+#ifdef MYSQL_NOT_THREAD_SAFE
+	slurm_mutex_unlock(&mysql_lock);
+#endif
 	return SLURM_SUCCESS;
 }
 
@@ -323,40 +336,48 @@ extern int mysql_db_ping(MYSQL *mysql_db)
 
 extern int mysql_db_commit(MYSQL *mysql_db)
 {
-	//slurm_mutex_lock(&mysql_lock);
-
+#ifdef MYSQL_NOT_THREAD_SAFE
+	slurm_mutex_lock(&mysql_lock);
+#endif
 	/* clear out the old results so we don't get a 2014 error */
 	_clear_results(mysql_db);		
 	if(mysql_commit(mysql_db)) {
 		error("mysql_commit failed: %d %s",
 		      mysql_errno(mysql_db),
 		      mysql_error(mysql_db));
 		errno = mysql_errno(mysql_db);
-		//slurm_mutex_unlock(&mysql_lock);
+#ifdef MYSQL_NOT_THREAD_SAFE
+		slurm_mutex_unlock(&mysql_lock);
+#endif
 		return SLURM_ERROR;
 	}
-	//slurm_mutex_unlock(&mysql_lock);
-
+#ifdef MYSQL_NOT_THREAD_SAFE
+	slurm_mutex_unlock(&mysql_lock);
+#endif
 	return SLURM_SUCCESS;
 }
 
 extern int mysql_db_rollback(MYSQL *mysql_db)
 {
-	//slurm_mutex_lock(&mysql_lock);
-
+#ifdef MYSQL_NOT_THREAD_SAFE
+	slurm_mutex_lock(&mysql_lock);
+#endif
 	/* clear out the old results so we don't get a 2014 error */
 	_clear_results(mysql_db);		
 	if(mysql_rollback(mysql_db)) {
 		error("mysql_commit failed: %d %s",
 		      mysql_errno(mysql_db),
 		      mysql_error(mysql_db));
 		errno = mysql_errno(mysql_db);
-		//slurm_mutex_unlock(&mysql_lock);
+#ifdef MYSQL_NOT_THREAD_SAFE
+		slurm_mutex_unlock(&mysql_lock);
+#endif
 		return SLURM_ERROR;
 	}
 	//mysql_db_query(mysql_db, "unlock tables;");
-	//slurm_mutex_unlock(&mysql_lock);
-
+#ifdef MYSQL_NOT_THREAD_SAFE
+	slurm_mutex_unlock(&mysql_lock);
+#endif
 	return SLURM_SUCCESS;
 
 }

diff --git a/src/slurmdbd/proc_req.c b/src/slurmdbd/proc_req.c
@@ -1159,7 +1159,9 @@ static int _init_conn(slurmdbd_conn_t *slurmdbd_conn,
 	}
 	*uid = init_msg->uid;
 
-	debug("DBD_INIT: VERSION:%u UID:%u", init_msg->version, init_msg->uid);
+	debug("DBD_INIT: VERSION:%u UID:%u IP:%s CONN:%u",
+	      init_msg->version, init_msg->uid, 
+	      slurmdbd_conn->ip, slurmdbd_conn->newsockfd);
 	slurmdbd_conn->db_conn = acct_storage_g_get_connection(
 		false, slurmdbd_conn->newsockfd, init_msg->rollback);
 	slurmdbd_conn->rpc_version = init_msg->version;