bossan 0.1.8 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTI5NjNkNTJkYmMwYmY0NDk5OGFkZDIyYzU1NzQxYWU1NGM3ODcxYw==
+  data.tar.gz: !binary |-
+    NjBmZmUxYjczNTM0YzllYjRmMmI4MzM3Mzc0MjkyZmQ1MDU2MmI4Ng==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjJjMzk1YTlhMjM4OTgxYjU4MWUwODY1ZmZhNWQzY2M3YzU4ZjA0N2U0ODIx
+    MzUzODU0MDYxZmM2YTBhMzlkZjVjNGMyOTU0YjY2MGJiYzlmYTI1YWZlZTZh
+    M2ZjNjBiZWMxZmRlZjE0YzNlNjNlNjE2ODhkZjMxMzM4MjE1MGE=
+  data.tar.gz: !binary |-
+    NWQ4YTdkNmNjODVkZTgyZGQxNzdhMjk5NjViYzk1ZjliYjQwODY2OGI1MTI0
+    MTgxMjlkNDA2MzRkNzJlNDY4MDNmMTViODJmM2ZmNDY4MTFiNjYyNzIyYzlk
+    MThmNWY4Mjg4NGI5YzgyOWY1OGFhMDlhOGEzYTE2OTRkNzA1ZGE=

data/.gitignore

@@ -20,4 +20,5 @@ tmp
 Makefile
 *.log
 *.db
+*.pid
 TAGS

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# CHANGELOG
+
+### v0.2.0
+
+(New Feature release. rerelease 2013-05-22)
+
+* support keep-alive (use Bossan.set_keepalive)
+
+* use TCP_DEFER_ACCEPT
+
+* add set_backlog (default:1024)
+
+* add set_picoev_max_fd (default:1024)

data/README.md

@@ -8,7 +8,7 @@ Bossan is a high performance asynchronous ruby's rack-compliant web server.
 
 Bossan requires Ruby 1.9.2 or later.
 
-Bossan supports Linux, FreeBSD and Mac OS X(need gcc>=4.2).
+Bossan supports Linux, FreeBSD and MacOSX(need gcc>=4.2).
 
 ## Installation
 
@@ -16,7 +16,7 @@ from rubygems
 
 `gem install bossan`
 
-or from source:
+from source(github)
 
 ```
 git clone git://github.com/kubo39/bossan.git

data/Rakefile

@@ -13,7 +13,7 @@ end
 
 task :clean do
   Dir.chdir File.expand_path("../ext/bossan", __FILE__)
-  sh "rm -f *.o Makefile"
+  sh "rm -f *.o Makefile mkmf.log"
 end
 
 task :test do

data/TODO

@@ -0,0 +1,6 @@
+* add picoev_max_fd setter, getter
+
+* set rack.input File-type object, if over 512K
+  - avoid too much use memory
+
+* or else...

data/examples/hello.rb

@@ -1,4 +1,4 @@
-require 'bossan'
+require_relative '../lib/bossan'
 
 Bossan.run('127.0.0.1', 8000, proc {|env|
   body = 'hello, world!'

data/examples/sinatra_app.rb

@@ -1,4 +1,4 @@
-require 'bossan'
+require_relative '../lib/bossan'
 require 'sinatra/base'
 
 class App < Sinatra::Base

data/examples/views_sample.rb

@@ -1,4 +1,4 @@
-require 'bossan'
+require_relative '../lib/bossan'
 require 'sinatra/base'
 require 'haml'
 

data/ext/bossan/bossan.h

@@ -0,0 +1,75 @@
+#ifndef BOSSAN_H
+#define BOSSAN_H
+
+#include "ruby.h"
+#include <assert.h>
+#include <fcntl.h>   
+#include <stddef.h> 
+#include <unistd.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <signal.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#ifdef linux
+#include <sys/prctl.h>
+#elif defined(__APPLE__) || defined(__FreeBSD__)
+#include <sys/uio.h>
+#endif
+#include <sys/un.h>
+#include <sys/stat.h>
+#include <sys/file.h>
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netdb.h>
+
+/* #define DEVELOP */
+
+#ifdef DEVELOP
+#define DEBUG(...) \
+    do { \
+        printf("%-40s %-26s%4u: ", __FILE__, __func__, __LINE__); \
+        printf(__VA_ARGS__); \
+        printf("\n"); \
+    } while(0)
+#define RDEBUG(...) \
+    do { \
+        printf("\x1B[31m%-40s %-26s%4u: ", __FILE__, __func__, __LINE__); \
+        printf(__VA_ARGS__); \
+        printf("\x1B[0m\n"); \
+    } while(0)
+#define GDEBUG(...) \
+    do { \
+        printf("\x1B[32m%-40s %-26s%4u: ", __FILE__, __func__, __LINE__); \
+        printf(__VA_ARGS__); \
+        printf("\x1B[0m\n"); \
+    } while(0)
+#define BDEBUG(...) \
+    do { \
+        printf("\x1B[1;34m%-40s %-26s%4u: ", __FILE__, __func__, __LINE__); \
+        printf(__VA_ARGS__); \
+        printf("\x1B[0m\n"); \
+    } while(0)
+#define YDEBUG(...) \
+    do { \
+        printf("\x1B[1;33m%-40s %-26s%4u: ", __FILE__, __func__, __LINE__); \
+        printf(__VA_ARGS__); \
+        printf("\x1B[0m\n"); \
+    } while(0)
+#else
+#define DEBUG(...) do{}while(0)
+#define RDEBUG(...) do{}while(0)
+#define GDEBUG(...) do{}while(0)
+#define BDEBUG(...) do{}while(0)
+#define YDEBUG(...) do{}while(0)
+#endif
+
+#if __GNUC__ >= 3
+# define likely(x)    __builtin_expect(!!(x), 1)
+# define unlikely(x)    __builtin_expect(!!(x), 0)
+#else
+# define likely(x) (x)
+# define unlikely(x) (x)
+#endif
+
+#endif

data/ext/bossan/bossan_ext.c

@@ -1,25 +1,4 @@
-#include "ruby.h"
-#include <assert.h>
-#include <fcntl.h>   
-#include <stddef.h> 
-#include <unistd.h>
-#include <errno.h>
-#include <arpa/inet.h>
-#include <signal.h>
-#include <sys/socket.h>
-#include <sys/types.h>
-#ifdef linux
-#include <sys/sendfile.h>
-#include <sys/prctl.h>
-#elif defined(__APPLE__) || defined(__FreeBSD__)
-#include <sys/uio.h>
-#endif
-#include <sys/un.h>
-#include <sys/stat.h>
-#include <sys/file.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
+#include "bossan.h"
 
 #include "time_cache.h"
 #include "http_parser.h"
@@ -27,13 +6,11 @@
 #include "buffer.h"
 #include "client.h"
 
-#define MAX_FDS 1024 * 8
 #define ACCEPT_TIMEOUT_SECS 1
 #define SHORT_TIMEOUT_SECS 2
 #define WRITE_TIMEOUT_SECS 5
 #define READ_LONG_TIMEOUT_SECS 5
 
-#define BACKLOG 1024
 #define MAX_BUFSIZE 1024 * 8
 #define INPUT_BUF_SIZE 1024 * 8
 
@@ -50,7 +27,7 @@
 
 #define MSG_413 ("HTTP/1.0 413 Request Entity Too Large\r\nContent-Type: text/html\r\nServer: " SERVER "\r\n\r\n<html><head><title>Request Entity Too Large</title></head><body><p>Request Entity Too Large.</p></body></html>")
 
-#define SERVER "bossan/0.1.8"
+#define SERVER "bossan/0.2.0"
 
 VALUE server; // Bossan
 
@@ -116,6 +93,10 @@ static int log_fd = -1; //access log
 /* static int err_log_fd = -1; //error log */
 
 static int is_keep_alive = 0; //keep alive support
+static int keep_alive_timeout = 5;
+
+static int max_fd = 1024 * 4;  // picoev max_fd size
+static int backlog = 1024;  // backlog size
 int max_content_length = 1024 * 1024 * 16; //max_content_length
 
 static VALUE StringIO;
@@ -132,6 +113,13 @@ typedef struct {
 } write_bucket;
 
 
+static void
+r_callback(picoev_loop* loop, int fd, int events, void* cb_arg);
+
+static void
+w_callback(picoev_loop* loop, int fd, int events, void* cb_arg);
+
+
 int
 open_log_file(const char *path)
 {
@@ -139,6 +127,27 @@ open_log_file(const char *path)
 }
 
 
+void
+write_error_log(char *file_name, int line)
+{
+  char buf[64];
+  FILE *fp = stderr;
+  int fd = fileno(fp);
+
+  flock(fd, LOCK_EX);
+
+  cache_time_update();
+  fputs((char *)err_log_time, fp);
+  fputs(" [error] ", fp);
+
+  sprintf(buf, "pid %d, File \"%s\", line %d :", getpid(), file_name, line);
+  fputs(buf, fp);
+  fflush(fp);
+
+  flock(fd, LOCK_UN);
+}
+
+
 static int
 write_log(const char *new_path, int fd, const char *data, size_t len)
 {
@@ -261,7 +270,7 @@ blocking_write(client_t *client, char *data, size_t len)
 	  // TODO:
 	  // raise exception from errno
 
-	  /* write_error_log(__FILE__, __LINE__); */
+	  write_error_log(__FILE__, __LINE__);
 	  client->keep_alive = 0;
 	}
 	return -1;
@@ -309,15 +318,6 @@ send_error_page(client_t *client)
 }
 
 
-static void
-extent_sndbuf(client_t *client)
-{
-  int bufsize = 1024 * 1024 * 2, r;
-  r = setsockopt(client->fd, SOL_SOCKET, SO_SNDBUF, &bufsize, sizeof(bufsize));
-  assert(r == 0);
-}
-
-
 static void
 enable_cork(client_t *client)
 {
@@ -391,7 +391,7 @@ writev_bucket(write_bucket *data)
       // TODO:
       // raise exception from errno
       /* rb_raise(rb_eIOError); */
-      /* write_error_log(__FILE__, __LINE__);  */
+      write_error_log(__FILE__, __LINE__);
       return -1;
     }
   }if(w == 0){
@@ -410,9 +410,7 @@ writev_bucket(write_bucket *data)
 	}
       }
       data->total = data->total -w;
-#ifdef DEBUG
-      printf("writev_bucket write %d progeress %d/%d \n", w, data->total, data->total_size);
-#endif
+      DEBUG("writev_bucket write %d progeress %d/%d \n", w, data->total, data->total_size);
       //resume
       // again later
       return writev_bucket(data);
@@ -531,7 +529,7 @@ write_headers(client_t *client)
   }
   return ret;
  error:
-  /* write_error_log(__FILE__, __LINE__); */
+  write_error_log(__FILE__, __LINE__);
   if(bucket){
     free_write_bucket(bucket);
     client->bucket = NULL;
@@ -662,9 +660,7 @@ start_response_write(client_t *client)
     return -1;
   }
 
-#ifdef DEBUG
-  printf("start_response_write buflen %d \n", buflen);
-#endif
+  /* DEBUG("start_response_write buflen %d \n", buflen); */
   return write_headers(client);
 }
 
@@ -678,9 +674,7 @@ response_start(client_t *client)
     return write_headers(client);
   }
   ret = start_response_write(client);
-#ifdef DEBUG
-  printf("start_response_write ret = %d \n", ret);
-#endif
+  DEBUG("start_response_write ret = %d \n", ret);
   if(ret > 0){
     // sended header
     ret = processs_write(client);
@@ -693,7 +687,7 @@ static void
 key_upper(char *s, const char *key, size_t len)
 {
   int i = 0;
-  register int c;
+  int c;
   for (i = 0; i < len; i++) {
     c = key[i];
     if(c == '-'){
@@ -709,30 +703,14 @@ key_upper(char *s, const char *key, size_t len)
 }
 
 
-static int
-write_body2file(client_t *client, const char *buffer, size_t buffer_len)
-{
-  FILE *tmp = (FILE *)client->body;
-  fwrite(buffer, 1, buffer_len, tmp);
-  client->body_readed += buffer_len;
-#ifdef DEBUG
-  printf("write_body2file %d bytes \n", buffer_len);
-#endif
-  return client->body_readed;
-}
-
-
 static int
 write_body2mem(client_t *client, const char *buffer, size_t buffer_len)
 {
   VALUE obj;
-  /* printf("body2mem called\n"); */
 
   rb_funcall((VALUE)client->body, i_write, 1, rb_str_new(buffer, buffer_len));
   client->body_readed += buffer_len;
-#ifdef DEBUG
-  printf("write_body2mem %d bytes \n", buffer_len);
-#endif
+  DEBUG("write_body2mem %d bytes \n", buffer_len);
   return client->body_readed;
 }
 
@@ -910,7 +888,7 @@ int
 request_uri_cb (http_parser *p, const char *buf, size_t len, char partial)
 {
   client_t *client = get_client(p);
-  register request *req = client->req;
+  request *req = client->req;
   buffer_result ret = MEMORY_ERROR;
     
   if(req->uri){
@@ -964,7 +942,7 @@ int
 fragment_cb (http_parser *p, const char *buf, size_t len, char partial)
 {
   client_t *client = get_client(p);
-  register request *req = client->req;
+  request *req = client->req;
   buffer_result ret = MEMORY_ERROR;
   
   if(req->fragment){
@@ -1002,14 +980,10 @@ body_cb (http_parser *p, const char *buf, size_t len, char partial)
       return -1;
     }
     //default memory stream
-#ifdef DEBUG
-    printf("client->body_length %d \n", client->body_length);
-#endif
+    DEBUG("client->body_length %d \n", client->body_length);
     client->body = rb_funcall(StringIO, i_new, 1, rb_str_new2(""));
     client->body_type = BODY_TYPE_BUFFER;
-#ifdef DEBUG
-    printf("BODY_TYPE_BUFFER \n");
-#endif
+    DEBUG("BODY_TYPE_BUFFER \n");
   }
   write_body(client, buf, len);
   return 0;
@@ -1276,12 +1250,35 @@ setsig(int sig, void* handler)
 }
 
 
+void 
+setup_listen_sock(int fd)
+{
+  int on = 1, r;
+  r = setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &on, sizeof(on));
+  assert(r == 0);
+  r = fcntl(fd, F_SETFL, O_NONBLOCK);
+  assert(r == 0);
+}
+
+
 static void
 setup_sock(int fd)
 {
   int on = 1, r;
   r = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
   assert(r == 0);
+
+  // 60 + 30 * 4
+  on = 300;
+  r = setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &on, sizeof(on));
+  assert(r == 0);
+  on = 30;
+  r = setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &on, sizeof(on));
+  assert(r == 0);
+  on = 4;
+  r = setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &on, sizeof(on));
+  assert(r == 0);
+
   r = fcntl(fd, F_SETFL, O_NONBLOCK);
   assert(r == 0);
 }
@@ -1304,21 +1301,18 @@ disable_cork(client_t *client)
 
 
 static client_t *
-new_client_t(int client_fd, struct sockaddr_in client_addr){
+new_client_t(int client_fd, char *remote_addr, uint32_t remote_port)
+{
   client_t *client;
     
   client = ruby_xmalloc(sizeof(client_t));
   memset(client, 0, sizeof(client_t));
     
-  /* printf("size %d\n", sizeof(client_t)); */
-
   client->fd = client_fd;
-    
-  client->remote_addr = inet_ntoa(client_addr.sin_addr);
-  client->remote_port = ntohs(client_addr.sin_port);
+  client->remote_addr = remote_addr;
+  client->remote_port = remote_port;
   client->req = new_request();
   client->body_type = BODY_TYPE_NONE;
-  //printf("input_buf_size %d\n", client->input_buf_size);
   return client;
 }
 
@@ -1331,9 +1325,7 @@ clean_cli(client_t *client)
     free_request(client->req);
     client->req = NULL;
   }
-#ifdef DEBUG
-  printf("close environ %p \n", client->environ);
-#endif
+  DEBUG("close environ %p \n", client->environ);
 
   // force clear
   client->environ = rb_hash_new();
@@ -1348,32 +1340,26 @@ clean_cli(client_t *client)
 static void
 close_conn(client_t *cli, picoev_loop* loop)
 {
+  client_t *new_client;
+  if(!cli->response_closed){
+    close_response(cli);
+  }
+  picoev_del(loop, cli->fd);
+
+  DEBUG("picoev_del client:%p fd:%d \n", cli, cli->fd);
+  clean_cli(cli);
   if(!cli->keep_alive){
-    picoev_del(loop, cli->fd);
-    clean_cli(cli);
     close(cli->fd);
-#ifdef DEBUG
-    printf("close fd %d \n", cli->fd);
-#endif
-    ruby_xfree(cli);
+    DEBUG("close client:%p fd:%d \n", cli, cli->fd);
   }else{
-    clean_cli(cli);
     disable_cork(cli);
-    cli->keep_alive = 1;
-    cli->environ = Qnil;
-    cli->http_status = Qnil;
-    cli->headers = Qnil;
-    cli->header_done = 0;
-    cli->body_type = BODY_TYPE_NONE;
-    cli->status_code = 0;
-    cli->response = Qnil;
-    cli->content_length_set = 0;
-    cli->content_length = 0;
-    cli->write_bytes = 0;
-    cli->response_closed = 0;
-    cli->bad_request_code = 0;
-    init_parser(cli, server_name, server_port);
+    new_client = new_client_t(cli->fd, cli->remote_addr, cli->remote_port);
+    rb_gc_register_address(&new_client->environ);
+    new_client->keep_alive = 1;
+    init_parser(new_client, server_name, server_port);
+    picoev_add(main_loop, new_client->fd, PICOEV_READ, keep_alive_timeout, r_callback, (void *)new_client);
   }
+  ruby_xfree(cli);
 }
 
 
@@ -1413,7 +1399,7 @@ process_rack_app(client_t *cli)
 
   //check response
   if(cli->response && cli->response == Qnil){
-    /*   write_error_log(__FILE__, __LINE__); */
+    write_error_log(__FILE__, __LINE__);
     rb_raise(rb_eException, "response must be a iter or sequence object");
   }
 
@@ -1426,13 +1412,9 @@ w_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
 {
   client_t *client = ( client_t *)(cb_arg);
   int ret;
-#ifdef DEBUG
-  printf("call w_callback \n");
-#endif
+  DEBUG("call w_callback \n");
   if ((events & PICOEV_TIMEOUT) != 0) {
-#ifdef DEBUG
-    printf("** w_callback timeout ** \n");
-#endif
+    YDEBUG("** w_callback timeout ** \n");
     //timeout
     client->keep_alive = 0;
     close_conn(client, loop);
@@ -1440,9 +1422,7 @@ w_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
   } else if ((events & PICOEV_WRITE) != 0) {
     ret = process_body(client);
     picoev_set_timeout(loop, client->fd, WRITE_TIMEOUT_SECS);
-#ifdef DEBUG
-    printf("process_body ret %d \n", ret);
-#endif
+    DEBUG("process_body ret %d \n", ret);
     if(ret != 0){
       //ok or die
       close_conn(client, loop);
@@ -1464,7 +1444,6 @@ call_rack_app(client_t *client, picoev_loop* loop)
   }
 
   ret = response_start(client);
-  /* printf("response_start done: %d\n", ret); */
   switch(ret){
   case -1:
     // Internal Server Error
@@ -1475,9 +1454,7 @@ call_rack_app(client_t *client, picoev_loop* loop)
   case 0:
     // continue
     // set callback
-#ifdef DEBUG
-    printf("set write callback %d \n", ret);
-#endif
+    DEBUG("set write callback %d \n", ret);
     //clear event
     picoev_del(loop, client->fd);
     picoev_add(loop, client->fd, PICOEV_WRITE, WRITE_TIMEOUT_SECS, w_callback, (void *)client);
@@ -1528,16 +1505,12 @@ r_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
 {
   client_t *cli = ( client_t *)(cb_arg);
   if ((events & PICOEV_TIMEOUT) != 0) {
-#ifdef DEBUG
-    printf("** r_callback timeout ** \n");
-#endif
+    YDEBUG("** r_callback timeout ** \n");
     //timeout
     cli->keep_alive = 0;
     close_conn(cli, loop);
   } else if ((events & PICOEV_READ) != 0) {
-#ifdef DEBUG
-    printf("ready read \n");
-#endif
+    RDEBUG("ready read \n");
     /* update timeout, and read */
     int finish = 0, nread;
     char buf[INPUT_BUF_SIZE];
@@ -1548,50 +1521,56 @@ r_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
     r = read(cli->fd, buf, sizeof(buf));
     switch (r) {
     case 0: 
-      finish = 1;
-      break;
+      cli->keep_alive = 0;
+      cli->status_code = 500; // ??? 503 ??
+      send_error_page(cli);
+      close_conn(cli, loop);
+      return;
     case -1: /* error */
       if (errno == EAGAIN || errno == EWOULDBLOCK) { /* try again later */
 	break;
       } else { /* fatal error */
-	rb_raise(rb_eException, "fatal error");
-	// TODO:
-	// raise exception from errno
-	/* rb_raise(); */
-	/* write_error_log(__FILE__, __LINE__);  */
-	cli->keep_alive = 0;
-	cli->status_code = 500;
+	if (cli->keep_alive && errno == ECONNRESET) {
+	  cli->keep_alive = 0;
+	  cli->status_code = 500;
+	  cli->header_done = 1;
+	  cli->response_closed = 1;
+	} else {
+	  /* rb_raise(rb_eException, "fatal error"); */
+	  write_error_log(__FILE__, __LINE__);
+	  cli->keep_alive = 0;
+	  cli->status_code = 500;
+	  if(errno != ECONNRESET){
+	    send_error_page(cli);
+	  }else{
+	    cli->header_done = 1;
+	    cli->response_closed = 1;
+	  }
+	}
 	close_conn(cli, loop);
 	return;
       }
       break;
     default:
-#ifdef DEBUG
-      printf("read request fd %d bufsize %d \n", cli->fd, r);
-#endif
+      RDEBUG("read request fd %d bufsize %d \n", cli->fd, r);
       nread = execute_parse(cli, buf, r);
-                
+
       if(cli->bad_request_code > 0){
-#ifdef DEBUG
-	printf("fd %d bad_request code %d \n", cli->fd,  cli->bad_request_code);
-#endif
+	RDEBUG("fd %d bad_request code %d \n", cli->fd,  cli->bad_request_code);
 	send_error_page(cli);
 	close_conn(cli, loop);
 	return;
       }
       if( nread != r ){
 	// parse error
-#ifdef DEBUG
-	printf("fd %d parse error %d \n", cli->fd, cli->bad_request_code);
-#endif
+	DEBUG("fd %d parse error %d \n", cli->fd, cli->bad_request_code);
 	cli->bad_request_code = 400;
 	send_error_page(cli);
 	close_conn(cli, loop);
 	return;
       }
-#ifdef DEBUG
-      printf("parse ok, fd %d %d nread \n", cli->fd, nread);
-#endif
+      RDEBUG("parse ok, fd %d %d nread \n", cli->fd, nread);
+
       if(parser_finish(cli) > 0){
 	finish = 1;
       }
@@ -1599,6 +1578,7 @@ r_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
     }
     
     if(finish == 1){
+      /* picoev_del(loop, cli->fd); */
       prepare_call_rack(cli);
       call_rack_app(cli, loop);
       return;
@@ -1613,6 +1593,9 @@ accept_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
   int client_fd;
   client_t *client;
   struct sockaddr_in client_addr;
+  char *remote_addr;
+  uint32_t remote_port;
+
   if ((events & PICOEV_TIMEOUT) != 0) {
     // time out
     // next turn or other process
@@ -1625,24 +1608,17 @@ accept_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
     client_fd = accept(fd, (struct sockaddr *)&client_addr, &client_len);
 #endif
     if (client_fd != -1) {
-#ifdef DEBUG
-      printf("accept fd %d \n", client_fd);
-#endif
+      DEBUG("accept fd %d \n", client_fd);
       setup_sock(client_fd);
-      client = new_client_t(client_fd, client_addr);
-
-      client->environ = Qnil;
+      remote_addr = inet_ntoa(client_addr.sin_addr);
+      remote_port = ntohs(client_addr.sin_port);
+      client = new_client_t(client_fd, remote_addr, remote_port);
       rb_gc_register_address(&client->environ);
-
       init_parser(client, server_name, server_port);
-
-      picoev_add(loop, client_fd, PICOEV_READ, READ_LONG_TIMEOUT_SECS, r_callback, (void *)client);
+      picoev_add(loop, client_fd, PICOEV_READ, keep_alive_timeout, r_callback, (void *)client);
     }else{
       if (errno != EAGAIN && errno != EWOULDBLOCK) {
-	// TODO:
-	// raise exception from errno
-	/* rb_raise(); */
-	/* write_error_log(__FILE__, __LINE__); */
+	write_error_log(__FILE__, __LINE__);
 	// die
 	loop_done = 0;
       }
@@ -1654,9 +1630,9 @@ accept_callback(picoev_loop* loop, int fd, int events, void* cb_arg)
 static void
 setup_server_env(void)
 {
+  setup_listen_sock(listen_sock);
   setup_sock(listen_sock);
   cache_time_init();
-
   setup_static_env(server_name, server_port);
 }
 
@@ -1677,9 +1653,6 @@ inet_listen(void)
   snprintf(strport, sizeof (strport), "%d", server_port);
   
   if ((rv = getaddrinfo(server_name, strport, &hints, &servinfo)) == -1) {
-    // TODO:
-    // raise exception from errno
-    /* rb_raise(); */
     return -1;
   }
 
@@ -1694,17 +1667,11 @@ inet_listen(void)
     if (setsockopt(listen_sock, SOL_SOCKET, SO_REUSEADDR, &flag,
 		   sizeof(int)) == -1) {
       close(listen_sock);
-      // TODO:
-      // raise exception from errno
-      /* rb_raise(); */
       return -1;
     }
 
     if (bind(listen_sock, p->ai_addr, p->ai_addrlen) == -1) {
       close(listen_sock);
-      // TODO:
-      // raise exception from errno
-      /* rb_raise(); */
       return -1;
     }
     break;
@@ -1719,11 +1686,8 @@ inet_listen(void)
   freeaddrinfo(servinfo); // all done with this structure
     
   // BACKLOG 1024
-  if (listen(listen_sock, BACKLOG) == -1) {
+  if (listen(listen_sock, backlog) == -1) {
     close(listen_sock);
-    // TODO:
-    // raise exception from errno
-    /* rb_raise(); */
     return -1;
   }
   setup_server_env();
@@ -1750,9 +1714,7 @@ unix_listen(char *sock_name)
   struct sockaddr_un saddr;
   mode_t old_umask;
 
-#ifdef DEBUG
-  printf("unix domain socket %s\n", sock_name);
-#endif
+  DEBUG("unix domain socket %s\n", sock_name);
   memset(&saddr, 0, sizeof(saddr));
   check_unix_sockpath(sock_name);
 
@@ -1778,7 +1740,7 @@ unix_listen(char *sock_name)
   umask(old_umask);
 
   // BACKLOG 1024
-  if (listen(listen_sock, BACKLOG) == -1) {
+  if (listen(listen_sock, backlog) == -1) {
     close(listen_sock);
     rb_raise(rb_eIOError, "server: failed to set backlog\n");
   }
@@ -1792,7 +1754,6 @@ static void
 sigint_cb(int signum)
 {
   loop_done = 0;
-  /* rb_interrupt(); */
 }
 
 
@@ -1881,7 +1842,7 @@ bossan_run_loop(int argc, VALUE *argv, VALUE self)
   }
     
   /* init picoev */
-  picoev_init(MAX_FDS);
+  picoev_init(max_fd);
   /* create loop */
   main_loop = picoev_create_loop(60);
   loop_done = 1;
@@ -1899,6 +1860,9 @@ bossan_run_loop(int argc, VALUE *argv, VALUE self)
   picoev_destroy_loop(main_loop);
   picoev_deinit();
 
+  if(unix_sock_name){
+    unlink(unix_sock_name);
+  }
   printf("Bye.\n");
   return Qnil;
 }
@@ -1919,6 +1883,75 @@ bossan_get_max_content_length(VALUE self)
 }
 
 
+VALUE 
+bossan_set_keepalive(VALUE self, VALUE args)
+{
+  int on;
+
+  on = NUM2INT(args);
+  if(on < 0){
+    rb_p("keep alive value out of range.\n");
+    return Qfalse;
+  }
+
+  is_keep_alive = on;
+
+  if(is_keep_alive){
+    keep_alive_timeout = on;
+  }else{
+    keep_alive_timeout = 2;
+  }
+  return Qnil;
+}
+
+
+VALUE
+bossan_get_keepalive(VALUE self)
+{
+  return INT2NUM(is_keep_alive);
+}
+
+
+VALUE 
+bossan_set_picoev_max_fd(VALUE self, VALUE args)
+{
+  int temp;
+  temp = NUM2INT(args);
+  if (temp <= 0) {
+    rb_raise(rb_eException, "max_fd value out of range ");
+  }
+  max_fd = temp;
+  return Qnil;
+}
+
+
+VALUE 
+bossan_get_picoev_max_fd(VALUE self)
+{
+  return INT2NUM(max_fd);
+}
+
+
+VALUE
+bossan_set_backlog(VALUE self, VALUE args)
+{
+  int temp;
+  temp = NUM2INT(args);
+  if (temp <= 0) {
+    rb_raise(rb_eException, "backlog value out of range ");
+  }
+  backlog = temp;
+  return Qnil;
+}
+
+
+VALUE 
+bossan_get_backlog(VALUE self)
+{
+  return INT2NUM(backlog);
+}
+
+
 void
 Init_bossan_ext(void)
 {
@@ -1984,11 +2017,21 @@ Init_bossan_ext(void)
 
   rb_define_module_function(server, "run", bossan_run_loop, -1);
   rb_define_module_function(server, "stop", bossan_stop, 0);
+  rb_define_module_function(server, "shutdown", bossan_stop, 0);
 
   rb_define_module_function(server, "access_log", bossan_access_log, 1);
   rb_define_module_function(server, "set_max_content_length", bossan_set_max_content_length, 1);
   rb_define_module_function(server, "get_max_content_length", bossan_get_max_content_length, 0);
 
+  rb_define_module_function(server, "set_keepalive", bossan_set_keepalive, 1);
+  rb_define_module_function(server, "get_keepalive", bossan_get_keepalive, 0);
+
+  rb_define_module_function(server, "set_picoev_max_fd", bossan_set_picoev_max_fd, 1);
+  rb_define_module_function(server, "get_picoev_max_fd", bossan_get_picoev_max_fd, 0);
+
+  rb_define_module_function(server, "set_backlog", bossan_set_backlog, 1);
+  rb_define_module_function(server, "get_backlog", bossan_get_backlog, 0);
+
   rb_require("stringio");
   StringIO = rb_const_get(rb_cObject, rb_intern("StringIO"));
 }

data/ext/bossan/picoev_epoll.c

@@ -64,8 +64,6 @@ picoev_loop* picoev_create_loop(int max_timeout)
     free(loop);
     return NULL;
   }
-
-  loop->loop.now = time(NULL);
   return &loop->loop;
 }
 

data/lib/bossan/version.rb

@@ -1,3 +1,3 @@
 module Bossan
-  VERSION = "0.1.8"
+  VERSION = "0.2.0"
 end

data/test/test_rack_spec.rb

@@ -29,7 +29,6 @@ class RackSpecTest < Test::Unit::TestCase
       rescue
         next
       end
-      server_is_wake_up = true
       $stderr.puts "*** running success ***"
       return true
     }
@@ -39,6 +38,8 @@ class RackSpecTest < Test::Unit::TestCase
   private :server_is_wake_up?
 
   def setup
+    $stderr.puts RUBY_DESCRIPTION
+
     @pid = fork do
       trap(:INT) { Bossan.stop }
       Bossan.run(DEFAULT_HOST, DEFAULT_PORT, App.new)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: bossan
 version: !ruby/object:Gem::Version
-  version: 0.1.8
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Hiroki Noda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -37,10 +34,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO
 - bossan.gemspec
 - examples/blog/README.md
 - examples/blog/app.rb
@@ -53,6 +52,7 @@ files:
 - examples/sinatra_app.rb
 - examples/views/index.haml
 - examples/views_sample.rb
+- ext/bossan/bossan.h
 - ext/bossan/bossan_ext.c
 - ext/bossan/buffer.c
 - ext/bossan/buffer.h
@@ -75,28 +75,27 @@ files:
 - test/test_rack_spec.rb
 homepage: https://github.com/kubo39/bossan
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: high performance asynchronous rack web server
 test_files: []
 has_rdoc: