From 6ebb62ead4583fa71a0018d50a17bfd347432dc6 Mon Sep 17 00:00:00 2001 From: Shilpa Seshadri Date: Mon, 16 Sep 2019 16:37:12 -0700 Subject: [PATCH] Removing the additional conn_unref as conn_close handles this --- src/connection.c | 4 ---- tests/test_connection.c | 47 ----------------------------------------- 2 files changed, 51 deletions(-) diff --git a/src/connection.c b/src/connection.c index 62a074a..e82bde2 100644 --- a/src/connection.c +++ b/src/connection.c @@ -688,10 +688,6 @@ void close_and_unref_connection(noPollConn *conn) { if (conn) { nopoll_conn_close(conn); - - if (0 < nopoll_conn_ref_count (conn)) { - nopoll_conn_unref(conn); - } get_parodus_cfg()->cloud_status = CLOUD_STATUS_OFFLINE; ParodusInfo("cloud_status set as %s after connection close\n", get_parodus_cfg()->cloud_status); diff --git a/tests/test_connection.c b/tests/test_connection.c index fade40e..1441637 100644 --- a/tests/test_connection.c +++ b/tests/test_connection.c @@ -181,13 +181,6 @@ void nopoll_conn_close (noPollConn *conn) UNUSED(conn); } -int nopoll_conn_ref_count (noPollConn *conn) -{ - UNUSED(conn); - function_called (); - return (nopoll_bool) mock(); -} - int checkHostIp(char * serverIP) { UNUSED(serverIP); @@ -729,8 +722,6 @@ void test_connect_and_wait () expect_function_call (nopoll_conn_is_ok); will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false); expect_function_call (nopoll_conn_wait_for_status_until_connection_ready); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS); Cfg.flags = 0; @@ -740,8 +731,6 @@ void test_connect_and_wait () expect_function_call (nopoll_conn_new_opts); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS); will_return (nopoll_conn_new_opts, &connection1); @@ -779,8 +768,6 @@ void test_connect_and_wait () expect_function_call (nopoll_conn_tls_new6); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new, NULL); expect_function_call (nopoll_conn_tls_new); will_return (checkHostIp, 0); @@ -791,8 +778,6 @@ void test_connect_and_wait () expect_function_call (nopoll_conn_tls_new6); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new); will_return (nopoll_conn_is_ok, nopoll_true); @@ -812,8 +797,6 @@ void test_connect_and_wait () mock_redirect = "mydns.mycom.net"; will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false); expect_function_call (nopoll_conn_wait_for_status_until_connection_ready); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_RETRY_DNS); will_return (nopoll_conn_tls_new, &connection1); @@ -824,8 +807,6 @@ void test_connect_and_wait () mock_redirect = "https://mydns.mycom.net"; will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false); expect_function_call (nopoll_conn_wait_for_status_until_connection_ready); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); assert_int_equal (connect_and_wait (&ctx), CONN_WAIT_ACTION_RETRY); } @@ -877,8 +858,6 @@ void test_keep_trying () mock_redirect = "https://mydns.mycom.net"; will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false); expect_function_call (nopoll_conn_wait_for_status_until_connection_ready); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new); will_return (nopoll_conn_is_ok, nopoll_true); @@ -897,16 +876,12 @@ void test_keep_trying () mock_redirect = "https://mydns.mycom.net"; will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false); expect_function_call (nopoll_conn_wait_for_status_until_connection_ready); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new); will_return (nopoll_conn_is_ok, nopoll_true); expect_function_call (nopoll_conn_is_ok); will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false); expect_function_call (nopoll_conn_wait_for_status_until_connection_ready); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); init_backoff_timer (&backoff_timer, 5); rtn = keep_trying_to_connect (&ctx, &backoff_timer); assert_int_equal (rtn, false); @@ -929,8 +904,6 @@ void test_keep_trying () expect_function_call (nopoll_conn_is_ok); will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false); expect_function_call (nopoll_conn_wait_for_status_until_connection_ready); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); init_backoff_timer (&backoff_timer, 5); rtn = keep_trying_to_connect (&ctx, &backoff_timer); assert_int_equal (rtn, false); @@ -980,8 +953,6 @@ void test_create_nopoll_connection() expect_function_call (nopoll_conn_tls_new6); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new); will_return (nopoll_conn_is_ok, nopoll_true); @@ -995,8 +966,6 @@ void test_create_nopoll_connection() expect_function_call (nopoll_conn_tls_new6); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new); will_return (nopoll_conn_is_ok, nopoll_true); @@ -1005,15 +974,11 @@ void test_create_nopoll_connection() mock_redirect = "https://mydns.mycom.net"; will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false); expect_function_call (nopoll_conn_wait_for_status_until_connection_ready); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new6, &connection1); expect_function_call (nopoll_conn_tls_new6); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new); will_return (nopoll_conn_is_ok, nopoll_true); @@ -1057,8 +1022,6 @@ void test_create_nopoll_connection() expect_function_call (nopoll_conn_tls_new6); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); mock_wait_status = 0; will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new); @@ -1135,8 +1098,6 @@ void test_interface_down_retry() expect_function_call (nopoll_conn_tls_new6); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new); will_return (nopoll_conn_is_ok, nopoll_true); @@ -1150,8 +1111,6 @@ void test_interface_down_retry() expect_function_call (nopoll_conn_tls_new6); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new); will_return (nopoll_conn_is_ok, nopoll_true); @@ -1160,15 +1119,11 @@ void test_interface_down_retry() mock_redirect = "https://mydns.mycom.net"; will_return (nopoll_conn_wait_for_status_until_connection_ready, nopoll_false); expect_function_call (nopoll_conn_wait_for_status_until_connection_ready); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new6, &connection1); expect_function_call (nopoll_conn_tls_new6); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new); will_return (nopoll_conn_is_ok, nopoll_true); @@ -1212,8 +1167,6 @@ void test_interface_down_retry() expect_function_call (nopoll_conn_tls_new6); will_return (nopoll_conn_is_ok, nopoll_false); expect_function_call (nopoll_conn_is_ok); - will_return (nopoll_conn_ref_count, 0); - expect_function_call (nopoll_conn_ref_count); mock_wait_status = 0; will_return (nopoll_conn_tls_new, &connection1); expect_function_call (nopoll_conn_tls_new);