--- mqtt/src/pubmqtt.c	2012/04/25 07:37:16	1.2.2.4
+++ mqtt/src/pubmqtt.c	2012/05/05 14:51:02	1.2.2.6
@@ -20,7 +20,8 @@ mqtt_rtlm_log(const char *fmt, ...)
 	vsyslog(LOG_ERR, fmt, lst);
 	va_end(lst);
 }
-#define MQTT_RTLM_LOG(_sql)	(assert((_sql)), mqtt_rtlm_log("Error:: SQL #%d - %s", \
+#define MQTT_RTLM_LOG(_sql)	(assert((_sql)), mqtt_rtlm_log("Error:: %s(%d) SQL #%d - %s", \
+					__func__, __LINE__, \
 					sqlite3_errcode((_sql)), sqlite3_errmsg((_sql))))
 
 
@@ -39,10 +40,6 @@ mqtt_rtlm_open(cfg_root_t *cfg)
 	if (!cfg)
 		return NULL;
 
-	sqlite3_config(SQLITE_CONFIG_SERIALIZED);
-	if (!sqlite3_threadsafe())
-		return NULL;
-
 	str = cfg_getAttribute(cfg, "mqtt_pub", "name");
 	if (!str) {
 		mqtt_rtlm_log("Error:: Unknown database name ...\n");
@@ -55,14 +52,11 @@ mqtt_rtlm_open(cfg_root_t *cfg)
 		return NULL;
 	}
 
-	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_exec(sql, sql_schema, NULL, NULL, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		sqlite3_close(sql);
 		return NULL;
 	}
-	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 	return sql;
 }
 
@@ -120,10 +114,8 @@ mqtt_rtlm_init_session(cfg_root_t *cfg, sqlite3 *sql, 
 		va_end(lst);
 	}
 
-	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return -1;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -134,7 +126,6 @@ mqtt_rtlm_init_session(cfg_root_t *cfg, sqlite3 *sql, 
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
-	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -167,10 +158,8 @@ mqtt_rtlm_fini_session(cfg_root_t *cfg, sqlite3 *sql, 
 	snprintf(szStmt, sizeof szStmt, "DELETE FROM %s WHERE ConnID = '%s' AND Username = '%s' "
 			"AND RemoteHost LIKE '%s';", str, connid, user, host);
 
-	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return -1;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -181,7 +170,6 @@ mqtt_rtlm_fini_session(cfg_root_t *cfg, sqlite3 *sql, 
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
-	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -215,10 +203,8 @@ mqtt_rtlm_chk_session(cfg_root_t *cfg, sqlite3 *sql, c
 			"ConnID = '%s' AND Username = '%s' AND RemoteHost LIKE '%s';", 
 			str, connid, user, host);
 
-	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return -1;
 	}
 	if (sqlite3_step(stmt) == SQLITE_ROW)
@@ -226,7 +212,6 @@ mqtt_rtlm_chk_session(cfg_root_t *cfg, sqlite3 *sql, c
 	else
 		ret = 0;
 	sqlite3_finalize(stmt);
-	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -265,10 +250,8 @@ mqtt_rtlm_write_topic(cfg_root_t *cfg, sqlite3 *sql, u
 			"datetime('now', 'localtime'), '%s');", 
 			str, retain, msgid, topic, txt, user, host);
 
-	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return -1;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -279,7 +262,6 @@ mqtt_rtlm_write_topic(cfg_root_t *cfg, sqlite3 *sql, u
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
-	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -327,10 +309,8 @@ mqtt_rtlm_delete_topic(cfg_root_t *cfg, sqlite3 *sql, 
 			"PubUser LIKE '%s' AND PubHost LIKE '%s' %s;", str, 
 			msgid, topic, user, host, rtn);
 
-	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return -1;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -341,7 +321,6 @@ mqtt_rtlm_delete_topic(cfg_root_t *cfg, sqlite3 *sql, 
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
-	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -389,10 +368,8 @@ mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, u_
 			"MsgID = %d AND Topic LIKE '%s' %s;", 
 			str, msgid, topic, szStr);
 
-	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return NULL;
 	}
 
@@ -416,7 +393,6 @@ mqtt_rtlm_read_topic(cfg_root_t *cfg, sqlite3 *sql, u_
 	}
 end:
 	sqlite3_finalize(stmt);
-	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return s;
 }
@@ -454,10 +430,8 @@ mqtt_rtlm_write_subscribe(cfg_root_t *cfg, sqlite3 *sq
 			"datetime('now', 'localtime'), '%s');", str, 
 			msgid, qos, topic, user, host);
 
-	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return -1;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -468,7 +442,6 @@ mqtt_rtlm_write_subscribe(cfg_root_t *cfg, sqlite3 *sq
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
-	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -506,10 +479,8 @@ mqtt_rtlm_delete_subscribe(cfg_root_t *cfg, sqlite3 *s
 			"PubUser LIKE '%s' AND PubHost LIKE '%s' %s;", str, 
 			topic, user, host, szStr);
 
-	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return -1;
 	}
 	if ((ret = sqlite3_step(stmt)) == SQLITE_DONE)
@@ -520,7 +491,6 @@ mqtt_rtlm_delete_subscribe(cfg_root_t *cfg, sqlite3 *s
 		ret = 0;
 	}
 	sqlite3_finalize(stmt);
-	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return ret;
 }
@@ -552,10 +522,8 @@ mqtt_rtlm_read_subscribe(cfg_root_t *cfg, sqlite3 *sql
 	}
 	snprintf(szStmt, sizeof szStmt, "SELECT QoS, Topic FROM %s WHERE Topic LIKE '%s';", str, topic);
 
-	sqlite3_mutex_enter(sqlite3_db_mutex(sql));
 	if (sqlite3_prepare_v2(sql, szStmt, strlen(szStmt), &stmt, NULL)) {
 		MQTT_RTLM_LOG(sql);
-		sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 		return NULL;
 	}
 
@@ -579,7 +547,6 @@ mqtt_rtlm_read_subscribe(cfg_root_t *cfg, sqlite3 *sql
 	}
 end:
 	sqlite3_finalize(stmt);
-	sqlite3_mutex_leave(sqlite3_db_mutex(sql));
 
 	return s;
 }