iodine 0.8.2 → 0.8.3

data/ext/iodine/iodine.c

@@ -240,6 +240,7 @@ void Init_iodine(void) {
   Init_Iodine_PubSub_Message();
   Init_Iodine_TLS();
   Init_Iodine_Connection();
+  Init_Iodine_Params();
   /* make sure the Iodine.run / async methods are available pre-start */
   fio_io_async_attach(&IODINE_THREAD_POOL, (uint32_t)fio_cli_get_i("-t"));
 #ifdef SIGUSR1

data/ext/iodine/iodine.h

@@ -99,7 +99,7 @@ static ID IODINE_JOIN_ID;
 static ID IODINE_TO_PATH_ID;
 static ID IODINE_TO_S_ID;
 static ID IODINE_TO_JSON_ID;
-static ID IODINE_RACK_HIJACK_ID;
+static ID IODINE_RACK_HIJACK_ID; /* rack_hijack */
 static ID IODINE_ON_AUTHENTICATE_ID;
 static ID IODINE_ON_AUTHENTICATE_SSE_ID;
 static ID IODINE_ON_AUTHENTICATE_WEBSOCKET_ID;
@@ -135,6 +135,10 @@ static ID IODINE_DELETE_ID;
   name = rb_intern(value);                                                     \
   STORE.hold(RB_ID2SYM(name));
 
+#define IODINE_CONST_IDSYM_STORE(name, value)                                  \
+  name##_ID = rb_intern(value);                                                \
+  STORE.hold((name##_SYM = RB_ID2SYM(name##_ID)));
+
 static VALUE iodine_rb_IODINE;
 static VALUE iodine_rb_IODINE_BASE;
 static VALUE iodine_rb_IODINE_BASE_APP404;
@@ -150,9 +154,9 @@ static rb_encoding *IodineBinaryEncoding;
 static VALUE IODINE_CONNECTION_ENV_TEMPLATE = Qnil;
 static VALUE IODINE_CONNECTION_ENV_TEMPLATE_HTTPS = Qnil;
 static VALUE IODINE_RACK_PROTOCOL_STR;
-static VALUE IODINE_RACK_HIJACK_ID_SYM;
-static VALUE IODINE_RACK_HIJACK_STR;
-static VALUE IODINE_RACK_HIJACK_SYM;
+static VALUE IODINE_RACK_HIJACK_ID_SYM; /* rack_hijack */
+static VALUE IODINE_RACK_HIJACK_STR;    /* rack.hijack */
+static VALUE IODINE_RACK_HIJACK_SYM;    /* rack.hijack */
 static VALUE IODINE_RACK_UPGRADE_STR;
 static VALUE IODINE_RACK_UPGRADE_Q_STR;
 static VALUE IODINE_RACK_UPGRADE_WS_SYM;
@@ -252,6 +256,7 @@ static VALUE iodine_handler_method_injection__inner(VALUE self,
 #include "iodine_tls.h"
 /* layer 3 modules */
 #include "iodine_connection.h"
+#include "iodine_params.h"
 
 /* layer 4 modules */
 #include "iodine_core.h"

data/ext/iodine/iodine_connection.h

@@ -149,7 +149,11 @@ typedef enum {
   IODINE_CONNECTION_STORE_opath,  /**< Cached original path string */
   IODINE_CONNECTION_STORE_query,  /**< Cached query string */
   IODINE_CONNECTION_STORE_version, /**< Cached HTTP version string */
-  IODINE_CONNECTION_STORE_tmp, /**< Temporary storage during GC-sensitive ops */
+  IODINE_CONNECTION_STORE_tmp, /**< Active upload / temporary GC root */
+  IODINE_CONNECTION_STORE_params, /**< Memoized params Hash (iodine_params.h) */
+  IODINE_CONNECTION_STORE_params_stage, /**< Body parse staging Hash */
+  IODINE_CONNECTION_STORE_params_input, /**< Guarded JSON input copy */
+  IODINE_CONNECTION_STORE_params_exception, /**< Pending parser exception */
   IODINE_CONNECTION_STORE_FINISH, /**< Sentinel value (array size) */
 } iodine_connection_store_e;
 
@@ -164,6 +168,9 @@ typedef enum {
   IODINE_CONNECTION_UPGRADE = (2 | 4),  /**< Any upgrade (SSE or WS) */
   IODINE_CONNECTION_CLOSED = 8,         /**< Connection close scheduled */
   IODINE_CONNECTION_CLIENT = 16,        /**< This is a client connection */
+  IODINE_CONNECTION_PARAMS_QUERY = 32, /**< Query merged into params Hash */
+  IODINE_CONNECTION_PARAMS_BODY = 64,  /**< Body merged into params Hash */
+  IODINE_CONNECTION_PARAMS_HAS_UPLOAD = 128, /**< Upload cleanup may be needed */
 } iodine_connection_flags_e;
 
 /**
@@ -181,9 +188,14 @@ typedef struct iodine_connection_s {
   fio_http_s *http;                            /**< facil.io HTTP handle */
   VALUE store[IODINE_CONNECTION_STORE_FINISH]; /**< Cached Ruby objects */
   iodine_minimap_s map;                        /**< Header storage map */
+  struct iodine_upload_s *open_uploads;        /**< Params cleanup list */
   iodine_connection_flags_e flags;             /**< Connection state flags */
+  size_t params_spent; /**< Params field budget spent (iodine_params.h) */
 } iodine_connection_s;
 
+/* Implemented in iodine_params.h (included after this header). */
+static void iodine_params_on_connection_free(iodine_connection_s *c);
+
 static size_t iodine_connection_data_size(const void *ptr_) {
   iodine_connection_s *c = (iodine_connection_s *)ptr_;
   return sizeof(*c) +
@@ -192,6 +204,7 @@ static size_t iodine_connection_data_size(const void *ptr_) {
 
 static void iodine_connection_free(void *ptr_) {
   iodine_connection_s *c = (iodine_connection_s *)ptr_;
+  iodine_params_on_connection_free(c);
   fio_http_free(c->http);
   iodine_hmap_destroy(&c->map.map);
   FIO_LEAK_COUNTER_ON_FREE(iodine_connection);
@@ -252,6 +265,9 @@ static iodine_connection_s *iodine_connection_ptr(VALUE self) {
   return c;
 }
 
+/* Defined in iodine_params.h (included after this header). */
+static void iodine_params_on_finish(iodine_connection_s *c);
+
 /** Creates (and allocates) a new Iodine::Connection object. */
 static VALUE iodine_connection_create_from_io(fio_io_s *io) {
   VALUE m = rb_obj_alloc(iodine_rb_IODINE_CONNECTION);
@@ -1927,6 +1943,7 @@ static void iodine_io_http_on_http(fio_http_s *h) {
                                 IODINE_ON_FINISH_ID,                           \
                                 1,                                             \
                                 &connection);                                  \
+      iodine_params_on_finish(c);                                             \
       fio_http_free(c->http);                                                  \
       c->http = NULL;                                                          \
       c->io = NULL;                                                            \
@@ -1965,6 +1982,7 @@ IODINE_CONNECTION_DEF_CB(on_close, IODINE_ON_CLOSE_ID, 1);
                             IODINE_ON_FINISH_ID,                               \
                             1,                                                 \
                             &connection);                                      \
+    iodine_params_on_finish(c);                                                \
     fio_http_free(c->http);                                                    \
     c->http = NULL;                                                            \
     c->io = NULL;                                                              \
@@ -2113,6 +2131,7 @@ static void iodine_io_http_on_finish(fio_http_s *h) {
     }
     fio_http_free(h);
   }
+  iodine_params_on_finish(c);
   c->http = NULL;
   c->io = NULL;
   STORE.release(connection);