2002-03-04 Robert Collins <rbtcollins@hotmail.com>

        * cygserver_shm.cc (delete_shmnode): New function.
        (client_request_shm::serve): Use it.

diff --git a/winsup/cygserver/shm.cc b/winsup/cygserver/shm.cc
index 50ca42e0eaa22e3c4ee0f9d218493f1bfe18c702..97f05f9d96c8fe14d017a17b4611327f84eb44ca 100644 (file)
--- a/winsup/cygserver/shm.cc
+++ b/winsup/cygserver/shm.cc
@@ -170,6 +170,35 @@ static long
   new_private_key =
   0;
 
+static void
+delete_shmnode (shmnode **nodeptr)
+{
+  shmnode *node = *nodeptr;
+
+  // remove from the list
+  if (node == shm_head)
+    shm_head = shm_head->next;
+  else
+    {
+      shmnode *tempnode = shm_head;
+      while (tempnode && tempnode->next != node)
+        tempnode = tempnode->next;
+      if (tempnode)
+        tempnode->next = node->next;
+      // else log the unexpected !
+    }
+
+    // release the shared data view
+    UnmapViewOfFile (node->shmds->mapptr);
+    delete node->shmds;
+    CloseHandle (node->filemap);
+    CloseHandle (node->attachmap);
+
+    // free the memory
+    delete node;
+    nodeptr = NULL;
+}
+  
 void
 client_request_shm::serve (transport_layer_base * conn, process_cache * cache)
 {
@@ -326,6 +355,14 @@ client_request_shm::serve (transport_layer_base * conn, process_cache * cache)
                deleted_head = temp2;
 
                // FIXME: when/where do we delete the handles?
+               if (temp2->shmds->shm_nattch)
+                 {
+                   // FIXME: add to a pending queue?
+                 }
+               else
+                 {
+                   delete_shmnode (&temp2);
+                 }
                
                header.error_code = 0;
                CloseHandle (token_handle);

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4b3436f61263f91e3121244c3463da8f789272af..a76a1b97e3c4e8e8d53dd3b12c1e1dcd8f3663dc 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-04  Robert Collins  <rbtcollins@hotmail.com>
+
+       * cygserver_shm.cc (delete_shmnode): New function.
+       (client_request_shm::serve): Use it.
+
 2002-03-04  Robert Collins  <rbtcollins@hotmail.com>
 
        * cygserver_shm.cc (client_request_shm::serve): Implement SHM_DETACH.

diff --git a/winsup/cygwin/cygserver_shm.cc b/winsup/cygwin/cygserver_shm.cc
index 50ca42e0eaa22e3c4ee0f9d218493f1bfe18c702..97f05f9d96c8fe14d017a17b4611327f84eb44ca 100755 (executable)
--- a/winsup/cygwin/cygserver_shm.cc
+++ b/winsup/cygwin/cygserver_shm.cc
@@ -170,6 +170,35 @@ static long
   new_private_key =
   0;
 
+static void
+delete_shmnode (shmnode **nodeptr)
+{
+  shmnode *node = *nodeptr;
+
+  // remove from the list
+  if (node == shm_head)
+    shm_head = shm_head->next;
+  else
+    {
+      shmnode *tempnode = shm_head;
+      while (tempnode && tempnode->next != node)
+        tempnode = tempnode->next;
+      if (tempnode)
+        tempnode->next = node->next;
+      // else log the unexpected !
+    }
+
+    // release the shared data view
+    UnmapViewOfFile (node->shmds->mapptr);
+    delete node->shmds;
+    CloseHandle (node->filemap);
+    CloseHandle (node->attachmap);
+
+    // free the memory
+    delete node;
+    nodeptr = NULL;
+}
+  
 void
 client_request_shm::serve (transport_layer_base * conn, process_cache * cache)
 {
@@ -326,6 +355,14 @@ client_request_shm::serve (transport_layer_base * conn, process_cache * cache)
                deleted_head = temp2;
 
                // FIXME: when/where do we delete the handles?
+               if (temp2->shmds->shm_nattch)
+                 {
+                   // FIXME: add to a pending queue?
+                 }
+               else
+                 {
+                   delete_shmnode (&temp2);
+                 }
                
                header.error_code = 0;
                CloseHandle (token_handle);