ustd: get_subbuffer: assume prog died if trace cannot be found

[ust.git] / ustd / ustd.c

diff --git a/ustd/ustd.c b/ustd/ustd.c
index 1144705fec00d0eaaf29bdc13d4471ada0bb4f6f..aae4b0248ba0a9a689ecb9f4de8f969c64e6d5f3 100644 (file)
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -99,8 +99,8 @@ int get_subbuffer(struct buffer_info *buf)
                goto end_rep;
        }
        else if(!strcmp(received_msg, "NOTFOUND")) {
-               WARN("For buffer %s, the trace was not found. This likely means it was destroyed by the user.", buf->name);
-               retval = GET_SUBBUF_DONE;
+               DBG("For buffer %s, the trace was not found. This likely means it was destroyed by the user.", buf->name);
+               retval = GET_SUBBUF_DIED;
                goto end_rep;
        }
        else {
@@ -160,7 +160,7 @@ int put_subbuffer(struct buffer_info *buf)
                retval = PUT_SUBBUF_OK;
        }
        else if(!strcmp(received_msg, "NOTFOUND")) {
-               WARN("For buffer %s, the trace was not found. This likely means it was destroyed by the user.", buf->name);
+               DBG("For buffer %s, the trace was not found. This likely means it was destroyed by the user.", buf->name);
                /* However, maybe this was not the last subbuffer. So
                 * we return the program died.
                 */
@@ -509,7 +509,7 @@ int consumer_loop(struct buffer_info *buf)
                        break;
                }
                else if(result == PUT_SUBBUF_DIED) {
-                       WARN("application died while putting subbuffer");
+                       DBG("application died while putting subbuffer");
                        /* Skip the first subbuffer. We are not sure it is trustable
                         * because the put_subbuffer() did not complete.
                         */
@@ -559,11 +559,10 @@ void *consumer_thread(void *arg)
 
        consumer_loop(buf);
 
-       free(args->bufname);
+       free((void *)args->bufname);
        destroy_buffer(buf);
 
        end:
-       /* bufname is free'd in free_buffer() */
        free(args);
        return NULL;
 }