malloc 1.1.2 → 1.2.0

data/Rakefile

@@ -7,12 +7,12 @@ require 'rake/loaders/makefile'
 require 'rbconfig'
 
 PKG_NAME = 'malloc'
-PKG_VERSION = '1.1.2'
+PKG_VERSION = '1.2.0'
 CXX = ENV[ 'CXX' ] || 'g++'
 STRIP = ENV[ 'STRIP' ] || 'strip'
 RB_FILES = FileList[ 'lib/**/*.rb' ]
 CC_FILES = FileList[ 'ext/*.cc' ]
-HH_FILES = FileList[ 'ext/*.hh' ]
+HH_FILES = FileList[ 'ext/*.hh' ] + FileList[ 'ext/*.tcc' ]
 TC_FILES = FileList[ 'test/tc_*.rb' ]
 TS_FILES = FileList[ 'test/ts_*.rb' ]
 SO_FILE = "ext/#{PKG_NAME}.so"
@@ -165,7 +165,9 @@ rule '.o' => '.cc' do |t|
 end
 
 file ".depends.mf" do |t|
-  sh "makedepend -f- -- #{$CXXFLAGS} -- #{CC_FILES.join ' '} > #{t.name}"
+  sh "g++ -MM #{$CXXFLAGS} #{CC_FILES.join ' '} | " +
+    "sed -e :a -e N -e 's/\\n/\\$/g' -e ta | " +
+    "sed -e 's/ *\\\\\\$ */ /g' -e 's/\\$/\\n/g' | sed -e 's/^/ext\\//' > #{t.name}"
 end
 CC_FILES.each do |t|
   file t.ext(".o") => t

data/ext/malloc.cc

@@ -39,7 +39,7 @@ VALUE Malloc::init( VALUE rbModule )
   rb_define_method( cRubyClass, "orig_read",
                     RUBY_METHOD_FUNC( mallocRead ), 1 );
   rb_define_method( cRubyClass, "orig_write",
-                    RUBY_METHOD_FUNC( mallocWrite ), 1 );
+                    RUBY_METHOD_FUNC( mallocWrite ), -1 );
   return cRubyClass;
 }
 
@@ -80,9 +80,28 @@ VALUE Malloc::mallocRead( VALUE rbSelf, VALUE rbLength )
   return rb_str_new( self, length );
 }
 
-VALUE Malloc::mallocWrite( VALUE rbSelf, VALUE rbString )
+VALUE Malloc::mallocWrite( int argc, VALUE *rbArgv, VALUE rbSelf )
 {
-  char *self; Data_Get_Struct( rbSelf, char, self );
-  memcpy( self, StringValuePtr( rbString ), RSTRING_LEN( rbString ) );
-  return rbString;
+  VALUE retVal = Qnil;
+  try {
+    char *self; Data_Get_Struct( rbSelf, char, self );
+    ERRORMACRO( argc == 1 || argc == 2, Error, , "Malloc#write accepts "
+                  "one or two arguments (not " << argc << ")" );
+    if ( argc == 1 ) {
+      VALUE rbString = rbArgv[0];
+      memcpy( self, StringValuePtr( rbString ), RSTRING_LEN( rbString ) );
+      retVal = rbString;
+    } else {
+      VALUE rbOther = rbArgv[0];
+      VALUE rbSize = rbArgv[1];
+      char *other; Data_Get_Struct( rbOther, char, other );
+      int size = NUM2INT( rbSize );
+      memcpy( self, other, size );
+      retVal = rbOther;
+    };
+  } catch ( std::exception &e ) {
+    rb_raise( rb_eRuntimeError, "%s", e.what() );
+  };
+  return retVal;
 }
+

data/ext/malloc.hh

@@ -26,7 +26,7 @@ public:
   static VALUE mallocNew( VALUE rbClass, VALUE rbSize );
   static VALUE mallocPlus( VALUE rbSelf, VALUE rbOffset );
   static VALUE mallocRead( VALUE rbSelf, VALUE rbLength );
-  static VALUE mallocWrite( VALUE rbSelf, VALUE rbString );
+  static VALUE mallocWrite( int argc, VALUE *rbArgv, VALUE rbSelf );
 };
 
 #endif

data/lib/malloc_ext.rb

@@ -164,16 +164,24 @@ module Hornetseye
     #   m.read 2
     #   # "ab"
     #
-    # @param [String] string A string with the data.
+    # @param [String,Malloc] data A string or malloc object with the data.
     # @return [String] Returns the parameter +string+.
     #
     # @see #read
-    def write( string )
-      if string.bytesize > @size
-        raise "Must not write more than #{@size} bytes of memory " +
-          "(illegal attempt to write #{string.bytesize} bytes)"
+    def write( data )
+      if data.is_a? Malloc
+        if data.size > @size
+          raise "Must not write more than #{@size} bytes of memory " +
+            "(illegal attempt to write #{data.size} bytes)"
+        end
+        orig_write data, data.size
+      else
+        if data.bytesize > @size
+          raise "Must not write more than #{@size} bytes of memory " +
+            "(illegal attempt to write #{data.bytesize} bytes)"
+        end
+        orig_write data
       end
-      orig_write string
     end
 
     private :orig_write

data/test/tc_malloc.rb

@@ -19,35 +19,46 @@ Kernel::require 'malloc'
 
 class TC_Malloc < Test::Unit::TestCase
 
+  Malloc = Hornetseye::Malloc
+
+  def Malloc( *args )
+    Hornetseye::Malloc *args
+  end
+
   def test_new
-    assert_nothing_raised { Hornetseye::Malloc.new 32 }
-    assert_nothing_raised { Hornetseye::Malloc 32 }
-    assert_raise( ArgumentError ) { Hornetseye::Malloc.new }
+    assert_nothing_raised { Malloc.new 32 }
+    assert_nothing_raised { Malloc 32 }
+    assert_raise( ArgumentError ) { Malloc.new }
   end
 
   def test_inspect
-    assert_equal 'Malloc(32)', Hornetseye::Malloc.new( 32 ).inspect
+    assert_equal 'Malloc(32)', Malloc.new( 32 ).inspect
   end
 
   def test_to_s
-    assert_equal 'Malloc(32)', Hornetseye::Malloc.new( 32 ).to_s
+    assert_equal 'Malloc(32)', Malloc.new( 32 ).to_s
   end
 
   def test_read_write
-    m = Hornetseye::Malloc.new 6
+    m = Malloc.new 6
     assert_equal 'abcdef', m.write( 'abcdef' )
     assert_equal 'abcdef', m.read( 6 )
     assert_equal 'ghi', m.write( 'ghi' )
     assert_equal 'ghidef', m.read( 6 )
+    n = Malloc.new 3
+    n.write 'jkl'
+    assert_equal n, m.write( n )
+    assert_equal 'jkldef', m.read( 6 )
     assert_raise( RuntimeError ) { m.read 7 }
     assert_raise( RuntimeError ) { m.write 'abcdefg' }
+    assert_raise( RuntimeError ) { m.write Malloc.new( 7 ) }
   end
 
   def test_plus
-    assert_raise( RuntimeError ) { Hornetseye::Malloc.new( 2 ) + ( -1 ) }
-    assert_nothing_raised { Hornetseye::Malloc.new( 2 ) + 2 }
-    assert_raise( RuntimeError ) { Hornetseye::Malloc.new( 2 ) + 3 }
-    m = Hornetseye::Malloc.new 6
+    assert_raise( RuntimeError ) { Malloc.new( 2 ) + ( -1 ) }
+    assert_nothing_raised { Malloc.new( 2 ) + 2 }
+    assert_raise( RuntimeError ) { Malloc.new( 2 ) + 3 }
+    m = Malloc.new 6
     m.write 'abcdef'
     assert_equal 'cde', ( m + 2 ).read( 3 )
     assert_raise( RuntimeError ) { ( m + 2 ).read 5 }

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Jan Wedekind
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 +01:00
+date: 2010-10-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency