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 ae82941..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--;
 }
@@ -609,11 +616,9 @@ lws_plat_inet_ntop(int af, const void *src, char *dst, int cnt)
        return inet_ntop(af, src, dst, cnt);
 }
 
-// lws_get_fops(lws_get_context(wsi))
-
-static lws_fop_fd_t
-_lws_plat_file_open(struct lws_plat_file_ops *fops, const char *filename,
-                  lws_filepos_t *filelen, lws_fop_flags_t *flags)
+LWS_VISIBLE lws_fop_fd_t
+_lws_plat_file_open(const struct lws_plat_file_ops *fops, const char *filename,
+                   const char *vpath, lws_fop_flags_t *flags)
 {
        struct stat stat_buf;
        int ret = open(filename, (*flags) & LWS_FOP_FLAGS_MASK, 0664);
@@ -630,9 +635,11 @@ _lws_plat_file_open(struct lws_plat_file_ops *fops, const char *filename,
                goto bail;
 
        fop_fd->fops = fops;
+       fop_fd->flags = *flags;
        fop_fd->fd = ret;
        fop_fd->filesystem_priv = NULL; /* we don't use it */
-       *filelen = stat_buf.st_size;
+       fop_fd->len = stat_buf.st_size;
+       fop_fd->pos = 0;
 
        return fop_fd;
 
@@ -641,22 +648,40 @@ bail:
        return NULL;
 }
 
-static int
-_lws_plat_file_close(lws_fop_fd_t fop_fd)
+LWS_VISIBLE int
+_lws_plat_file_close(lws_fop_fd_t *fop_fd)
 {
-       int fd = fop_fd->fd;
+       int fd = (*fop_fd)->fd;
+
+       free(*fop_fd);
+       *fop_fd = NULL;
 
-       free(fop_fd);
        return close(fd);
 }
 
-lws_fileofs_t
+LWS_VISIBLE lws_fileofs_t
 _lws_plat_file_seek_cur(lws_fop_fd_t fop_fd, lws_fileofs_t offset)
 {
-       return lseek(fop_fd->fd, offset, SEEK_CUR);
+       lws_fileofs_t r;
+
+       if (offset > 0 && offset > fop_fd->len - fop_fd->pos)
+               offset = fop_fd->len - fop_fd->pos;
+
+       if ((lws_fileofs_t)fop_fd->pos + offset < 0)
+               offset = -fop_fd->pos;
+
+       r = lseek(fop_fd->fd, offset, SEEK_CUR);
+
+       if (r >= 0)
+               fop_fd->pos = r;
+       else
+               lwsl_err("error seeking from cur %ld, offset %ld\n",
+                        (long)fop_fd->pos, (long)offset);
+
+       return r;
 }
 
-static int
+LWS_VISIBLE int
 _lws_plat_file_read(lws_fop_fd_t fop_fd, lws_filepos_t *amount,
                    uint8_t *buf, lws_filepos_t len)
 {
@@ -667,13 +692,15 @@ _lws_plat_file_read(lws_fop_fd_t fop_fd, lws_filepos_t *amount,
                *amount = 0;
                return -1;
        }
-
+       fop_fd->pos += n;
+       lwsl_debug("%s: read %ld of req %ld, pos %ld, len %ld\n", __func__, n,
+                  (long)len, (long)fop_fd->pos, (long)fop_fd->len);
        *amount = n;
 
        return 0;
 }
 
-static int
+LWS_VISIBLE int
 _lws_plat_file_write(lws_fop_fd_t fop_fd, lws_filepos_t *amount,
                     uint8_t *buf, lws_filepos_t len)
 {
@@ -685,6 +712,7 @@ _lws_plat_file_write(lws_fop_fd_t fop_fd, lws_filepos_t *amount,
                return -1;
        }
 
+       fop_fd->pos += n;
        *amount = n;
 
        return 0;
@@ -719,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--) {
@@ -737,12 +766,6 @@ lws_plat_init(struct lws_context *context,
                }
        }
 
-       context->fops.open      = _lws_plat_file_open;
-       context->fops.close     = _lws_plat_file_close;
-       context->fops.seek_cur  = _lws_plat_file_seek_cur;
-       context->fops.read      = _lws_plat_file_read;
-       context->fops.write     = _lws_plat_file_write;
-
 #ifdef LWS_WITH_PLUGINS
        if (info->plugin_dirs)
                lws_plat_plugins_init(context, info->plugin_dirs);