Cleaning up code (#323)

* fix: missing newline on task start fail log * feat: uniformize c99 pub example with c11 one * fix: free session is task start fail * fix: unitiialized data issue * fix: clean up if declare keyexpr fail in z_put * fix: run Wconversion on c11 examples * fix: run Wconversion on tests * fix: run Wconversion on c99 examples * build: add commented debug options
eclipse-zenoh · Jan 19, 2024 · f0ba603 · f0ba603
1 parent b48d2c1
commit f0ba603
Show file tree

Hide file tree

Showing 44 changed files with 139 additions and 89 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -178,6 +178,8 @@ endif()
 if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
   if(UNIX)
     add_compile_options(-c -Wall -Wextra -Werror -Wshadow -Wpedantic -Wunused -Wstrict-prototypes -pipe -g -O0)
+    # add_compile_options(-Wconversion)
+    # add_link_options(-fsanitize=address)
   elseif(MSVC)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /std:c11 /experimental:c11atomics")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++latest /experimental:c11atomics")

diff --git a/examples/freertos_plus_tcp/z_get.c b/examples/freertos_plus_tcp/z_get.c
@@ -65,6 +65,7 @@ void app_main(void) {
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return;
     }
 

diff --git a/examples/freertos_plus_tcp/z_pub.c b/examples/freertos_plus_tcp/z_pub.c
@@ -76,6 +76,7 @@ void app_main(void) {
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), &read_task_opt) < 0 || zp_start_lease_task(z_loan(s), &lease_task_opt) < 0) {
         printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return;
     }
 

diff --git a/examples/freertos_plus_tcp/z_pull.c b/examples/freertos_plus_tcp/z_pull.c
@@ -53,6 +53,7 @@ void app_main(void) {
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return;
     }
 

diff --git a/examples/freertos_plus_tcp/z_put.c b/examples/freertos_plus_tcp/z_put.c
@@ -46,13 +46,17 @@ void app_main(void) {
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return;
     }
 
     printf("Declaring key expression '%s'...\n", KEYEXPR);
     z_owned_keyexpr_t ke = z_declare_keyexpr(z_loan(s), z_keyexpr(KEYEXPR));
     if (!z_check(ke)) {
         printf("Unable to declare key expression!\n");
+        zp_stop_read_task(z_loan(s));
+        zp_stop_lease_task(z_loan(s));
+        z_close(z_move(s));
         return;
     }
 
@@ -67,12 +71,10 @@ void app_main(void) {
         zp_sleep_s(1);
     }
 
+    // Clean up
     z_undeclare_keyexpr(z_loan(s), z_move(ke));
-
-    // Stop read and lease tasks for zenoh-pico
     zp_stop_read_task(z_loan(s));
     zp_stop_lease_task(z_loan(s));
-
     z_close(z_move(s));
 }
 #else

diff --git a/examples/freertos_plus_tcp/z_queryable.c b/examples/freertos_plus_tcp/z_queryable.c
@@ -61,6 +61,7 @@ void app_main(void) {
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return;
     }
 

diff --git a/examples/freertos_plus_tcp/z_sub.c b/examples/freertos_plus_tcp/z_sub.c
@@ -53,6 +53,7 @@ void app_main(void) {
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
         printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return;
     }
 

diff --git a/examples/unix/c11/z_get.c b/examples/unix/c11/z_get.c
@@ -91,7 +91,8 @@ int main(int argc, char **argv) {
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return -1;
     }
 

diff --git a/examples/unix/c11/z_info.c b/examples/unix/c11/z_info.c
@@ -74,7 +74,8 @@ int main(int argc, char **argv) {
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return -1;
     }
 

diff --git a/examples/unix/c11/z_ping.c b/examples/unix/c11/z_ping.c
@@ -71,7 +71,8 @@ int main(int argc, char** argv) {
     }
 
     if (zp_start_read_task(z_loan(session), NULL) < 0 || zp_start_lease_task(z_loan(session), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&session));
         return -1;
     }
 
@@ -93,7 +94,7 @@ int main(int argc, char** argv) {
 
     uint8_t* data = zp_malloc(args.size);
     for (unsigned int i = 0; i < args.size; i++) {
-        data[i] = i % 10;
+        data[i] = (uint8_t)(i % 10);
     }
     zp_mutex_lock(&mutex);
     if (args.warmup_ms) {
@@ -151,17 +152,17 @@ struct args_t parse_args(int argc, char** argv) {
     char* arg = getopt(argc, argv, 's');
     unsigned int size = DEFAULT_PKT_SIZE;
     if (arg) {
-        size = atoi(arg);
+        size = (unsigned int)atoi(arg);
     }
     arg = getopt(argc, argv, 'n');
     unsigned int number_of_pings = DEFAULT_PING_NB;
     if (arg) {
-        number_of_pings = atoi(arg);
+        number_of_pings = (unsigned int)atoi(arg);
     }
     arg = getopt(argc, argv, 'w');
     unsigned int warmup_ms = DEFAULT_WARMUP_MS;
     if (arg) {
-        warmup_ms = atoi(arg);
+        warmup_ms = (unsigned int)atoi(arg);
     }
     return (struct args_t){
         .help_requested = 0,

diff --git a/examples/unix/c11/z_pong.c b/examples/unix/c11/z_pong.c
@@ -40,7 +40,8 @@ int main(int argc, char** argv) {
     }
 
     if (zp_start_read_task(z_loan(session), NULL) < 0 || zp_start_lease_task(z_loan(session), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&session));
         return -1;
     }
 

diff --git a/examples/unix/c11/z_pub.c b/examples/unix/c11/z_pub.c
@@ -84,7 +84,8 @@ int main(int argc, char **argv) {
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return -1;
     }
 

diff --git a/examples/unix/c11/z_pub_thr.c b/examples/unix/c11/z_pub_thr.c
@@ -25,7 +25,7 @@ int main(int argc, char **argv) {
         exit(-1);
     }
     char *keyexpr = "test/thr";
-    size_t len = atoi(argv[1]);
+    size_t len = (size_t)atoi(argv[1]);
     uint8_t *value = (uint8_t *)malloc(len);
     memset(value, 1, len);
 
@@ -45,7 +45,8 @@ int main(int argc, char **argv) {
     }
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         exit(-1);
     }
     // Declare publisher

diff --git a/examples/unix/c11/z_pull.c b/examples/unix/c11/z_pull.c
@@ -66,7 +66,8 @@ int main(int argc, char **argv) {
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return -1;
     }
 

diff --git a/examples/unix/c11/z_put.c b/examples/unix/c11/z_put.c
@@ -79,16 +79,20 @@ int main(int argc, char **argv) {
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return -1;
     }
 
     printf("Declaring key expression '%s'...\n", keyexpr);
-    // z_owned_keyexpr_t ke = z_declare_keyexpr(z_loan(s), z_keyexpr(keyexpr));
-    // if (!z_check(ke)) {
-    //     printf("Unable to declare key expression!\n");
-    //     return -1;
-    // }
+    z_owned_keyexpr_t ke = z_declare_keyexpr(z_loan(s), z_keyexpr(keyexpr));
+    if (!z_check(ke)) {
+        printf("Unable to declare key expression!\n");
+        zp_stop_read_task(z_loan(s));
+        zp_stop_lease_task(z_loan(s));
+        z_close(z_move(s));
+        return -1;
+    }
 
     printf("Putting Data ('%s': '%s')...\n", keyexpr, value);
     z_put_options_t options = z_put_options_default();
@@ -105,9 +109,9 @@ int main(int argc, char **argv) {
 #if Z_FEATURE_ATTACHMENT == 1
     z_bytes_map_drop(&map);
 #endif
-    // z_undeclare_keyexpr(z_loan(s), z_move(ke));
 
-    // Stop read and lease tasks for zenoh-pico
+    // Clean up
+    z_undeclare_keyexpr(z_loan(s), z_move(ke));
     zp_stop_read_task(z_loan(s));
     zp_stop_lease_task(z_loan(s));
     z_close(z_move(s));

diff --git a/examples/unix/c11/z_queryable.c b/examples/unix/c11/z_queryable.c
@@ -90,7 +90,8 @@ int main(int argc, char **argv) {
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return -1;
     }
 

diff --git a/examples/unix/c11/z_sub.c b/examples/unix/c11/z_sub.c
@@ -95,7 +95,8 @@ int main(int argc, char **argv) {
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return -1;
     }
 

diff --git a/examples/unix/c11/z_sub_thr.c b/examples/unix/c11/z_sub_thr.c
@@ -86,7 +86,8 @@ int main(int argc, char **argv) {
     }
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_loan(s), NULL) < 0 || zp_start_lease_task(z_loan(s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         exit(-1);
     }
     // Declare Subscriber/resource
@@ -101,7 +102,7 @@ int main(int argc, char **argv) {
     printf("Start listening.\n");
     char c = 0;
     while (c != 'q') {
-        c = fgetc(stdin);
+        c = (char)fgetc(stdin);
     }
     // Wait for everything to settle
     printf("End of test\n");

diff --git a/examples/unix/c99/z_get.c b/examples/unix/c99/z_get.c
@@ -91,7 +91,8 @@ int main(int argc, char **argv) {
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_session_loan(&s), NULL) < 0 || zp_start_lease_task(z_session_loan(&s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return -1;
     }
 

diff --git a/examples/unix/c99/z_info.c b/examples/unix/c99/z_info.c
@@ -74,7 +74,8 @@ int main(int argc, char **argv) {
 
     // Start read and lease tasks for zenoh-pico
     if (zp_start_read_task(z_session_loan(&s), NULL) < 0 || zp_start_lease_task(z_session_loan(&s), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&s));
         return -1;
     }
 

diff --git a/examples/unix/c99/z_ping.c b/examples/unix/c99/z_ping.c
@@ -73,7 +73,8 @@ int main(int argc, char** argv) {
 
     if (zp_start_read_task(z_session_loan(&session), NULL) < 0 ||
         zp_start_lease_task(z_session_loan(&session), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&session));
         return -1;
     }
 
@@ -95,7 +96,7 @@ int main(int argc, char** argv) {
 
     uint8_t* data = zp_malloc(args.size);
     for (unsigned int i = 0; i < args.size; i++) {
-        data[i] = i % 10;
+        data[i] = (uint8_t)(i % 10);
     }
     zp_mutex_lock(&mutex);
     if (args.warmup_ms) {
@@ -153,17 +154,17 @@ struct args_t parse_args(int argc, char** argv) {
     char* arg = getopt(argc, argv, 's');
     unsigned int size = DEFAULT_PKT_SIZE;
     if (arg) {
-        size = atoi(arg);
+        size = (unsigned int)atoi(arg);
     }
     arg = getopt(argc, argv, 'n');
     unsigned int number_of_pings = DEFAULT_PING_NB;
     if (arg) {
-        number_of_pings = atoi(arg);
+        number_of_pings = (unsigned int)atoi(arg);
     }
     arg = getopt(argc, argv, 'w');
     unsigned int warmup_ms = DEFAULT_WARMUP_MS;
     if (arg) {
-        warmup_ms = atoi(arg);
+        warmup_ms = (unsigned int)atoi(arg);
     }
     return (struct args_t){
         .help_requested = 0,

diff --git a/examples/unix/c99/z_pong.c b/examples/unix/c99/z_pong.c
@@ -42,7 +42,8 @@ int main(int argc, char** argv) {
 
     if (zp_start_read_task(z_session_loan(&session), NULL) < 0 ||
         zp_start_lease_task(z_session_loan(&session), NULL) < 0) {
-        printf("Unable to start read and lease tasks");
+        printf("Unable to start read and lease tasks\n");
+        z_close(z_session_move(&session));
         return -1;
     }