pthread-cancel

ci-scripts/xml_files/container_5g_rfsim_24prb.xml

@@ -94,7 +94,7 @@
         <testCase id="000004">
                 <class>IdleSleep</class>
                 <desc>Sleep</desc>
-                <idle_sleep_time_in_sec>1</idle_sleep_time_in_sec>
+                <idle_sleep_time_in_sec>3</idle_sleep_time_in_sec>
         </testCase>
 
         <testCase id="020001">

openair2/SDAP/nr_sdap/nr_sdap.c

@@ -211,7 +211,9 @@ void remove_ip_if(nr_sdap_entity_t *entity)
   // Close the socket: read() will get EBADF and exit
   close(entity->pdusession_sock);
 
-  int ret = pthread_join(entity->pdusession_thread, NULL);
+  int ret = pthread_cancel(entity->pdusession_thread);
+  AssertFatal(ret == 0, "pthread_cancel() failed, errno: %d, %s\n", errno, strerror(errno));
+  ret = pthread_join(entity->pdusession_thread, NULL);
   AssertFatal(ret == 0, "pthread_join() failed, errno: %d, %s\n", errno, strerror(errno));
   // Bring down the IP interface
   int default_pdu = get_softmodem_params()->default_pdu_session_id;