trema 0.4.3 → 0.4.4

data/src/lib/log.c

@@ -25,6 +25,9 @@
 #include <string.h>
 #include <syslog.h>
 #include <time.h>
+#ifdef DEBUG
+#include <sys/time.h>
+#endif
 #include "bool.h"
 #include "log.h"
 #include "trema_wrapper.h"
@@ -130,7 +133,13 @@ static const size_t max_message_length = 1024;
 
 static void
 log_file( int priority, const char *format, va_list ap ) {
+#ifdef DEBUG
+  struct timeval tv;
+  gettimeofday( &tv, NULL );
+  time_t tm = tv.tv_sec;
+#else
   time_t tm = time( NULL );
+#endif
   char now[ 26 ];
   asctime_r( localtime( &tm ), now );
   now[ 24 ] = '\0'; // chomp
@@ -143,7 +152,11 @@ log_file( int priority, const char *format, va_list ap ) {
   vsnprintf( message, max_message_length, format, new_ap );
   va_end( new_ap );
 
+#ifdef DEBUG
+  trema_fprintf( fd, "%s %03dms [%s] %s\n", now, tv.tv_usec / 1000, priority_name, message );
+#else
   trema_fprintf( fd, "%s [%s] %s\n", now, priority_name, message );
+#endif
   fflush( fd );
 }
 
@@ -210,6 +223,9 @@ get_log_directory() {
   return log_directory;
 }
 
+#ifdef DEBUG
+pid_t trema_log_pid = 0;
+#endif
 
 static FILE *
 open_log_file( bool append ) {
@@ -217,7 +233,14 @@ open_log_file( bool append ) {
   assert( strlen( get_ident_string() ) > 0 );
 
   char pathname[ PATH_MAX ];
+#ifdef DEBUG
+  if ( trema_log_pid == 0 ) {
+    trema_log_pid = getpid();
+  }
+  sprintf( pathname, "%s/%s.%d.log", get_log_directory(), get_ident_string(), trema_log_pid );
+#else
   sprintf( pathname, "%s/%s.log", get_log_directory(), get_ident_string() );
+#endif
   FILE *log = fopen( pathname, append ? "a" : "w" );
 
   if ( log == NULL ) {
@@ -369,11 +392,19 @@ rename_log( const char *new_ident ) {
 
   if ( output & LOGGING_TYPE_FILE ) {
     char old_path[ PATH_MAX ];
+#ifdef DEBUG
+    snprintf( old_path, PATH_MAX, "%s/%s.%d.log", get_log_directory(), get_ident_string(), trema_log_pid );
+#else
     snprintf( old_path, PATH_MAX, "%s/%s.log", get_log_directory(), get_ident_string() );
+#endif
     old_path[ PATH_MAX - 1 ] = '\0';
     char new_path[ PATH_MAX ];
     set_ident_string( new_ident );
+#ifdef DEBUG
+    snprintf( new_path, PATH_MAX, "%s/%s.%d.log", get_log_directory(), get_ident_string(), trema_log_pid );
+#else
     snprintf( new_path, PATH_MAX, "%s/%s.log", get_log_directory(), get_ident_string() );
+#endif
     new_path[ PATH_MAX - 1 ] = '\0';
 
     unlink( new_path );

data/src/lib/messenger.c

@@ -776,14 +776,22 @@ rename_message_callback( const char *old_service_name, const char *new_service_n
     return false;
   }
 
+  bool success = true;
   for ( element = old_rq->message_callbacks->next; element; element = element->next ) {
     cb = element->data;
-    add_message_callback( new_service_name, cb->message_type, cb->function );
+    if ( !add_message_callback( new_service_name, cb->message_type, cb->function ) ) {
+      success = false;
+      break;
+    }
+  }
+  if ( success ) {
+    delete_receive_queue( old_rq->service_name, old_rq, NULL );
+  }
+  else if ( ( new_rq = lookup_hash_entry( receive_queues, new_service_name ) ) != NULL ) {
+    delete_receive_queue( new_rq->service_name, new_rq, NULL );
   }
 
-  delete_receive_queue( old_rq->service_name, old_rq, NULL );
-
-  return true;
+  return success;
 }
 
 static bool
@@ -1198,7 +1206,7 @@ _clear_send_queue( const char *service_name ) {
   send_queue *sq = lookup_hash_entry( send_queues, service_name );
 
   if ( NULL == sq ) {
-    error( "Send queue is already deleted or not created yet ( service_name = %s ).", service_name );
+    warn( "Send queue is already deleted or not created yet ( service_name = %s ).", service_name );
     return false;
   }
   if ( NULL == sq->buffer ) {

data/src/lib/trema.c

@@ -99,11 +99,11 @@ pid_t mock_read_pid( const char *directory, const char *name );
 #define kill mock_kill
 int mock_kill( pid_t pid, int sig );
 
-#ifdef sleep
-#undef sleep
+#ifdef clock_nanosleep
+#undef clock_nanosleep
 #endif
-#define sleep mock_sleep
-unsigned int mock_sleep( unsigned int seconds );
+#define clock_nanosleep mock_clock_nanosleep
+unsigned int mock_clock_nanosleep( clockid_t clock_id, int flags, const struct timespec *request, struct timespec *remain);
 
 #ifdef init_event_handler
 #undef init_event_handler
@@ -741,8 +741,9 @@ terminate_trema_process( pid_t pid ) {
 
   int try = 0;
   const int max_try = 10;
+  struct timespec tv = { 0, 500000000 };
   while ( kill( pid, 0 ) == 0 && ++try <= max_try ) {
-    sleep( 1 );
+    clock_nanosleep( CLOCK_MONOTONIC, 0, &tv, NULL );
   }
   if ( try > max_try ) {
     error( "Failed to terminate %d.", pid );

data/src/switch_manager/switch.c

@@ -57,8 +57,14 @@ struct switch_info switch_info;
 
 static const time_t COOKIE_TABLE_AGING_INTERVAL = 3600; // sec.
 static const time_t ECHO_REQUEST_INTERVAL = 60; // sec.
-static const time_t ECHO_REPLY_TIMEOUT = 2; // ses.
+static const time_t ECHO_REPLY_TIMEOUT = 2; // sec.
 static const time_t WARNING_ECHO_RTT = 500; // msec. The value must is less than 1000.
+static const time_t REGISTRATION_RETRY = 1; // sec.
+static const int REGISTRATION_RETRY_COUNT = 1;
+static const time_t REGISTRATION_TIMEOUT = 1; // sec.
+static const time_t UNREGISTRATION_RETRY = 1; // sec.
+static const int UNREGISTRATION_RETRY_COUNT = 1;
+static const time_t UNREGISTRATION_TIMEOUT = 1; // sec.
 
 
 static bool age_cookie_table_enabled = false;
@@ -308,6 +314,7 @@ static void
 echo_reply_timeout( void *user_data ) {
   UNUSED( user_data );
 
+  switch_info.running_timer = false;
   error( "Echo request timeout ( datapath id %#" PRIx64 ").", switch_info.datapath_id );
   switch_event_disconnected( &switch_info );
 }
@@ -368,7 +375,18 @@ echo_request_interval( void *user_data ) {
 
 
 static void
-confirm_self_dpid_is_registerd( uint64_t* dpids, size_t n_dpids, void *user_data );
+registration_timeout( void *user_data ) {
+  struct switch_info *sw_info = user_data;
+
+  sw_info->running_timer = false;
+
+  error( "Registration timeout ( datapath id %#" PRIx64 " ).", sw_info->datapath_id );
+  switch_event_disconnected( sw_info );
+}
+
+
+static void
+confirm_self_dpid_is_registered( uint64_t* dpids, size_t n_dpids, void *user_data );
 
 
 int
@@ -381,7 +399,7 @@ switch_event_recv_featuresreply( struct switch_info *sw_info, uint64_t *dpid ) {
   case SWITCH_STATE_WAIT_FEATURES_REPLY:
 
     sw_info->datapath_id = *dpid;
-    sw_info->state = SWITCH_STATE_COMPLETED;
+    sw_info->state = SWITCH_STATE_WAIT_REGISTRATION;
 
     // cancel to features_reply_wait-timeout timer
     switch_unset_timeout( switch_event_timeout_features_reply, NULL );
@@ -392,7 +410,7 @@ switch_event_recv_featuresreply( struct switch_info *sw_info, uint64_t *dpid ) {
     // checking duplicate service
     pid_t pid = get_pid_by_trema_name( new_service_name );
     if ( pid > 0 ) {
-      // duplicated
+      debug( "duplicated datapath-id %#" PRIx64, sw_info->datapath_id );
       if ( !terminate_trema_process( pid ) ) {
         return -1;
       }
@@ -440,12 +458,17 @@ switch_event_recv_featuresreply( struct switch_info *sw_info, uint64_t *dpid ) {
     init_event_forward_interface();
     // Check switch_manager registration
     debug( "Checking switch manager's switch list." );
-    if ( !send_efi_switch_list_request( confirm_self_dpid_is_registerd, sw_info ) ) {
+    sw_info->retry_count = REGISTRATION_RETRY_COUNT;
+    if ( send_efi_switch_list_request( confirm_self_dpid_is_registered, sw_info ) ) {
+      switch_set_timeout( REGISTRATION_TIMEOUT, registration_timeout, sw_info );
+    }
+    else {
       error( "Failed to send switch list request to switch manager." );
       return -1;
     }
     break;
 
+  case SWITCH_STATE_WAIT_REGISTRATION:
   case SWITCH_STATE_COMPLETED:
     // NOP
     break;
@@ -462,47 +485,118 @@ switch_event_recv_featuresreply( struct switch_info *sw_info, uint64_t *dpid ) {
 
 
 static void
-notify_state_to_controllers( struct switch_info *sw_info );
+registration_retry( void *user_data ) {
+  struct switch_info *sw_info = user_data;
+
+  if ( sw_info->retry_count == 0 ) {
+    switch_event_disconnected( sw_info );
+    return;
+  }
+  sw_info->retry_count--;
+  sw_info->running_timer = false;
+  debug( "Checking switch manager's switch list." );
+  if ( send_efi_switch_list_request( confirm_self_dpid_is_registered, sw_info ) ) {
+    switch_set_timeout( REGISTRATION_TIMEOUT, registration_timeout, sw_info );
+  }
+  else {
+    error( "Failed to send switch list request to switch manager." );
+    switch_event_disconnected( sw_info );
+  }
+}
 
 
 static void
-confirm_self_dpid_is_registerd( uint64_t* dpids, size_t n_dpids, void *user_data ) {
+confirm_self_dpid_is_registered( uint64_t* dpids, size_t n_dpids, void *user_data ) {
   struct switch_info *sw_info = user_data;
 
+  switch_unset_timeout( registration_timeout, sw_info );
+
   debug( "Received switch manager's switch list." );
+  bool found = false;
   for ( size_t i = 0 ; i < n_dpids ; ++i ) {
     if ( sw_info->datapath_id == dpids[ i ] ) {
       // self dpid registered
       debug( "Self dpid found" );
-      return notify_state_to_controllers( sw_info );
+      found = true;
+      break;
     }
   }
+  if ( found ) {
+    sw_info->state = SWITCH_STATE_COMPLETED;
 
-  debug( "Self dpid not found. Retrying..." );
-  if ( !send_efi_switch_list_request( confirm_self_dpid_is_registerd, sw_info ) ){
-    error( "Failed to send switch list request to switch manager on retry." );
+    // notify state and datapath_id to controllers
+    service_send_state( sw_info, &sw_info->datapath_id, MESSENGER_OPENFLOW_READY );
+    debug( "send ready state" );
+
+    add_periodic_event_callback( ECHO_REQUEST_INTERVAL, echo_request_interval, sw_info );
+  }
+  else {
+    debug( "Self dpid not found. Retrying..." );
+    switch_set_timeout( REGISTRATION_RETRY, registration_retry, sw_info );
   }
 }
 
 
 static void
-notify_state_to_controllers( struct switch_info *sw_info ) {
-    // notify state and datapath_id to controllers
-    service_send_state( sw_info, &sw_info->datapath_id, MESSENGER_OPENFLOW_READY );
-    debug( "send ready state" );
+stop_switch( struct switch_info *sw_info ) {
+  if ( sw_info->secure_channel_fd >= 0 ) {
+    close( sw_info->secure_channel_fd );
+    sw_info->secure_channel_fd = -1;
+  }
+  uint8_t state = MESSENGER_OPENFLOW_DISCONNECTED;
+  if ( sw_info->state == SWITCH_STATE_CONNECTION_FAILED ) {
+    state = MESSENGER_OPENFLOW_FAILD_TO_CONNECT;
+  }
+  service_send_state( sw_info, &sw_info->datapath_id, state );
+  flush_messenger();
 
-    add_periodic_event_callback( ECHO_REQUEST_INTERVAL, echo_request_interval, sw_info );
- }
+  // free service name list
+  iterate_list( sw_info->vendor_service_name_list, xfree_data, NULL );
+  delete_list( sw_info->vendor_service_name_list );
+  sw_info->vendor_service_name_list = NULL;
+  iterate_list( sw_info->packetin_service_name_list, xfree_data, NULL );
+  delete_list( sw_info->packetin_service_name_list );
+  sw_info->packetin_service_name_list = NULL;
+  iterate_list( sw_info->portstatus_service_name_list, xfree_data, NULL );
+  delete_list( sw_info->portstatus_service_name_list );
+  sw_info->portstatus_service_name_list = NULL;
+  iterate_list( sw_info->state_service_name_list, xfree_data, NULL );
+  delete_list( sw_info->state_service_name_list );
+  sw_info->state_service_name_list = NULL;
+
+  stop_trema();
+}
+
+
+static void
+unregistration_timeout( void *user_data ) {
+  struct switch_info *sw_info = user_data;
+
+  sw_info->running_timer = false;
+
+  warn( "Unregistration timeout ( datapath id %#" PRIx64 " ).", sw_info->datapath_id );
+
+  stop_switch( sw_info );
+}
+
+
+static void
+confirm_self_dpid_is_unregistered( uint64_t* dpids, size_t n_dpids, void *user_data );
 
 
 int
 switch_event_disconnected( struct switch_info *sw_info ) {
   int old_state = sw_info->state;
 
-  sw_info->state = SWITCH_STATE_DISCONNECTED;
+  if ( sw_info->state == SWITCH_STATE_COMPLETED ) {
+    sw_info->state = SWITCH_STATE_DISCONNECTED;
+  }
+  else {
+    sw_info->state = SWITCH_STATE_CONNECTION_FAILED;
+  }
 
   if ( old_state == SWITCH_STATE_COMPLETED ) {
-    delete_timer_event( echo_request_interval, sw_info );
+    switch_unset_timeout( echo_reply_timeout, NULL );
   }
 
   if ( sw_info->fragment_buf != NULL ) {
@@ -524,37 +618,80 @@ switch_event_disconnected( struct switch_info *sw_info ) {
     set_readable( switch_info.secure_channel_fd, false );
     set_writable( switch_info.secure_channel_fd, false );
     delete_fd_handler( switch_info.secure_channel_fd );
+  }
 
-    close( sw_info->secure_channel_fd );
-    sw_info->secure_channel_fd = -1;
+  uint8_t state = MESSENGER_OPENFLOW_DISCONNECTED;
+  if ( sw_info->state == SWITCH_STATE_CONNECTION_FAILED ) {
+    state = MESSENGER_OPENFLOW_FAILD_TO_CONNECT;
   }
 
-  if ( old_state != SWITCH_STATE_COMPLETED ) {
-    service_send_state( sw_info, &sw_info->datapath_id, MESSENGER_OPENFLOW_FAILD_TO_CONNECT );
+  debug( "Notify switch_disconnected to switch manager." );
+  char switch_manager[] =  SWITCH_MANAGER;
+  list_element switch_manager_only_list;
+  switch_manager_only_list.next = NULL;
+  switch_manager_only_list.data = switch_manager;
+  service_send_to_application( &switch_manager_only_list, state, &sw_info->datapath_id, NULL );
+
+  // Check switch_manager registration
+  debug( "Checking switch manager's switch list." );
+  sw_info->retry_count = UNREGISTRATION_RETRY_COUNT;
+  if ( send_efi_switch_list_request( confirm_self_dpid_is_unregistered, sw_info ) ) {
+    switch_set_timeout( UNREGISTRATION_TIMEOUT, unregistration_timeout, sw_info );
   }
   else {
-    // send secure channle disconnect state to application
-    service_send_state( sw_info, &sw_info->datapath_id, MESSENGER_OPENFLOW_DISCONNECTED );
+    error( "Failed to send switch list request to switch manager." );
+    stop_switch( sw_info );
   }
-  flush_messenger();
 
-  // free service name list
-  iterate_list( sw_info->vendor_service_name_list, xfree_data, NULL );
-  delete_list( sw_info->vendor_service_name_list );
-  sw_info->vendor_service_name_list = NULL;
-  iterate_list( sw_info->packetin_service_name_list, xfree_data, NULL );
-  delete_list( sw_info->packetin_service_name_list );
-  sw_info->packetin_service_name_list = NULL;
-  iterate_list( sw_info->portstatus_service_name_list, xfree_data, NULL );
-  delete_list( sw_info->portstatus_service_name_list );
-  sw_info->portstatus_service_name_list = NULL;
-  iterate_list( sw_info->state_service_name_list, xfree_data, NULL );
-  delete_list( sw_info->state_service_name_list );
-  sw_info->state_service_name_list = NULL;
+  return 0;
+}
 
-  stop_trema();
 
-  return 0;
+static void
+unregistration_retry( void *user_data ) {
+  struct switch_info *sw_info = user_data;
+
+  if ( sw_info->retry_count == 0 ) {
+    stop_switch( sw_info );
+    return;
+  }
+  sw_info->retry_count--;
+  sw_info->running_timer = false;
+  debug( "Checking switch manager's switch list." );
+  if ( send_efi_switch_list_request( confirm_self_dpid_is_unregistered, sw_info ) ) {
+    switch_set_timeout( UNREGISTRATION_TIMEOUT, unregistration_timeout, sw_info );
+  }
+  else {
+    error( "Failed to send switch list request to switch manager." );
+    stop_switch( sw_info );
+  }
+}
+
+
+static void
+confirm_self_dpid_is_unregistered( uint64_t* dpids, size_t n_dpids, void *user_data ) {
+  struct switch_info *sw_info = user_data;
+
+  switch_unset_timeout( unregistration_timeout, sw_info );
+
+  debug( "Received switch manager's switch list." );
+  bool found = false;
+  for ( size_t i = 0 ; i < n_dpids ; ++i ) {
+    if ( sw_info->datapath_id == dpids[ i ] ) {
+      // self dpid registered
+      debug( "Self dpid found" );
+      found = true;
+      break;
+    }
+  }
+  if ( found ) {
+    debug( "Self dpid found. Retrying..." );
+    switch_set_timeout( UNREGISTRATION_RETRY, unregistration_retry, sw_info );
+  }
+  else {
+    // The switch has been deleted from the switch list
+    stop_switch( sw_info );
+  }
 }