mochilo 1.2 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64991c41216b4fb7659230eb433f7cb6c3f4ffff
-  data.tar.gz: 21e5f81fdf2be02ad17303ca98636020fa2f8f78
+  metadata.gz: 3d82e754f7a2bb538e67c8adf3bb6bb69b99217e
+  data.tar.gz: c3149f3843ab0627a63aca89202defee06923cf9
 SHA512:
-  metadata.gz: 8258d48406e1674370d61cf42562db462908a6239f8471f2033a157bc4547fe4e7793d74a516046f6326d4473e73162be9b467b35f4e6fe55f43aa09c763fec7
-  data.tar.gz: 4e44d9ab0960cadaa4b70c15c1da0b2b10447dfe3790f80189d6ee70f697966b52bdbb9ae9546b446f7bfa860274efb8cd212f80ca26c858ddc1ad8850fc1f66
+  metadata.gz: 3d8b64f21e023a7964acd1d4da66e08be2af5298a51c53bd58b60dccea91f0e8b10e0ef4d0a0f53a4b391b125361d8c4e4d27a962ca36a766f27ac6e6461fb5f
+  data.tar.gz: e8a87d90c3151bdcaf22e1a1d91c302303d40ea0b38e2c3b3f874b5f3fe6ddbf5a062259bf01b85a9771ddc3738b560635eff58a60c19ac87fca1ee99436be3e

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 script:
   - bundle exec rake test
+install: ./script/bootstrap
 rvm:
   - 2.3.0
   - 2.2

data/Gemfile

@@ -3,3 +3,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "pry"
+
+group :benchmark do
+  gem "msgpack"
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mochilo (1.2)
+    mochilo (1.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -28,6 +28,3 @@ DEPENDENCIES
   msgpack
   pry
   rake-compiler (>= 0.8.1)
-
-BUNDLED WITH
-   1.11.2

data/ext/mochilo/buffer.c

@@ -19,7 +19,7 @@ static mochilo_buf_chunk *init_cur_chunk(mochilo_buf *buf, size_t chunk_size)
 
 	buf->last_alloc = chunk->ptr = malloc(chunk_size);
 	if (!chunk->ptr)
-		return NULL;
+		rb_raise(rb_eNoMemError, "Failed to allocate new chunk");
 
 	chunk->end = chunk->ptr + chunk_size;
 	return chunk;
@@ -38,7 +38,7 @@ static void skip_last_chunk(mochilo_buf *buf)
 
 static void free_buf(mochilo_buf *buf)
 {
-	uint16_t i;
+	uint32_t i;
 
 	for (i = 0; i < buf->cur_chunk; ++i)
 		free(buf->chunks[i].ptr);
@@ -61,7 +61,7 @@ VALUE mochilo_buf_flush(mochilo_buf *buf)
 {
 	VALUE rb_str;
 	char *ptr;
-	uint16_t i;
+	uint32_t i;
 
 	skip_last_chunk(buf);
 
@@ -95,15 +95,20 @@ VALUE mochilo_buf_flush(mochilo_buf *buf)
 
 mochilo_buf_chunk *mochilo_buf_rechunk2(mochilo_buf *buf, size_t chunk_size)
 {
+	mochilo_buf_chunk *chunks;
+
 	skip_last_chunk(buf);
 
 	if (buf->cur_chunk == buf->chunk_count) {
-		buf->chunk_count *= 2;
+		if ((buf->chunk_count * 2) < buf->chunk_count)
+			rb_raise(rb_eArgError, "Too many chunks required to serialize");
 
-		buf->chunks = realloc(buf->chunks, buf->chunk_count * sizeof(mochilo_buf_chunk));
-		if (!buf->chunks)
-			return NULL;
+		chunks = realloc(buf->chunks, buf->chunk_count * 2 * sizeof(mochilo_buf_chunk));
+		if (!chunks)
+			rb_raise(rb_eNoMemError, "Failed to realloc chunks");
 
+		buf->chunks = chunks;
+		buf->chunk_count *= 2;
 	}
 
 	return init_cur_chunk(buf, chunk_size);
@@ -118,10 +123,8 @@ void mochilo_buf_put(mochilo_buf *buf, const char *data, size_t len)
 {
 	mochilo_buf_chunk *chunk = &buf->chunks[buf->cur_chunk];
 
-	if (unlikely(chunk->ptr + len > chunk->end)) {
-		if (!(chunk = mochilo_buf_rechunk2(buf, len)))
-			return;
-	}
+	if (unlikely(chunk->ptr + len > chunk->end))
+		chunk = mochilo_buf_rechunk2(buf, len);
 
 	memmove(chunk->ptr, data, len);
 	chunk->ptr += len;

data/ext/mochilo/buffer.h

@@ -59,7 +59,7 @@ typedef struct {
 	mochilo_buf_chunk *chunks;
 	char *last_alloc;
 	size_t total_size;
-	uint16_t chunk_count, cur_chunk;
+	uint32_t chunk_count, cur_chunk;
 } mochilo_buf;
 
 typedef struct {
@@ -81,7 +81,7 @@ const char *mochilo_src_peek(mochilo_src *buf, size_t need);
 #define BUF_ENSURE_AVAIL(b, d) \
 	mochilo_buf_chunk *chunk = &b->chunks[b->cur_chunk]; \
 	if (unlikely(chunk->ptr + (d) > chunk->end)) { \
-		if ((chunk = mochilo_buf_rechunk(b)) == NULL) return; };
+		chunk = mochilo_buf_rechunk(b); };
 
 #define SRC_CHECK_AVAIL(src, bytes) (src->ptr + bytes <= src->end) 
 

data/lib/mochilo/version.rb

@@ -1,3 +1,3 @@
 module Mochilo
-  VERSION = "1.2"
+  VERSION = "1.2.1"
 end

data/mochilo.gemspec

@@ -19,6 +19,4 @@ Gem::Specification.new do |s|
   # tests
   s.add_development_dependency 'rake-compiler', ">= 0.8.1"
   s.add_development_dependency 'minitest', ">= 4.1.0"
-  # benchmarks
-  s.add_development_dependency 'msgpack'
 end

data/script/bootstrap

@@ -12,5 +12,5 @@ cd "$(dirname "$0")/.."
 if bundle check 1>/dev/null 2>&1; then
     echo "Gem environment up-to-date"
 else
-    exec bundle install --binstubs --path vendor/gems "$@"
+    exec bundle install --binstubs --path vendor/gems --without benchmark "$@"
 fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mochilo
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.2.1
 platform: ruby
 authors:
 - Vicent Martí
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-02 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -39,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
-- !ruby/object:Gem::Dependency
-  name: msgpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: vicent@github.com seniorlopez@gmail.com
 executables: []