Revert "Fix: get_new_metadata receive all the metadata"

[babeltrace.git] / formats / lttng-live / lttng-live-comm.c

diff --git a/formats/lttng-live/lttng-live-comm.c b/formats/lttng-live/lttng-live-comm.c
index bd696ff76f330c4f192bb82dd52b0c34222d0bc4..f9ed51e1b3a1aaa9829309e01ce10aac5649e2f7 100644 (file)
--- a/formats/lttng-live/lttng-live-comm.c
+++ b/formats/lttng-live/lttng-live-comm.c
@@ -123,7 +123,7 @@ int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
                ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending cmd\n");
+               perror("[error] Error sending cmd");
                ret = ret_len;
                goto error;
        }
@@ -133,7 +133,7 @@ int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
                ret_len = send(ctx->control_sock, &connect, sizeof(connect), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending version\n");
+               perror("[error] Error sending version");
                ret = ret_len;
                goto error;
        }
@@ -142,8 +142,13 @@ int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
        do {
                ret_len = recv(ctx->control_sock, &connect, sizeof(connect), 0);
        } while (ret_len < 0 && errno == EINTR);
+       if (ret_len == 0) {
+               fprintf(stderr, "[error] Remote side has closed connection\n");
+               ret = -1;
+               goto error;
+       }
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error receiving version\n");
+               perror("[error] Error receiving version");
                ret = ret_len;
                goto error;
        }
@@ -245,7 +250,7 @@ int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
                ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending cmd\n");
+               perror("[error] Error sending cmd");
                ret = ret_len;
                goto error;
        }
@@ -254,8 +259,13 @@ int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
        do {
                ret_len = recv(ctx->control_sock, &list, sizeof(list), 0);
        } while (ret_len < 0 && errno == EINTR);
+       if (ret_len == 0) {
+               fprintf(stderr, "[error] Remote side has closed connection\n");
+               ret = -1;
+               goto error;
+       }
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error receiving session list\n");
+               perror("[error] Error receiving session list");
                ret = ret_len;
                goto error;
        }
@@ -266,8 +276,13 @@ int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
                do {
                        ret_len = recv(ctx->control_sock, &lsession, sizeof(lsession), 0);
                } while (ret_len < 0 && errno == EINTR);
+               if (ret_len == 0) {
+                       fprintf(stderr, "[error] Remote side has closed connection\n");
+                       ret = -1;
+                       goto error;
+               }
                if (ret_len < 0) {
-                       fprintf(stderr, "[error] Error receiving session\n");
+                       perror("[error] Error receiving session");
                        ret = ret_len;
                        goto error;
                }
@@ -354,7 +369,7 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
                ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending cmd\n");
+               perror("[error] Error sending cmd");
                ret = ret_len;
                goto error;
        }
@@ -364,7 +379,7 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
                ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending attach request\n");
+               perror("[error] Error sending attach request");
                ret = ret_len;
                goto error;
        }
@@ -373,8 +388,13 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
        do {
                ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
        } while (ret_len < 0 && errno == EINTR);
+       if (ret_len == 0) {
+               fprintf(stderr, "[error] Remote side has closed connection\n");
+               ret = -1;
+               goto error;
+       }
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error receiving attach response\n");
+               perror("[error] Error receiving attach response");
                ret = ret_len;
                goto error;
        }
@@ -387,7 +407,7 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
                ret = -LTTNG_VIEWER_ATTACH_UNK;
                goto end;
        case LTTNG_VIEWER_ATTACH_ALREADY:
-               fprintf(stderr, "[error] Already a viewer attached\n");
+               fprintf(stderr, "[error] There is already a viewer attached to this session\n");
                ret = -1;
                goto end;
        case LTTNG_VIEWER_ATTACH_NOT_LIVE:
@@ -427,8 +447,13 @@ int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
                do {
                        ret_len = recv(ctx->control_sock, &stream, sizeof(stream), 0);
                } while (ret_len < 0 && errno == EINTR);
+               if (ret_len == 0) {
+                       fprintf(stderr, "[error] Remote side has closed connection\n");
+                       ret = -1;
+                       goto error;
+               }
                if (ret_len < 0) {
-                       fprintf(stderr, "[error] Error receiving stream\n");
+                       perror("[error] Error receiving stream");
                        ret = ret_len;
                        goto error;
                }
@@ -554,7 +579,7 @@ int get_data_packet(struct lttng_live_ctx *ctx,
                ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending cmd\n");
+               perror("[error] Error sending cmd");
                ret = ret_len;
                goto error;
        }
@@ -564,7 +589,7 @@ int get_data_packet(struct lttng_live_ctx *ctx,
                ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending get_data_packet request\n");
+               perror("[error] Error sending get_data_packet request");
                ret = ret_len;
                goto error;
        }
@@ -573,8 +598,13 @@ int get_data_packet(struct lttng_live_ctx *ctx,
        do {
                ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
        } while (ret_len < 0 && errno == EINTR);
+       if (ret_len == 0) {
+               fprintf(stderr, "[error] Remote side has closed connection\n");
+               ret = -1;
+               goto error;
+       }
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error receiving data response\n");
+               perror("[error] Error receiving data response");
                ret = ret_len;
                goto error;
        }
@@ -637,8 +667,7 @@ int get_data_packet(struct lttng_live_ctx *ctx,
                        /* unmap old base */
                        ret = munmap_align(pos->base_mma);
                        if (ret) {
-                               fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
-                                       strerror(errno));
+                               perror("[error] Unable to unmap old base");
                                ret = -1;
                                goto error;
                        }
@@ -648,8 +677,7 @@ int get_data_packet(struct lttng_live_ctx *ctx,
                                PROT_READ | PROT_WRITE,
                                MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
                if (pos->base_mma == MAP_FAILED) {
-                       fprintf(stderr, "[error] mmap error %s.\n",
-                               strerror(errno));
+                       perror("[error] mmap error");
                        pos->base_mma = NULL;
                        ret = -1;
                        goto error;
@@ -665,8 +693,13 @@ int get_data_packet(struct lttng_live_ctx *ctx,
                        mmap_align_addr(pos->base_mma), len,
                        MSG_WAITALL);
        } while (ret_len < 0 && errno == EINTR);
+       if (ret_len == 0) {
+               fprintf(stderr, "[error] Remote side has closed connection\n");
+               ret = -1;
+               goto error;
+       }
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error receiving trace packet\n");
+               perror("[error] Error receiving trace packet");
                ret = ret_len;
                goto error;
        }
@@ -705,7 +738,7 @@ int get_new_metadata(struct lttng_live_ctx *ctx,
                ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending cmd\n");
+               perror("[error] Error sending cmd");
                ret = ret_len;
                goto error;
        }
@@ -715,7 +748,7 @@ int get_new_metadata(struct lttng_live_ctx *ctx,
                ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending get_metadata request\n");
+               perror("[error] Error sending get_metadata request");
                ret = ret_len;
                goto error;
        }
@@ -724,8 +757,13 @@ int get_new_metadata(struct lttng_live_ctx *ctx,
        do {
                ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
        } while (ret_len < 0 && errno == EINTR);
+       if (ret_len == 0) {
+               fprintf(stderr, "[error] Remote side has closed connection\n");
+               ret = -1;
+               goto error;
+       }
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error receiving metadata response\n");
+               perror("[error] Error receiving metadata response");
                ret = ret_len;
                goto error;
        }
@@ -765,8 +803,14 @@ int get_new_metadata(struct lttng_live_ctx *ctx,
        do {
                ret_len = recv(ctx->control_sock, data, len, MSG_WAITALL);
        } while (ret_len < 0 && errno == EINTR);
+       if (ret_len == 0) {
+               fprintf(stderr, "[error] Remote side has closed connection\n");
+               ret = -1;
+               free(data);
+               goto error;
+       }
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error receiving trace packet\n");
+               perror("[error] Error receiving trace packet");
                ret = ret_len;
                free(data);
                goto error;
@@ -821,7 +865,7 @@ retry:
                ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending cmd\n");
+               perror("[error] Error sending cmd");
                ret = ret_len;
                goto error;
        }
@@ -831,7 +875,7 @@ retry:
                ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending get_next_index request\n");
+               perror("[error] Error sending get_next_index request");
                ret = ret_len;
                goto error;
        }
@@ -840,8 +884,13 @@ retry:
        do {
                ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
        } while (ret_len < 0 && errno == EINTR);
+       if (ret_len == 0) {
+               fprintf(stderr, "[error] Remote side has closed connection\n");
+               ret = -1;
+               goto error;
+       }
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error receiving index response\n");
+               perror("[error] Error receiving index response");
                ret = ret_len;
                goto error;
        }
@@ -1057,7 +1106,7 @@ int lttng_live_create_viewer_session(struct lttng_live_ctx *ctx)
                ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending cmd\n");
+               perror("[error] Error sending cmd");
                ret = ret_len;
                goto error;
        }
@@ -1066,8 +1115,13 @@ int lttng_live_create_viewer_session(struct lttng_live_ctx *ctx)
        do {
                ret_len = recv(ctx->control_sock, &resp, sizeof(resp), 0);
        } while (ret_len < 0 && errno == EINTR);
+       if (ret_len == 0) {
+               fprintf(stderr, "[error] Remote side has closed connection\n");
+               ret = -1;
+               goto error;
+       }
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error receiving create session reply\n");
+               perror("[error] Error receiving create session reply");
                ret = ret_len;
                goto error;
        }
@@ -1202,7 +1256,7 @@ int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
                ret_len = send(ctx->control_sock, &cmd, sizeof(cmd), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending cmd\n");
+               perror("[error] Error sending cmd");
                ret = ret_len;
                goto error;
        }
@@ -1212,7 +1266,7 @@ int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
                ret_len = send(ctx->control_sock, &rq, sizeof(rq), 0);
        } while (ret_len < 0 && errno == EINTR);
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error sending get_new_streams request\n");
+               perror("[error] Error sending get_new_streams request");
                ret = ret_len;
                goto error;
        }
@@ -1221,8 +1275,13 @@ int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
        do {
                ret_len = recv(ctx->control_sock, &rp, sizeof(rp), 0);
        } while (ret_len < 0 && errno == EINTR);
+       if (ret_len == 0) {
+               fprintf(stderr, "[error] Remote side has closed connection\n");
+               ret = -1;
+               goto error;
+       }
        if (ret_len < 0) {
-               fprintf(stderr, "[error] Error receiving get_new_streams response\n");
+               perror("[error] Error receiving get_new_streams response");
                ret = ret_len;
                goto error;
        }
@@ -1267,8 +1326,13 @@ int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
                do {
                        ret_len = recv(ctx->control_sock, &stream, sizeof(stream), 0);
                } while (ret_len < 0 && errno == EINTR);
+               if (ret_len == 0) {
+                       fprintf(stderr, "[error] Remote side has closed connection\n");
+                       ret = -1;
+                       goto error;
+               }
                if (ret_len < 0) {
-                       fprintf(stderr, "[error] Error receiving stream\n");
+                       perror("[error] Error receiving stream");
                        ret = ret_len;
                        goto error;
                }