mongrel 1.0.5 → 1.1

data/ext/http11/tst_grow_node_free_list.c

@@ -1,38 +0,0 @@
-
-#include "tst.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-int tst_grow_node_free_list(struct tst *tst)
-{
-   struct node *current_node;
-   struct node_lines *new_line;
-   int i;
-
-   
-   if((new_line = (struct node_lines *) malloc(sizeof(struct node_lines))) == NULL)
-      return TST_ERROR;
-   
-   if((new_line->node_line = (struct node *)
-   calloc(tst->node_line_width, sizeof(struct node))) == NULL)
-   {
-      free(new_line);
-      return TST_ERROR;
-   }
-   else
-   {
-      new_line->next = tst->node_lines;
-      tst->node_lines = new_line;
-   }
-   
-   current_node = tst->node_lines->node_line;
-   tst->free_list = current_node;
-   for (i = 1; i < tst->node_line_width; i++)
-   {
-      current_node->middle = &(tst->node_lines->node_line[i]);
-      current_node = current_node->middle;
-   }
-   current_node->middle = NULL;
-   return 1;
-}
-

data/ext/http11/tst_init.c

@@ -1,41 +0,0 @@
-
-#include "tst.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-struct tst *tst_init(int width)
-{
-   struct tst *tst;
-   struct node *current_node;
-   int i;
-
-
-if((tst = (struct tst *) calloc(1, sizeof(struct tst))) == NULL)
-   return NULL;
-
-if ((tst->node_lines = (struct node_lines *) calloc(1, sizeof(struct node_lines))) == NULL)
-{
-   free(tst);
-   return NULL;
-}
-
-tst->node_line_width = width;
-tst->node_lines->next = NULL;
-if ((tst->node_lines->node_line = (struct node *) calloc(width, sizeof(struct node))) == NULL)
-{
-   free(tst->node_lines);
-   free(tst);
-   return NULL;
-}
-
-current_node = tst->node_lines->node_line;
-tst->free_list = current_node;
-for (i = 1; i < width; i++)
-{
-   current_node->middle = &(tst->node_lines->node_line[i]);
-   current_node = current_node->middle;
-}
-current_node->middle = NULL;
-return tst;
-}
-

data/ext/http11/tst_insert.c

@@ -1,218 +0,0 @@
-
-#include "tst.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h> 
-
-int tst_grow_node_free_list(struct tst *tst);
-int tst_insert(unsigned char *key, void *data, struct tst *tst, int option, void **exist_ptr)
-{
-   struct node *current_node;
-   struct node *new_node_tree_begin = NULL;
-   struct node *new_node;
-   int key_index;
-   int perform_loop = 1;
-   
-   if (key == NULL)
-      return TST_NULL_KEY;
-   
-   if(key[0] == 0)
-      return TST_NULL_KEY;
-   
-   if(tst->head[(int)key[0]] == NULL)
-   {
-      
-      if(tst->free_list == NULL)
-      {
-         if(tst_grow_node_free_list(tst) != 1)
-            return TST_ERROR;
-      }
-      tst->head[(int)key[0]] = tst->free_list;
-      
-      tst->free_list = tst->free_list->middle;
-      current_node = tst->head[(int)key[0]];
-      current_node->value = key[1];
-      if(key[1] == 0)
-      {
-         current_node->middle = data;
-         return TST_OK;
-      }
-      else
-         perform_loop = 0;
-   }
-   
-   current_node = tst->head[(int)key[0]];
-   key_index = 1;
-   while(perform_loop == 1)
-   {
-      if(key[key_index] == current_node->value)
-      {
-         
-         if(key[key_index] == 0)
-         {
-            if (option == TST_REPLACE)
-            {
-               if (exist_ptr != NULL)
-                  *exist_ptr = current_node->middle;
-         
-               current_node->middle = data;
-               return TST_OK;
-            }
-            else
-            {
-               if (exist_ptr != NULL)
-                  *exist_ptr = current_node->middle;
-               return TST_DUPLICATE_KEY;
-            }
-         }
-         else
-         {
-            if(current_node->middle == NULL)
-            {
-               
-               if(tst->free_list == NULL)
-               {
-                  if(tst_grow_node_free_list(tst) != 1)
-                     return TST_ERROR;
-               }
-               current_node->middle = tst->free_list;
-               
-               tst->free_list = tst->free_list->middle;
-               new_node_tree_begin = current_node;
-               current_node = current_node->middle;
-               current_node->value = key[key_index];
-               break;
-            }
-            else
-            {
-               current_node = current_node->middle;
-               key_index++;
-               continue;
-            }
-         }
-      }
-      if(key[key_index] == 0)
-      {
-      	 if(tst->free_list == NULL)
-	 {
-	     if(tst_grow_node_free_list(tst) != 1)
-		 return TST_ERROR;
-	 }
-	 new_node = tst->free_list;
-	 tst->free_list = tst->free_list->middle;
-
-	 memcpy((void*)new_node, (void*)current_node, sizeof(struct node));
-	 current_node->value = 0;
-	 if(new_node->value < 64)
-	 {
-	    current_node->left = new_node;
-	    current_node->right = '\0';
-	 }
-	 else
-	 {
-	    current_node->left = '\0';
-	    current_node->right = new_node;
-         }
-
-         current_node->middle = data;
-         return TST_OK;
-      }
-
-      if( ((current_node->value == 0) && (key[key_index] < 64)) ||
-         ((current_node->value != 0) && (key[key_index] <
-         current_node->value)) )
-      {
-         
-         if (current_node->left == NULL)
-         {
-            
-            if(tst->free_list == NULL)
-            {
-               if(tst_grow_node_free_list(tst) != 1)
-                  return TST_ERROR;
-            }
-            current_node->left = tst->free_list;
-            
-            tst->free_list = tst->free_list->middle;
-            new_node_tree_begin = current_node;
-            current_node = current_node->left;
-            current_node->value = key[key_index];
-            if(key[key_index] == 0)
-            {
-               current_node->middle = data;
-               return TST_OK;
-            }
-            else
-               break;
-         }
-         else
-         {
-            current_node = current_node->left;
-            continue;
-         }
-      }
-      else
-      {
-         
-         if (current_node->right == NULL)
-         {
-            
-            if(tst->free_list == NULL)
-            {
-               if(tst_grow_node_free_list(tst) != 1)
-                  return TST_ERROR;
-            }
-            current_node->right = tst->free_list;
-            
-            tst->free_list = tst->free_list->middle;
-            new_node_tree_begin = current_node;
-            current_node = current_node->right;
-            current_node->value = key[key_index];
-            break;
-         }
-         else
-         {
-            current_node = current_node->right;
-            continue;
-         }
-      }
-   }
-   
-   do
-   {
-      key_index++;
-   
-      if(tst->free_list == NULL)
-      {
-         if(tst_grow_node_free_list(tst) != 1)
-         {
-            current_node = new_node_tree_begin->middle;
-   
-            while (current_node->middle != NULL)
-               current_node = current_node->middle;
-   
-            current_node->middle = tst->free_list;
-            tst->free_list = new_node_tree_begin->middle;
-            new_node_tree_begin->middle = NULL;
-   
-            return TST_ERROR;
-         }
-      }
-   
-      
-      if(tst->free_list == NULL)
-      {
-         if(tst_grow_node_free_list(tst) != 1)
-            return TST_ERROR;
-      }
-      current_node->middle = tst->free_list;
-      
-      tst->free_list = tst->free_list->middle;
-      current_node = current_node->middle;
-      current_node->value = key[key_index];
-   } while(key[key_index] !=0);
-   
-   current_node->middle = data;
-   return TST_OK;
-}
-

data/ext/http11/tst_search.c

@@ -1,73 +0,0 @@
-
-#include "tst.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-
-void *tst_search(const unsigned char *key, struct tst *tst, int option,
-		 unsigned int *match_len)
-{
-    struct node *current_node;
-    struct node *longest_match = NULL;
-    unsigned int longest_match_len = 0;
-    int key_index;
-
-    assert(key != NULL && "key can't be NULL");
-    assert(tst != NULL && "tst can't be NULL");
-
-    if (key[0] == 0)
-	return NULL;
-
-    if (tst->head[(int) key[0]] == NULL)
-	return NULL;
-
-    if (match_len)
-	*match_len = 0;
-
-    current_node = tst->head[(int) key[0]];
-    key_index = 1;
-
-    while (current_node != NULL) {
-	if (key[key_index] == current_node->value) {
-	    if (current_node->value == 0) {
-		if (match_len)
-		    *match_len = key_index;
-		return current_node->middle;
-	    } else {
-		current_node = current_node->middle;
-		key_index++;
-		continue;
-	    }
-	} else {
-	    if (current_node->value == 0) {
-		if (option & TST_LONGEST_MATCH) {
-		    longest_match = current_node->middle;
-		    longest_match_len = key_index;
-		}
-
-		if (key[key_index] < 64) {
-		    current_node = current_node->left;
-		    continue;
-		} else {
-		    current_node = current_node->right;
-		    continue;
-		}
-	    } else {
-		if (key[key_index] < current_node->value) {
-		    current_node = current_node->left;
-		    continue;
-		} else {
-		    current_node = current_node->right;
-		    continue;
-		}
-	    }
-	}
-    }
-
-    if (match_len)
-	*match_len = longest_match_len;
-
-    return longest_match;
-
-}

data/lib/mutex_fix.rb

@@ -1,34 +0,0 @@
-require 'thread'
-
-# monkey patch Mutex so it does not leak memory.
-class Mutex
-
-  def lock
-    while (Thread.critical = true; @locked)
-      @waiting.unshift Thread.current
-      Thread.stop
-    end
-    @locked = true
-    Thread.critical = false
-    self
-  end
-  
-  def unlock
-    return unless @locked
-    Thread.critical = true
-    @locked = false
-    begin
-      t = @waiting.pop
-      t.wakeup if t
-    rescue ThreadError
-      retry
-    end
-    Thread.critical = false
-    begin
-      t.run if t
-    rescue ThreadError
-    end
-    self
-  end
-  
-end

data/test/jruby_socket.rb

@@ -1,39 +0,0 @@
-
-# Minimal test to help debug JRuby socket issues
-
-require 'socket'
-
-@server = Thread.new do 
-  server_socket = TCPServer.new('0.0.0.0', 10101)
-  this_client = server_socket.accept
-  4.times do |n|
-    begin
-      data = this_client.readpartial(2)
-      puts "Server got:  #{data}"
-      if n == 0
-        this_client.close 
-        puts "Server closed the client"
-      end
-    rescue IOError => e
-      puts "Server has: #{e.inspect}"
-    end
-    sleep(1)
-  end
-  server_socket.close
-end
-
-sleep(3)
-client_socket = TCPSocket.new('0.0.0.0', 10101)
-4.times do |n|
-  string = "X#{n}"
-  begin
-    client_socket.write(string)
-    puts "Client said: #{string}"
-  rescue Errno::EPIPE => e
-    puts "Client has: #{e.inspect}"
-  end
-  sleep(1)
-end
-client_socket.close
-
-@server.join