PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

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

* cygserver_shm.cc (delete_shmnode): New function.
        (client_request_shm::serve): Use it.
This commit is contained in:
Robert Collins 2002-03-04 08:45:40 +00:00
parent 038c71f10c
commit 7c3617cc0a
3 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
winsup/cygserver/shm.cc
View File

@ -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);

5
winsup/cygwin/ChangeLog
View File

@ -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.

37
winsup/cygwin/cygserver_shm.cc
View File

@ -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);