another crank on the can opener for the big can o worms

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15584 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/private/switch_core_pvt.h b/src/include/private/switch_core_pvt.h
index 1c9f33545b38dd221a8c9a9384127d525fdfd807..2d7ac406eefd7a9e33d232b6d097123244fdd582 100644 (file)
--- a/src/include/private/switch_core_pvt.h
+++ b/src/include/private/switch_core_pvt.h
@@ -210,6 +210,7 @@ struct switch_runtime {
        char *odbc_dsn;
        char *odbc_user;
        char *odbc_pass;
+       uint32_t debug_level;
 };
 
 extern struct switch_runtime runtime;

diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index c1d779d1dbecf895a3276dbfa27411da153a5e0f..b814009f1a663c77d9af11df2e1ea734ade53496 100644 (file)
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -1937,17 +1937,24 @@ typedef struct {
 
 SWITCH_DECLARE(void) switch_cache_db_release_db_handle(switch_cache_db_handle_t **dbh);
 SWITCH_DECLARE(void) switch_cache_db_destroy_db_handle(switch_cache_db_handle_t **dbh);
-SWITCH_DECLARE(switch_status_t) switch_cache_db_get_db_handle(switch_cache_db_handle_t **dbh, 
-                                                                                                                                               const char *db_name, const char *odbc_user, const char *odbc_pass);
+SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle(switch_cache_db_handle_t **dbh, 
+                                                                                                                          const char *db_name, 
+                                                                                                                          const char *odbc_user, 
+                                                                                                                          const char *odbc_pass, const char *file, const char *func, int line);
+#define switch_cache_db_get_db_handle(_a, _b, _c, _d) _switch_cache_db_get_db_handle(_a, _b, _c, _d, __FILE__, __SWITCH_FUNC__, __LINE__)
+
 SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql(switch_cache_db_handle_t *dbh, const char *sql, char **err);
 SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_callback(switch_cache_db_handle_t *dbh, const char *sql, 
                                                                                                                                         switch_core_db_callback_func_t callback, void *pdata, char **err);
 
-SWITCH_DECLARE(switch_status_t) switch_core_db_handle(switch_cache_db_handle_t **dbh);
+SWITCH_DECLARE(switch_status_t) _switch_core_db_handle(switch_cache_db_handle_t **dbh, const char *file, const char *func, int line);
+#define switch_core_db_handle(_a) _switch_core_db_handle(_a, __FILE__, __SWITCH_FUNC__, __LINE__)
+
 SWITCH_DECLARE(void) switch_cache_db_test_reactive(switch_cache_db_handle_t *db, const char *test_sql, const char *drop_sql, const char *reactive_sql);
 SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute(switch_cache_db_handle_t *dbh, const char *sql, uint32_t retries);
 SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute_trans(switch_cache_db_handle_t *dbh, const char *sql, uint32_t retries);
 SWITCH_DECLARE(void) switch_cache_db_detach(void);
+SWITCH_DECLARE(uint32_t) switch_core_debug_level(void);
 
 SWITCH_END_EXTERN_C
 #endif

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 5e44a1baa19f44a2fdc0accf1befcc7d224c08e4..eab3bc643d573740c207ef7850d1c41985788dd6 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -764,6 +764,16 @@ typedef enum {
 </pre>
  */
 typedef enum {
+       SWITCH_LOG_DEBUG10 = 110,
+       SWITCH_LOG_DEBUG9 = 109,
+       SWITCH_LOG_DEBUG8 = 108,
+       SWITCH_LOG_DEBUG7 = 107,
+       SWITCH_LOG_DEBUG6 = 106,
+       SWITCH_LOG_DEBUG5 = 105,
+       SWITCH_LOG_DEBUG4 = 104,
+       SWITCH_LOG_DEBUG3 = 103,
+       SWITCH_LOG_DEBUG2 = 102,
+       SWITCH_LOG_DEBUG1 = 101,
        SWITCH_LOG_DEBUG = 7,
        SWITCH_LOG_INFO = 6,
        SWITCH_LOG_NOTICE = 5,
@@ -1410,7 +1420,8 @@ typedef enum {
        SCSC_SHUTDOWN_ELEGANT,
        SCSC_SHUTDOWN_ASAP,
        SCSC_CANCEL_SHUTDOWN,
-       SCSC_SEND_SIGHUP
+       SCSC_SEND_SIGHUP,
+       SCSC_DEBUG_LEVEL
 } switch_session_ctl_t;
 
 typedef enum {

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index 29405dc29a94cba212874750d421f99cf5fe5e45..1ddc8548911478a76326925e0bdf44bb97e9a11d 100644 (file)
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -1250,7 +1250,7 @@ SWITCH_STANDARD_API(status_function)
        return SWITCH_STATUS_SUCCESS;
 }
 
-#define CTL_SYNTAX "[send_sighup|hupall|pause|resume|shutdown [cancel|elegant|asap|restart]|sps|sync_clock|reclaim_mem|max_sessions|min_dtmf_duration [num]|max_dtmf_duration [num]|default_dtmf_duration [num]|loglevel [level]]"
+#define CTL_SYNTAX "[send_sighup|hupall|pause|resume|shutdown [cancel|elegant|asap|restart]|sps|sync_clock|reclaim_mem|max_sessions|min_dtmf_duration [num]|max_dtmf_duration [num]|default_dtmf_duration [num]|loglevel [level]|debug_level [level]]"
 SWITCH_STANDARD_API(ctl_function)
 {
        int argc;
@@ -1348,6 +1348,16 @@ SWITCH_STANDARD_API(ctl_function)
                                switch_core_session_ctl(SCSC_LOGLEVEL, &arg);
                                stream->write_function(stream, "+OK log level: %s [%d]\n", switch_log_level2str(arg), arg);
                        }
+               } else if (!strcasecmp(argv[0], "debug_level")) {
+                       if (argc > 1) {
+                               arg = atoi(argv[1]);
+                       } else {
+                               arg = -1;
+                       }
+
+                       switch_core_session_ctl(SCSC_DEBUG_LEVEL, &arg);
+                       stream->write_function(stream, "+OK DEBUG level: %d\n", arg);
+
                } else if (!strcasecmp(argv[0], "last_sps")) {
                        switch_core_session_ctl(SCSC_LAST_SPS, &arg);
                        stream->write_function(stream, "+OK last sessions per second: %d\n", arg);
@@ -3759,6 +3769,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_commands_load)
        SWITCH_ADD_API(commands_api_interface, "uuid_media", "media", uuid_media_function, MEDIA_SYNTAX);
        SWITCH_ADD_API(commands_api_interface, "fsctl", "control messages", ctl_function, CTL_SYNTAX);
        switch_console_set_complete("add fsctl hupall");
+       switch_console_set_complete("add fsctl loglevel");
+       switch_console_set_complete("add fsctl debug_level");
        switch_console_set_complete("add fsctl pause");
        switch_console_set_complete("add fsctl resume");
        switch_console_set_complete("add fsctl shutdown");

diff --git a/src/switch_core.c b/src/switch_core.c
index 44e3ffb25e8caf7fb842a46a0bbfa08781411922..6eea4e24684ff27b22fa76937f0a33da03844881 100644 (file)
--- a/src/switch_core.c
+++ b/src/switch_core.c
@@ -1463,12 +1463,12 @@ static void switch_load_core_config(const char *file)
 /*!
   \brief Open the default system database
 */
-SWITCH_DECLARE(switch_status_t)switch_core_db_handle(switch_cache_db_handle_t **dbh)
+SWITCH_DECLARE(switch_status_t) _switch_core_db_handle(switch_cache_db_handle_t **dbh, const char *file, const char *func, int line)
 {
        if (runtime.odbc_dsn && runtime.odbc_user && runtime.odbc_pass) {
-               return switch_cache_db_get_db_handle(dbh, runtime.odbc_dsn, runtime.odbc_user, runtime.odbc_pass);
+               return _switch_cache_db_get_db_handle(dbh, runtime.odbc_dsn, runtime.odbc_user, runtime.odbc_pass, file, func, line);
        } else {
-               return switch_cache_db_get_db_handle(dbh, SWITCH_CORE_DB, NULL, NULL);
+               return _switch_cache_db_get_db_handle(dbh, SWITCH_CORE_DB, NULL, NULL, file, func, line);
        }
 }
 
@@ -1576,6 +1576,12 @@ static void win_shutdown(void)
 }
 #endif
 
+SWITCH_DECLARE(uint32_t) switch_core_debug_level(void)
+{
+       return runtime.debug_level;
+}
+
+
 SWITCH_DECLARE(int32_t) switch_core_session_ctl(switch_session_ctl_t cmd, int32_t *val)
 {
        if (switch_test_flag((&runtime), SCF_SHUTTING_DOWN)) {
@@ -1677,6 +1683,13 @@ SWITCH_DECLARE(int32_t) switch_core_session_ctl(switch_session_ctl_t cmd, int32_
                }
                *val = runtime.hard_log_level;
                break;
+       case SCSC_DEBUG_LEVEL:
+               if (*val > -1) {
+                       if (*val > 10) *val = 10;
+                       runtime.debug_level = *val;
+               }
+               *val = runtime.debug_level;
+               break;
        case SCSC_MAX_SESSIONS:
                *val = switch_core_session_limit(*val);
                break;

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index a803d654bb7d6d2f9c813bdc9f187769848bac6a..3d998ea5264b4a13b0cfd643175cc735c020994a 100644 (file)
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -164,8 +164,9 @@ SWITCH_DECLARE(void) switch_cache_db_detach(void)
        switch_mutex_unlock(dbh_mutex);
 }
 
-SWITCH_DECLARE(switch_status_t)switch_cache_db_get_db_handle(switch_cache_db_handle_t **dbh,
-                                                                                                                        const char *db_name, const char *odbc_user, const char *odbc_pass)
+SWITCH_DECLARE(switch_status_t)_switch_cache_db_get_db_handle(switch_cache_db_handle_t **dbh,
+                                                                                                                         const char *db_name, const char *odbc_user, const char *odbc_pass,
+                                                                                                                         const char *file, const char *func, int line)
 {
        switch_thread_id_t self = switch_thread_self();
        char thread_str[CACHE_DB_LEN] = "";
@@ -176,7 +177,10 @@ SWITCH_DECLARE(switch_status_t)switch_cache_db_get_db_handle(switch_cache_db_han
        snprintf(thread_str, sizeof(thread_str) - 1, "%s_%lu", db_name, (unsigned long)(intptr_t)self);
        
        switch_mutex_lock(dbh_mutex);
-       if (!(new_dbh = switch_core_hash_find(dbh_hash, thread_str))) {
+       if ((new_dbh = switch_core_hash_find(dbh_hash, thread_str))) {
+               switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG1, 
+                                                 "Reuse Cached DB handle %s [%s]\n", thread_str, new_dbh->db ? "sqlite" : "ODBC");
+       } else {
                switch_hash_index_t *hi;
                const void *var;
                void *val;
@@ -190,6 +194,8 @@ SWITCH_DECLARE(switch_status_t)switch_cache_db_get_db_handle(switch_cache_db_han
                                if (!switch_test_flag(new_dbh, CDF_INUSE) && switch_mutex_trylock(new_dbh->mutex) == SWITCH_STATUS_SUCCESS) {
                                        switch_set_flag(new_dbh, CDF_INUSE);
                                        switch_set_string(new_dbh->name, thread_str);
+                                       switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG1, 
+                                                                         "Reuse Unused Cached DB handle %s [%s]\n", thread_str, new_dbh->db ? "sqlite" : "ODBC");
                                        break;
                                }
                        }
@@ -217,6 +223,9 @@ SWITCH_DECLARE(switch_status_t)switch_cache_db_get_db_handle(switch_cache_db_han
                        goto end;
                }
 
+               switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG1, 
+                                                 "Create Cached DB handle %s [%s]\n", thread_str, db ? "sqlite" : "ODBC");
+
                switch_core_new_memory_pool(&pool);
                new_dbh = switch_core_alloc(pool, sizeof(*new_dbh));
                new_dbh->pool = pool;
@@ -242,16 +251,15 @@ SWITCH_DECLARE(switch_status_t)switch_cache_db_get_db_handle(switch_cache_db_han
 }
 
 
-
-SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql(switch_cache_db_handle_t *dbh, const char *sql, char **err)
+static switch_status_t switch_cache_db_execute_sql_real(switch_cache_db_handle_t *dbh, const char *sql, char **err)
 {
        switch_status_t status = SWITCH_STATUS_FALSE;
        char *errmsg = NULL;
 
        if (err) *err = NULL;
-
+       
        if (switch_odbc_available() && dbh->odbc_dbh) {
-               switch_odbc_statement_handle_t stmt;
+               switch_odbc_statement_handle_t stmt = NULL;
                if ((status = switch_odbc_handle_exec(dbh->odbc_dbh, sql, &stmt)) != SWITCH_ODBC_SUCCESS) {
                        errmsg = switch_odbc_handle_get_error(dbh->odbc_dbh, stmt);
                }
@@ -271,6 +279,84 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql(switch_cache_db_hand
                }
        }
        
+       return status;
+}
+
+/**
+   OMFG you cruel bastards.  Who chooses 64k as a max buffer len for a sql statement, have you ever heard of transactions?
+ **/
+static switch_status_t switch_cache_db_execute_sql_chunked(switch_cache_db_handle_t *dbh, const char *sql, uint32_t chunk_size, char **err)
+{
+       switch_status_t status = SWITCH_STATUS_FALSE;
+       char *p, *s, *e;
+       int chunk_count;
+       char *dup = NULL;
+       switch_size_t len;
+       
+       switch_assert(chunk_size);
+
+       if (err) *err = NULL;
+
+       len = strlen(sql);
+
+       if (chunk_size > len) {
+               return switch_cache_db_execute_sql_real(dbh, sql, err);
+       }
+
+       if (!(chunk_count = strlen(sql) / chunk_size)) {
+               return SWITCH_STATUS_FALSE;
+       }
+       
+       dup = strdup(sql);
+
+
+       e = end_of_p(dup);
+       s = dup;
+
+       while(s && s < e) {
+               p = s + chunk_size;
+
+               if (p > e) {
+                       p = e;
+               }
+               
+               while (p > s && *p != ';') {
+                       p--;
+               }
+
+               if (p) {
+                       *p = '\0';
+                       while(p < e && (*p == '\n' || *p == ' ')) {
+                               p++;
+                       }
+               }
+               
+               status = switch_cache_db_execute_sql_real(dbh, s, err);
+               if (status != SWITCH_STATUS_SUCCESS || (err && *err)) {
+                       break;
+               }
+
+               s = p + 1;
+       
+       }
+
+       free(dup);
+
+       return status;
+
+}
+
+
+SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql(switch_cache_db_handle_t *dbh, const char *sql, char **err)
+{
+       switch_status_t status = SWITCH_STATUS_FALSE;
+
+       if (dbh->db) {
+               status = switch_cache_db_execute_sql_real(dbh, sql, err);
+       } else {
+               status = switch_cache_db_execute_sql_chunked(dbh, (char *)sql, 32000, err);
+       }
+       
        return status;
 
 }
@@ -313,7 +399,7 @@ SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute_trans(switch_
        uint8_t forever = 0;
        unsigned begin_retries = 100;
        uint8_t again = 0;
-
+       
        if (!retries) {
                forever = 1;
                retries = 1000;
@@ -353,7 +439,10 @@ again:
        }
 
        while (retries > 0) {
-               switch_cache_db_execute_sql(dbh,  sql, &errmsg);
+
+               switch_cache_db_execute_sql(dbh, sql, &errmsg);
+
+
                if (errmsg) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQL ERR [%s]\n", errmsg);
                        free(errmsg);
@@ -518,7 +607,7 @@ static void *SWITCH_THREAD_FUNC switch_core_sql_thread(switch_thread_t * thread,
                
                
                if (trans && ((itterations == target) || (nothing_in_queue && ++lc >= 500))) {
-                       if (switch_cache_db_persistant_execute_trans(sql_manager.event_db, sqlbuf, 100) != SWITCH_STATUS_SUCCESS) {
+                       if (switch_cache_db_persistant_execute_trans(sql_manager.event_db, sqlbuf, 1) != SWITCH_STATUS_SUCCESS) {
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "SQL thread unable to commit transaction, records lost!\n");
                        }
                        itterations = 0;

diff --git a/src/switch_log.c b/src/switch_log.c
index f28960c3c04425eee21abecd2d51c54aea3a6a5a..86bb45de1b2fe72a6cf509923e365104c7760f3a 100644 (file)
--- a/src/switch_log.c
+++ b/src/switch_log.c
@@ -340,6 +340,14 @@ SWITCH_DECLARE(void) switch_log_vprintf(switch_text_channel_t channel, const cha
        const char *extra_fmt = "%s [%s] %s:%d%c%s";
 #endif
 
+       if (level > 100) {
+               if (level - 100 > runtime.debug_level) {
+                       return;
+               }
+
+               level = 7;
+       }
+
        if (level > runtime.hard_log_level) {
                return;
        }