[Freeswitch-trunk] [commit] r5800 - freeswitch/trunk/src

Author: anthm Date: Thu Oct 4 16:22:37 2007 New Revision: 5800 Modified: freeswitch/trunk/src/switch_core_state_machine.c freeswitch/trunk/src/switch_event.c freeswitch/trunk/src/switch_log.c Log: more cleanup Modified: freeswitch/trunk/src/switch_core_state_machine.c ============================================================================== --- freeswitch/trunk/src/switch_core_state_machine.c (original) +++ freeswitch/trunk/src/switch_core_state_machine.c Thu Oct 4 16:22:37 2007 @@ -274,6 +274,44 @@ } } + + +#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 @@ 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 @@ 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; } Modified: freeswitch/trunk/src/switch_event.c ============================================================================== --- freeswitch/trunk/src/switch_event.c (original) +++ freeswitch/trunk/src/switch_event.c Thu Oct 4 16:22:37 2007 @@ -366,8 +366,14 @@ 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); Modified: freeswitch/trunk/src/switch_log.c ============================================================================== --- freeswitch/trunk/src/switch_log.c (original) +++ freeswitch/trunk/src/switch_log.c Thu Oct 4 16:22:37 2007 @@ -282,7 +282,8 @@ 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); }