merge fixes/changes

Lior Amram · Lior Amram · commit 2bf579057de6 · 2014-02-25T18:40:05.000-08:00
diff --git a/examples/mydump/src/Makefile b/examples/mydump/src/Makefile
@@ -1,6 +1,8 @@
 all:
 	@$(MAKE) -s -f mydump.mk
+ifneq ($(wildcard /usr/include/mysql/mysql.h),)
 	@$(MAKE) -s -f mydumper.mk
+endif
 
 clean:
 	@$(MAKE) -s -f mydump.mk clean
diff --git a/include/ds_field.h b/include/ds_field.h
@@ -33,7 +33,7 @@ static inline int TEMPLATE_FUNC(ds_field,T,init)(struct TEMPLATE(ds_field,T) *ds
         return LOGGER_PERROR_FUNC("fstat %s", filename), close(fd), -1;
     off_t size = st.st_size;
     if (size < (off_t)sizeof(int64_t))
-        return LOGGER_ERROR_FUNC("%s, wrong file size: %zd", __FUNCTION__, size), close(fd), -1;
+        return LOGGER_ERROR_FUNC("%s, wrong file size: %jd", __FUNCTION__, (intmax_t)size), close(fd), -1;
     if (0 != ((size - sizeof(int64_t)) % sizeof(T)))
         return LOGGER_ERROR_FUNC("%s: data is misaligned", filename), close(fd), -1;
     void *mem = (char *)mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0);
diff --git a/include/file_writer.h b/include/file_writer.h
@@ -45,6 +45,7 @@ struct file_writer {
 };
 
 _RIBS_INLINE_ void file_writer_make(struct file_writer *fw);
+_RIBS_INLINE_ int file_writer_attachfd(struct file_writer *fw, int fd, size_t initial_size);
 _RIBS_INLINE_ int file_writer_init(struct file_writer *fw, const char *filename);
 _RIBS_INLINE_ size_t file_writer_wavail(struct file_writer *fw);
 _RIBS_INLINE_ char *file_writer_wloc(struct file_writer *fw);
diff --git a/include/http_server.h b/include/http_server.h
@@ -60,14 +60,16 @@ struct http_server {
     size_t init_payload_size;
     size_t max_req_size;
     size_t context_size;
+    uint32_t bind_addr;
 };
 
-#define HTTP_SERVER_INIT_DEFAULTS .stack_size = 0, .num_stacks = 0, .init_request_size = 8*1024, .init_header_size = 8*1024, .init_payload_size = 8*1024, .max_req_size = 0, .context_size = 0, .timeout_handler.timeout = 60000
+#define HTTP_SERVER_INIT_DEFAULTS .stack_size = 0, .num_stacks = 0, .init_request_size = 8*1024, .init_header_size = 8*1024, .init_payload_size = 8*1024, .max_req_size = 0, .context_size = 0, .timeout_handler.timeout = 60000, .bind_addr = INADDR_ANY
 #define HTTP_SERVER_INITIALIZER { HTTP_SERVER_INIT_DEFAULTS }
 
 #define HTTP_SERVER_NOT_FOUND (-2)
 
 int http_server_init(struct http_server *server);
+int http_server_init2(struct http_server *server);
 int http_server_init_acceptor(struct http_server *server);
 void http_server_header_start(const char *status, const char *content_type);
 void http_server_header_start_no_body(const char *status);
@@ -77,8 +79,13 @@ void http_server_set_session_cookie(const char *name, const char *value, const c
 struct vmbuf *http_server_begin_cookie(const char *name);
 struct vmbuf *http_server_end_cookie(time_t expires, const char *domain, const char *path);
 void http_server_response(const char *status, const char *content_type);
-void http_server_response_sprintf(const char *status, const char *content_type, const char *format, ...);
+void http_server_response_sprintf(const char *status, const char *content_type, const char *format, ...) __attribute__ ((format (gnu_printf, 3, 4)));
+void http_server_response_vsprintf(const char *status, const char *content_type, const char *format, va_list ap);
 void http_server_header_content_length(void);
+void http_server_header_redirect(const char *format, ...);
+void http_server_header_redirect2(const char *format, va_list ap);
+void http_server_redirect(const char *status, const char *content_type, const char *format, ...);
+void http_server_redirect2(const char *status, const char *content_type, const char *format, va_list ap);
 void http_server_fiber_main(void);
 int http_server_sendfile(const char *filename);
 int http_server_sendfile2(const char *filename, const char *additional_headers, const char *ext);
diff --git a/include/lhashtable.h b/include/lhashtable.h
@@ -148,6 +148,7 @@ struct lhashtable {
 int lhashtable_init(struct lhashtable *lht, const char *filename);
 int lhashtable_close(struct lhashtable *lht);
 uint64_t lhashtable_put(struct lhashtable *lht, const void *key, size_t key_len, const void *val, size_t val_len);
+uint64_t lhashtable_put_key(struct lhashtable *lht, const void *key, size_t key_len, size_t val_len, int *is_inserted);
 uint64_t lhashtable_get(struct lhashtable *lht, const void *key, size_t key_len);
 int lhashtable_del(struct lhashtable *lht, const void *key, size_t key_len);
 int lhashtable_foreach(struct lhashtable *lht, int (*callback)(uint64_t, void *), void *arg);
diff --git a/include/list.h b/include/list.h
@@ -27,6 +27,7 @@ struct list {
 };
 
 #define LIST_INITIALIZER(name) { &(name), &(name) }
+#define LIST_NULL_INITIALIZER { NULL, NULL }
 #define LIST_CREATE(name) struct list name = LIST_INITIALIZER(name);
 
 #define LIST_ENTRY(ptr, type, member)                   \
@@ -37,6 +38,11 @@ _RIBS_INLINE_ void list_init(struct list *list) {
     list->prev = list;
 }
 
+_RIBS_INLINE_ void list_clear(struct list *list) {
+    list->next = NULL;
+    list->prev = NULL;
+}
+
 _RIBS_INLINE_ void list_insert_head(struct list *list, struct list *entry) {
     entry->next = list->next;
     entry->prev = list;
diff --git a/include/logger.h b/include/logger.h
@@ -23,14 +23,14 @@
 #include "ribs_defs.h"
 #include <stdarg.h>
 
-void logger_log(const char *format, ...);
-void logger_log_at(const char *filename, unsigned int linenum, const char *format, ...);
-void logger_error(const char *format, ...);
-void logger_error_at(const char *filename, unsigned int linenum, const char *format, ...);
-void logger_error_func_at(const char *filename, unsigned int linenum, const char *funcname, const char *format, ...);
-void logger_perror(const char *format, ...);
-void logger_perror_at(const char *filename, unsigned int linenum, const char *format, ...);
-void logger_perror_func_at(const char *filename, unsigned int linenum, const char *funcname, const char *format, ...);
+void logger_log(const char *format, ...) __attribute__ ((format (gnu_printf, 1, 2)));
+void logger_log_at(const char *filename, unsigned int linenum, const char *format, ...) __attribute__ ((format (gnu_printf, 3, 4)));
+void logger_error(const char *format, ...) __attribute__ ((format (gnu_printf, 1, 2)));
+void logger_error_at(const char *filename, unsigned int linenum, const char *format, ...) __attribute__ ((format (gnu_printf, 3, 4)));
+void logger_error_func_at(const char *filename, unsigned int linenum, const char *funcname, const char *format, ...) __attribute__ ((format (gnu_printf, 4, 5)));
+void logger_perror(const char *format, ...) __attribute__ ((format (gnu_printf, 1, 2)));
+void logger_perror_at(const char *filename, unsigned int linenum, const char *format, ...) __attribute__ ((format (gnu_printf, 3, 4)));
+void logger_perror_func_at(const char *filename, unsigned int linenum, const char *funcname, const char *format, ...) __attribute__ ((format (gnu_printf, 4, 5)));
 void logger_vlog(int fd, const char *format, const char *msg_class, va_list ap);
 void logger_vlog_at(int fd, const char *filename, unsigned int linenum, const char *format, const char *msg_class, va_list ap);
 void logger_vlog_func_at(int fd, const char *filename, unsigned int linenum, const char *funcname, const char *format, const char *msg_class, va_list ap);
diff --git a/include/mysql_helper.h b/include/mysql_helper.h
@@ -71,6 +71,11 @@ struct mysql_helper_column_map {
 };
 
 #define MYSQL_HELPER_COL_MAP_GET_STR(d,m) (*((char **)((d) + (m)->data.ofs)))
+
+/* field declaration helper macros */
+#define _MYSQL_HELPER_COL_MAP(type,name,is_un,mysqlt,field)             \
+    {#name,{mysql_helper_field_type_##field,is_un,mysqlt,sizeof(((struct mysql_helper_column_map *)0)->data.field[0])},{.field=&((type *)0)->name}}
+
 #define MYSQL_HELPER_COL_MAP_I8(type,name) _MYSQL_HELPER_COL_MAP(type, name, 0, MYSQL_TYPE_TINY, i8)
 #define MYSQL_HELPER_COL_MAP_U8(type,name) _MYSQL_HELPER_COL_MAP(type, name, 1, MYSQL_TYPE_TINY, u8)
 #define MYSQL_HELPER_COL_MAP_I16(type,name) _MYSQL_HELPER_COL_MAP(type, name, 0, MYSQL_TYPE_SHORT, i16)
@@ -87,20 +92,16 @@ struct mysql_helper_column_map {
 #define MYSQL_HELPER_COL_MAP_CUSTOM_STR(name,value) \
     {name,{mysql_helper_field_type_cstr,0,MYSQL_TYPE_STRING,0},{.custom_str=value}}
 
-#define MYSQL_HELPER_COL_MAP_ADD_IF(name, class, type, buf)                \
-    do {                                                                \
-        if (*name) {                                                    \
-            struct mysql_helper_column_map __field__ = MYSQL_HELPER_COL_MAP_##type(class, name); \
-            vmbuf_memcpy(&buf, &__field__, sizeof(__field__));          \
-        }                                                               \
-    } while (0)
-
 #define MYSQL_HELPER_COL_MAP_ADD(name, class, type, buf)                \
     {                                                                   \
-        struct mysql_helper_column_map __field__ = MYSQL_HELPER_COL_MAP_##type(class, name); \
+        struct mysql_helper_column_map __field__ =                      \
+            MYSQL_HELPER_COL_MAP_##type(class, name);                   \
         vmbuf_memcpy(&buf, &__field__, sizeof(__field__));              \
     }
 
+#define MYSQL_HELPER_COL_MAP_ADD_IF(name, class, type, buf)             \
+    if (name && *name)                                                  \
+        MYSQL_HELPER_COL_MAP_ADD(name, class, type, buf)
 
 void mysql_helper_connect_init(struct mysql_helper *mysql_helper);
 int mysql_helper_real_connect(struct mysql_helper *mysql_helper, struct mysql_login_info *login_info);
@@ -150,10 +151,6 @@ enum {
     mysql_helper_field_type_ts_unix
 };
 
-/* field declaration helper macros */
-#define _MYSQL_HELPER_COL_MAP(type,name,is_un,mysqlt,field)             \
-    {#name,{mysql_helper_field_type_##field,is_un,mysqlt,sizeof(((struct mysql_helper_column_map *)0)->data.field[0])},{.field=&((type *)0)->name}}
-
 /* get data from field */
 #define _MYSQL_HELPER_FIELD_TYPE_TO_STR(T) case mysql_helper_field_type_##T: return #T
 
diff --git a/include/ribs.h b/include/ribs.h
@@ -26,6 +26,7 @@
 #include "context.h"
 #include "ctx_pool.h"
 #include "hashtable.h"
+#include "thashtable.h"
 #include "lhashtable.h"
 #include "epoll_worker.h"
 #include "logger.h"
diff --git a/include/ribs_defs.h b/include/ribs_defs.h
@@ -43,4 +43,14 @@
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
 
+#define ribs_min(a,b)                           \
+    ({ __typeof__ (a) _a = (a);                 \
+        __typeof__ (b) _b = (b);                \
+        _a < _b ? _a : _b; })
+
+#define ribs_max(a,b)                           \
+    ({ __typeof__ (a) _a = (a);                 \
+        __typeof__ (b) _b = (b);                \
+        _a > _b ? _a : _b; })
+
 #endif // _RIBS_DEFS__H_
diff --git a/include/ringfile.h b/include/ringfile.h
@@ -32,13 +32,16 @@ struct ringfile_header {
     size_t read_loc;
     size_t write_loc;
     size_t reserved_size;
+    char reserved[];
 };
 
-#define RINGFILE_INITIALIZER { 0, 0, 0, NULL }
+#define RINGFILE_INITIALIZER { NULL, NULL }
 #define RINGFILE_INIT(x) (x) = (struct ringfile)RINGFILE_INITIALIZER
 
 int ringfile_init(struct ringfile *rb, const char *filename, size_t size, size_t reserved);
+int ringfile_init_with_resize(struct ringfile *rb, const char *filename, size_t size, size_t reserved, void (*evict_one_rec)(struct ringfile *));
 int ringfile_free(struct ringfile *rb);
+int ringfile_sync(struct ringfile *rb);
 _RIBS_INLINE_ void *ringfile_get_reserved(struct ringfile *rb);
 _RIBS_INLINE_ void *ringfile_wloc(struct ringfile *rb);
 _RIBS_INLINE_ void *ringfile_rloc(struct ringfile *rb);
diff --git a/include/vmbuf.h b/include/vmbuf.h
@@ -80,6 +80,7 @@ _RIBS_INLINE_ void vmbuf_wreset(struct vmbuf *vmb);
 _RIBS_INLINE_ int vmbuf_sprintf(struct vmbuf *vmb, const char *format, ...) __attribute__ ((format (gnu_printf, 2, 3)));
 _RIBS_INLINE_ int vmbuf_vsprintf(struct vmbuf *vmb, const char *format, va_list ap) __attribute__ ((format (gnu_printf, 2, 0)));
 _RIBS_INLINE_ int vmbuf_strcpy(struct vmbuf *vmb, const char *src);
+_RIBS_INLINE_ int vmbuf_replace_last_if(struct vmbuf *vmb, char s, char d);
 _RIBS_INLINE_ void vmbuf_remove_last_if(struct vmbuf *vmb, char c);
 _RIBS_INLINE_ int vmbuf_read(struct vmbuf *vmb, int fd);
 _RIBS_INLINE_ int vmbuf_write(struct vmbuf *vmb, int fd);
diff --git a/make/ribs.mk b/make/ribs.mk
@@ -25,19 +25,23 @@ else
 OBJ_DIR=../obj/$(OBJ_SUB_DIR)
 endif
 
+ifneq ($(wildcard /usr/include/zlib.h),)
+CPPFLAGS+=-DHAVE_ZLIB
+endif
+
 LDFLAGS+=-L../lib
 CFLAGS+=$(OPTFLAGS) -ggdb3 -W -Wall -Werror
 GCCVER_GTE_4_7=$(shell expr `gcc -dumpversion` \>= 4.7)
 ifeq ($(GCCVER_GTE_4_7),1)
 CFLAGS+=-ftrack-macro-expansion=2
 endif
 
-RIBIFY_SYMS+=write read connect fcntl recv recvfrom recvmsg send sendto sendmsg readv writev pipe pipe2 nanosleep usleep sleep sendfile malloc calloc realloc free strdup close
+RIBIFY_SYMS+=write read socket connect fcntl recv recvfrom recvmsg send sendto sendmsg readv writev pipe pipe2 nanosleep usleep sleep sendfile malloc calloc realloc free strdup close
 
 ifdef UGLY_GETADDRINFO_WORKAROUND
 LDFLAGS+=-lanl
 RIBIFY_SYMS+=getaddrinfo
-CFLAGS+=-DUGLY_GETADDRINFO_WORKAROUND
+CPPFLAGS+=-DUGLY_GETADDRINFO_WORKAROUND
 endif
 
 RIBIFYFLAGS+=$(subst --redefine-sym_,--redefine-sym ,$(join $(RIBIFY_SYMS:%=--redefine-sym_%=),$(RIBIFY_SYMS:%=_ribified_%)))
@@ -64,16 +68,16 @@ $(ALL_DIRS):
 	@touch $@
 
 $(OBJ_DIR)/%.o: %.c $(OBJ_DIR)/%.d
-	@echo "  (C)      $*.c  [ -c $(CFLAGS) $*.c -o $(OBJ_DIR)/$*.o ]"
-	@$(CC) -c $(CFLAGS) $*.c -o $(OBJ_DIR)/$*.o
+	@echo "  (C)      $*.c  [ $(CPPFLAGS) -c $(CFLAGS) $*.c -o $(OBJ_DIR)/$*.o ]"
+	@$(CC) $(CPPFLAGS) -c $(CFLAGS) $*.c -o $(OBJ_DIR)/$*.o
 
 $(OBJ_DIR)/%.o: %.S
-	@echo "  (ASM)    $*.S  [ -c $(CFLAGS) $*.S -o $(OBJ_DIR)/$*.o ]"
-	@$(CC) -c $(CFLAGS) $*.S -o $(OBJ_DIR)/$*.o
+	@echo "  (ASM)    $*.S  [ $(CPPFLAGS) -c $(CFLAGS) $*.S -o $(OBJ_DIR)/$*.o ]"
+	@$(CC) $(CPPFLAGS) -c $(CFLAGS) $*.S -o $(OBJ_DIR)/$*.o
 
 $(OBJ_DIR)/%.d: %.c
 	@echo "  (DEP)    $*.c"
-	@$(CC) -MM $(CFLAGS) $(INCLUDES) $*.c | sed -e 's|.*:|$(OBJ_DIR)/$*.o:|' > $@
+	@$(CC) -MM $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $*.c | sed -e 's|.*:|$(OBJ_DIR)/$*.o:|' > $@
 
 $(OBJ): $(DIRS)
 
@@ -87,7 +91,7 @@ $(DEP): $(DIRS)
 
 ../ribified/%: $(RIBIFY_DIR)
 	@echo "  (RIBIFY) $(@:../ribified/%=%) [ $@ $(RIBIFYFLAGS) ]"
-	@objcopy $(shell find $(RIBIFY_LIB_PATH) /usr/lib -name $(@:../ribified/%=%)) $@ $(RIBIFYFLAGS)
+	@objcopy $(shell find $(RIBIFY_LIB_PATH) /usr/lib -name $(@:../ribified/%=%) 2>/dev/null) $@ $(RIBIFYFLAGS)
 
 ../bin/%: $(OBJ) $(RIBIFY:%=../ribified/%) $(EXTRA_DEPS)
 	@echo "  (LD)     $(@:../bin/%=%)  [ -o $@ $(OBJ) $(LDFLAGS) ]"
diff --git a/src/_file_writer.c b/src/_file_writer.c
@@ -21,15 +21,20 @@ _RIBS_INLINE_ void file_writer_make(struct file_writer *fw) {
     *fw = (struct file_writer)FILE_WRITER_INITIALIZER;
 }
 
-_RIBS_INLINE_ int file_writer_init(struct file_writer *fw, const char *filename) {
-    file_writer_close(fw);
-    unlink(filename);
+_RIBS_INLINE_ int file_writer_attachfd(struct file_writer *fw, int fd, size_t initial_size) {
+    if (0 > file_writer_close(fw))
+        return -1;
     fw->mem = NULL;
     fw->base_loc = fw->write_loc = 0;
-    fw->fd = open(filename, O_RDWR | O_CREAT, 0644);
-    fw->buffer_size = next_p2(fw->buffer_size);
+    fw->fd = fd;
+
+    if (initial_size < 4096)
+        fw->buffer_size = 4096;
+    else
+        fw->buffer_size = next_p2(initial_size);
+
     if (0 > fw->fd)
-        return perror("open, file_writer_init"), -1;
+        return perror("open, file_writer_attachfd"), -1;
 
     if (0 > ftruncate(fw->fd, fw->buffer_size))
         return perror("ftruncate, file_writer_init"), -1;
@@ -42,6 +47,12 @@ _RIBS_INLINE_ int file_writer_init(struct file_writer *fw, const char *filename)
     return 0;
 }
 
+_RIBS_INLINE_ int file_writer_init(struct file_writer *fw, const char *filename) {
+    unlink(filename);
+    int fd = open(filename, O_RDWR | O_CREAT, 0644);
+    return file_writer_attachfd(fw, fd, fw->buffer_size);
+}
+
 _RIBS_INLINE_ size_t file_writer_wavail(struct file_writer *fw) {
     return fw->capacity - fw->write_loc;
 }
diff --git a/src/_lhashtable.c b/src/_lhashtable.c
@@ -17,6 +17,8 @@
     You should have received a copy of the GNU Lesser General Public License
     along with RIBS.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include <inttypes.h>
+
 _RIBS_INLINE_ uint64_t lhashtable_put_str(struct lhashtable *lht, const char *key, const char *val) {
     return lhashtable_put(lht, key, strlen(key), val, strlen(val) + 1);
 }
@@ -59,10 +61,10 @@ _RIBS_INLINE_ uint64_t lhashtable_writeloc(struct lhashtable *lht) {
 static inline int _lhashtable_resize_to(struct lhashtable *lht, uint64_t new_capacity) {
     _LHT_ALIGN_P2(new_capacity, LHT_BLOCK_SIZE);
     if (0 > ftruncate(lht->fd, new_capacity))
-        return LOGGER_PERROR("ftruncate, new size = %zu", new_capacity), -1;
+        return LOGGER_PERROR("ftruncate, new size = %"PRIu64, new_capacity), -1;
     void *mem = mremap(lht->mem, LHT_GET_HEADER()->capacity, new_capacity, MREMAP_MAYMOVE);
     if (MAP_FAILED == mem)
-        return LOGGER_PERROR("mremap, new size = %zu", new_capacity), -1;
+        return LOGGER_PERROR("mremap, new size = %"PRIu64, new_capacity), -1;
     lht->mem = mem;
     LHT_GET_HEADER()->capacity = new_capacity;
     return 0;
diff --git a/src/_ringfile.c b/src/_ringfile.c
@@ -18,12 +18,17 @@
     along with RIBS.  If not, see <http://www.gnu.org/licenses/>.
 */
 #define RINGFILE_HEADER (ringfile_get_header(rb))
+_RIBS_INLINE_ struct ringfile_header *ringfile_get_header(struct ringfile *rb) {
+    return rb->mem;
+}
+
 _RIBS_INLINE_ void *ringfile_get_reserved(struct ringfile *rb) {
-    return rb->mem + sizeof(struct ringfile_header);
+    return RINGFILE_HEADER->reserved;
 }
 
-_RIBS_INLINE_ struct ringfile_header *ringfile_get_header(struct ringfile *rb) {
-    return rb->mem;
+_RIBS_INLINE_ int ringfile_reset(struct ringfile *rb) {
+    RINGFILE_HEADER->read_loc = RINGFILE_HEADER->write_loc = 0;
+    return 0;
 }
 
 _RIBS_INLINE_ void *ringfile_wloc(struct ringfile *rb) {
diff --git a/src/_vmbuf_impl.c b/src/_vmbuf_impl.c
@@ -207,13 +207,19 @@ _RIBS_INLINE_ int TEMPLATE(VMBUF_T,strcpy)(struct VMBUF_T *vmb, const char *src)
     return 0;
 }
 
-_RIBS_INLINE_ void TEMPLATE(VMBUF_T,remove_last_if)(struct VMBUF_T *vmb, char c) {
+_RIBS_INLINE_ int TEMPLATE(VMBUF_T,replace_last_if)(struct VMBUF_T *vmb, char s, char d)
+{
     char *loc = TEMPLATE(VMBUF_T,wloc)(vmb);
-    --loc;
-    if (vmb->write_loc > 0 && *loc == c) {
-        --vmb->write_loc;
-        *loc = 0;
+    if (0 < vmb->write_loc && s == *--loc) {
+        *loc = d;
+        return 0;
     }
+    return -1;
+}
+
+_RIBS_INLINE_ void TEMPLATE(VMBUF_T,remove_last_if)(struct VMBUF_T *vmb, char c) {
+    if (!TEMPLATE(VMBUF_T,replace_last_if)(vmb, c, 0))
+        --vmb->write_loc;
 }
 
 _RIBS_INLINE_ int TEMPLATE(VMBUF_T,read)(struct VMBUF_T *vmb, int fd) {
diff --git a/src/daemonize.c b/src/daemonize.c
@@ -73,7 +73,7 @@ static int _logger_init(const char *filename) {
         // open
         int fd = open(filename, O_CREAT | O_WRONLY | O_APPEND, 0644);
         if (fd < 0)
-            return LOGGER_PERROR(filename), -1;
+            return LOGGER_PERROR("%s", filename), -1;
         if (0 > dup2(fd, STDOUT_FILENO) ||
             0 > dup2(fd, STDERR_FILENO))
             LOGGER_PERROR("dup2"), res = -1;
diff --git a/src/epoll_worker.c b/src/epoll_worker.c
@@ -112,7 +112,7 @@ int epoll_worker_init(void) {
     int sfd = signalfd(-1, &set, SFD_NONBLOCK);
     if (0 > sfd)
         return LOGGER_PERROR("signalfd"), -1;
-    if (NULL == small_ctx_for_fd(sfd, sigrtmin_to_context))
+    if (NULL == small_ctx_for_fd(sfd, 0, sigrtmin_to_context))
         return -1;
 #endif
 
diff --git a/src/heap.c b/src/heap.c
@@ -85,7 +85,7 @@ uint32_t heap_insert(struct heap *h, void *user_data) {
     uint32_t loc = ofs[pos];
     struct _heap_entry *d = _HEAP_DATA(loc);
     d->key = pos;
-    memcpy(d->user_data, user_data, h->el_size);
+    memcpy(d->user_data, user_data, h->el_size - sizeof(struct _heap_entry));
     ++h->num_items;
     return loc;
 }
diff --git a/src/http_file_server.c b/src/http_file_server.c
diff --git a/src/http_server.c b/src/http_server.c
diff --git a/src/json.c b/src/json.c
diff --git a/src/lhashtable.c b/src/lhashtable.c
diff --git a/src/logger.c b/src/logger.c
diff --git a/src/mempool.c b/src/mempool.c
diff --git a/src/mysql_helper.c b/src/mysql_helper.c
diff --git a/src/ribify.c b/src/ribify.c
diff --git a/src/ribs2.mk b/src/ribs2.mk
diff --git a/src/ringfile.c b/src/ringfile.c
