Changeset 1f2b07a in mainline for uspace/lib/c/generic/inet/udp.c

Timestamp:

2015-06-08T22:00:22Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

dc0d6e5d

Parents:

204ba47

Message:

TCP and UDP client code needs to make sure callback connection handler has terminated before freeing session-related data.

File:

• uspace/lib/c/generic/inet/udp.c (modified) (4 diffs)

uspace/lib/c/generic/inet/udp.c

@@ -73 +73 @@
 
         list_initialize(&udp->assoc);
+        fibril_mutex_initialize(&udp->lock);
+        fibril_condvar_initialize(&udp->cv);
 
         rc = loc_service_get_id(SERVICE_NAME_UDP, &udp_svcid,
@@ -107 +109 @@
 
         async_hangup(udp->sess);
+
+        fibril_mutex_lock(&udp->lock);
+        while (!udp->cb_done)
+                fibril_condvar_wait(&udp->cv, &udp->lock);
+        fibril_mutex_unlock(&udp->lock);
+
         free(udp);
 }
@@ -343 +351 @@
 
                 if (!IPC_GET_IMETHOD(call)) {
-                        /* TODO: Handle hangup */
-                        return;
+                        /* Hangup */
+                        goto out;
                 }
 
@@ -356 +364 @@
                 }
         }
+out:
+        fibril_mutex_lock(&udp->lock);
+        udp->cb_done = true;
+        fibril_mutex_unlock(&udp->lock);
+        fibril_condvar_broadcast(&udp->cv);
 }