luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-09 10:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

*giowin32.c: Debug and partial rewrite of async socket code

Browse Source 
on windows, which fixes major MT issues. Some test code kindly
provided by wroberts1@home.com.
This commit is contained in:
Andy Lanoix
2001-06-22 15:44:44 +00:00
parent ef8daf9297
commit a7bd3d0d5e
10 changed files with 108 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2001-06-22 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: Debug and partial rewrite of async socket code
on windows, which fixes major MT issues. Some test code kindly
provided by wroberts1@home.com.
Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com> Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com>
* gstrfuncs.c (g_strconcat): Fix a use of strcat that * gstrfuncs.c (g_strconcat): Fix a use of strcat that

6
ChangeLog.pre-2-0
View File

@@ -1,3 +1,9 @@
2001-06-22 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: Debug and partial rewrite of async socket code
on windows, which fixes major MT issues. Some test code kindly
provided by wroberts1@home.com.
Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com> Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com>
* gstrfuncs.c (g_strconcat): Fix a use of strcat that * gstrfuncs.c (g_strconcat): Fix a use of strcat that

6
ChangeLog.pre-2-10
View File

@@ -1,3 +1,9 @@
2001-06-22 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: Debug and partial rewrite of async socket code
on windows, which fixes major MT issues. Some test code kindly
provided by wroberts1@home.com.
Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com> Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com>
* gstrfuncs.c (g_strconcat): Fix a use of strcat that * gstrfuncs.c (g_strconcat): Fix a use of strcat that

6
ChangeLog.pre-2-12
View File

@@ -1,3 +1,9 @@
2001-06-22 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: Debug and partial rewrite of async socket code
on windows, which fixes major MT issues. Some test code kindly
provided by wroberts1@home.com.
Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com> Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com>
* gstrfuncs.c (g_strconcat): Fix a use of strcat that * gstrfuncs.c (g_strconcat): Fix a use of strcat that

6
ChangeLog.pre-2-2
View File

@@ -1,3 +1,9 @@
2001-06-22 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: Debug and partial rewrite of async socket code
on windows, which fixes major MT issues. Some test code kindly
provided by wroberts1@home.com.
Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com> Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com>
* gstrfuncs.c (g_strconcat): Fix a use of strcat that * gstrfuncs.c (g_strconcat): Fix a use of strcat that

6
ChangeLog.pre-2-4
View File

@@ -1,3 +1,9 @@
2001-06-22 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: Debug and partial rewrite of async socket code
on windows, which fixes major MT issues. Some test code kindly
provided by wroberts1@home.com.
Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com> Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com>
* gstrfuncs.c (g_strconcat): Fix a use of strcat that * gstrfuncs.c (g_strconcat): Fix a use of strcat that

6
ChangeLog.pre-2-6
View File

@@ -1,3 +1,9 @@
2001-06-22 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: Debug and partial rewrite of async socket code
on windows, which fixes major MT issues. Some test code kindly
provided by wroberts1@home.com.
Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com> Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com>
* gstrfuncs.c (g_strconcat): Fix a use of strcat that * gstrfuncs.c (g_strconcat): Fix a use of strcat that

6
ChangeLog.pre-2-8
View File

@@ -1,3 +1,9 @@
2001-06-22 Andrew Lanoix <alanoix@umich.edu>
*giowin32.c: Debug and partial rewrite of async socket code
on windows, which fixes major MT issues. Some test code kindly
provided by wroberts1@home.com.
Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com> Thu Jun 14 14:09:46 2001 Owen Taylor <otaylor@redhat.com>
* gstrfuncs.c (g_strconcat): Fix a use of strcat that * gstrfuncs.c (g_strconcat): Fix a use of strcat that

27
giowin32.c
View File

@@ -4,6 +4,7 @@
* giowin32.c: IO Channels for Win32. * giowin32.c: IO Channels for Win32.
* Copyright 1998 Owen Taylor and Tor Lillqvist * Copyright 1998 Owen Taylor and Tor Lillqvist
* Copyright 1999-2000 Tor Lillqvist and Craig Setera * Copyright 1999-2000 Tor Lillqvist and Craig Setera
* Copyright 2001 Andrew Lanoix
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@@ -437,6 +438,14 @@ select_thread (void *parameter)
ResetEvent (channel->data_avail_noticed_event); ResetEvent (channel->data_avail_noticed_event);
SetEvent (channel->data_avail_event); SetEvent (channel->data_avail_event);
LOCK (channel->mutex);
if (channel->needs_close)
{
UNLOCK (channel->mutex);
break;
}
UNLOCK (channel->mutex);
if (channel->debug) if (channel->debug)
g_print ("select_thread %#x: waiting for data_avail_noticed\n", g_print ("select_thread %#x: waiting for data_avail_noticed\n",
channel->thread_id); channel->thread_id);
@@ -449,7 +458,7 @@ select_thread (void *parameter)
channel->running = FALSE; channel->running = FALSE;
LOCK (channel->mutex); LOCK (channel->mutex);
if (channel->needs_close) if (channel->fd != -1)
{ {
if (channel->debug) if (channel->debug)
g_print ("select_thread %#x: channel fd %d needs closing\n", g_print ("select_thread %#x: channel fd %d needs closing\n",
@@ -576,6 +585,7 @@ g_io_win32_destroy (GSource *source)
channel->watches = g_slist_remove (channel->watches, watch); channel->watches = g_slist_remove (channel->watches, watch);
SetEvent (channel->data_avail_noticed_event);
g_io_channel_unref (watch->channel); g_io_channel_unref (watch->channel);
} }
@@ -971,12 +981,27 @@ g_io_win32_sock_close (GIOChannel *channel)
{ {
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel; GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
LOCK(win32_channel->mutex);
if (win32_channel->running)
{
if (win32_channel->debug)
g_print ("thread %#x: running, marking for later close\n",
win32_channel->thread_id);
win32_channel->running = FALSE;
win32_channel->needs_close = TRUE;
SetEvent(win32_channel->data_avail_noticed_event);
}
if (win32_channel->fd != -1)
{
if (win32_channel->debug) if (win32_channel->debug)
g_print ("thread %#x: closing socket %d\n", g_print ("thread %#x: closing socket %d\n",
win32_channel->thread_id, win32_channel->thread_id,
win32_channel->fd); win32_channel->fd);
closesocket (win32_channel->fd); closesocket (win32_channel->fd);
win32_channel->fd = -1; win32_channel->fd = -1;
}
UNLOCK(win32_channel->mutex);
} }
static GSource * static GSource *

27
glib/giowin32.c
View File

@@ -4,6 +4,7 @@
* giowin32.c: IO Channels for Win32. * giowin32.c: IO Channels for Win32.
* Copyright 1998 Owen Taylor and Tor Lillqvist * Copyright 1998 Owen Taylor and Tor Lillqvist
* Copyright 1999-2000 Tor Lillqvist and Craig Setera * Copyright 1999-2000 Tor Lillqvist and Craig Setera
* Copyright 2001 Andrew Lanoix
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@@ -437,6 +438,14 @@ select_thread (void *parameter)
ResetEvent (channel->data_avail_noticed_event); ResetEvent (channel->data_avail_noticed_event);
SetEvent (channel->data_avail_event); SetEvent (channel->data_avail_event);
LOCK (channel->mutex);
if (channel->needs_close)
{
UNLOCK (channel->mutex);
break;
}
UNLOCK (channel->mutex);
if (channel->debug) if (channel->debug)
g_print ("select_thread %#x: waiting for data_avail_noticed\n", g_print ("select_thread %#x: waiting for data_avail_noticed\n",
channel->thread_id); channel->thread_id);
@@ -449,7 +458,7 @@ select_thread (void *parameter)
channel->running = FALSE; channel->running = FALSE;
LOCK (channel->mutex); LOCK (channel->mutex);
if (channel->needs_close) if (channel->fd != -1)
{ {
if (channel->debug) if (channel->debug)
g_print ("select_thread %#x: channel fd %d needs closing\n", g_print ("select_thread %#x: channel fd %d needs closing\n",
@@ -576,6 +585,7 @@ g_io_win32_destroy (GSource *source)
channel->watches = g_slist_remove (channel->watches, watch); channel->watches = g_slist_remove (channel->watches, watch);
SetEvent (channel->data_avail_noticed_event);
g_io_channel_unref (watch->channel); g_io_channel_unref (watch->channel);
} }
@@ -971,12 +981,27 @@ g_io_win32_sock_close (GIOChannel *channel)
{ {
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel; GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
LOCK(win32_channel->mutex);
if (win32_channel->running)
{
if (win32_channel->debug)
g_print ("thread %#x: running, marking for later close\n",
win32_channel->thread_id);
win32_channel->running = FALSE;
win32_channel->needs_close = TRUE;
SetEvent(win32_channel->data_avail_noticed_event);
}
if (win32_channel->fd != -1)
{
if (win32_channel->debug) if (win32_channel->debug)
g_print ("thread %#x: closing socket %d\n", g_print ("thread %#x: closing socket %d\n",
win32_channel->thread_id, win32_channel->thread_id,
win32_channel->fd); win32_channel->fd);
closesocket (win32_channel->fd); closesocket (win32_channel->fd);
win32_channel->fd = -1; win32_channel->fd = -1;
}
UNLOCK(win32_channel->mutex);
} }
static GSource * static GSource *