trema 0.3.14 → 0.3.15

data/.travis.yml

@@ -1,3 +1,5 @@
+language: ruby
+
 script: "rake travis"
 
 rvm:
@@ -9,5 +11,6 @@ branches:
     - develop
 
 before_install:
- - sudo apt-get update
- - sudo apt-get install libpcap-dev
+ - sudo apt-get update -qq
+ - sudo apt-get install libpcap-dev -qq
+ - gem install bundler

data/Gemfile

@@ -21,8 +21,8 @@ group :development do
   gem "redcarpet", "~> 2.2.2"
   gem "reek", "~> 1.3.1"
   gem "relish", "~> 0.6"
-  gem "rspec", "~> 2.12.0"
-  gem "yard", "~> 0.8.4.1"
+  gem "rspec", "~> 2.13.0"
+  gem "yard", "~> 0.8.5"
 end
 
 

data/Rakefile

@@ -16,11 +16,21 @@
 #
 
 
+$LOAD_PATH.unshift( File.expand_path( File.dirname( __FILE__ ) + "/ruby" ) )
+
+
 require "rubygems"
 require "rake"
+require "trema/path"
+
+task :default => :build_trema
 
+directory Trema.log
+directory Trema.pid
+directory Trema.sock
 
-task :default do
+desc "Build Trema"
+task :build_trema => [ Trema.log, Trema.pid, Trema.sock ] do
   sh "#{ Gem.ruby } ./build.rb"
 end
 
@@ -29,8 +39,8 @@ end
 # Maintenance Tasks
 ################################################################################
 
+# Generate a monolithic rant file"
 # FIXME: Remove dependency to rant
-desc "Generate a monolithic rant file"
 task "build.rb" do
   sh "rant-import --force --auto .mono.rant"
 end
@@ -52,35 +62,43 @@ task :relish do
 end
 
 
+################################################################################
+# Cruise
+################################################################################
+
+task :setup do
+  sh "./build.rb distclean"
+  sh "bundle update"
+  sh "bundle install"
+end
+
+
 ################################################################################
 # Tests
 ################################################################################
 
-task :travis => [ :default, "spec:travis" ]
+task :travis => [ :setup, :spec ]
 
 
 begin
   require "rspec/core"
   require "rspec/core/rake_task"
 
+  task :spec => :build_trema
   RSpec::Core::RakeTask.new do | task |
     task.verbose = $trace
     task.pattern = FileList[ "spec/**/*_spec.rb" ]
     task.rspec_opts = "--format documentation --color"
   end
 
+  task "spec:actions" => :build_trema
   RSpec::Core::RakeTask.new( "spec:actions" ) do | task |
     task.verbose = $trace
     task.pattern = FileList[ "spec/**/*_spec.rb" ]
     task.rspec_opts = "--tag type:actions --format documentation --color"
   end
 
-  RSpec::Core::RakeTask.new( "spec:travis" ) do | spec |
-    spec.pattern = FileList[ "spec/**/*_spec.rb" ]
-    # FIXME: use --tag ~sudo
-    spec.rspec_opts = "--tag nosudo -fs -c"
-  end
-
+  task :rcov => :build_trema
   RSpec::Core::RakeTask.new( :rcov ) do | spec |
     spec.pattern = "spec/**/*_spec.rb"
     spec.rcov = true
@@ -93,6 +111,7 @@ end
 
 begin
   require "cucumber/rake/task"
+  task :features => :build_trema
   Cucumber::Rake::Task.new( :features ) do | t |
     t.cucumber_opts = "features --tags ~@wip"
   end

data/Rantfile

@@ -825,7 +825,7 @@ end
 def libtrema_unit_tests
   {
     :byteorder_test => [ :log, :utility, :wrapper, :trema_wrapper ],
-    :daemon_test => [],
+    :daemon_test => [ :log, :utility, :wrapper, :trema_wrapper ],
     :ether_test => [ :buffer, :log, :utility, :wrapper, :trema_wrapper ],
     :messenger_test => [ :doubly_linked_list, :hash_table, :event_handler, :linked_list, :utility, :wrapper, :timer, :log, :trema_wrapper ],
     :openflow_application_interface_test => [ :buffer, :byteorder, :hash_table, :doubly_linked_list, :linked_list, :log, :openflow_message, :packet_info, :stat, :trema_wrapper, :utility, :wrapper ],

data/bin/trema

@@ -22,6 +22,7 @@
 $LOAD_PATH.unshift File.expand_path( File.join File.dirname( __FILE__ ), "..", "ruby" )
 
 require "rubygems"
+require "bundler/setup"
 
 require "gli"
 require "trema/command"

data/build.rb

@@ -27,7 +27,7 @@ RUBY_PATH = File.join(
             )
 
 result = system "cd #{ File.dirname( __FILE__ ) } && #{ RUBY_PATH } .mono.rant #{ ARGV.join ' ' }"
-abort "#{ $0 } aborted!" unless result;
+abort "#{ $0 } aborted!" unless result
 
 
 ### Local variables:

data/cruise.rb

@@ -317,7 +317,6 @@ end
 def run_unit_test
   test "Running unit tests ..." do
     sh "./build.rb unittests"
-    sh "./build.rb"
     sh "rake spec"
   end
   measure_coverage
@@ -326,7 +325,6 @@ end
 
 def run_acceptance_test
   test "Running acceptance tests ..." do
-    sh "./build.rb"
     sh "rake features"
   end
 end
@@ -361,16 +359,12 @@ $options.parse! ARGV
 
 
 def init_cruise
-  $start_time = Time.now
-  sh "./build.rb distclean"
-  sh "bundle install"
-  mkdir_p Trema.log
-  mkdir_p Trema.pid
-  mkdir_p Trema.sock
+  sh "rake setup"
 end
 
 
 Blocker.start do
+  $start_time = Time.now
   cd Trema.home do
     init_cruise
     run_unit_test if not $acceptance_test_only

data/features/.nav

@@ -36,3 +36,4 @@
   - switch_manager.feature
   - packetin_filter.feature
   - trema-config.feature
+  - get_pid_by_trema_name.feature

data/features/core/get_pid_by_trema_name.feature

@@ -0,0 +1,137 @@
+Feature: get_pid_by_trema_name()
+  
+  The function get_pid_by_trema_name() returns the PID of the process 
+  specified by its `name` argument. 
+  If the `name` is not found, the function returns -1. 
+  
+      pid_t get_pid_by_trema_name( const char *name )
+  
+  The `name` argument refers to controller process name called *trema-name*. 
+  In the trema framework the trema-name is a unique identifier assigned to 
+  each controller process. 
+  It is determined automatically by the following rules: 
+  
+  **Rule 1:** When you start a Ruby controller:
+  
+      class TopologyController < Controller
+        ...
+      end
+  
+      $ trema run topology-controller.rb
+  
+  then its trema-name is set to "TopologyController", 
+  which is the same as the class name.  
+  
+  **Rule 2:** When you start a C controller:
+  
+      $ trema run topology_controller
+  
+  then its trema-name is set to "topology_controller", 
+  which is same as the executable name.  
+  
+  **Rule 3:** Trema-name can be overwritten using the `-n` or `--name`
+  option given by the `trema run` command. 
+  
+      $ trema run "topology_controller -n topology"
+      $ trema run "topology_controller --name=topology"
+
+  Background: 
+    Given a file named "print_pid.c" with:
+      """
+      #include <stdio.h>
+      #include "trema.h"
+      
+      int
+      main( int argc, char* argv[] ) {
+        init_trema( &argc, &argv );
+        
+        if ( argc >= 2 ) {
+          pid_t pid = get_pid_by_trema_name( argv[ 1 ] );
+          if ( pid == -1 ) {
+            printf( "No such process : %s\n", argv[ 1 ] );
+          }
+          else {
+            printf( "PID of %s = %d\n", argv[ 1 ], pid );
+          }
+        }
+        
+        finalize_trema();
+        return 0;
+      }
+      """
+    And I compile "print_pid.c" into "print_pid"
+    And a file named "c_controller.c" with:
+      """
+      #include "trema.h"
+      
+      int
+      main( int argc, char* argv[] ) {
+        init_trema( &argc, &argv );
+        start_trema();
+        return 0;
+      }
+      """
+    And I compile "c_controller.c" into "c_controller"
+
+  Scenario: Getting the PID of a Ruby controller process with a default name.
+    Given a file named "RubyController.rb" with:
+      """
+      class RubyController < Controller
+      end
+      """
+    And I run `trema run ./RubyController.rb -d`
+    And wait until "RubyController" is up
+    When I run `trema run "./print_pid RubyController"`
+    Then the output should match:
+      """
+      PID of RubyController = \d+
+      """
+
+  Scenario: Getting the PID of a C controller process with a default name.
+    Given I run `trema run "./c_controller" -d`
+    And wait until "c_controller" is up
+    When I run `trema run "./print_pid c_controller"`
+    Then the output should match:
+      """
+      PID of c_controller = \d+
+      """
+
+  Scenario: Getting the PID of a C controller process renamed through CLI option '-n'.
+    Given I run `trema run "./c_controller -n NewName" -d`
+    And wait until "NewName" is up
+    When I run `trema run "./print_pid NewName"`
+    Then the output should match:
+      """
+      PID of NewName = \d+
+      """
+
+  Scenario: Getting the PID of a C controller process renamed through CLI option '--name'.
+    Given I run `trema run "./c_controller --name=NewName" -d`
+    And wait until "NewName" is up
+    When I run `trema run "./print_pid NewName"`
+    Then the output should match:
+      """
+      PID of NewName = \d+
+      """
+
+  @wip
+  Scenario: Getting the PID of a Ruby controller process renamed through CLI option '-n'.
+    Given a file named "RubyController.rb" with:
+      """
+      class RubyController < Controller
+      end
+      """
+    And I run `trema run "./RubyController.rb -n NewName" -d`
+    And wait until "NewName" is up
+    When I run `trema run "./print_pid NewName"`
+    Then the output should match:
+      """
+      PID of NewName = \d+
+      """
+
+  Scenario: Getting the PID of non-existent controller returns an error code -1.
+    When I run `trema run "./print_pid NO_SUCH_TREMA_PROCESS"`
+    Then the output should match:
+      """
+      No such process : NO_SUCH_TREMA_PROCESS
+      """

data/features/support/hooks.rb

@@ -16,10 +16,25 @@
 #
 
 
+require "trema/path"
+
+
+def wait_until_all_pid_files_are_deleted timeout = 10
+  elapsed = 0
+  loop do
+    raise "Failed to clean up remaining processes." if elapsed > timeout
+    break if Dir.glob( File.join( Trema.pid, "*.pid" ) ).empty?
+    sleep 1
+    elapsed += 1
+  end
+  sleep 1
+end
+
+
 Before do
   @aruba_timeout_seconds = 10
   run "trema killall"
-  sleep 5
+  wait_until_all_pid_files_are_deleted
 end
 
 
@@ -30,7 +45,7 @@ end
 
 After do
   run "trema killall"
-  sleep 1
+  wait_until_all_pid_files_are_deleted
 end
 
 

data/ruby/trema/controller.c

@@ -21,11 +21,11 @@
 #include "barrier-reply.h"
 #include "buffer.h"
 #include "controller.h"
+#include "default-logger.h"
 #include "features-reply.h"
 #include "flow-removed.h"
 #include "get-config-reply.h"
 #include "list-switches-reply.h"
-#include "logger.h"
 #include "openflow-error.h"
 #include "openflow.h"
 #include "packet-in.h"

data/ruby/trema/controller.rb

@@ -17,7 +17,7 @@
 
 
 require "trema/app"
-require "trema/logger"
+require "trema/default-logger"
 require "trema/monkey-patch/integer"
 require "trema/monkey-patch/string"
 require "trema/timers"
@@ -28,7 +28,7 @@ module Trema
   # @abstract The base class of Trema controller. Subclass and override handlers to implement a custom OpenFlow controller.
   #
   class Controller < App
-    include Logger
+    include DefaultLogger
     include Timers
 
 

data/ruby/trema/{logger.c → default-logger.c}

@@ -18,11 +18,11 @@
 
 #include "checks.h"
 #include "log.h"
-#include "logger.h"
+#include "default-logger.h"
 
 
 extern VALUE mTrema;
-VALUE mLogger;
+VALUE mDefaultLogger;
 
 
 static VALUE
@@ -45,7 +45,7 @@ do_log( void ( *log_function )( const char *format, ... ), int argc, VALUE *argv
  *     additional arguments.
  */
 static VALUE
-logger_critical( int argc, VALUE *argv, VALUE self ) {
+default_logger_critical( int argc, VALUE *argv, VALUE self ) {
   UNUSED( self );
   return( do_log( critical, argc, argv ) );
 }
@@ -63,7 +63,7 @@ logger_critical( int argc, VALUE *argv, VALUE self ) {
  *     additional arguments.
  */
 static VALUE
-logger_error( int argc, VALUE *argv, VALUE self ) {
+default_logger_error( int argc, VALUE *argv, VALUE self ) {
   UNUSED( self );
   return( do_log( error, argc, argv ) );
 }
@@ -81,7 +81,7 @@ logger_error( int argc, VALUE *argv, VALUE self ) {
  *     additional arguments.
  */
 static VALUE
-logger_warn( int argc, VALUE *argv, VALUE self ) {
+default_logger_warn( int argc, VALUE *argv, VALUE self ) {
   UNUSED( self );
   return( do_log( warn, argc, argv ) );
 }
@@ -99,7 +99,7 @@ logger_warn( int argc, VALUE *argv, VALUE self ) {
  *     additional arguments.
  */
 static VALUE
-logger_notice( int argc, VALUE *argv, VALUE self ) {
+default_logger_notice( int argc, VALUE *argv, VALUE self ) {
   UNUSED( self );
   return( do_log( notice, argc, argv ) );
 }
@@ -116,7 +116,7 @@ logger_notice( int argc, VALUE *argv, VALUE self ) {
  *     additional arguments.
  */
 static VALUE
-logger_info( int argc, VALUE *argv, VALUE self ) {
+default_logger_info( int argc, VALUE *argv, VALUE self ) {
   UNUSED( self );
   return( do_log( info, argc, argv ) );
 }
@@ -133,23 +133,23 @@ logger_info( int argc, VALUE *argv, VALUE self ) {
  *     additional arguments.
  */
 static VALUE
-logger_debug( int argc, VALUE *argv, VALUE self ) {
+default_logger_debug( int argc, VALUE *argv, VALUE self ) {
   UNUSED( self );
   return( do_log( debug, argc, argv ) );
 }
 
 
 void
-Init_logger() {
+Init_default_logger() {
   mTrema = rb_define_module( "Trema" );
-  mLogger = rb_define_module_under( mTrema, "Logger" );
-
-  rb_define_method( mLogger, "critical", logger_critical, -1 );
-  rb_define_method( mLogger, "error", logger_error, -1 );
-  rb_define_method( mLogger, "warn", logger_warn, -1 );
-  rb_define_method( mLogger, "notice", logger_notice, -1 );
-  rb_define_method( mLogger, "info", logger_info, -1 );
-  rb_define_method( mLogger, "debug", logger_debug, -1 );
+  mDefaultLogger = rb_define_module_under( mTrema, "DefaultLogger" );
+
+  rb_define_method( mDefaultLogger, "critical", default_logger_critical, -1 );
+  rb_define_method( mDefaultLogger, "error", default_logger_error, -1 );
+  rb_define_method( mDefaultLogger, "warn", default_logger_warn, -1 );
+  rb_define_method( mDefaultLogger, "notice", default_logger_notice, -1 );
+  rb_define_method( mDefaultLogger, "info", default_logger_info, -1 );
+  rb_define_method( mDefaultLogger, "debug", default_logger_debug, -1 );
 }
 
 

data/ruby/trema/{logger.h → default-logger.h}

@@ -1,5 +1,5 @@
 /*
- * Logger class.
+ * DefaultLogger module.
  *
  * Copyright (C) 2008-2013 NEC Corporation
  *
@@ -18,20 +18,20 @@
  */
 
 
-#ifndef LOGGER_H
-#define LOGGER_H
+#ifndef DEFAULT_LOGGER_H
+#define DEFAULT_LOGGER_H
 
 
 #include "ruby.h"
 
 
-extern VALUE mLogger;
+extern VALUE mDefaultLogger;
 
 
-void Init_logger( void );
+void Init_default_logger( void );
 
 
-#endif // LOGGER_H
+#endif // DEFAULT_LOGGER_H
 
 
 /*

data/ruby/trema/{logger.rb → default-logger.rb}

@@ -17,7 +17,7 @@
 
 
 module Trema
-  module Logger
+  module DefaultLogger
   end
 end
 

data/ruby/trema/switch.c

@@ -16,8 +16,8 @@
  */
 
 
+#include "default-logger.h"
 #include "flow-mod.h"
-#include "logger.h"
 #include "ruby.h"
 #include "rubysig.h"
 #include "switch.h"
@@ -180,7 +180,7 @@ void
 Init_switch() {
   mTrema = rb_define_module( "Trema" );
   cSwitch = rb_define_class_under( mTrema, "Switch", rb_cObject );
-  rb_include_module( cSwitch, mLogger );
+  rb_include_module( cSwitch, mDefaultLogger );
 
   rb_define_method( cSwitch, "run!", switch_run, 0 );
   rb_define_method( cSwitch, "send_message", switch_send_message, 1 );

data/ruby/trema/trema.c

@@ -21,6 +21,7 @@
 #include "barrier-reply.h"
 #include "barrier-request.h"
 #include "controller.h"
+#include "default-logger.h"
 #include "echo-reply.h"
 #include "echo-request.h"
 #include "error.h"
@@ -31,7 +32,6 @@
 #include "get-config-reply.h"
 #include "get-config-request.h"
 #include "hello.h"
-#include "logger.h"
 #include "match.h"
 #include "openflow-error.h"
 #include "packet-in.h"
@@ -85,6 +85,7 @@ Init_trema() {
   Init_barrier_reply();
   Init_barrier_request();
   Init_controller();
+  Init_default_logger();
   Init_echo_reply();
   Init_echo_request();
   Init_error();
@@ -95,7 +96,6 @@ Init_trema() {
   Init_get_config_reply();
   Init_get_config_request();
   Init_hello();
-  Init_logger();
   Init_match();
   Init_openflow_error();
   Init_packet_in();

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.14"
+  VERSION = "0.3.15"
 end
 
 

data/spec/trema/{logger_spec.rb → default-logger_spec.rb}

@@ -21,10 +21,10 @@ require "trema"
 
 
 module Trema
-  describe Logger do
+  describe DefaultLogger do
     subject {
       class LoggingObject
-        include Trema::Logger
+        include Trema::DefaultLogger
       end
       LoggingObject.new
     }

data/src/examples/learning_switch/fdb.rb

@@ -19,7 +19,7 @@
 
 
 class ForwardingEntry
-  include Trema::Logger
+  include DefaultLogger
 
 
   attr_reader :mac

data/src/examples/simple_router/arp-table.rb

@@ -19,7 +19,7 @@
 
 
 class ARPEntry
-  include Trema::Logger
+  include Trema::DefaultLogger
 
 
   attr_reader :port

data/src/lib/daemon.c

@@ -26,6 +26,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <getopt.h>
 #include "checks.h"
 #include "log.h"
 #include "wrapper.h"
@@ -290,12 +291,85 @@ read_pid( const char *directory, const char *name ) {
   exe_path[ readsiz ] = '\0';
 
   char *exe_name = basename( exe_path );
-  if ( strcmp( name, exe_name ) != 0 ) {
-    warn( "Failed to check process name %s ( %s [%d] ).", name, strerror( errno ), errno );
+  if ( strcmp( name, exe_name ) == 0 ) {
+    return pid;
+  }
+
+  // check if -n (service_name) option is used
+  sprintf( proc_path, "/proc/%d/cmdline", pid );
+  fd = open( proc_path, O_RDONLY, 0 );
+  if ( fd < 0 ) {
+    warn( "Failed to open %s ( %s [%d] ).", proc_path, strerror( errno ), errno );
     return -1;
   }
 
-  return pid;
+  char *buffer = xcalloc( PATH_MAX + 2, sizeof( char ) );
+  char *write_head = buffer;
+  size_t buffer_left = PATH_MAX;
+  size_t read_byte = 0;
+  while ( ( readsiz = read( fd, write_head, buffer_left ) ) > 0 ) {
+    read_byte += ( size_t ) readsiz;
+    write_head += readsiz;
+    buffer_left = PATH_MAX - read_byte;
+  }
+  close( fd );
+
+  // convert cmdline to argv format
+  size_t argc = 0;
+  char **argv = xcalloc( 1, sizeof( char * ) );
+
+  char *token = buffer;
+  const char *buffer_end = buffer + read_byte;
+  while ( token <= buffer_end ) {
+    size_t token_len = strlen( token );
+    if ( token_len > 0 ) {
+      ++argc;
+      char **new_argv = xmalloc( ( argc + 1 ) * sizeof( char * ) );
+      for ( size_t i = 0; i < argc - 1; ++i ) {
+        new_argv[ i ] = argv[ i ];
+      }
+      xfree( argv );
+      argv = new_argv;
+      argv[ argc - 1 ] = token;
+      argv[ argc ] = NULL;
+    }
+    else {
+      if ( *( token + 1 ) == '\0' ) {
+        // "\0\0", end of cmdline
+        break;
+      }
+    }
+    token += token_len + 1;
+  }
+
+  const struct option long_options[] = {
+    { "name", 1, NULL, 'n' },
+    { NULL, 0, NULL, 0 },
+  };
+  const char short_options[] = "n:";
+  int c;
+  optind = 0;
+  opterr = 0;
+  const char *service_name = basename( argv[ 0 ] );
+  while ( ( c = getopt_long( ( int )argc, argv, short_options, long_options, NULL ) ) != -1 ){
+    switch ( c ) {
+      case 'n':
+        service_name = optarg;
+        break;
+    }
+  }
+
+  if ( strcmp( name, service_name ) == 0 ) {
+    xfree( argv );
+    xfree( buffer );
+    return pid;
+  }
+  else {
+    warn( "Failed to check process name %s.", name );
+    xfree( argv );
+    xfree( buffer );
+    return -1;
+  }
 }
 
 

data/src/lib/openflow_application_interface.c

@@ -1763,6 +1763,35 @@ delete_openflow_messages( uint64_t datapath_id ) {
 }
 
 
+bool
+disconnect_switch( uint64_t datapath_id ) {
+  debug( "Disconnecting a switch ( datapath_id = %#" PRIx64 " ).", datapath_id );
+
+  maybe_init_openflow_application_interface();
+  assert( openflow_application_interface_initialized );
+
+  size_t service_name_length = strlen( service_name ) + 1;
+  size_t length = sizeof( openflow_service_header_t ) + service_name_length;
+  buffer *buf = alloc_buffer_with_length( length );
+  openflow_service_header_t *header = append_back_buffer( buf, sizeof( openflow_service_header_t ) );
+  header->datapath_id = htonll( datapath_id );
+  header->service_name_length = htons( ( uint16_t ) service_name_length );
+  char *name = append_back_buffer( buf, service_name_length );
+  memcpy( name, service_name, service_name_length );
+
+  char remote_service_name[ MESSENGER_SERVICE_NAME_LENGTH ];
+  snprintf( remote_service_name, sizeof( remote_service_name ),
+            "switch.%#" PRIx64, datapath_id );
+
+  bool ret =  send_message( remote_service_name, MESSENGER_OPENFLOW_DISCONNECT_REQUEST,
+                            buf->data, buf->length );
+
+  free_buffer( buf );
+
+  return ret;
+}
+
+
 /*
  * Local variables:
  * c-basic-offset: 2

data/src/lib/openflow_application_interface.h

@@ -341,6 +341,13 @@ bool send_list_switches_request( void *user_data );
 bool delete_openflow_messages( uint64_t datapath_id );
 
 
+/********************************************************************************
+ * Function for disconnecting a switch
+ ********************************************************************************/
+
+bool disconnect_switch( uint64_t datapath_id );
+
+
 #endif // OPENFLOW_APPLICATION_INTERFACE_H
 
 

data/src/lib/trema.c

@@ -373,7 +373,7 @@ die_unless_initialized() {
 }
 
 
-static void
+void
 finalize_trema() {
   die_unless_initialized();
 
@@ -632,35 +632,28 @@ init_trema( int *argc, char ***argv ) {
 }
 
 
+static void
+create_pid_file() {
+  write_pid( get_trema_pid(), get_trema_name() );
+}
+
+
 /**
  * Runs the main loop.
  */
 void
 start_trema() {
-  start_trema_up();
-  start_event_handler();
-  start_trema_down();
-}
-
-
-void
-start_trema_up() {
   pthread_mutex_lock( &mutex );
 
   die_unless_initialized();
-
-  debug( "Starting %s ... ( TREMA_HOME = %s )", get_trema_name(), get_trema_home() );
+  debug( "Starting %s ... (TREMA_HOME = %s)", get_trema_name(), get_trema_home() );
 
   maybe_daemonize();
-  write_pid( get_trema_pid(), get_trema_name() );
+  create_pid_file();
   trema_started = true;
-
   start_messenger();
-}
-
+  start_event_handler();
 
-void
-start_trema_down() {
   finalize_trema();
 
   pthread_mutex_unlock( &mutex );
@@ -723,11 +716,17 @@ get_executable_name() {
 
 
 pid_t
-get_trema_process_from_name( const char *name ) {
+get_pid_by_trema_name( const char *name ) {
   return read_pid( get_trema_pid(), name );
 }
 
 
+pid_t
+get_trema_process_from_name( const char *name ) {
+  return get_pid_by_trema_name( name );
+}
+
+
 bool
 terminate_trema_process( pid_t pid ) {
   assert( pid > 0 );

data/src/lib/trema.h

@@ -53,16 +53,16 @@ static const char DEFAULT_DUMP_SERVICE_NAME[] = "dump_service";
 
 void init_trema( int *argc, char ***argv );
 void start_trema( void );
-void start_trema_up();
-void start_trema_down();
 void stop_trema( void );
+void finalize_trema( void );
 void flush( void );
 const char *get_trema_home( void );
 const char *get_trema_tmp( void );
 void set_trema_name( const char *name );
 const char *get_trema_name( void );
 const char *get_executable_name( void );
-pid_t get_trema_process_from_name( const char *name );
+pid_t get_pid_by_trema_name( const char *name );
+pid_t get_trema_process_from_name( const char *name ) __attribute__ ((deprecated));
 bool terminate_trema_process( pid_t pid );
 __attribute__( ( weak ) ) void usage( void );
 

data/src/switch_manager/service_interface.c

@@ -131,7 +131,7 @@ service_recv_from_application( uint16_t message_type, buffer *buf ) {
    uint16_t service_name_length;
    char *service_name;
 
-  if ( buf->length < sizeof( openflow_service_header_t ) + sizeof( struct ofp_header ) ) {
+  if ( buf->length < sizeof( openflow_service_header_t ) ) {
     error( "Too short openflow application message(%zu).", buf->length );
     free_buffer( buf );
 

data/src/switch_manager/switch.c

@@ -399,7 +399,7 @@ switch_event_recv_featuresreply( struct switch_info *sw_info, uint64_t *dpid ) {
     snprintf( new_service_name, new_service_name_len, "%s%#" PRIx64, SWITCH_MANAGER_PREFIX, sw_info->datapath_id );
 
     // checking duplicate service
-    pid_t pid = get_trema_process_from_name( new_service_name );
+    pid_t pid = get_pid_by_trema_name( new_service_name );
     if ( pid > 0 ) {
       // duplicated
       if ( !terminate_trema_process( pid ) ) {
@@ -682,7 +682,11 @@ main( int argc, char *argv[] ) {
     error( "Failed to set connected state." );
     return -1;
   }
-  flush_secure_channel( &switch_info );
+  ret = flush_secure_channel( &switch_info );
+  if ( ret < 0 ) {
+    error( "Failed to flush secure channel. Terminating %s.", argv[ 0 ] );
+    return -1;
+  }
 
   start_trema();
 

data/trema.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do | gem |
   gem.extra_rdoc_files = [ "README.md" ]
   gem.test_files = `git ls-files -- {spec,features}/*`.split( "\n" )
 
-  gem.add_dependency "bundler", "~> 1.2.3"
+  gem.add_dependency "bundler"
   gem.add_dependency "gli", "~> 2.5.4"
   gem.add_dependency "rake", "~> 10.0.3"
-  gem.add_dependency "rdoc", "~> 3.12.1"
+  gem.add_dependency "rdoc", "~> 4.0.0"
 end
 
 

data/unittests/lib/daemon_test.c

@@ -658,59 +658,6 @@ test_read_pid_fail_if_readlink_fail() {
 }
 
 
-static void
-test_read_pid_fail_if_strcmp_fail() {
-  // Test if correctly access.
-  char path[] = "/home/yasuhito/trema/tmp/chess.pid";
-  expect_string( mock_access, pathname, path );
-  expect_value( mock_access, mode, R_OK );
-  will_return( mock_access, 0 );
-
-  // Test if correctly opened.
-  int pid_file_fd = 111;
-  expect_string( mock_open, pathname, path );
-  expect_value( mock_open, flags, O_RDONLY );
-  expect_value( mock_open, mode, 0 );
-  will_return( mock_open, pid_file_fd );
-
-  // Test if correctly read.
-  expect_value( mock_read, fd, pid_file_fd );
-  expect_not_value( mock_read, buf, NULL );
-  expect_value( mock_read, count, 10 - 1 );
-  char valid_pid_string[] = "123\n";
-  pid_t valid_pid = 123;
-  read_buffer = valid_pid_string;
-  read_length = strlen( valid_pid_string );
-  will_return( mock_read, read_length );
-
-  // Test if correctly kill.
-  expect_value( mock_kill, pid, valid_pid );
-  expect_value( mock_kill, sig, 0 );
-  will_return( mock_kill, 0 );
-
-  // Test if correctly close.
-  expect_value( mock_close, fd, pid_file_fd );
-
-  // Test if correctly readlink.
-  char proc_path[] = "/proc/123/exe";
-  expect_string( mock_readlink, path, proc_path );
-  expect_not_value( mock_readlink, buf, NULL );
-  expect_value( mock_readlink, bufsiz, PATH_MAX - 1 );
-  char INVALID_exe_path[] = "/home/yasuhito/trema/bin/chess2";
-  link_buffer = INVALID_exe_path;
-  link_length = strlen( INVALID_exe_path );
-  will_return( mock_readlink, link_length );
-
-  // Test if correctly basename.
-  expect_string( mock_basename, path, INVALID_exe_path );
-  will_return( mock_basename, strdup( "chess2" ) );
-
-  // Go
-  pid_t pid = read_pid( "/home/yasuhito/trema/tmp", "chess" );
-  assert_true( pid == -1 );
-}
-
-
 static void
 test_rename_pid_successed() {
   // Test if correctly unlink.
@@ -781,7 +728,6 @@ main() {
     unit_test( test_read_pid_fail_if_kill_fail_with_ESRCH ),
     unit_test( test_read_pid_fail_if_kill_fail_with_EPERM ),
     unit_test( test_read_pid_fail_if_readlink_fail ),
-    unit_test( test_read_pid_fail_if_strcmp_fail ),
 
     // rename_pid() tests.
     unit_test( test_rename_pid_successed ),

data/unittests/lib/openflow_application_interface_test.c

@@ -3476,6 +3476,52 @@ test_delete_openflow_messages_if_clear_send_queue_fails() {
 }
 
 
+/********************************************************************************
+ * disconnect_switch() tests.
+ ********************************************************************************/
+
+static void
+test_disconnect_switch() {
+  size_t expected_length = ( size_t ) ( sizeof( openflow_service_header_t ) + strlen( SERVICE_NAME ) + 1 );
+  void *expected_data = xcalloc( 1, expected_length );
+  openflow_service_header_t *header = expected_data;
+  header->datapath_id = htonll( DATAPATH_ID );
+  header->service_name_length = htons( ( uint16_t ) ( strlen( SERVICE_NAME ) + 1 ) );
+  memcpy( ( char * ) expected_data + sizeof( openflow_service_header_t ), SERVICE_NAME, strlen( SERVICE_NAME ) + 1 );
+
+  expect_string( mock_send_message, service_name, REMOTE_SERVICE_NAME );
+  expect_value( mock_send_message, tag32, MESSENGER_OPENFLOW_DISCONNECT_REQUEST );
+  expect_value( mock_send_message, len, expected_length );
+  expect_memory( mock_send_message, data, expected_data, expected_length );
+  will_return( mock_send_message, true );
+
+  assert_true( disconnect_switch( DATAPATH_ID ) );
+
+  xfree( expected_data );
+}
+
+
+static void
+test_disconnect_switch_if_send_message_fails() {
+  size_t expected_length = ( size_t ) ( sizeof( openflow_service_header_t ) + strlen( SERVICE_NAME ) + 1 );
+  void *expected_data = xcalloc( 1, expected_length );
+  openflow_service_header_t *header = expected_data;
+  header->datapath_id = htonll( DATAPATH_ID );
+  header->service_name_length = htons( ( uint16_t ) ( strlen( SERVICE_NAME ) + 1 ) );
+  memcpy( ( char * ) expected_data + sizeof( openflow_service_header_t ), SERVICE_NAME, strlen( SERVICE_NAME ) + 1 );
+
+  expect_string( mock_send_message, service_name, REMOTE_SERVICE_NAME );
+  expect_value( mock_send_message, tag32, MESSENGER_OPENFLOW_DISCONNECT_REQUEST );
+  expect_value( mock_send_message, len, expected_length );
+  expect_memory( mock_send_message, data, expected_data, expected_length );
+  will_return( mock_send_message, false );
+
+  assert_false( disconnect_switch( DATAPATH_ID ) );
+
+  xfree( expected_data );
+}
+
+
 /********************************************************************************
  * Run tests.
  ********************************************************************************/
@@ -3650,6 +3696,10 @@ main() {
     // delete_openflow_messages() tests.
     unit_test_setup_teardown( test_delete_openflow_messages, init, cleanup ),
     unit_test_setup_teardown( test_delete_openflow_messages_if_clear_send_queue_fails, init, cleanup ),
+
+    // disconnect_switch() tests.
+    unit_test_setup_teardown( test_disconnect_switch, init, cleanup ),
+    unit_test_setup_teardown( test_disconnect_switch_if_send_message_fails, init, cleanup ),
   };
   return run_tests( tests );
 }

data/unittests/lib/trema_test.c

@@ -833,11 +833,11 @@ test_get_executable_name() {
 
 
 /********************************************************************************
- * get_trema_process_from_name() tests.
+ * get_pid_by_trema_name() tests.
  *******************************************************************************/
 
 static void
-test_get_trema_process_from_name() {
+test_get_pid_by_trema_name() {
   char NAME[] = "test_name";
   char TEMP_DIRECTORY[] = "/tmp";
   char PID_DIRECTORY[] = "/tmp/pid";
@@ -848,7 +848,7 @@ test_get_trema_process_from_name() {
   will_return( mock_read_pid, PID );
 
   // Go
-  pid_t pid = get_trema_process_from_name( NAME );
+  pid_t pid = get_pid_by_trema_name( NAME );
   assert_true( pid == PID );
   unset_trema_tmp();
 }
@@ -990,8 +990,8 @@ main() {
     // get_executable_name() test.
     unit_test_setup_teardown( test_get_executable_name, reset_trema, reset_trema ),
 
-    // get_trema_process_from_name() test.
-    unit_test_setup_teardown( test_get_trema_process_from_name, reset_trema, reset_trema ),
+    // get_pid_by_trema_name() test.
+    unit_test_setup_teardown( test_get_pid_by_trema_name, reset_trema, reset_trema ),
 
     // terminate_trema_process() test.
     unit_test_setup_teardown( test_terminate_trema_process_when_was_found, reset_trema, reset_trema ),

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 3
-  - 14
-  version: 0.3.14
+  - 15
+  version: 0.3.15
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -15,27 +15,23 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2013-02-18 00:00:00 Z
+date: 2013-03-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: bundler
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 3
         segments: 
-        - 1
-        - 2
-        - 3
-        version: 1.2.3
+        - 0
+        version: "0"
+  name: bundler
+  prerelease: false
   type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: gli
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,11 +43,11 @@ dependencies:
         - 5
         - 4
         version: 2.5.4
+  name: gli
+  prerelease: false
   type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rake
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,22 +59,24 @@ dependencies:
         - 0
         - 3
         version: 10.0.3
+  name: rake
+  prerelease: false
   type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rdoc
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 63
         segments: 
-        - 3
-        - 12
-        - 1
-        version: 3.12.1
+        - 4
+        - 0
+        - 0
+        version: 4.0.0
+  name: rdoc
+  prerelease: false
   type: :runtime
   requirement: *id004
 description: Trema is a full-stack, easy-to-use framework for developing OpenFlow controllers in Ruby and C.
@@ -108,6 +106,7 @@ files:
 - cruise.rb
 - features/.nav
 - features/README.md
+- features/core/get_pid_by_trema_name.feature
 - features/core/packetin_filter.feature
 - features/core/switch_manager.feature
 - features/core/trema-config.feature
@@ -182,6 +181,9 @@ files:
 - ruby/trema/controller.rb
 - ruby/trema/custom-switch.rb
 - ruby/trema/daemon.rb
+- ruby/trema/default-logger.c
+- ruby/trema/default-logger.h
+- ruby/trema/default-logger.rb
 - ruby/trema/desc-stats-reply.rb
 - ruby/trema/dsl.rb
 - ruby/trema/dsl/configuration.rb
@@ -232,9 +234,6 @@ files:
 - ruby/trema/link.rb
 - ruby/trema/list-switches-reply.c
 - ruby/trema/list-switches-reply.h
-- ruby/trema/logger.c
-- ruby/trema/logger.h
-- ruby/trema/logger.rb
 - ruby/trema/mac.rb
 - ruby/trema/match.c
 - ruby/trema/match.h
@@ -338,6 +337,7 @@ files:
 - spec/trema/barrier-request_spec.rb
 - spec/trema/cli_spec.rb
 - spec/trema/controller_spec.rb
+- spec/trema/default-logger_spec.rb
 - spec/trema/dsl/configuration_spec.rb
 - spec/trema/dsl/link_spec.rb
 - spec/trema/dsl/run_spec.rb
@@ -363,7 +363,6 @@ files:
 - spec/trema/ip_spec.rb
 - spec/trema/link_spec.rb
 - spec/trema/list-switches-reply_spec.rb
-- spec/trema/logger_spec.rb
 - spec/trema/mac_spec.rb
 - spec/trema/match_spec.rb
 - spec/trema/open-vswitch_spec.rb