Subject: lws_stats: fix compile error on VS2013

[platform/upstream/libwebsockets.git] / lib / lws-plat-unix.c

diff --git a/lib/lws-plat-unix.c b/lib/lws-plat-unix.c
index 49c3d21..b9f317b 100644 (file)
--- a/lib/lws-plat-unix.c
+++ b/lib/lws-plat-unix.c
@@ -114,11 +114,14 @@ _lws_plat_service_tsi(struct lws_context *context, int timeout_ms, int tsi)
 
        pt = &context->pt[tsi];
 
+       lws_stats_atomic_bump(context, pt, LWSSTATS_C_SERVICE_ENTRY, 1);
+
        if (timeout_ms < 0)
                goto faked_service;
 
        lws_libev_run(context, tsi);
        lws_libuv_run(context, tsi);
+       lws_libevent_run(context, tsi);
 
        if (!context->service_tid_detected) {
                struct lws _lws;
@@ -454,7 +457,9 @@ sigabrt_handler(int x)
 LWS_VISIBLE int
 lws_plat_context_early_init(void)
 {
+#if !defined(LWS_AVOID_SIGPIPE_IGN)
        signal(SIGPIPE, SIG_IGN);
+#endif
 
 //     signal(SIGABRT, sigabrt_handler);
 
@@ -571,6 +576,7 @@ lws_plat_insert_socket_into_fds(struct lws_context *context, struct lws *wsi)
 
        lws_libev_io(wsi, LWS_EV_START | LWS_EV_READ);
        lws_libuv_io(wsi, LWS_EV_START | LWS_EV_READ);
+       lws_libevent_io(wsi, LWS_EV_START | LWS_EV_READ);
 
        pt->fds[pt->fds_count++].revents = 0;
 }
@@ -583,6 +589,7 @@ lws_plat_delete_socket_from_fds(struct lws_context *context,
 
        lws_libev_io(wsi, LWS_EV_STOP | LWS_EV_READ | LWS_EV_WRITE);
        lws_libuv_io(wsi, LWS_EV_STOP | LWS_EV_READ | LWS_EV_WRITE);
+       lws_libevent_io(wsi, LWS_EV_STOP | LWS_EV_READ | LWS_EV_WRITE);
 
        pt->fds_count--;
 }
@@ -669,7 +676,7 @@ _lws_plat_file_seek_cur(lws_fop_fd_t fop_fd, lws_fileofs_t offset)
                fop_fd->pos = r;
        else
                lwsl_err("error seeking from cur %ld, offset %ld\n",
-                        fop_fd->pos, offset);
+                        (long)fop_fd->pos, (long)offset);
 
        return r;
 }
@@ -687,7 +694,7 @@ _lws_plat_file_read(lws_fop_fd_t fop_fd, lws_filepos_t *amount,
        }
        fop_fd->pos += n;
        lwsl_debug("%s: read %ld of req %ld, pos %ld, len %ld\n", __func__, n,
-                  (long)len, fop_fd->pos, fop_fd->len);
+                  (long)len, (long)fop_fd->pos, (long)fop_fd->len);
        *amount = n;
 
        return 0;
@@ -740,7 +747,8 @@ lws_plat_init(struct lws_context *context,
        }
 
        if (!lws_libev_init_fd_table(context) &&
-           !lws_libuv_init_fd_table(context)) {
+           !lws_libuv_init_fd_table(context) &&
+           !lws_libevent_init_fd_table(context)) {
                /* otherwise libev handled it instead */
 
                while (n--) {