bitmapper 0.1.2 → 0.1.3

data/ext/bitmapper/bit_mapper_wrap.c

@@ -4,6 +4,7 @@
 #include <math.h>
 
 #include "bit_mapper_wrap.h"
+#include "helper.h"
 
 /*
    Creates empty Bitmapper*. Without BitBucket pointers.
@@ -51,23 +52,47 @@ void free_map(Bitmapper* map){
   if(map->bkts != NULL) free(map->bkts);
 }
 
+/*
+   Enables filtering on given bucket, this is a whitelist filtering pattern.
+   @param BitBucket* the pointer to the bucket
+ */
 void enable_filter(Bitmapper* map){
   map->filter_enabled = 1;
 }
 
+/*
+   Disble filtering on given bucket
+   @param BitBucket* the pointer to the bucket
+ */
 void disable_filter(Bitmapper* map){
   map->filter_enabled = 0;
 }
 
+/*
+  Add the given number to whitelist
+  @param BitBucket* the pointer to the bucket
+  @param unsigned long long int the number to set
+ */
 int set_in_filter(Bitmapper* map, unsigned long long int number){
   map->filter_enabled = 1;
   return bit_bucket_set_bit(map->filter_status, number);
 }
 
+/*
+  Gives the status
+  @param BitBucket* the pointer to the bucket
+  @param unsigned long long int the number to set
+ */
 int status_for_filter(Bitmapper* map, unsigned long long int number){
   return bit_bucket_get_bit(map->filter_status, number);
 }
 
+
+/*
+  Removes the given number from whitelist
+  @param BitBucket* the pointer to the bucket
+  @param unsigned long long int the number to set
+ */
 int clear_in_filter(Bitmapper* map, unsigned long long int number){
   return bit_bucket_clear_bit(map->filter_status, number);
 }
@@ -250,13 +275,10 @@ int dump_all_to_file(Bitmapper* map, FILE* fp){
 }
 
 /*
-  Dumps the bucket's(if available) bit values into the given file
+  Dumps the bucket's(if not available create empty) bit values into the given file
   @param Bitmapper* the mapepr object to use
   @param FILE* the file pointer to the opened file
   @param unsigned long long int index to the bucket to consider
-
-  TODO: If the bucket doesn't exist, dump empty string equal to the
-  size of the bucket
  */
 int dump_bucket_str_to_file(Bitmapper* map, FILE* fp,unsigned long long int bkt_index){
   unsigned char* raw = (unsigned char*)malloc(map->bkt_size/8+1);
@@ -273,12 +295,47 @@ int dump_bucket_str_to_file(Bitmapper* map, FILE* fp,unsigned long long int bkt_
   if(raw != NULL) free(raw);
   return 0;
 }
+/*
+  Dumps a range of bucket's(in sequence) bit values into the given file
+  @param Bitmapper* the mapepr object to use
+  @param FILE* the file pointer to the opened file
+  @param unsigned long long int start index to the bucket to consider(inclusive)
+  @param unsigned long long int end index to the bucket to consider(inclusive)
+ */
+int dump_bucket_range_str_to_file(Bitmapper* map, FILE* fp,
+                            unsigned long long int start,
+                            unsigned long long int end){
+  BitBucket* tmp;
+  unsigned long long int i;
+  FileBuffer buf;
+  if(map->bkt_count<=end) return 1;
+  buf.buffer = '\0';
+  buf.buff_fill_count = 0;
+  buf.string = (unsigned char*)malloc(map->bkt_size/8+1);
+  buf.str_length = map->bkt_size;
+
+  for(i=start; i<=end ;i++){
+    if(map->bkts[i] == NULL)
+      tmp = bit_bucket_create(map->bkt_size);
+    else
+      tmp = map->bkts[i];
+
+    bit_bucket_string(tmp, buf.string);
+    append_to_file(fp, buf);
+
+    if(map->bkts[i] == NULL)
+      bit_bucket_free(tmp);
+  }
+  if(buf.string != NULL) free(buf.string);
+  buf.str_length = 0;
+  append_to_file(fp, buf);
+  return 0;
+}
 
 /*
   Dumps all bucket's bit values into the given file
   @param Bitmapper* the mapepr object to use
   @param FILE* the file pointer to the opened file
-  @param unsigned long long int the length of index
  */
 int dump_all_str_to_file(Bitmapper* map, FILE* fp){
   unsigned long long int i;

data/ext/bitmapper/bit_mapper_wrap.h

@@ -1,4 +1,5 @@
 #include "bit_bucket.h"
+#include "helper.h"
 
 #ifndef BIT_MAPPER_WRAP
 #define BIT_MAPPER_WRAP
@@ -24,7 +25,7 @@ BitBucket* create_bucket_for(BitBucket*, unsigned long long int);
 
 void enable_filter(Bitmapper*);
 void disable_filter(Bitmapper*);
-int set_for_filter(Bitmapper* , unsigned long long int);
+int set_in_filter(Bitmapper* , unsigned long long int);
 int status_for_filter(Bitmapper*, unsigned long long int );
 int clear_in_filter(Bitmapper*, unsigned long long int);
 
@@ -41,7 +42,10 @@ int dump_bucket_to_file(Bitmapper*, FILE* , unsigned long long int);
 int dump_all_to_file(Bitmapper* , FILE* );
 
 int dump_bucket_str_to_file(Bitmapper* , FILE* ,unsigned long long int );
+int dump_bucket_range_str_to_file(Bitmapper*, FILE* , unsigned long long int ,
+                                  unsigned long long int );
 int dump_all_str_to_file(Bitmapper* , FILE*);
+
 int load_str_file_to_bucket(Bitmapper* , FILE* ,unsigned long long int);
 int load_str_file(Bitmapper* , FILE*);
 

data/ext/bitmapper/bitmapper.c

@@ -115,6 +115,17 @@ VALUE bm_load_str_to_bkt(VALUE self, VALUE file_str, VALUE index){
   return self;
 }
 
+VALUE bm_dump_range_bkt_str(VALUE self, VALUE file_str, VALUE start, VALUE end){
+  Bitmapper* map;
+  FILE *fp;
+  Data_Get_Struct(self, Bitmapper, map);
+  fp = fopen(RSTRING_PTR(StringValue(file_str)), "w");
+  if(fp == NULL) rb_raise(rb_eIOError, "file counld not be opened");
+  dump_bucket_range_str_to_file(map, fp, NUM2LL(start), NUM2LL(end));
+  fclose(fp);
+  return self;
+}
+
 VALUE bm_dump_bkt_str(VALUE self, VALUE file_str, VALUE index){
   Bitmapper* map;
   FILE *fp;
@@ -252,6 +263,7 @@ void Init_bitmapper(){
   rb_define_method(rb_cBitmapper, "clear_filters", bm_clear_filters, 1);
 
   rb_define_method(rb_cBitmapper, "load_from_str", bm_load_str_to_bkt, 2);
+  rb_define_method(rb_cBitmapper, "dump_range_to_str", bm_dump_range_bkt_str, 3);
   rb_define_method(rb_cBitmapper, "dump_to_str", bm_dump_bkt_str, 2);
 
   rb_define_method(rb_cBitmapper, "status?", bm_num_status, 1);

data/ext/bitmapper/helper.c

@@ -0,0 +1,60 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "helper.h"
+
+/*
+  Takes a string
+  if buffer.len > 0
+    * fills the buffer from string
+    * shift's the string to left
+    * write the buffer to file
+  end
+  * write the string to file with byte boundry
+  * copy rest of string bits to buffer if present
+ */
+FileBuffer append_to_file(FILE* fp, FileBuffer buf){
+  int shift, nxt_bits, final_bits;
+  unsigned long long int str_byte_len, str_bytes_to_write, i;
+
+  nxt_bits = buf.str_length % 8;
+  /* no shift if string or buffer is zero */
+  if(buf.buff_fill_count == 0 || buf.str_length == 0) shift = 0;
+  else shift = (8 - buf.buff_fill_count);
+  final_bits = (shift <= nxt_bits) ? nxt_bits - shift : 8 - (shift - nxt_bits);
+  str_byte_len = buf.str_length / 8;
+  str_bytes_to_write = str_byte_len - ((shift <= nxt_bits) ? 0 : 1);
+
+  if(buf.buff_fill_count > 0){
+    /* fills the buffer from string */
+    shift_bits(&(buf.buffer), buf.string, shift);
+    /* shift's the string to left */
+    for(i=0;i< str_byte_len ; i++){
+      shift_bits(&(buf.string[i]), &(buf.string[i+1]), shift);
+    }
+     /* write the buffer to file */
+    fwrite(&(buf.buffer), 1, 1, fp);
+  }
+  /* write the string to file with byte boundry */
+  if(str_bytes_to_write > 0) fwrite(buf.string, 1, str_bytes_to_write, fp);
+  if(nxt_bits != 0){
+    buf.buffer = buf.string[str_byte_len];
+    buf.buff_fill_count = final_bits;
+    printf("new buffer - %X - %d\n", buf.buffer, buf.buff_fill_count);
+  }
+  return buf;
+}
+
+/*
+   copies 'num_bits' from src head to dest tail,
+   and left shift src by 'num_bits'.
+ */
+int shift_bits(char* dest, char* src, int num_bits){
+  char tmp;
+  char mask = '\xFF';
+  if(num_bits == 0) return 0;
+  tmp = *src;
+  *dest = ((*dest) & mask<<num_bits) | ((unsigned char)tmp)>>(8-num_bits);
+  *src = (*src)<<num_bits;
+  return 0;
+}

data/ext/bitmapper/helper.h

@@ -0,0 +1,14 @@
+#ifndef BIT_WRAP_HELPER
+#define BIT_WRAP_HELPER
+
+typedef struct FileBuffer{
+  unsigned char buffer;
+  int buff_fill_count;
+  unsigned char* string;
+  unsigned long long int str_length; /* number of bits */
+}FileBuffer;
+
+FileBuffer append_to_file(FILE*, FileBuffer);
+int shift_bits(char* , char* , int);
+
+#endif /* BIT_WRAP_HELPER */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bitmapper
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-07-19 00:00:00.000000000 Z
 dependencies: []
 description: A fast, in-memory, bit map filter!
 email: gouthamvel@gmail.com
@@ -22,8 +22,10 @@ files:
 - ext/bitmapper/bitmapper.c
 - ext/bitmapper/bit_bucket.c
 - ext/bitmapper/bit_mapper_wrap.c
+- ext/bitmapper/helper.c
 - ext/bitmapper/bit_bucket.h
 - ext/bitmapper/bit_mapper_wrap.h
+- ext/bitmapper/helper.h
 - ext/bitmapper/extconf.rb
 homepage: ''
 licenses: []