Brad Hilton
9/25/2003 8:34:00 PM
Hello,
I have two patches that fix / enhance the C version of ruby-fcgi. This
message was sent to the maintainer several days ago, but I haven't
received a response. I'm hoping perhaps he reads this list.
The fix:
fcgi_stream_read() does not free the buff variable, which results in
memory leakage that is most noticeable when handling large file
uploads. Simply doing a:
------------------------
FCGI::each { |request|
until request.in.eof?
request.in.read(1024)
end
}
------------------------
exposes the problem, as the application grows in size with each new
client POST. Calling GC.start does nothing to decrease the size. The
first patch appears to solve this problem.
The second patch adds a new method FCGI::open_socket(socket_path,
tcp_backlog) which allows the library to be used with the
FastCgiExternalServer option of mod_fastcgi for Apache. FCGI::accept()
and FCGI::each() had to be patched to optionally take this new socket
argument. Example usage would be:
sock = FCGI.open_socket('localhost:23443', 10)
FCGI::each(sock) { |request|
...
}
Thank you for considering these patches.
Regards,
-Brad Hilton
--- fcgi.c.orig 2003-09-23 11:20:01.000000000 -0700+++ fcgi.c 2003-09-23 11:20:29.000000000 -0700@@ -389,9 +389,11 @@ static VALUE fcgi_stream_read(int argc, if (n > 0) { rb_str_cat(str, buff, n); } else {+ xfree(buff); return Qnil; } }+ xfree(buff); return str; } @@ -404,9 +406,11 @@ static VALUE fcgi_stream_read(int argc, if (n > 0) { str = rb_str_new(buff, n); OBJ_TAINT(str);+ xfree(buff); return str; } else {+ xfree(buff); return Qnil; } }--- fcgi.c 2003-09-23 11:20:29.000000000 -0700+++ /home/bhilton/fcgi.c.patched 2003-09-23 11:20:50.000000000 -0700@@ -37,15 +37,37 @@ static void fcgi_mark(fcgi_data *data) rb_gc_mark(data->env); } -static VALUE fcgi_s_accept(VALUE self)+static VALUE fcgi_s_open_socket(VALUE self, VALUE path, VALUE backlog)+{+ VALUE fileno;++ fileno = INT2NUM(FCGX_OpenSocket( STR2CSTR(path), NUM2INT(backlog) ));+ return rb_funcall(rb_cIO, rb_intern("new"), 1, fileno);+}++static VALUE fcgi_s_accept(int argc, VALUE *argv, VALUE self) { int status; FCGX_Request *req; fd_set readfds;+ int fileno;++ switch (argc)+ {+ case 1:+ fileno = NUM2INT(rb_funcall(argv[0], rb_intern("fileno"), 0));+ break;+ case 0:+ fileno = 0;+ break;+ default:+ rb_raise(rb_eArgError, "wrong number of arguments (0 or 1)");+ break;+ } req = ALLOC(FCGX_Request); - status = FCGX_InitRequest(req,0,0);+ status = FCGX_InitRequest(req,fileno,0); if (status != 0) { rb_raise(eFCGIError, "FCGX_Init() failed"); return Qnil;@@ -89,11 +111,28 @@ static VALUE fcgi_s_accept(VALUE self) } } -static VALUE fcgi_s_each(VALUE self)+static VALUE fcgi_s_each(int argc, VALUE *argv, VALUE self) { VALUE fcgi;+ VALUE socket;+ VALUE args[1];++ switch(argc)+ {+ case 1:+ socket = argv[0];+ break;+ case 0:+ socket = rb_funcall(rb_cIO, rb_intern("new"), 1, INT2NUM(0));+ break;+ default:+ rb_raise(rb_eArgError, "wrong number of arguments (0 or 1)");+ break;+ }++ args[0] = socket; - while ((fcgi = fcgi_s_accept(self)) != Qnil) {+ while ((fcgi = fcgi_s_accept(1, args, self)) != Qnil) { rb_yield(fcgi); } return Qnil;@@ -488,9 +527,10 @@ void Init_fcgi() cFCGI = rb_define_class("FCGI", rb_cObject); eFCGIError =rb_define_class_under(cFCGI, "Error", rb_eStandardError);- rb_define_singleton_method(cFCGI, "accept", fcgi_s_accept, 0);- rb_define_singleton_method(cFCGI, "each", fcgi_s_each, 0);- rb_define_singleton_method(cFCGI, "each_request", fcgi_s_each, 0);+ rb_define_singleton_method(cFCGI, "accept", fcgi_s_accept, -1);+ rb_define_singleton_method(cFCGI, "open_socket", fcgi_s_open_socket, 2);+ rb_define_singleton_method(cFCGI, "each", fcgi_s_each, -1);+ rb_define_singleton_method(cFCGI, "each_request", fcgi_s_each, -1); rb_define_singleton_method(cFCGI, "is_cgi?", fcgi_s_iscgi, 0); rb_define_method(cFCGI, "in", fcgi_in, 0); rb_define_method(cFCGI, "out", fcgi_out, 0);