more cleanup

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

diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c
index 6b2ca1669e1563b75a5575d2c3bf23dac3649fbc..29b77f41c96acc13d612d13f26f133579bdb16f0 100644 (file)
--- a/src/switch_core_state_machine.c
+++ b/src/switch_core_state_machine.c
@@ -274,6 +274,44 @@ void switch_core_state_machine_init(switch_memory_pool_t *pool)
        }
 }
 
+
+
+#define STATE_MACRO(__STATE, __STATE_STR)                                              do {    \
+               midstate = state;                                                                                               \
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State %s\n", switch_channel_get_name(session->channel), __STATE_STR);     \
+               if (!driver_state_handler->on_##__STATE || (driver_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \
+                                                                                                       && midstate == switch_channel_get_state(session->channel))) { \
+                       while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) { \
+                               if (!application_state_handler || !application_state_handler->on_##__STATE \
+                                       || (application_state_handler->on_##__STATE                     \
+                                               && application_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \
+                                               && midstate == switch_channel_get_state(session->channel))) { \
+                                       proceed++;                                                                                      \
+                                       continue;                                                                                       \
+                               } else {                                                                                                \
+                                       proceed = 0;                                                                            \
+                                       break;                                                                                          \
+                               }                                                                                                               \
+                       }                                                                                                                       \
+                       index = 0;                                                                                                      \
+                       while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) { \
+                               if (!application_state_handler || !application_state_handler->on_##__STATE || \
+                                       (application_state_handler->on_##__STATE &&                     \
+                                        application_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \
+                                        && midstate == switch_channel_get_state(session->channel))) { \
+                                       proceed++;                                                                                      \
+                                       continue;                                                                                       \
+                               } else {                                                                                                \
+                                       proceed = 0;                                                                            \
+                                       break;                                                                                          \
+                               }                                                                                                               \
+                       }                                                                                                                       \
+                       if (proceed) {                                                                                          \
+                               switch_core_standard_on_##__STATE(session);                             \
+                       }                                                                                                                       \
+               }                                                                                                                               \
+       } while (0)
+
 SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
 {
        switch_channel_state_t state = CS_NEW, laststate = CS_HANGUP, midstate = CS_DONE, endstate;
@@ -343,7 +381,7 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
                if (state != laststate || state == CS_HANGUP || exception) {
                        int index = 0;
                        int proceed = 1;
-                       midstate = state;
+
 
                        switch (state) {
                        case CS_NEW:            /* Just created, Waiting for first instructions */
@@ -351,330 +389,35 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
                                break;
                        case CS_DONE:
                                goto done;
-                       case CS_HANGUP: /* Deactivate and end the thread */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State HANGUP\n", switch_channel_get_name(session->channel));
-                               if (!driver_state_handler->on_hangup
-                                       || (driver_state_handler->on_hangup
-                                               && driver_state_handler->on_hangup(session) == SWITCH_STATUS_SUCCESS && midstate == switch_channel_get_state(session->channel))) {
-                                       while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_hangup
-                                                       || (application_state_handler->on_hangup
-                                                               && application_state_handler->on_hangup(session) == SWITCH_STATUS_SUCCESS
-                                                               && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       index = 0;
-                                       while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_hangup ||
-                                                       (application_state_handler->on_hangup &&
-                                                        application_state_handler->on_hangup(session) == SWITCH_STATUS_SUCCESS &&
-                                                        midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-
-                                       if (proceed) {
-                                               switch_core_standard_on_hangup(session);
-                                       }
-                               }
+                       case CS_HANGUP:     /* Deactivate and end the thread */
+                               STATE_MACRO(hangup, "HANGUP");
                                goto done;
                        case CS_INIT:           /* Basic setup tasks */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State INIT\n", switch_channel_get_name(session->channel));
-                               if (!driver_state_handler->on_init
-                                       || (driver_state_handler->on_init && driver_state_handler->on_init(session) == SWITCH_STATUS_SUCCESS
-                                               && midstate == switch_channel_get_state(session->channel))) {
-                                       while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_init
-                                                       || (application_state_handler->on_init
-                                                               && application_state_handler->on_init(session) == SWITCH_STATUS_SUCCESS
-                                                               && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       index = 0;
-                                       while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_init ||
-                                                       (application_state_handler->on_init &&
-                                                        application_state_handler->on_init(session) == SWITCH_STATUS_SUCCESS
-                                                        && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       if (proceed) {
-                                               switch_core_standard_on_init(session);
-                                       }
-                               }
+                               STATE_MACRO(init, "INIT");
                                break;
                        case CS_RING:           /* Look for a dialplan and find something to do */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State RING\n", switch_channel_get_name(session->channel));
-                               if (!driver_state_handler->on_ring
-                                       || (driver_state_handler->on_ring && driver_state_handler->on_ring(session) == SWITCH_STATUS_SUCCESS
-                                               && midstate == switch_channel_get_state(session->channel))) {
-                                       while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_ring
-                                                       || (application_state_handler->on_ring
-                                                               && application_state_handler->on_ring(session) == SWITCH_STATUS_SUCCESS
-                                                               && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       index = 0;
-                                       while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_ring ||
-                                                       (application_state_handler->on_ring &&
-                                                        application_state_handler->on_ring(session) == SWITCH_STATUS_SUCCESS
-                                                        && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       if (proceed) {
-                                               switch_core_standard_on_ring(session);
-                                       }
-                               }
+                               STATE_MACRO(ring, "RING");
                                break;
-                       case CS_RESET:          /* Look for a dialplan and find something to do */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State RESET\n", switch_channel_get_name(session->channel));
-                               if (!driver_state_handler->on_reset
-                                       || (driver_state_handler->on_reset && driver_state_handler->on_reset(session) == SWITCH_STATUS_SUCCESS
-                                               && midstate == switch_channel_get_state(session->channel))) {
-                                       while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_reset
-                                                       || (application_state_handler->on_reset
-                                                               && application_state_handler->on_reset(session) == SWITCH_STATUS_SUCCESS
-                                                               && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       index = 0;
-                                       while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_reset ||
-                                                       (application_state_handler->on_reset &&
-                                                        application_state_handler->on_reset(session) == SWITCH_STATUS_SUCCESS
-                                                        && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       if (proceed) {
-                                               switch_core_standard_on_reset(session);
-                                       }
-                               }
+                       case CS_RESET:          /* Reset */
+                               STATE_MACRO(reset, "RESET");
                                break;
                        case CS_EXECUTE:        /* Execute an Operation */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State EXECUTE\n", switch_channel_get_name(session->channel));
-                               if (!driver_state_handler->on_execute
-                                       || (driver_state_handler->on_execute
-                                               && driver_state_handler->on_execute(session) == SWITCH_STATUS_SUCCESS && midstate == switch_channel_get_state(session->channel))) {
-                                       while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_execute
-                                                       || (application_state_handler->on_execute
-                                                               && application_state_handler->on_execute(session) == SWITCH_STATUS_SUCCESS
-                                                               && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       index = 0;
-                                       while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_execute ||
-                                                       (application_state_handler->on_execute &&
-                                                        application_state_handler->on_execute(session) == SWITCH_STATUS_SUCCESS &&
-                                                        midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       if (proceed) {
-                                               switch_core_standard_on_execute(session);
-                                       }
-                               }
+                               STATE_MACRO(execute, "EXECUTE");
                                break;
                        case CS_LOOPBACK:       /* loop all data back to source */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State LOOPBACK\n", switch_channel_get_name(session->channel));
-                               if (!driver_state_handler->on_loopback
-                                       || (driver_state_handler->on_loopback
-                                               && driver_state_handler->on_loopback(session) == SWITCH_STATUS_SUCCESS
-                                               && midstate == switch_channel_get_state(session->channel))) {
-                                       while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_loopback
-                                                       || (application_state_handler->on_loopback
-                                                               && application_state_handler->on_loopback(session) == SWITCH_STATUS_SUCCESS
-                                                               && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       index = 0;
-                                       while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_loopback ||
-                                                       (application_state_handler->on_loopback &&
-                                                        application_state_handler->on_loopback(session) == SWITCH_STATUS_SUCCESS &&
-                                                        midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       if (proceed) {
-                                               switch_core_standard_on_loopback(session);
-                                       }
-                               }
+                               STATE_MACRO(loopback, "LOOPBACK");
                                break;
                        case CS_TRANSMIT:       /* send/recieve data to/from another channel */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State TRANSMIT\n", switch_channel_get_name(session->channel));
-                               if (!driver_state_handler->on_transmit
-                                       || (driver_state_handler->on_transmit
-                                               && driver_state_handler->on_transmit(session) == SWITCH_STATUS_SUCCESS
-                                               && midstate == switch_channel_get_state(session->channel))) {
-
-                                       while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_transmit
-                                                       || (application_state_handler->on_transmit
-                                                               && application_state_handler->on_transmit(session) == SWITCH_STATUS_SUCCESS
-                                                               && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       index = 0;
-                                       while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_transmit ||
-                                                       (application_state_handler->on_transmit &&
-                                                        application_state_handler->on_transmit(session) == SWITCH_STATUS_SUCCESS &&
-                                                        midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       if (proceed) {
-                                               switch_core_standard_on_transmit(session);
-                                       }
-                               }
+                               STATE_MACRO(transmit, "TRANSMIT");
                                break;
                        case CS_HOLD:           /* wait in limbo */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State HOLD\n", switch_channel_get_name(session->channel));
-                               if (!driver_state_handler->on_hold
-                                       || (driver_state_handler->on_hold && driver_state_handler->on_hold(session) == SWITCH_STATUS_SUCCESS
-                                               && midstate == switch_channel_get_state(session->channel))) {
-
-                                       while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_hold
-                                                       || (application_state_handler->on_hold
-                                                               && application_state_handler->on_hold(session) == SWITCH_STATUS_SUCCESS
-                                                               && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       index = 0;
-                                       while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_hold ||
-                                                       (application_state_handler->on_hold &&
-                                                        application_state_handler->on_hold(session) == SWITCH_STATUS_SUCCESS
-                                                        && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       if (proceed) {
-                                               switch_core_standard_on_hold(session);
-                                       }
-                               }
+                               STATE_MACRO(hold, "HOLD");
                                break;
-                       case CS_HIBERNATE:      /* wait in limbo */
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State HIBERNATE\n", switch_channel_get_name(session->channel));
-                               if (!driver_state_handler->on_hibernate
-                                       || (driver_state_handler->on_hibernate
-                                               && driver_state_handler->on_hibernate(session) == SWITCH_STATUS_SUCCESS
-                                               && midstate == switch_channel_get_state(session->channel))) {
-
-                                       while ((application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_hibernate
-                                                       || (application_state_handler->on_hibernate
-                                                               && application_state_handler->on_hibernate(session) == SWITCH_STATUS_SUCCESS
-                                                               && midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       index = 0;
-                                       while (proceed && (application_state_handler = switch_core_get_state_handler(index++)) != 0) {
-                                               if (!application_state_handler || !application_state_handler->on_hibernate ||
-                                                       (application_state_handler->on_hibernate &&
-                                                        application_state_handler->on_hibernate(session) == SWITCH_STATUS_SUCCESS &&
-                                                        midstate == switch_channel_get_state(session->channel))) {
-                                                       proceed++;
-                                                       continue;
-                                               } else {
-                                                       proceed = 0;
-                                                       break;
-                                               }
-                                       }
-                                       if (proceed) {
-                                               switch_core_standard_on_hibernate(session);
-                                       }
-                               }
+                       case CS_HIBERNATE:      /* sleep */
+                               STATE_MACRO(hibernate, "HIBERNATE");
                                break;
                        }
-
+                       
                        if (midstate == CS_DONE) {
                                break;
                        }

diff --git a/src/switch_event.c b/src/switch_event.c
index 0b0910c0a8307674ccb0bdefe4026dd33d0b3716..04e297a72bc749a042b501327422f042f55481bc 100644 (file)
--- a/src/switch_event.c
+++ b/src/switch_event.c
@@ -366,8 +366,14 @@ SWITCH_DECLARE(switch_status_t) switch_event_reserve_subclass_detailed(char *own
 SWITCH_DECLARE(void) switch_core_memory_reclaim_events(void)
 {
        void *pop;
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Returning %d recycled event node(s) and %d recycled event header node(s)\n",
-                                         switch_queue_size(EVENT_RECYCLE_QUEUE),switch_queue_size(EVENT_HEADER_RECYCLE_QUEUE));
+       int size;
+       size = switch_queue_size(EVENT_RECYCLE_QUEUE);
+
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Returning %d recycled event(s) %d bytes\n", size, (int) sizeof(switch_event_t) * size);
+       size = switch_queue_size(EVENT_HEADER_RECYCLE_QUEUE);
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Returning %d recycled event header(s) %d bytes\n", 
+                                         size, (int) sizeof(switch_event_header_t) * size);
+
                                          
        while (switch_queue_trypop(EVENT_HEADER_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) {
                free(pop);

diff --git a/src/switch_log.c b/src/switch_log.c
index 8a749bfd0a216000f2a101e7e4e1ffe268f87856..aaa72e65c5756f38518f25390aad186ee303f3b7 100644 (file)
--- a/src/switch_log.c
+++ b/src/switch_log.c
@@ -282,7 +282,8 @@ SWITCH_DECLARE(switch_status_t) switch_log_init(switch_memory_pool_t *pool)
 SWITCH_DECLARE(void) switch_core_memory_reclaim_logger(void)
 {
        void *pop;
-       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Returning %d recycled log node(s)\n", switch_queue_size(LOG_RECYCLE_QUEUE));
+       int size = switch_queue_size(LOG_RECYCLE_QUEUE);
+       switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "Returning %d recycled log node(s) %d bytes\n", size, (int)sizeof(switch_log_node_t) * size);
        while (switch_queue_trypop(LOG_RECYCLE_QUEUE, &pop) == SWITCH_STATUS_SUCCESS) {
                free(pop);
        }