trema 0.3.18 → 0.3.19

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  data.tar.gz: ef4c570127042644202d811328fd28ba95b65c2e
-  metadata.gz: 15407d9c4231e8d79511d0e561ea37bfd9fd5f77
+  data.tar.gz: 9885ea68bffe5d48af843709c06d6b0380ea2916
+  metadata.gz: 5b4335551a0a407c64d74c84641fac37ffb7167c
 SHA512: 
-  data.tar.gz: ed442ede234c7c877ce354826453e12115f6fcb5ee9e224d1f9f7a532691b2513ff3f0aa96b86e77c8e178bcd598683d7cb611a57338a23ab85c9adfe1969c32
-  metadata.gz: 9c9b32674cad8e91467fb14becb1850a21c1ae2eb267e3dd155b59c627182d77228d741b1e23bca4160f930fedfb189b460d3a0b72fa107883768eae2961873a
+  data.tar.gz: e5484148554ae7e4c21e4653e91c13fee369a06b31c2454d15272a8ac581399b5079a818488d5d60d03388459173a26fe46b818aa3f55acbd1d5937dd4a51bf8
+  metadata.gz: e5defc8906693729384d4031065110450bffeab98f5954fa3e0b71ba9b3901512d1ca1e80f6a2b276b5111b1148a8620373c4fb48ba6a386a8e5cd50499883f1

data/README.md

@@ -1,6 +1,7 @@
 Welcome to Trema
 ================
 
+[![Gem Version](https://badge.fury.io/rb/trema.png)](http://badge.fury.io/rb/trema)
 [![Build Status](https://secure.travis-ci.org/trema/trema.png?branch=develop)](http://travis-ci.org/trema/trema)
 [![Code Climate](https://codeclimate.com/github/trema/trema.png)](https://codeclimate.com/github/trema/trema)
 [![Dependency Status](https://gemnasium.com/trema/trema.png)](https://gemnasium.com/trema/trema)
@@ -27,6 +28,7 @@ Supported Platforms
 Trema supports GNU/Linux only. And it has been tested on the following environments:
 
 * Ruby 1.8.7 (1.9.x is NOT supported yet)
+* RubyGems 1.3.6 or higher
 * Ubuntu 12.10, 12.04, 11.10, and 10.04 (i386/amd64, Desktop Edition)
 * Debian GNU/Linux 6.0 (i386/amd64)
 * Fedora 16 (i386/x86_64)
@@ -46,12 +48,17 @@ Getting Started
 
 1.Install the prerequisites at the command prompt:
 
-    (In Debian GNU/Linux or Ubuntu 12.04 and below)
-    $ sudo apt-get install gcc make ruby rubygems ruby-dev libpcap-dev libsqlite3-dev
-
     (In Ubuntu 12.10)
     $ sudo apt-get install gcc make ruby1.8 rubygems1.8 ruby1.8-dev libpcap-dev libsqlite3-dev
 
+    (In Ubuntu 12.04, 11.10 or Debian GNU/Linux 6.0)
+    $ sudo apt-get install gcc make ruby rubygems ruby-dev libpcap-dev libsqlite3-dev
+
+    (In Ubuntu 10.04)
+    $ sudo apt-get install gcc make ruby rubygems ruby-dev libopenssl-ruby libpcap-dev libsqlite3-dev
+    $ sudo gem install rubygems-update
+    $ sudo /var/lib/gems/1.8/bin/update_rubygems
+
     (In Fedora 16)
     $ sudo yum install gcc make ruby rubygems ruby-devel libpcap-devel libsqlite3x-devel
 

data/Rakefile

@@ -37,11 +37,10 @@ task :build_trema => [ Trema.log, Trema.pid, Trema.sock ] do
 end
 
 
-################################################################################
-# Build libtrema.{a,so}
-################################################################################
-
-require "rake/c/library-task"
+require "paper-house/executable-task"
+require "paper-house/ruby-library-task"
+require "paper-house/shared-library-task"
+require "paper-house/static-library-task"
 require "trema/version"
 
 
@@ -63,31 +62,31 @@ CFLAGS = [
 ]
 
 
-desc "Build trema library (static library)."
+desc "Build Trema C library (static library)."
 task "libtrema:static" => "vendor:openflow"
-Rake::C::StaticLibraryTask.new "libtrema:static" do | task |
+PaperHouse::StaticLibraryTask.new "libtrema:static" do | task |
   task.library_name = "libtrema"
   task.target_directory = Trema.lib
   task.sources = "#{ Trema.include }/*.c"
-  task.includes = [ Trema.openflow ]
   task.cflags = CFLAGS
+  task.includes = [ Trema.openflow ]
 end
 
 
-desc "Build trema library (coverage)."
+desc "Build Trema C library (coverage)."
 task "libtrema:gcov" => "vendor:openflow"
-Rake::C::StaticLibraryTask.new "libtrema:gcov" do | task |
+PaperHouse::StaticLibraryTask.new "libtrema:gcov" do | task |
   task.library_name = "libtrema"
-  task.target_directory = File.join( Trema.objects, "unittests" )
+  task.target_directory = "#{ Trema.home }/objects/unittests"
   task.sources = "#{ Trema.include }/*.c"
   task.includes = [ Trema.openflow ]
   task.cflags = [ "--coverage" ] + CFLAGS
 end
 
 
-desc "Build trema library (shared library)."
+desc "Build Trema C library (shared library)."
 task "libtrema:shared" => "vendor:openflow"
-Rake::C::SharedLibraryTask.new "libtrema:shared" do | task |
+PaperHouse::SharedLibraryTask.new "libtrema:shared" do | task |
   task.library_name = "libtrema"
   task.target_directory = Trema.lib
   task.version = Trema::VERSION
@@ -97,6 +96,83 @@ Rake::C::SharedLibraryTask.new "libtrema:shared" do | task |
 end
 
 
+desc "Build Trema Ruby library."
+task "rubylib" => "libtrema:static"
+PaperHouse::RubyLibraryTask.new "rubylib" do | task |
+  task.library_name = "trema"
+  task.target_directory = Trema.ruby
+  task.sources = "#{ Trema.ruby }/trema/*.c"
+  task.includes = [ Trema.include, Trema.openflow ]
+  task.cflags = CFLAGS
+  task.ldflags = [ "-Wl,-Bsymbolic", "-L#{ Trema.lib }" ]
+  task.library_dependencies = [
+    "trema",
+    "sqlite3",
+    "pthread",
+    "rt",
+    "dl",
+    "crypt",
+    "m"
+  ]
+end
+
+
+desc "Build switch manager."
+task :switch_manager => "libtrema:static"
+
+PaperHouse::ExecutableTask.new :switch_manager do | task |
+  task.target_directory = File.dirname( Trema::Executables.switch_manager )
+  task.sources = [
+    "src/switch_manager/dpid_table.c",
+    "src/switch_manager/event_forward_entry_manipulation.c",
+    "src/switch_manager/secure_channel_listener.c",
+    "src/switch_manager/switch_manager.c",
+    "src/switch_manager/switch_option.c",
+  ]
+  task.includes = [ Trema.include, Trema.openflow ]
+  task.cflags = CFLAGS
+  task.ldflags = "-L#{ Trema.lib }"
+  task.library_dependencies = [
+    "trema",
+    "sqlite3",
+    "pthread",
+    "rt",
+    "dl",
+  ]
+end
+
+
+desc "Build switch daemon."
+task :switch_daemon => "libtrema:static"
+
+PaperHouse::ExecutableTask.new :switch_daemon do | task |
+  task.executable_name = File.basename( Trema::Executables.switch )
+  task.target_directory = File.dirname( Trema::Executables.switch )
+  task.sources = [
+    "src/switch_manager/cookie_table.c",
+    "src/switch_manager/event_forward_entry_manipulation.c",
+    "src/switch_manager/ofpmsg_recv.c",
+    "src/switch_manager/ofpmsg_send.c",
+    "src/switch_manager/secure_channel_receiver.c",
+    "src/switch_manager/secure_channel_sender.c",
+    "src/switch_manager/service_interface.c",
+    "src/switch_manager/switch.c",
+    "src/switch_manager/switch_option.c",
+    "src/switch_manager/xid_table.c",
+  ]
+  task.includes = [ Trema.include, Trema.openflow ]
+  task.cflags = CFLAGS
+  task.ldflags = "-L#{ Trema.lib }"
+  task.library_dependencies = [
+    "trema",
+    "sqlite3",
+    "pthread",
+    "rt",
+    "dl",
+  ]
+end
+
+
 ################################################################################
 # Extract OpenFlow reference implementation
 ################################################################################
@@ -326,8 +402,6 @@ end
 
 task :setup do
   sh "./build.rb distclean"
-  sh "bundle update"
-  sh "bundle install"
 end
 
 

data/Rantfile

@@ -39,7 +39,7 @@ task :default => [
   :management_commands,
   :rubylib,
   :switch_manager,
-  :switch,
+  :switch_daemon,
   :packetin_filter,
   :tremashark,
   :packet_capture,
@@ -244,35 +244,9 @@ end
 # Build trema.so (ruby library)
 ################################################################################
 
-task :clean => "rubylib:clean"
-task :distclean => "rubylib:distclean"
-
-
-require "rbconfig"
-RUBY_PATH = File.join(
-              RbConfig::CONFIG[ 'bindir' ],
-              RbConfig::CONFIG[ 'RUBY_INSTALL_NAME' ] +
-              RbConfig::CONFIG[ 'EXEEXT' ]
-            )
-
 desc "Build ruby library."
-task :rubylib => "ruby/trema.so"
-file "ruby/trema.so" => FileList[ "ruby/trema/*.c", "ruby/trema/*.h", libtrema ] do
-  sys.cd "ruby" do
-    sys "#{ RUBY_PATH } extconf.rb --with-trema-include=#{ Trema.include } --with-trema-lib=#{ Trema.lib } --with-openflow-include=#{ Trema.openflow }"
-    sys "make"
-  end
-end
-
-
-task "rubylib:clean" do
-  sys.cd "ruby" do
-    sys "make clean" rescue nil
-  end
-end
-
-task "rubylib:distclean" do
-  sys.rm_f "ruby/Makefile"
+task :rubylib do
+  sys "rake rubylib"
 end
 
 
@@ -280,59 +254,15 @@ end
 # Build switch manager
 ################################################################################
 
-switch_manager_objects_dir = objects( "switch_manager" )
-
-gen C::Dependencies, dependency( "switch_manager" ),
-  :search => [ "src/switch_manager", Trema.include ], :sources => sys[ "src/switch_manager/*.{c,h}" ]
-
-gen Action do
-  source dependency( "switch_manager" )
-end
-
-
-gen Directory, switch_manager_objects_dir
-
-gen DirectedRule, switch_manager_objects_dir => [ "src/switch_manager" ], :o => :c do | t |
-  sys "gcc -I#{ Trema.include } -I#{ Trema.openflow } #{ var :CFLAGS } -c -o #{ t.name } #{ t.source }"
-end
-
-
-switch_manager_objects = [
-  "dpid_table.o",
-  "event_forward_entry_manipulation.o",
-  "switch_manager.o",
-  "switch_option.o",
-  "secure_channel_listener.o"
-].collect do | each |
-  File.join switch_manager_objects_dir, each
-end
-
 desc "Build switch manager."
-task :switch_manager => Trema::Executables.switch_manager
-file Trema::Executables.switch_manager => switch_manager_objects + [ libtrema ] do | t |
-  sys "gcc -L#{ Trema.lib } -o #{ t.name } #{ sys.sp t.prerequisites } -ltrema -lsqlite3 -ldl -lrt -lpthread"
-end
-
-
-switch_objects = [
-  "cookie_table.o",
-  "event_forward_entry_manipulation.o",
-  "ofpmsg_recv.o",
-  "ofpmsg_send.o",
-  "secure_channel_receiver.o",
-  "secure_channel_sender.o",
-  "service_interface.o",
-  "switch.o",
-  "switch_option.o",
-  "xid_table.o",
-].collect do | each |
-  File.join switch_manager_objects_dir, each
+task :switch_manager do
+  sys "rake switch_manager"
 end
 
+
 desc "Build switch."
-task :switch => Trema::Executables.switch
-file Trema::Executables.switch => switch_objects + [ libtrema ] do | t |
-  sys "gcc -L#{ Trema.lib } -o #{ t.name } #{ sys.sp t.prerequisites } -ltrema -lsqlite3 -ldl -lrt -lpthread"
+task :switch_daemon do
+  sys "rake switch_daemon"
 end
 
 

data/cruise.rb

@@ -34,7 +34,6 @@ $coverage_threshold = 70.2
 $LOAD_PATH.unshift( File.expand_path( File.dirname( __FILE__ ) + "/ruby" ) )
 
 require "rubygems"
-require "bundler/setup"
 
 require "English"
 require "blocker"
@@ -359,6 +358,7 @@ $options.parse! ARGV
 
 
 def init_cruise
+  sh "bundle"
   sh "rake setup"
 end
 

data/features/switch_event/C-add_forward_entry.feature

@@ -39,6 +39,7 @@ Feature: C function example command "add_forward_entry"
         -t, --type={vendor,packet_in,port_status,state_notify} Specify event type.
       """
 
+  @slow_process
   Scenario Outline: Add 'mirror' to All Switch Manager/Daemon's event forwarding entries of packet_in
     Given a file named "nw_dsl.conf" with:
       """
@@ -60,6 +61,7 @@ Feature: C function example command "add_forward_entry"
       | SW 0x1 | -s 0x1 |
       | SW 0x2 | -s 0x2 |
 
+  @slow_process
   Scenario Outline: Switch added after event forwarding entry manipulation should also reflect new configuration of Switch Manager.
     Given a file named "nw_dsl.conf" with:
       """
@@ -87,6 +89,7 @@ Feature: C function example command "add_forward_entry"
       | SW 0x1 | -s 0x1 |
       | SW 0x2 | -s 0x2 |
 
+  @slow_process
   Scenario Outline: Add 'mirror' only to Switch Manager's event forwarding entry of packet_in
     Given a file named "nw_dsl.conf" with:
       """
@@ -108,6 +111,7 @@ Feature: C function example command "add_forward_entry"
       | 0x1    |
       | 0x2    |
 
+  @slow_process
   Scenario Outline: Add 'mirror' only to Switch Daemon 0x1's event forwarding entries of packet_in
     Given a file named "nw_dsl.conf" with:
       """

data/features/switch_event/C-delete_forward_entry.feature

@@ -39,6 +39,7 @@ Feature: C function example command "delete_forward_entry"
         -t, --type={vendor,packet_in,port_status,state_notify} Specify event type.
       """
 
+  @slow_process
   Scenario Outline: Delete 'RepeaterHub' from All Switch Manager/Daemon's event forwarding entries of packet_in
     Given a file named "nw_dsl.conf" with:
       """
@@ -58,6 +59,7 @@ Feature: C function example command "delete_forward_entry"
       | SW 0x1 | -s 0x1 |
       | SW 0x2 | -s 0x2 |
 
+  @slow_process
   Scenario Outline: Delete 'RepeaterHub' only from Switch Manager's event forwarding entries of packet_in
     Given a file named "nw_dsl.conf" with:
       """
@@ -77,6 +79,7 @@ Feature: C function example command "delete_forward_entry"
       | 0x1    |
       | 0x2    |
 
+  @slow_process
   Scenario Outline: Delete 'RepeaterHub' only from Switch Daemon 0x1's event forwarding entries of packet_in
     Given a file named "nw_dsl.conf" with:
       """

data/features/switch_event/C-dump_forward_entries.feature

@@ -37,6 +37,7 @@ Feature: C function example command "dump_forward_entries"
         -t, --type={vendor,packet_in,port_status,state_notify} Specify event type.
       """
 
+  @slow_process
   Scenario Outline: Dump Switch Manager's event forwarding entries for each event type
     Given a file named "nw_dsl.conf" with:
       """
@@ -56,6 +57,7 @@ Feature: C function example command "dump_forward_entries"
       | port_status  |
       | state_notify |
 
+  @slow_process
   Scenario Outline: Dump Switch Daemon's event forwarding entries for each event type on each switch
     Given a file named "nw_dsl.conf" with:
       """

data/features/switch_event/C-set_forward_entries.feature

@@ -38,6 +38,7 @@ Feature: C function example command "set_forward_entries"
         -t, --type={vendor,packet_in,port_status,state_notify} Specify event type.
       """
 
+  @slow_process
   Scenario Outline: Replace Switch Manager's event forwarding entries of packet_in to 'mirror' and 'filter'
     Given a file named "nw_dsl.conf" with:
       """
@@ -61,6 +62,7 @@ Feature: C function example command "set_forward_entries"
       | 0x1    |
       | 0x2    |
 
+  @slow_process
   Scenario Outline: Replace Switch Daemon 0x1's event forwarding entries of packet_in to 'mirror' and 'filter'
     Given a file named "nw_dsl.conf" with:
       """

data/features/switch_event/add_forward_entry.feature

@@ -29,6 +29,7 @@ Feature: Ruby methods for adding switch event forwarding entry
   All the above methods take a result handler as Ruby block, but 
   can be omitted if checking is not necessary.
 
+  @slow_process
   Scenario Outline: add_forward_entry_to_all_switches event_type, trema_name
     Given a file named "nw_dsl.conf" with:
       """
@@ -57,7 +58,7 @@ Feature: Ruby methods for adding switch event forwarding entry
       """
     When I successfully run `trema run ./AddEntryToAllTest.rb -c nw_dsl.conf -d`
     And wait until "AddEntryToAllTest" is up
-    And *** sleep 1 ***
+    And *** sleep 2 ***
     Then the file "../../tmp/log/AddEntryToAllTest.log" should contain:
       """
       Successfully added a forwarding entry of <event_type>.
@@ -78,6 +79,7 @@ Feature: Ruby methods for adding switch event forwarding entry
       | :port_status  | "new_controller", "AddEntryToAllTest" | "new_controller", "AddEntryToAllTest"                   |
       | :state_notify | "new_controller", "AddEntryToAllTest" | "new_controller", "AddEntryToAllTest", "switch_manager" |
 
+  @slow_process
   Scenario Outline: add_forward_entry_to_switch dpid, event_type, trema_name
     Given a file named "nw_dsl.conf" with:
       """
@@ -111,6 +113,7 @@ Feature: Ruby methods for adding switch event forwarding entry
       | :port_status  | "new_controller", "AddEntryToSwitchDaemonTest"                   |
       | :state_notify | "new_controller", "AddEntryToSwitchDaemonTest", "switch_manager" |
 
+  @slow_process
   Scenario Outline: add_forward_entry_to_switch_manager event_type, trema_name
     Given a file named "AddEntryToSwitchManagerTest.rb" with:
       """ruby

data/features/switch_event/delete_forward_entry.feature

@@ -29,6 +29,7 @@ Feature: Ruby methods for deleting switch event forwarding entry
   All the above methods take a result handler as Ruby block, but 
   they can be omitted if checking is not necessary.
 
+  @slow_process
   Scenario Outline: delete_forward_entry_from_all_switches event_type, trema_name
     Given a file named "nw_dsl.conf" with:
       """
@@ -57,7 +58,7 @@ Feature: Ruby methods for deleting switch event forwarding entry
       """
     When I successfully run `trema run ./DeleteEntryFromAllTest.rb -c nw_dsl.conf -d`
     And wait until "DeleteEntryFromAllTest" is up
-    And *** sleep 1 ***
+    And *** sleep 2 ***
     Then the file "../../tmp/log/DeleteEntryFromAllTest.log" should contain:
       """
       Successfully deleted a forwarding entry of <event_type>.
@@ -78,6 +79,7 @@ Feature: Ruby methods for deleting switch event forwarding entry
       | :port_status  |                           |                   |
       | :state_notify |                           | "switch_manager"  |
 
+  @slow_process
   Scenario Outline: delete_forward_entry_from_switch dpid, event_type, trema_name
     Given a file named "nw_dsl.conf" with:
       """
@@ -111,6 +113,7 @@ Feature: Ruby methods for deleting switch event forwarding entry
       | :port_status  |                   |
       | :state_notify | "switch_manager"  |
 
+  @slow_process
   Scenario Outline: delete_forward_entry_from_switch_manager event_type, trema_name
     Given a file named "DeleteFromSwitchManagerTest.rb" with:
       """ruby

data/features/switch_event/dump_forward_entries.feature

@@ -22,6 +22,7 @@ Feature: Ruby methods for dumping switch event forwarding entry
   ----
   All the above methods take a result handler as Ruby block.
 
+  @slow_process
   Scenario Outline: dump_forward_entries_from_switch dpid, event_type
     Given a file named "nw_dsl.conf" with:
       """
@@ -56,6 +57,7 @@ Feature: Ruby methods for dumping switch event forwarding entry
       | :port_status  | "port_status"                            |
       | :state_notify | "DumpSwitchDaemonTest", "switch_manager" |
 
+  @slow_process
   Scenario Outline: dump_forward_entries_from_switch_manager event_type
     Given a file named "nw_dsl.conf" with:
       """

data/features/switch_event/set_forward_entries.feature

@@ -26,6 +26,7 @@ Feature: Ruby methods for setting switch event forwarding entry
   All the above methods take a result handler as Ruby block, but 
   they can be omitted if checking is not necessary.
 
+  @slow_process
   Scenario Outline: set_forward_entries_to_switch dpid, event_type, trema_names
     Given a file named "nw_dsl.conf" with:
       """
@@ -59,6 +60,7 @@ Feature: Ruby methods for setting switch event forwarding entry
       | :port_status  | "SetEntriesToSwitchDaemonTest", "Another" |
       | :state_notify | "SetEntriesToSwitchDaemonTest", "Another" |
 
+  @slow_process
   Scenario Outline: set_forward_entries_to_switch_manager event_type, trema_names
     Given a file named "SetEntriesToSwitchManagerTest.rb" with:
       """ruby

data/ruby/trema/path.rb

@@ -53,6 +53,7 @@ module Trema
 
 
   dir :home, "objects"
+  dir :home, "ruby"
   dir :home, "src/lib", :include
   dir :home, "vendor"
   dir :objects, "cmockery"

data/ruby/trema/version.rb

@@ -17,7 +17,7 @@
 
 
 module Trema
-  VERSION = "0.3.18"
+  VERSION = "0.3.19"
 end
 
 

data/src/lib/event_forward_interface.c

@@ -438,11 +438,11 @@ add_switch_manager_event_forward_entry( enum efi_event_type type, const char *se
   const char switch_manager[] = "switch_manager.m";
   list_element service_list;
   service_list.next = NULL;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-  service_list.data = ( void * ) service_name;
-#pragma GCC diagnostic pop
-  return send_efi_event_config_request( switch_manager, EVENT_FORWARD_ENTRY_ADD, type, &service_list, callback, user_data );
+  // Copying only to avoid const_cast warnings. Will not modify in callee.
+  service_list.data = xstrdup( service_name );
+  bool sent_ok = send_efi_event_config_request( switch_manager, EVENT_FORWARD_ENTRY_ADD, type, &service_list, callback, user_data );
+  xfree( service_list.data );
+  return sent_ok;
 }
 
 
@@ -451,11 +451,11 @@ delete_switch_manager_event_forward_entry( enum efi_event_type type, const char
   const char switch_manager[] = "switch_manager.m";
   list_element service_list;
   service_list.next = NULL;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-  service_list.data = ( void * ) service_name;
-#pragma GCC diagnostic pop
-  return send_efi_event_config_request( switch_manager, EVENT_FORWARD_ENTRY_DELETE, type, &service_list, callback, user_data );
+  // Copying only to avoid const_cast warnings. Will not modify in callee.
+  service_list.data = xstrdup( service_name );
+  bool sent_ok = send_efi_event_config_request( switch_manager, EVENT_FORWARD_ENTRY_DELETE, type, &service_list, callback, user_data );
+  xfree( service_list.data );
+  return sent_ok;
 }
 
 
@@ -480,11 +480,11 @@ add_switch_event_forward_entry( uint64_t dpid, enum efi_event_type type, const c
   snprintf( switch_name, MESSENGER_SERVICE_NAME_LENGTH, "switch.%#" PRIx64 ".m", dpid  );
   list_element service_list;
   service_list.next = NULL;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-  service_list.data = ( void * ) service_name;
-#pragma GCC diagnostic pop
-  return send_efi_event_config_request( switch_name, EVENT_FORWARD_ENTRY_ADD, type, &service_list, callback, user_data );
+  // Copying only to avoid const_cast warnings. Will not modify in callee.
+  service_list.data = xstrdup( service_name );
+  bool sent_ok = send_efi_event_config_request( switch_name, EVENT_FORWARD_ENTRY_ADD, type, &service_list, callback, user_data );
+  xfree( service_list.data );
+  return sent_ok;
 }
 
 
@@ -494,11 +494,11 @@ delete_switch_event_forward_entry( uint64_t dpid, enum efi_event_type type, cons
   snprintf( switch_name, MESSENGER_SERVICE_NAME_LENGTH, "switch.%#" PRIx64 ".m", dpid  );
   list_element service_list;
   service_list.next = NULL;
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-  service_list.data = ( void * ) service_name;
-#pragma GCC diagnostic pop
-  return send_efi_event_config_request( switch_name, EVENT_FORWARD_ENTRY_DELETE, type, &service_list, callback, user_data );
+  // Copying only to avoid const_cast warnings. Will not modify in callee.
+  service_list.data = xstrdup( service_name );
+  bool sent_ok = send_efi_event_config_request( switch_name, EVENT_FORWARD_ENTRY_DELETE, type, &service_list, callback, user_data );
+  xfree( service_list.data );
+  return sent_ok;
 }
 
 

data/trema.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do | gem |
 
   gem.add_dependency "bundler"
   gem.add_dependency "gli", "~> 2.5.5"
-  gem.add_dependency "popen4", "~> 0.1.2"
+  gem.add_dependency "paper-house", "~> 0.1.13"
   gem.add_dependency "rake", "~> 10.0.3"
   gem.add_dependency "rdoc", "~> 4.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trema
 version: !ruby/object:Gem::Version 
-  version: 0.3.18
+  version: 0.3.19
 platform: ruby
 authors: 
 - Yasuhito Takamiya
@@ -9,7 +9,7 @@ autorequire:
 bindir: .
 cert_chain: []
 
-date: 2013-03-22 00:00:00 Z
+date: 2013-03-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -33,13 +33,13 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: popen4
+  name: paper-house
   type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.1.2
+        version: 0.1.13
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -144,10 +144,6 @@ files:
 - ruby/.gitignore
 - ruby/blocker.rb
 - ruby/extconf.rb
-- ruby/rake/c/dependency.rb
-- ruby/rake/c/library-task.rb
-- ruby/rake/c/shared-library-task.rb
-- ruby/rake/c/static-library-task.rb
 - ruby/sub-process.rb
 - ruby/trema/action-common.c
 - ruby/trema/action-common.h

data/ruby/rake/c/dependency.rb

@@ -1,42 +0,0 @@
-require "pstore"
-require "trema/path"
-
-
-module Rake
-  module C
-    module Dependency
-      @@store = {}
-
-
-      def self.read name, file
-        dump_of( name ).transaction( true ) do | store |
-          store[ file ]
-        end || []
-      end
-
-
-      def self.write name, file, dependency
-        dump_of( name ).transaction( false ) do | store |
-          store[ file ] = dependency
-        end
-      end
-
-
-      def self.dump_of name
-        @@store[ name ] ||= PStore.new( path( name ) )
-      end
-
-
-      def self.path name
-        File.join Trema.home, ".#{ name }.depends"
-      end
-    end
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/ruby/rake/c/library-task.rb

@@ -1,142 +0,0 @@
-require "popen4"
-require "rake/c/dependency"
-require "rake/clean"
-require "rake/tasklib"
-
-
-module Rake
-  module C
-    class LibraryTask < TaskLib
-      attr_accessor :cflags
-      attr_accessor :includes
-      attr_accessor :library_name
-      attr_accessor :name
-      attr_accessor :target_directory
-      attr_writer :sources
-
-
-      def initialize name, &block
-        init name
-        block.call self
-        define
-      end
-
-
-      def sources
-        FileList.new @sources
-      end
-
-
-      ##########################################################################
-      private
-      ##########################################################################
-
-
-      def init name
-        @name = name
-        @includes = []
-      end
-
-
-      def define
-        CLEAN.include objects
-        CLOBBER.include target_directory
-        CLOBBER.include Dependency.path( @library_name )
-
-        task name => [ target_directory, target_path ]
-        directory target_directory
-
-        sources.zip( objects ) do | source, object |
-          task object => source do | task |
-            compile task.name, task.prerequisites[ 0 ]
-          end
-        end
-
-        file target_path => objects do | task |
-          generate_library
-        end
-      end
-
-
-      def generate_library
-        raise NotImplementedError, "Override this!"
-      end
-
-
-      def target_file_name
-        raise NotImplementedError, "Override this!"
-      end
-
-
-      def target_path
-        File.join @target_directory, target_file_name
-      end
-
-
-      def objects
-        sources.collect do | each |
-          File.join @target_directory, File.basename( each ).ext( ".o" )
-        end
-      end
-
-
-      def compile o_file, c_file
-        return if uptodate?( o_file, [ c_file ] + Dependency.read( library_name, o_file ) )
-        autodepends = run_gcc_H( "gcc -H #{ gcc_cflags } -fPIC #{ gcc_I_options } -c #{ c_file } -o #{ o_file }" )
-        Dependency.write( library_name, o_file, autodepends )
-      end
-
-
-      def run_gcc_H command
-        autodepends = []
-
-        puts command
-        status = POpen4.popen4( command ) do | stdout, stderr, stdin, pid |
-          stdin.close
-          stderr.each do | line |
-            case line
-              when /^\./
-                autodepends << line.sub( /^\.+\s+/, "" ).strip
-              when /Multiple include guards/
-                # Filter out include guards warnings.
-                stderr.each do | line |
-                  if line =~ /:$/
-                    puts line
-                    break
-                  end
-                end
-              else
-                puts line
-            end
-          end
-        end
-        fail "gcc failed" if status.exitstatus != 0
-
-        autodepends
-      end
-
-
-      def gcc_cflags
-        @cflags.join " "
-      end
-
-
-      def gcc_I_options
-        @includes.collect do | each |
-          "-I#{ each }"
-        end.join( " " )
-      end
-    end
-  end
-end
-
-
-require "rake/c/shared-library-task"
-require "rake/c/static-library-task"
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/ruby/rake/c/shared-library-task.rb

@@ -1,38 +0,0 @@
-require "rake/c/library-task"
-
-
-module Rake
-  module C
-    class SharedLibraryTask < LibraryTask
-      attr_accessor :version
-
-
-      ##########################################################################
-      private
-      ##########################################################################
-
-
-      def generate_library
-        return if uptodate?( target_path, objects )
-        sh "gcc -shared -Wl,-soname=#{ soname } -o #{ target_path } #{ objects.to_s }"
-      end
-
-
-      def soname
-        File.basename( target_file_name ).sub( /\.\d+\.\d+\Z/, "" )
-      end
-
-
-      def target_file_name
-        @library_name + ".so." + @version
-      end
-    end
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/ruby/rake/c/static-library-task.rb

@@ -1,32 +0,0 @@
-require "rake/c/library-task"
-
-
-module Rake
-  module C
-    class StaticLibraryTask < LibraryTask
-      ##########################################################################
-      private
-      ##########################################################################
-
-
-      def generate_library
-        if not uptodate?( target_path, objects )
-          sh "ar -cq #{ target_path } #{ objects.join ' ' }"
-          sh "ranlib #{ target_path }"
-        end
-      end
-
-
-      def target_file_name
-        @library_name + ".a"
-      end
-    end
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End: