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

Timestamp:

2015-06-08T22:00:22Z (9 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/tcp.c (modified) (4 diffs)

uspace/lib/c/generic/inet/tcp.c

@@ -81 +81 @@
         list_initialize(&tcp->conn);
         list_initialize(&tcp->listener);
+        fibril_mutex_initialize(&tcp->lock);
+        fibril_condvar_initialize(&tcp->cv);
 
         rc = loc_service_get_id(SERVICE_NAME_TCP, &tcp_svcid,
@@ -115 +117 @@
 
         async_hangup(tcp->sess);
+
+        fibril_mutex_lock(&tcp->lock);
+        while (!tcp->cb_done)
+                fibril_condvar_wait(&tcp->cv, &tcp->lock);
+        fibril_mutex_unlock(&tcp->lock);
+
         free(tcp);
 }
@@ -593 +601 @@
 
                 if (!IPC_GET_IMETHOD(call)) {
-                        /* TODO: Handle hangup */
-                        return;
+                        /* Hangup*/
+                        goto out;
                 }
 
@@ -621 +629 @@
                 }
         }
+out:
+        fibril_mutex_lock(&tcp->lock);
+        tcp->cb_done = true;
+        fibril_mutex_unlock(&tcp->lock);
+        fibril_condvar_broadcast(&tcp->cv);
 }