luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-28 06:56:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
fef417575c
glib/glib/giowin32.c

2242 lines
59 KiB
C
Raw Normal View History

Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* giowin32.c: IO Channels for Win32.
* Copyright 1998 Owen Taylor and Tor Lillqvist
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
* Copyright 1999-2000 Tor Lillqvist and Craig Setera
Resolved thread deadlocks in socket ichannel code to support * glib/giowin32.c: Resolved thread deadlocks in socket ichannel code to support Add-Cancel-Add watch functionality on windows. Also cleaned up socket error handling to not segfault and do the right thing.
2003-06-07 22:31:28 +02:00
* Copyright 2001-2003 Andrew Lanoix
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
*
* This library is free software; you can redistribute it and/or
applied patch from Andreas Persenius <ndap@swipnet.se> that updates the Wed Jul 26 12:59:31 2000 Tim Janik <timj@gtk.org> * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that updates the license headers to the GNU Lesser General Public License, as well as updating the copyright year to 2000.
2000-07-26 13:02:02 +02:00
* modify it under the terms of the GNU Lesser General Public
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
applied patch from Andreas Persenius <ndap@swipnet.se> that updates the Wed Jul 26 12:59:31 2000 Tim Janik <timj@gtk.org> * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that updates the license headers to the GNU Lesser General Public License, as well as updating the copyright year to 2000.
2000-07-26 13:02:02 +02:00
* Lesser General Public License for more details.
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
*
applied patch from Andreas Persenius <ndap@swipnet.se> that updates the Wed Jul 26 12:59:31 2000 Tim Janik <timj@gtk.org> * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that updates the license headers to the GNU Lesser General Public License, as well as updating the copyright year to 2000.
2000-07-26 13:02:02 +02:00
* You should have received a copy of the GNU Lesser General Public
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
inserted additional note to look for ChangeLog and AUTHORS file for a log Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org> * *.[ch]: inserted additional note to look for ChangeLog and AUTHORS file for a log of modifications.
1999-02-24 07:14:27 +01:00
/*
applied patch from Andreas Persenius <ndap@swipnet.se> that updates the Wed Jul 26 12:59:31 2000 Tim Janik <timj@gtk.org> * *.[hc]: applied patch from Andreas Persenius <ndap@swipnet.se> that updates the license headers to the GNU Lesser General Public License, as well as updating the copyright year to 2000.
2000-07-26 13:02:02 +02:00
* Modified by the GLib Team and others 1997-2000. See the AUTHORS
inserted additional note to look for ChangeLog and AUTHORS file for a log Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org> * *.[ch]: inserted additional note to look for ChangeLog and AUTHORS file for a log of modifications.
1999-02-24 07:14:27 +01:00
* file for a list of people on the GLib Team. See the ChangeLog
* files for a list of changes. These files are distributed with
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
* GLib at ftp://ftp.gtk.org/pub/gtk/.
inserted additional note to look for ChangeLog and AUTHORS file for a log Wed Feb 24 00:08:42 CST 1999 Shawn T. Amundson <amundson@gtk.org> * *.[ch]: inserted additional note to look for ChangeLog and AUTHORS file for a log of modifications.
1999-02-24 07:14:27 +01:00
*/
Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return on a non-blocking socket returns prematurely Bug 548278 - Async GETs connections are always terminated unexpectedly on Windows * glib/giowin32.c: Add one more state variable to the GIOWin32Channel struct, ever_writable. Initialise it to FALSE, set to TRUE when the WSAEventSelect() indicates FD_WRITE, and never reset to FALSE. Don't do the WSASetEvent() in g_io_win32_prepare() unless ever_writable is TRUE. Don't automatically indicate G_IO_OUT in g_io_win32_check() unless ever_writable is TRUE. This fixes the behaviour of the test case program in bug #548278, and the "Testcase for the spurious OUT event bug" in bug #324234. It also doesn't seem to break anything. Not that there is any exhaustive test suite... Add a comment with a list of bugs that are related to the code in this file. svn path=/trunk/; revision=7372
2008-08-20 01:48:16 +02:00
/*
* Bugs that are related to the code in this file:
*
* Bug 137968 - Sometimes a GIOFunc on Win32 is called with zero condition
* http://bugzilla.gnome.org/show_bug.cgi?id=137968
*
* Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return on a non-blocking socket returns prematurely
* http://bugzilla.gnome.org/show_bug.cgi?id=324234
*
* Bug 331214 - g_io_channel async socket io stalls
* http://bugzilla.gnome.org/show_bug.cgi?id=331214
*
* Bug 338943 - Multiple watches on the same socket
* http://bugzilla.gnome.org/show_bug.cgi?id=338943
*
* Bug 357674 - 2 serious bugs in giowin32.c making glib iochannels useless
* http://bugzilla.gnome.org/show_bug.cgi?id=357674
*
* Bug 425156 - GIOChannel deadlocks on a win32 socket
* http://bugzilla.gnome.org/show_bug.cgi?id=425156
*
* Bug 468910 - giofunc condition=0
* http://bugzilla.gnome.org/show_bug.cgi?id=468910
*
* Bug 500246 - Bug fixes for giowin32
* http://bugzilla.gnome.org/show_bug.cgi?id=500246
*
* Bug 548278 - Async GETs connections are always terminated unexpectedly on windows
* http://bugzilla.gnome.org/show_bug.cgi?id=548278
*
* Bug 548536 - giowin32 problem when adding and removing watches
* http://bugzilla.gnome.org/show_bug.cgi?id=548536
*
* When fixing bugs related to the code in this file, either the above
* bugs or others, make sure that the test programs attached to the
* above bugs continue to work.
*/
Updated. Fri Feb 15 10:41:51 2002 Owen Taylor <otaylor@redhat.com> * NEWS: Updated. * configure.in: Require autoconf-2.52, run AC_SYS_LARGEFILE. (#71410, Sven Neumann) * glib/giounix.c glib/giowin32.c glib/giochannel.[ch]: Change offset type for g_io_channel_seek[_position] to gint64.
2002-02-15 17:41:54 +01:00
#include "config.h"
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
#include "glib.h"
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
#include <stdlib.h>
configure.in (G_LIBS_EXTRA) I think we can include <winsock2.h> and link 2005-02-05 Tor Lillqvist <tml@novell.com> * configure.in (G_LIBS_EXTRA) * glib/giowin32.c: I think we can include <winsock2.h> and link with -lws2_32. Only Windows 95 originally didn't have Winsock 2, and it's available as an update for it. Not that we use any actual Winsock 2 -only features, but still, simpler to link directly with ws2_32.dll instead of going through wsock32.dll.
2005-02-05 23:39:40 +01:00
#include <winsock2.h>
Include winsock2.h before windows.h, to avoid compilation errors with 2005-02-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Include winsock2.h before windows.h, to avoid compilation errors with MSVC. (#167105)
2005-02-11 23:43:32 +01:00
#include <windows.h>
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
#include <conio.h>
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
#include <fcntl.h>
#include <io.h>
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
#include <process.h>
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
#include <errno.h>
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
#include <sys/stat.h>
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Introduce the idea of a filename encoding, which is *literally* the 2004-10-27 Matthias Clasen <mclasen@redhat.com> Introduce the idea of a filename encoding, which is *literally* the filename encoding on Unix. On windows, use the Unicode name converted to UTF-8. (#156325, Tor Lillqvist, Owen Taylor) * glib/gdir.[hc]: * glib/gconvert.[hc]: * glib/gfileutils.[hc]: * glib/gutils.[hc]: * glib/giowin32.c: On Windows, keep old ABI versions of GLib pathname api for DLL ABI stability. Use different names for the new-style UTF-8 versions. Hide this through a #define. * glib/gstdio.[hc]: New files containing wrappers for POSIX pathname api. * glib/glib.symbols: Add new symbols. * glib/makegalias.pl: Drop Win32 specific .def syntax, include gstdio.h
2004-10-27 18:46:29 +02:00
#include "gstdio.h"
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
#include "glibintl.h"
Make PLT-reduction work with gcc4, and don't include everything in 2005-03-13 Matthias Clasen <mclasen@redhat.com> Make PLT-reduction work with gcc4, and don't include everything in galias.h: * glib/glib.symbols: Group symbols by header and source file. * glib/makegalias.pl: Protect definitions by the same preprocessor symbols used to guard the headers. Move the alias declarations to a separate file which is produced when calling makegalias.pl -def * glib/Makefile.am (galiasdef.c): Add a rule to generate this file. * glib/*.c: Include galias.h after the other GLib headers, include galiasdef.c at the bottom.
2005-03-14 05:26:57 +01:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
typedef struct _GIOWin32Channel GIOWin32Channel;
typedef struct _GIOWin32Watch GIOWin32Watch;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
#define BUFFER_SIZE 4096
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
typedef enum {
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
G_IO_WIN32_WINDOWS_MESSAGES, /* Windows messages */
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
G_IO_WIN32_FILE_DESC, /* Unix-like file descriptors from
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
* _open() or _pipe(), except for
* console IO. Separate thread to read
* or write.
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
*/
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
G_IO_WIN32_CONSOLE, /* Console IO (usually stdin, stdout, stderr) */
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
G_IO_WIN32_SOCKET /* Sockets. No separate thread. */
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
} GIOWin32ChannelType;
struct _GIOWin32Channel {
GIOChannel channel;
gint fd; /* Either a Unix-like file handle as provided
* by the Microsoft C runtime, or a SOCKET
* as provided by WinSock.
*/
GIOWin32ChannelType type;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
gboolean debug;
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
/* Field used by G_IO_WIN32_WINDOWS_MESSAGES channels */
HWND hwnd; /* Handle of window, or NULL */
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
/* Fields used by G_IO_WIN32_FILE_DESC channels. */
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
CRITICAL_SECTION mutex;
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
int direction; /* 0 means we read from it,
* 1 means we write to it.
*/
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
gboolean running; /* Is reader or writer thread
* running. FALSE if EOF has been
* reached by the reader thread.
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
*/
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
gboolean needs_close; /* If the channel has been closed while
* the reader thread was still running.
*/
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
guint thread_id; /* If non-NULL the channel has or has
* had a reader or writer thread.
*/
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
HANDLE data_avail_event;
gushort revents;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
/* Data is kept in a circular buffer. To be able to distinguish between
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
* empty and full buffers, we cannot fill it completely, but have to
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
* leave a one character gap.
*
* Data available is between indexes rdp and wrp-1 (modulo BUFFER_SIZE).
*
* Empty: wrp == rdp
* Full: (wrp + 1) % BUFFER_SIZE == rdp
* Partial: otherwise
*/
guchar *buffer; /* (Circular) buffer */
gint wrp, rdp; /* Buffer indices for writing and reading */
HANDLE space_avail_event;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
Minor comment improvements. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Minor comment improvements. svn path=/trunk/; revision=7382
2008-08-21 13:24:00 +02:00
/* Fields used by G_IO_WIN32_SOCKET channels */
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
int event_mask;
int last_events;
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
HANDLE event;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
gboolean write_would_have_blocked;
Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return on a non-blocking socket returns prematurely Bug 548278 - Async GETs connections are always terminated unexpectedly on Windows * glib/giowin32.c: Add one more state variable to the GIOWin32Channel struct, ever_writable. Initialise it to FALSE, set to TRUE when the WSAEventSelect() indicates FD_WRITE, and never reset to FALSE. Don't do the WSASetEvent() in g_io_win32_prepare() unless ever_writable is TRUE. Don't automatically indicate G_IO_OUT in g_io_win32_check() unless ever_writable is TRUE. This fixes the behaviour of the test case program in bug #548278, and the "Testcase for the spurious OUT event bug" in bug #324234. It also doesn't seem to break anything. Not that there is any exhaustive test suite... Add a comment with a list of bugs that are related to the code in this file. svn path=/trunk/; revision=7372
2008-08-20 01:48:16 +02:00
gboolean ever_writable;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
};
struct _GIOWin32Watch {
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
GSource source;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
GPollFD pollfd;
GIOChannel *channel;
GIOCondition condition;
};
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
static void
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
g_win32_print_access_mode (int flags)
{
g_print ("%s%s%s%s%s%s%s%s%s%s",
((flags & 0x3) == _O_RDWR ? "O_RDWR" :
((flags & 0x3) == _O_RDONLY ? "O_RDONLY" :
((flags & 0x3) == _O_WRONLY ? "O_WRONLY" : "0"))),
(flags & _O_APPEND ? "|O_APPEND" : ""),
(flags & _O_RANDOM ? "|O_RANDOM" : ""),
(flags & _O_SEQUENTIAL ? "|O_SEQUENTIAL" : ""),
(flags & _O_TEMPORARY ? "|O_TEMPORARY" : ""),
(flags & _O_CREAT ? "|O_CREAT" : ""),
(flags & _O_TRUNC ? "|O_TRUNC" : ""),
(flags & _O_EXCL ? "|O_EXCL" : ""),
(flags & _O_TEXT ? "|O_TEXT" : ""),
(flags & _O_BINARY ? "|O_BINARY" : ""));
}
static void
g_win32_print_gioflags (GIOFlags flags)
{
char *bar = "";
if (flags & G_IO_FLAG_APPEND)
bar = "|", g_print ("APPEND");
if (flags & G_IO_FLAG_NONBLOCK)
g_print ("%sNONBLOCK", bar), bar = "|";
if (flags & G_IO_FLAG_IS_READABLE)
g_print ("%sREADABLE", bar), bar = "|";
if (flags & G_IO_FLAG_IS_WRITEABLE)
g_print ("%sWRITEABLE", bar), bar = "|";
if (flags & G_IO_FLAG_IS_SEEKABLE)
g_print ("%sSEEKABLE", bar), bar = "|";
}
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
static const char *
event_mask_to_string (int mask)
{
char buf[100];
int checked_bits = 0;
char *bufp = buf;
if (mask == 0)
return "";
#define BIT(n) checked_bits |= FD_##n; if (mask & FD_##n) bufp += sprintf (bufp, "%s" #n, (bufp>buf ? "|" : ""))
BIT (READ);
BIT (WRITE);
BIT (OOB);
BIT (ACCEPT);
BIT (CONNECT);
BIT (CLOSE);
BIT (QOS);
BIT (GROUP_QOS);
BIT (ROUTING_INTERFACE_CHANGE);
BIT (ADDRESS_LIST_CHANGE);
#undef BIT
if ((mask & ~checked_bits) != 0)
bufp += sprintf (bufp, "|%#x", mask & ~checked_bits);
return g_quark_to_string (g_quark_from_string (buf));
}
static const char *
condition_to_string (GIOCondition condition)
{
char buf[100];
int checked_bits = 0;
char *bufp = buf;
if (condition == 0)
return "";
#define BIT(n) checked_bits |= G_IO_##n; if (condition & G_IO_##n) bufp += sprintf (bufp, "%s" #n, (bufp>buf ? "|" : ""))
BIT (IN);
BIT (OUT);
BIT (PRI);
BIT (ERR);
BIT (HUP);
BIT (NVAL);
#undef BIT
if ((condition & ~checked_bits) != 0)
bufp += sprintf (bufp, "|%#x", condition & ~checked_bits);
return g_quark_to_string (g_quark_from_string (buf));
}
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
static gboolean
g_io_win32_get_debug_flag (void)
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
{
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
return (getenv ("G_IO_WIN32_DEBUG") != NULL);
}
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
static void
g_io_channel_win32_init (GIOWin32Channel *channel)
{
channel->debug = g_io_win32_get_debug_flag ();
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
InitializeCriticalSection (&channel->mutex);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->running = FALSE;
Rework the changes to needed to pass mainloop-test. Now we don't need to 2001-01-09 Tor Lillqvist <tml@iki.fi> * giowin32.c (create_reader_thread): Rework the changes to needed to pass mainloop-test. Now we don't need to call TerminateThread() after all, which is a relief, as the docs have a BIG RED WARNING SIGN about using that API. Instead, when closing a fd channel that has a reader thread running, just mark it as non-running and additionally mark the fd as ripe for closing. When the reader thread hopefully eventually gets something (and EOF or some actual data), it will note that it shouldn't be running, break out of the loop, and close the fd. The socket channel closing code should probably be changed similarily, but that will have to wait until I have a test case. (g_pipe_readable_msg, g_io_channel_win32_new_pipe, g_io_channel_win32_new_pipe_with_wakeups, g_io_channel_win32_pipe_request_wakeups, g_io_channel_win32_pipe_readable): Remove these, have been obsolete for some time. * glib.def: Update.
2001-01-09 21:46:49 +01:00
channel->needs_close = FALSE;
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->thread_id = 0;
Some indentation and spacing fixes. Add some more logging. 2000-08-12 Tor Lillqvist <tml@iki.fi> * giowin32.c: Some indentation and spacing fixes. Add some more logging. (g_io_win32_add_watch): New function, with common code from g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start more than one reader thread for a GIOChannel. We should obviously have just one reader thread reading a file descriptor or socket.
2000-08-11 23:36:00 +02:00
channel->data_avail_event = NULL;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
channel->revents = 0;
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
channel->buffer = NULL;
Some indentation and spacing fixes. Add some more logging. 2000-08-12 Tor Lillqvist <tml@iki.fi> * giowin32.c: Some indentation and spacing fixes. Add some more logging. (g_io_win32_add_watch): New function, with common code from g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start more than one reader thread for a GIOChannel. We should obviously have just one reader thread reading a file descriptor or socket.
2000-08-11 23:36:00 +02:00
channel->space_avail_event = NULL;
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
channel->event_mask = 0;
channel->last_events = 0;
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
channel->event = NULL;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
channel->write_would_have_blocked = FALSE;
Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return on a non-blocking socket returns prematurely Bug 548278 - Async GETs connections are always terminated unexpectedly on Windows * glib/giowin32.c: Add one more state variable to the GIOWin32Channel struct, ever_writable. Initialise it to FALSE, set to TRUE when the WSAEventSelect() indicates FD_WRITE, and never reset to FALSE. Don't do the WSASetEvent() in g_io_win32_prepare() unless ever_writable is TRUE. Don't automatically indicate G_IO_OUT in g_io_win32_check() unless ever_writable is TRUE. This fixes the behaviour of the test case program in bug #548278, and the "Testcase for the spurious OUT event bug" in bug #324234. It also doesn't seem to break anything. Not that there is any exhaustive test suite... Add a comment with a list of bugs that are related to the code in this file. svn path=/trunk/; revision=7372
2008-08-20 01:48:16 +02:00
channel->ever_writable = FALSE;
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
static void
create_events (GIOWin32Channel *channel)
{
SECURITY_ATTRIBUTES sec_attrs;
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
sec_attrs.nLength = sizeof (SECURITY_ATTRIBUTES);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
sec_attrs.lpSecurityDescriptor = NULL;
sec_attrs.bInheritHandle = FALSE;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
/* The data available event is manual reset, the space available event
* is automatic reset.
*/
if (!(channel->data_avail_event = CreateEvent (&sec_attrs, TRUE, FALSE, NULL))
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
|| !(channel->space_avail_event = CreateEvent (&sec_attrs, FALSE, FALSE, NULL)))
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
gchar *emsg = g_win32_error_message (GetLastError ());
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
g_error ("Error creating event: %s", emsg);
g_free (emsg);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
}
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
static unsigned __stdcall
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
read_thread (void *parameter)
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
{
GIOWin32Channel *channel = parameter;
guchar *buffer;
Bug 500246 - Bug fixes for giowin32 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 500246 - Bug fixes for giowin32 * glib/giowin32.c (read_thread) (write_thread): Change the nbytes variables to signed. (g_io_channel_win32_make_pollfd): Fix an obvious error in the file descriptor case leftover after the patch from bug #333098 on 2006-03-02. Thanks to Marcus Brinkmann. svn path=/trunk/; revision=7373
2008-08-20 03:30:31 +02:00
gint nbytes;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_io_channel_ref ((GIOChannel *)channel);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("read_thread %#x: start fd=%d, data_avail=%p space_avail=%p\n",
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->thread_id,
channel->fd,
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
channel->data_avail_event,
channel->space_avail_event);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
channel->direction = 0;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
channel->buffer = g_malloc (BUFFER_SIZE);
channel->rdp = channel->wrp = 0;
channel->running = TRUE;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
SetEvent (channel->space_avail_event);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
while (channel->running)
{
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (channel->debug)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_print ("read_thread %#x: rdp=%d, wrp=%d\n",
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->thread_id, channel->rdp, channel->wrp);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
if ((channel->wrp + 1) % BUFFER_SIZE == channel->rdp)
{
/* Buffer is full */
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (channel->debug)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_print ("read_thread %#x: resetting space_avail\n",
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->thread_id);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
ResetEvent (channel->space_avail_event);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (channel->debug)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_print ("read_thread %#x: waiting for space\n",
channel->thread_id);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
WaitForSingleObject (channel->space_avail_event, INFINITE);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (channel->debug)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_print ("read_thread %#x: rdp=%d, wrp=%d\n",
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->thread_id, channel->rdp, channel->wrp);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
}
buffer = channel->buffer + channel->wrp;
/* Always leave at least one byte unused gap to be able to
* distinguish between the full and empty condition...
*/
nbytes = MIN ((channel->rdp + BUFFER_SIZE - channel->wrp - 1) % BUFFER_SIZE,
BUFFER_SIZE - channel->wrp);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Some more debugging output. (g_io_channel_win32_poll): Remove unused vars. 2000-10-16 Tor Lillqvist <tml@iki.fi> * giowin32.c (reader_thread): Some more debugging output. (g_io_channel_win32_poll): Remove unused vars. * gfileutils.c: Changes for Win32, with no unistd.h and no S_ISLNK(). * gspawn-win32.c: Implementation of the g_spwan_* functions for Win32. Due to the general non-Unixness of Win32, much of the functionality that is relatively clean to implement on Unix, is hard to do on Win32. We must use a separate helper program to change directory, close extra file descriptors, redirect the std ones, as needed, and only then start the child process. No child process pid can be returned, unfortunately. Or if we used CreateProcess directly, it probably could. (Now we use the spawnv* functions from msvcrt.) * glib.def: Add new entry points. * glib.def * giowin32.c: Remove g_io_channel_win32_wait_for_condition(), g_io_channel_win32_poll() subsumes it. * gbacktrace.h: G_BREAKPOINT for MSVC (on the ix86). * gwin32.c (g_win32_getlocale): Use "sp" for LANG_CROATIAN+SUBLANG_SERBIAN_LATIN. * makefile.{mingw,msc}.in (glib_OBJECTS): Add new files. Add gspawn-win32-helper.exe rule. * tests/makefile.{mingw,msc}.in (TESTS): Add shell-test and spawn-test. * tests/spawn-test.c: (run_tests): On Win32, don't try to run /bin/sh, but ipconfig (no special significance in choosing that, just a program that outputs something to stdout).
2000-10-16 20:54:29 +02:00
if (channel->debug)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_print ("read_thread %#x: calling read() for %d bytes\n",
Some more debugging output. (g_io_channel_win32_poll): Remove unused vars. 2000-10-16 Tor Lillqvist <tml@iki.fi> * giowin32.c (reader_thread): Some more debugging output. (g_io_channel_win32_poll): Remove unused vars. * gfileutils.c: Changes for Win32, with no unistd.h and no S_ISLNK(). * gspawn-win32.c: Implementation of the g_spwan_* functions for Win32. Due to the general non-Unixness of Win32, much of the functionality that is relatively clean to implement on Unix, is hard to do on Win32. We must use a separate helper program to change directory, close extra file descriptors, redirect the std ones, as needed, and only then start the child process. No child process pid can be returned, unfortunately. Or if we used CreateProcess directly, it probably could. (Now we use the spawnv* functions from msvcrt.) * glib.def: Add new entry points. * glib.def * giowin32.c: Remove g_io_channel_win32_wait_for_condition(), g_io_channel_win32_poll() subsumes it. * gbacktrace.h: G_BREAKPOINT for MSVC (on the ix86). * gwin32.c (g_win32_getlocale): Use "sp" for LANG_CROATIAN+SUBLANG_SERBIAN_LATIN. * makefile.{mingw,msc}.in (glib_OBJECTS): Add new files. Add gspawn-win32-helper.exe rule. * tests/makefile.{mingw,msc}.in (TESTS): Add shell-test and spawn-test. * tests/spawn-test.c: (run_tests): On Win32, don't try to run /bin/sh, but ipconfig (no special significance in choosing that, just a program that outputs something to stdout).
2000-10-16 20:54:29 +02:00
channel->thread_id, nbytes);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
nbytes = read (channel->fd, buffer, nbytes);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
channel->revents = G_IO_IN;
if (nbytes == 0)
channel->revents |= G_IO_HUP;
else if (nbytes < 0)
channel->revents |= G_IO_ERR;
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (channel->debug)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_print ("read_thread %#x: read() returned %d, rdp=%d, wrp=%d\n",
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->thread_id, nbytes, channel->rdp, channel->wrp);
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
if (nbytes <= 0)
break;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
channel->wrp = (channel->wrp + nbytes) % BUFFER_SIZE;
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (channel->debug)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_print ("read_thread %#x: rdp=%d, wrp=%d, setting data_avail\n",
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->thread_id, channel->rdp, channel->wrp);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
SetEvent (channel->data_avail_event);
}
channel->running = FALSE;
Rework the changes to needed to pass mainloop-test. Now we don't need to 2001-01-09 Tor Lillqvist <tml@iki.fi> * giowin32.c (create_reader_thread): Rework the changes to needed to pass mainloop-test. Now we don't need to call TerminateThread() after all, which is a relief, as the docs have a BIG RED WARNING SIGN about using that API. Instead, when closing a fd channel that has a reader thread running, just mark it as non-running and additionally mark the fd as ripe for closing. When the reader thread hopefully eventually gets something (and EOF or some actual data), it will note that it shouldn't be running, break out of the loop, and close the fd. The socket channel closing code should probably be changed similarily, but that will have to wait until I have a test case. (g_pipe_readable_msg, g_io_channel_win32_new_pipe, g_io_channel_win32_new_pipe_with_wakeups, g_io_channel_win32_pipe_request_wakeups, g_io_channel_win32_pipe_readable): Remove these, have been obsolete for some time. * glib.def: Update.
2001-01-09 21:46:49 +01:00
if (channel->needs_close)
{
if (channel->debug)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_print ("read_thread %#x: channel fd %d needs closing\n",
Rework the changes to needed to pass mainloop-test. Now we don't need to 2001-01-09 Tor Lillqvist <tml@iki.fi> * giowin32.c (create_reader_thread): Rework the changes to needed to pass mainloop-test. Now we don't need to call TerminateThread() after all, which is a relief, as the docs have a BIG RED WARNING SIGN about using that API. Instead, when closing a fd channel that has a reader thread running, just mark it as non-running and additionally mark the fd as ripe for closing. When the reader thread hopefully eventually gets something (and EOF or some actual data), it will note that it shouldn't be running, break out of the loop, and close the fd. The socket channel closing code should probably be changed similarily, but that will have to wait until I have a test case. (g_pipe_readable_msg, g_io_channel_win32_new_pipe, g_io_channel_win32_new_pipe_with_wakeups, g_io_channel_win32_pipe_request_wakeups, g_io_channel_win32_pipe_readable): Remove these, have been obsolete for some time. * glib.def: Update.
2001-01-09 21:46:49 +01:00
channel->thread_id, channel->fd);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
close (channel->fd);
Rework the changes to needed to pass mainloop-test. Now we don't need to 2001-01-09 Tor Lillqvist <tml@iki.fi> * giowin32.c (create_reader_thread): Rework the changes to needed to pass mainloop-test. Now we don't need to call TerminateThread() after all, which is a relief, as the docs have a BIG RED WARNING SIGN about using that API. Instead, when closing a fd channel that has a reader thread running, just mark it as non-running and additionally mark the fd as ripe for closing. When the reader thread hopefully eventually gets something (and EOF or some actual data), it will note that it shouldn't be running, break out of the loop, and close the fd. The socket channel closing code should probably be changed similarily, but that will have to wait until I have a test case. (g_pipe_readable_msg, g_io_channel_win32_new_pipe, g_io_channel_win32_new_pipe_with_wakeups, g_io_channel_win32_pipe_request_wakeups, g_io_channel_win32_pipe_readable): Remove these, have been obsolete for some time. * glib.def: Update.
2001-01-09 21:46:49 +01:00
channel->fd = -1;
}
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (channel->debug)
g_print ("read_thread %#x: EOF, rdp=%d, wrp=%d, setting data_avail\n",
channel->thread_id, channel->rdp, channel->wrp);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
SetEvent (channel->data_avail_event);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
g_io_channel_unref ((GIOChannel *)channel);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Rework the changes to needed to pass mainloop-test. Now we don't need to 2001-01-09 Tor Lillqvist <tml@iki.fi> * giowin32.c (create_reader_thread): Rework the changes to needed to pass mainloop-test. Now we don't need to call TerminateThread() after all, which is a relief, as the docs have a BIG RED WARNING SIGN about using that API. Instead, when closing a fd channel that has a reader thread running, just mark it as non-running and additionally mark the fd as ripe for closing. When the reader thread hopefully eventually gets something (and EOF or some actual data), it will note that it shouldn't be running, break out of the loop, and close the fd. The socket channel closing code should probably be changed similarily, but that will have to wait until I have a test case. (g_pipe_readable_msg, g_io_channel_win32_new_pipe, g_io_channel_win32_new_pipe_with_wakeups, g_io_channel_win32_pipe_request_wakeups, g_io_channel_win32_pipe_readable): Remove these, have been obsolete for some time. * glib.def: Update.
2001-01-09 21:46:49 +01:00
/* No need to call _endthreadex(), the actual thread starter routine
* in MSVCRT (see crt/src/threadex.c:_threadstartex) calls
* _endthreadex() for us.
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
*/
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
return 0;
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
static unsigned __stdcall
write_thread (void *parameter)
{
GIOWin32Channel *channel = parameter;
guchar *buffer;
Bug 500246 - Bug fixes for giowin32 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 500246 - Bug fixes for giowin32 * glib/giowin32.c (read_thread) (write_thread): Change the nbytes variables to signed. (g_io_channel_win32_make_pollfd): Fix an obvious error in the file descriptor case leftover after the patch from bug #333098 on 2006-03-02. Thanks to Marcus Brinkmann. svn path=/trunk/; revision=7373
2008-08-20 03:30:31 +02:00
gint nbytes;
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
g_io_channel_ref ((GIOChannel *)channel);
if (channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("write_thread %#x: start fd=%d, data_avail=%p space_avail=%p\n",
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
channel->thread_id,
channel->fd,
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
channel->data_avail_event,
channel->space_avail_event);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
channel->direction = 1;
channel->buffer = g_malloc (BUFFER_SIZE);
channel->rdp = channel->wrp = 0;
channel->running = TRUE;
SetEvent (channel->space_avail_event);
/* We use the same event objects as for a reader thread, but with
* reversed meaning. So, space_avail is used if data is available
* for writing, and data_avail is used if space is available in the
* write buffer.
*/
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
while (channel->running || channel->rdp != channel->wrp)
{
if (channel->debug)
g_print ("write_thread %#x: rdp=%d, wrp=%d\n",
channel->thread_id, channel->rdp, channel->wrp);
if (channel->wrp == channel->rdp)
{
/* Buffer is empty. */
if (channel->debug)
g_print ("write_thread %#x: resetting space_avail\n",
channel->thread_id);
ResetEvent (channel->space_avail_event);
if (channel->debug)
g_print ("write_thread %#x: waiting for data\n",
channel->thread_id);
channel->revents = G_IO_OUT;
SetEvent (channel->data_avail_event);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
WaitForSingleObject (channel->space_avail_event, INFINITE);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
if (channel->rdp == channel->wrp)
break;
if (channel->debug)
g_print ("write_thread %#x: rdp=%d, wrp=%d\n",
channel->thread_id, channel->rdp, channel->wrp);
}
buffer = channel->buffer + channel->rdp;
if (channel->rdp < channel->wrp)
nbytes = channel->wrp - channel->rdp;
else
nbytes = BUFFER_SIZE - channel->rdp;
if (channel->debug)
g_print ("write_thread %#x: calling write() for %d bytes\n",
channel->thread_id, nbytes);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
nbytes = write (channel->fd, buffer, nbytes);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
if (channel->debug)
g_print ("write_thread %#x: write(%i) returned %d, rdp=%d, wrp=%d\n",
channel->thread_id, channel->fd, nbytes, channel->rdp, channel->wrp);
channel->revents = 0;
if (nbytes > 0)
channel->revents |= G_IO_OUT;
else if (nbytes <= 0)
channel->revents |= G_IO_ERR;
channel->rdp = (channel->rdp + nbytes) % BUFFER_SIZE;
if (nbytes <= 0)
break;
if (channel->debug)
g_print ("write_thread: setting data_avail for thread %#x\n",
channel->thread_id);
SetEvent (channel->data_avail_event);
}
channel->running = FALSE;
if (channel->needs_close)
{
if (channel->debug)
g_print ("write_thread %#x: channel fd %d needs closing\n",
channel->thread_id, channel->fd);
close (channel->fd);
channel->fd = -1;
}
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
g_io_channel_unref ((GIOChannel *)channel);
return 0;
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
static void
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
create_thread (GIOWin32Channel *channel,
GIOCondition condition,
unsigned (__stdcall *thread) (void *parameter))
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
{
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
HANDLE thread_handle;
thread_handle = (HANDLE) _beginthreadex (NULL, 0, thread, channel, 0,
&channel->thread_id);
if (thread_handle == 0)
Improve run-time warning messages. Drop some #if 0 code. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Improve run-time warning messages. Drop some #if 0 code. svn path=/trunk/; revision=7383
2008-08-21 13:35:51 +02:00
g_warning ("Error creating thread: %s.",
Final updates for 2.0.0 Fri Mar 8 10:20:46 2002 Owen Taylor <otaylor@redhat.com> * NEWS: Final updates for 2.0.0 * glib/gstrfuncs.c: Convert the results of strerror() and strsignal() to UTF-8. * glib/gconvert.c glib/gdir.c glib/giochannel.c glib/giounix.c glib/giowin32.c: Use g_strerror(), not strerror().
2002-03-08 16:50:54 +01:00
g_strerror (errno));
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
else if (!CloseHandle (thread_handle))
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
{
gchar *emsg = g_win32_error_message (GetLastError ());
g_warning ("Error closing thread handle: %s.", emsg);
g_free (emsg);
}
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
WaitForSingleObject (channel->space_avail_event, INFINITE);
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
static GIOStatus
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
buffer_read (GIOWin32Channel *channel,
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
gchar *dest,
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
gsize count,
gsize *bytes_read,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
guint nbytes;
guint left = count;
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("reading from thread %#x %" G_GSIZE_FORMAT " bytes, rdp=%d, wrp=%d\n",
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->thread_id, count, channel->rdp, channel->wrp);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (channel->wrp == channel->rdp)
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
{
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (channel->debug)
g_print ("waiting for data from thread %#x\n", channel->thread_id);
WaitForSingleObject (channel->data_avail_event, INFINITE);
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
if (channel->debug)
g_print ("done waiting for data from thread %#x\n", channel->thread_id);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (channel->wrp == channel->rdp && !channel->running)
The code didn't compile (must have been sleepy when committing). "return" 2000-07-31 Tor Lillqvist <tml@iki.fi> * giowin32.c (buffer_read): The code didn't compile (must have been sleepy when committing). "return" instead of "break" (g_io_win32_fd_add_watch): Cannot check if the file descriptor is readable by calling ReadFile to read zero bytes. ReadFile blocks on NT even if trying to read nothing at all. So, don't check if file descriptor is readable; assume this function isn't called otherwise.
2000-07-31 17:11:02 +02:00
{
Include <config.h> first here, too. Use g_io_channel_read_chars() instead 2002-02-19 Tor Lillqvist <tml@iki.fi> * glib/gspawn-win32.c: Include <config.h> first here, too. Use g_io_channel_read_chars() instead of (deprecated) g_io_channel_read(). Set encoding to NULL for the channels used for the pipes from the child. * glib/giowin32.c (buffer_read): Do return G_IO_STATUS_EOF when EOF has been reached. Otherwise, with the above change to gspawn-win32.c, spawn-test hangs.
2002-02-19 10:08:24 +01:00
if (channel->debug)
g_print ("wrp==rdp, !running\n");
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
*bytes_read = 0;
Include <config.h> first here, too. Use g_io_channel_read_chars() instead 2002-02-19 Tor Lillqvist <tml@iki.fi> * glib/gspawn-win32.c: Include <config.h> first here, too. Use g_io_channel_read_chars() instead of (deprecated) g_io_channel_read(). Set encoding to NULL for the channels used for the pipes from the child. * glib/giowin32.c (buffer_read): Do return G_IO_STATUS_EOF when EOF has been reached. Otherwise, with the above change to gspawn-win32.c, spawn-test hangs.
2002-02-19 10:08:24 +01:00
return G_IO_STATUS_EOF;
The code didn't compile (must have been sleepy when committing). "return" 2000-07-31 Tor Lillqvist <tml@iki.fi> * giowin32.c (buffer_read): The code didn't compile (must have been sleepy when committing). "return" instead of "break" (g_io_win32_fd_add_watch): Cannot check if the file descriptor is readable by calling ReadFile to read zero bytes. ReadFile blocks on NT even if trying to read nothing at all. So, don't check if file descriptor is readable; assume this function isn't called otherwise.
2000-07-31 17:11:02 +02:00
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
}
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (channel->rdp < channel->wrp)
nbytes = channel->wrp - channel->rdp;
else
nbytes = BUFFER_SIZE - channel->rdp;
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
nbytes = MIN (left, nbytes);
if (channel->debug)
g_print ("moving %d bytes from thread %#x\n",
nbytes, channel->thread_id);
memcpy (dest, channel->buffer + channel->rdp, nbytes);
dest += nbytes;
left -= nbytes;
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->rdp = (channel->rdp + nbytes) % BUFFER_SIZE;
if (channel->debug)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_print ("setting space_avail for thread %#x\n", channel->thread_id);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
SetEvent (channel->space_avail_event);
if (channel->debug)
g_print ("for thread %#x: rdp=%d, wrp=%d\n",
channel->thread_id, channel->rdp, channel->wrp);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (channel->running && channel->wrp == channel->rdp)
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
{
if (channel->debug)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_print ("resetting data_avail of thread %#x\n",
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
channel->thread_id);
ResetEvent (channel->data_avail_event);
};
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
/* We have no way to indicate any errors form the actual
* read() or recv() call in the reader thread. Should we have?
*/
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
*bytes_read = count - left;
return (*bytes_read > 0) ? G_IO_STATUS_NORMAL : G_IO_STATUS_EOF;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
static GIOStatus
buffer_write (GIOWin32Channel *channel,
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
const gchar *dest,
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
gsize count,
gsize *bytes_written,
GError **err)
{
guint nbytes;
guint left = count;
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
if (channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("buffer_write: writing to thread %#x %" G_GSIZE_FORMAT " bytes, rdp=%d, wrp=%d\n",
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
channel->thread_id, count, channel->rdp, channel->wrp);
if ((channel->wrp + 1) % BUFFER_SIZE == channel->rdp)
{
/* Buffer is full */
if (channel->debug)
g_print ("buffer_write: tid %#x: resetting data_avail\n",
channel->thread_id);
ResetEvent (channel->data_avail_event);
if (channel->debug)
g_print ("buffer_write: tid %#x: waiting for space\n",
channel->thread_id);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
WaitForSingleObject (channel->data_avail_event, INFINITE);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
if (channel->debug)
g_print ("buffer_write: tid %#x: rdp=%d, wrp=%d\n",
channel->thread_id, channel->rdp, channel->wrp);
}
nbytes = MIN ((channel->rdp + BUFFER_SIZE - channel->wrp - 1) % BUFFER_SIZE,
BUFFER_SIZE - channel->wrp);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
nbytes = MIN (left, nbytes);
if (channel->debug)
g_print ("buffer_write: tid %#x: writing %d bytes\n",
channel->thread_id, nbytes);
memcpy (channel->buffer + channel->wrp, dest, nbytes);
dest += nbytes;
left -= nbytes;
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
channel->wrp = (channel->wrp + nbytes) % BUFFER_SIZE;
if (channel->debug)
g_print ("buffer_write: tid %#x: rdp=%d, wrp=%d, setting space_avail\n",
channel->thread_id, channel->rdp, channel->wrp);
SetEvent (channel->space_avail_event);
if ((channel->wrp + 1) % BUFFER_SIZE == channel->rdp)
{
/* Buffer is full */
if (channel->debug)
g_print ("buffer_write: tid %#x: resetting data_avail\n",
channel->thread_id);
ResetEvent (channel->data_avail_event);
}
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
/* We have no way to indicate any errors form the actual
* write() call in the writer thread. Should we have?
*/
*bytes_written = count - left;
return (*bytes_written > 0) ? G_IO_STATUS_NORMAL : G_IO_STATUS_EOF;
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
static gboolean
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
g_io_win32_prepare (GSource *source,
gint *timeout)
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Watch *watch = (GIOWin32Watch *)source;
Some debugging output formatting changes. The following two changes fixes 2002-03-16 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Some debugging output formatting changes. The following two changes fixes a problem with buffered GIOChannels, noticed with the help of Owen's test program, thanks! (g_io_win32_prepare): Return value that takes the buffer condition into account, like g_io_unix_prepare() does. (g_io_win32_check): Ditto, like g_io_unix_check().
2002-03-16 00:01:55 +01:00
GIOCondition buffer_condition = g_io_channel_get_buffer_condition (watch->channel);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
int event_mask;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
*timeout = -1;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print ("g_io_win32_prepare: source=%p channel=%p", source, channel);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
switch (channel->type)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
{
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
case G_IO_WIN32_WINDOWS_MESSAGES:
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print (" MSG");
break;
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
case G_IO_WIN32_CONSOLE:
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print (" CON");
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
break;
case G_IO_WIN32_FILE_DESC:
if (channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print (" FD thread=%#x buffer_condition:{%s}"
"\n watch->pollfd.events:{%s} watch->pollfd.revents:{%s} channel->revents:{%s}",
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
channel->thread_id, condition_to_string (buffer_condition),
condition_to_string (watch->pollfd.events),
condition_to_string (watch->pollfd.revents),
condition_to_string (channel->revents));
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&channel->mutex);
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
if (channel->running)
Some debugging output formatting changes. The following two changes fixes 2002-03-16 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Some debugging output formatting changes. The following two changes fixes a problem with buffered GIOChannels, noticed with the help of Owen's test program, thanks! (g_io_win32_prepare): Return value that takes the buffer condition into account, like g_io_unix_prepare() does. (g_io_win32_check): Ditto, like g_io_unix_check().
2002-03-16 00:01:55 +01:00
{
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
if (channel->direction == 0 && channel->wrp == channel->rdp)
{
if (channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print ("\n setting revents=0");
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
channel->revents = 0;
}
Some debugging output formatting changes. The following two changes fixes 2002-03-16 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Some debugging output formatting changes. The following two changes fixes a problem with buffered GIOChannels, noticed with the help of Owen's test program, thanks! (g_io_win32_prepare): Return value that takes the buffer condition into account, like g_io_unix_prepare() does. (g_io_win32_check): Ditto, like g_io_unix_check().
2002-03-16 00:01:55 +01:00
}
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
else
{
if (channel->direction == 1
&& (channel->wrp + 1) % BUFFER_SIZE == channel->rdp)
{
if (channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print ("\n setting revents=0");
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
channel->revents = 0;
}
}
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&channel->mutex);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
break;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
case G_IO_WIN32_SOCKET:
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print (" SOCK");
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
event_mask = 0;
if (watch->condition & G_IO_IN)
event_mask |= (FD_READ | FD_ACCEPT);
if (watch->condition & G_IO_OUT)
event_mask |= (FD_WRITE | FD_CONNECT);
When WSAEnumNetworkEvents() signals FD_CONNECT that means that the 2007-07-06 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_check): When WSAEnumNetworkEvents() signals FD_CONNECT that means that the connection attempt finished, either successfully or failed. Test explicitly whether the connnection succeeded and set either G_IO_OUT if it did, G_IO_ERR|G_IO_HUP if it failed. Make sure we never set both G_IO_OUT and G_IO_HUP simultaneously because in Unix poll(2) POLLOUT and POLLHUP are mutually exclusive. Ignore whether the caller wants to watch G_IO_HUP or not. Always select for FD_CLOSE because Unix poll(2) also ignores whether POLLHUP in set the requested events bitmask or not. svn path=/trunk/; revision=5600
2007-07-06 03:22:53 +02:00
event_mask |= FD_CLOSE;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
Improve run-time warning messages. Drop some #if 0 code. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Improve run-time warning messages. Drop some #if 0 code. svn path=/trunk/; revision=7383
2008-08-21 13:35:51 +02:00
if (channel->event_mask != event_mask)
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
{
if (channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("\n WSAEventSelect(%d,%p,{%s})",
channel->fd, (HANDLE) watch->pollfd.fd,
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
event_mask_to_string (event_mask));
if (WSAEventSelect (channel->fd, (HANDLE) watch->pollfd.fd,
event_mask) == SOCKET_ERROR)
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
if (channel->debug)
{
gchar *emsg = g_win32_error_message (WSAGetLastError ());
g_print (" failed: %s", emsg);
g_free (emsg);
}
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
channel->event_mask = event_mask;
Drop #if 0 code. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Drop #if 0 code. svn path=/trunk/; revision=7385
2008-08-21 15:42:35 +02:00
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print ("\n setting last_events=0");
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
channel->last_events = 0;
Patch from Yu Kuan that makes watched sockets behave much better. See 2008-07-20 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_prepare): Patch from Yu Kuan that makes watched sockets behave much better. See gtk-devel-list archives from May for the (unfortunately rather meager) discussion. This patch fixes the presented simple test program, which reasonably could be expected to work. svn path=/trunk/; revision=7220
2008-07-20 22:44:39 +02:00
Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return on a non-blocking socket returns prematurely Bug 548278 - Async GETs connections are always terminated unexpectedly on Windows * glib/giowin32.c: Add one more state variable to the GIOWin32Channel struct, ever_writable. Initialise it to FALSE, set to TRUE when the WSAEventSelect() indicates FD_WRITE, and never reset to FALSE. Don't do the WSASetEvent() in g_io_win32_prepare() unless ever_writable is TRUE. Don't automatically indicate G_IO_OUT in g_io_win32_check() unless ever_writable is TRUE. This fixes the behaviour of the test case program in bug #548278, and the "Testcase for the spurious OUT event bug" in bug #324234. It also doesn't seem to break anything. Not that there is any exhaustive test suite... Add a comment with a list of bugs that are related to the code in this file. svn path=/trunk/; revision=7372
2008-08-20 01:48:16 +02:00
if ((event_mask & FD_WRITE) &&
channel->ever_writable &&
!channel->write_would_have_blocked)
Patch from Yu Kuan that makes watched sockets behave much better. See 2008-07-20 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_prepare): Patch from Yu Kuan that makes watched sockets behave much better. See gtk-devel-list archives from May for the (unfortunately rather meager) discussion. This patch fixes the presented simple test program, which reasonably could be expected to work. svn path=/trunk/; revision=7220
2008-07-20 22:44:39 +02:00
{
if (channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print (" WSASetEvent(%p)", (WSAEVENT) watch->pollfd.fd);
Patch from Yu Kuan that makes watched sockets behave much better. See 2008-07-20 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_prepare): Patch from Yu Kuan that makes watched sockets behave much better. See gtk-devel-list archives from May for the (unfortunately rather meager) discussion. This patch fixes the presented simple test program, which reasonably could be expected to work. svn path=/trunk/; revision=7220
2008-07-20 22:44:39 +02:00
WSASetEvent ((WSAEVENT) watch->pollfd.fd);
}
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
}
break;
default:
g_assert_not_reached ();
abort ();
}
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print ("\n");
Some debugging output formatting changes. The following two changes fixes 2002-03-16 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Some debugging output formatting changes. The following two changes fixes a problem with buffered GIOChannels, noticed with the help of Owen's test program, thanks! (g_io_win32_prepare): Return value that takes the buffer condition into account, like g_io_unix_prepare() does. (g_io_win32_check): Ditto, like g_io_unix_check().
2002-03-16 00:01:55 +01:00
return ((watch->condition & buffer_condition) == watch->condition);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
static gboolean
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
g_io_win32_check (GSource *source)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
MSG msg;
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
GIOWin32Watch *watch = (GIOWin32Watch *)source;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel;
make the code actually have an effect (Use |= to set bits). Not absolutely 2001-07-22 Hans Breuer <hans@breuer.org> * glib/giochannel.c (g_io_channel_get_buffer_condition) : make the code actually have an effect (Use |= to set bits). Not absolutely sure if is the right one. * glib/giowin32.c (g_io_win32_<check|prepare>) : don't modify watch->condition but restored the previous behaviour. Now gio-test as well as The Gimp work again ...
2001-07-22 23:15:22 +02:00
GIOCondition buffer_condition = g_io_channel_get_buffer_condition (watch->channel);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
WSANETWORKEVENTS events;
make the code actually have an effect (Use |= to set bits). Not absolutely 2001-07-22 Hans Breuer <hans@breuer.org> * glib/giochannel.c (g_io_channel_get_buffer_condition) : make the code actually have an effect (Use |= to set bits). Not absolutely sure if is the right one. * glib/giowin32.c (g_io_win32_<check|prepare>) : don't modify watch->condition but restored the previous behaviour. Now gio-test as well as The Gimp work again ...
2001-07-22 23:15:22 +02:00
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print ("g_io_win32_check: source=%p channel=%p", source, channel);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
switch (channel->type)
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
{
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
case G_IO_WIN32_WINDOWS_MESSAGES:
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print (" MSG\n");
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
return (PeekMessage (&msg, channel->hwnd, 0, 0, PM_NOREMOVE));
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
case G_IO_WIN32_FILE_DESC:
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print (" FD thread=%#x buffer_condition=%s\n"
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
" watch->pollfd.events={%s} watch->pollfd.revents={%s} channel->revents={%s}\n",
channel->thread_id, condition_to_string (buffer_condition),
condition_to_string (watch->pollfd.events),
condition_to_string (watch->pollfd.revents),
condition_to_string (channel->revents));
watch->pollfd.revents = (watch->pollfd.events & channel->revents);
return ((watch->pollfd.revents | buffer_condition) & watch->condition);
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
case G_IO_WIN32_CONSOLE:
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print (" CON\n");
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
if (watch->channel->is_writeable)
return TRUE;
else if (watch->channel->is_readable)
{
INPUT_RECORD buffer;
DWORD n;
if (PeekConsoleInput ((HANDLE) watch->pollfd.fd, &buffer, 1, &n) &&
n == 1)
{
/* _kbhit() does quite complex processing to find out
* whether at least one of the key events pending corresponds
* to a "real" character that can be read.
*/
if (_kbhit ())
return TRUE;
/* Discard all other kinds of events */
ReadConsoleInput ((HANDLE) watch->pollfd.fd, &buffer, 1, &n);
}
}
return FALSE;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
case G_IO_WIN32_SOCKET:
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print (" SOCK");
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
if (channel->last_events & FD_WRITE)
{
if (channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print (" sock=%d event=%p last_events has FD_WRITE",
channel->fd, (HANDLE) watch->pollfd.fd);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
}
else
{
WSAEnumNetworkEvents (channel->fd, 0, &events);
if (channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print ("\n revents={%s} condition={%s}"
"\n WSAEnumNetworkEvents(%d,0) sets events={%s}",
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
condition_to_string (watch->pollfd.revents),
condition_to_string (watch->condition),
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
channel->fd,
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
event_mask_to_string (events.lNetworkEvents));
if (watch->pollfd.revents != 0 &&
events.lNetworkEvents == 0 &&
!(channel->event_mask & FD_WRITE))
{
channel->event_mask = 0;
if (channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("\n WSAEventSelect(%d,%p,{})",
channel->fd, (HANDLE) watch->pollfd.fd);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
WSAEventSelect (channel->fd, (HANDLE) watch->pollfd.fd, 0);
if (channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print (" ResetEvent(%p)",
(HANDLE) watch->pollfd.fd);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
ResetEvent ((HANDLE) watch->pollfd.fd);
}
Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return on a non-blocking socket returns prematurely Bug 548278 - Async GETs connections are always terminated unexpectedly on Windows * glib/giowin32.c: Add one more state variable to the GIOWin32Channel struct, ever_writable. Initialise it to FALSE, set to TRUE when the WSAEventSelect() indicates FD_WRITE, and never reset to FALSE. Don't do the WSASetEvent() in g_io_win32_prepare() unless ever_writable is TRUE. Don't automatically indicate G_IO_OUT in g_io_win32_check() unless ever_writable is TRUE. This fixes the behaviour of the test case program in bug #548278, and the "Testcase for the spurious OUT event bug" in bug #324234. It also doesn't seem to break anything. Not that there is any exhaustive test suite... Add a comment with a list of bugs that are related to the code in this file. svn path=/trunk/; revision=7372
2008-08-20 01:48:16 +02:00
else if (events.lNetworkEvents & FD_WRITE)
channel->ever_writable = TRUE;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
channel->last_events = events.lNetworkEvents;
}
Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return on a non-blocking socket returns prematurely Bug 548278 - Async GETs connections are always terminated unexpectedly on Windows * glib/giowin32.c: Add one more state variable to the GIOWin32Channel struct, ever_writable. Initialise it to FALSE, set to TRUE when the WSAEventSelect() indicates FD_WRITE, and never reset to FALSE. Don't do the WSASetEvent() in g_io_win32_prepare() unless ever_writable is TRUE. Don't automatically indicate G_IO_OUT in g_io_win32_check() unless ever_writable is TRUE. This fixes the behaviour of the test case program in bug #548278, and the "Testcase for the spurious OUT event bug" in bug #324234. It also doesn't seem to break anything. Not that there is any exhaustive test suite... Add a comment with a list of bugs that are related to the code in this file. svn path=/trunk/; revision=7372
2008-08-20 01:48:16 +02:00
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
watch->pollfd.revents = 0;
if (channel->last_events & (FD_READ | FD_ACCEPT))
watch->pollfd.revents |= G_IO_IN;
Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return on a non-blocking socket returns prematurely Bug 548278 - Async GETs connections are always terminated unexpectedly on Windows * glib/giowin32.c: Add one more state variable to the GIOWin32Channel struct, ever_writable. Initialise it to FALSE, set to TRUE when the WSAEventSelect() indicates FD_WRITE, and never reset to FALSE. Don't do the WSASetEvent() in g_io_win32_prepare() unless ever_writable is TRUE. Don't automatically indicate G_IO_OUT in g_io_win32_check() unless ever_writable is TRUE. This fixes the behaviour of the test case program in bug #548278, and the "Testcase for the spurious OUT event bug" in bug #324234. It also doesn't seem to break anything. Not that there is any exhaustive test suite... Add a comment with a list of bugs that are related to the code in this file. svn path=/trunk/; revision=7372
2008-08-20 01:48:16 +02:00
When WSAEnumNetworkEvents() signals FD_CONNECT that means that the 2007-07-06 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_check): When WSAEnumNetworkEvents() signals FD_CONNECT that means that the connection attempt finished, either successfully or failed. Test explicitly whether the connnection succeeded and set either G_IO_OUT if it did, G_IO_ERR|G_IO_HUP if it failed. Make sure we never set both G_IO_OUT and G_IO_HUP simultaneously because in Unix poll(2) POLLOUT and POLLHUP are mutually exclusive. Ignore whether the caller wants to watch G_IO_HUP or not. Always select for FD_CLOSE because Unix poll(2) also ignores whether POLLHUP in set the requested events bitmask or not. svn path=/trunk/; revision=5600
2007-07-06 03:22:53 +02:00
if (channel->last_events & FD_WRITE)
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
watch->pollfd.revents |= G_IO_OUT;
When WSAEnumNetworkEvents() signals FD_CONNECT that means that the 2007-07-06 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_check): When WSAEnumNetworkEvents() signals FD_CONNECT that means that the connection attempt finished, either successfully or failed. Test explicitly whether the connnection succeeded and set either G_IO_OUT if it did, G_IO_ERR|G_IO_HUP if it failed. Make sure we never set both G_IO_OUT and G_IO_HUP simultaneously because in Unix poll(2) POLLOUT and POLLHUP are mutually exclusive. Ignore whether the caller wants to watch G_IO_HUP or not. Always select for FD_CLOSE because Unix poll(2) also ignores whether POLLHUP in set the requested events bitmask or not. svn path=/trunk/; revision=5600
2007-07-06 03:22:53 +02:00
else
{
/* We have called WSAEnumNetworkEvents() above but it didn't
* set FD_WRITE.
*/
if (events.lNetworkEvents & FD_CONNECT)
{
if (events.iErrorCode[FD_CONNECT_BIT] == 0)
watch->pollfd.revents |= G_IO_OUT;
else
watch->pollfd.revents |= (G_IO_HUP | G_IO_ERR);
}
if (watch->pollfd.revents == 0 && (channel->last_events & (FD_CLOSE)))
watch->pollfd.revents |= G_IO_HUP;
}
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
When WSAEnumNetworkEvents() signals FD_CONNECT that means that the 2007-07-06 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_check): When WSAEnumNetworkEvents() signals FD_CONNECT that means that the connection attempt finished, either successfully or failed. Test explicitly whether the connnection succeeded and set either G_IO_OUT if it did, G_IO_ERR|G_IO_HUP if it failed. Make sure we never set both G_IO_OUT and G_IO_HUP simultaneously because in Unix poll(2) POLLOUT and POLLHUP are mutually exclusive. Ignore whether the caller wants to watch G_IO_HUP or not. Always select for FD_CLOSE because Unix poll(2) also ignores whether POLLHUP in set the requested events bitmask or not. svn path=/trunk/; revision=5600
2007-07-06 03:22:53 +02:00
/* Regardless of WSAEnumNetworkEvents() result, if watching for
Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return on a non-blocking socket returns prematurely Bug 548278 - Async GETs connections are always terminated unexpectedly on Windows * glib/giowin32.c: Add one more state variable to the GIOWin32Channel struct, ever_writable. Initialise it to FALSE, set to TRUE when the WSAEventSelect() indicates FD_WRITE, and never reset to FALSE. Don't do the WSASetEvent() in g_io_win32_prepare() unless ever_writable is TRUE. Don't automatically indicate G_IO_OUT in g_io_win32_check() unless ever_writable is TRUE. This fixes the behaviour of the test case program in bug #548278, and the "Testcase for the spurious OUT event bug" in bug #324234. It also doesn't seem to break anything. Not that there is any exhaustive test suite... Add a comment with a list of bugs that are related to the code in this file. svn path=/trunk/; revision=7372
2008-08-20 01:48:16 +02:00
* writability, and if we have ever got a FD_WRITE event, and
* unless last write would have blocked, set G_IO_OUT. But never
* set both G_IO_OUT and G_IO_HUP.
When WSAEnumNetworkEvents() signals FD_CONNECT that means that the 2007-07-06 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_check): When WSAEnumNetworkEvents() signals FD_CONNECT that means that the connection attempt finished, either successfully or failed. Test explicitly whether the connnection succeeded and set either G_IO_OUT if it did, G_IO_ERR|G_IO_HUP if it failed. Make sure we never set both G_IO_OUT and G_IO_HUP simultaneously because in Unix poll(2) POLLOUT and POLLHUP are mutually exclusive. Ignore whether the caller wants to watch G_IO_HUP or not. Always select for FD_CLOSE because Unix poll(2) also ignores whether POLLHUP in set the requested events bitmask or not. svn path=/trunk/; revision=5600
2007-07-06 03:22:53 +02:00
*/
if (!(watch->pollfd.revents & G_IO_HUP) &&
Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 324234 - Using g_io_add_watch_full() to wait for connect() to return on a non-blocking socket returns prematurely Bug 548278 - Async GETs connections are always terminated unexpectedly on Windows * glib/giowin32.c: Add one more state variable to the GIOWin32Channel struct, ever_writable. Initialise it to FALSE, set to TRUE when the WSAEventSelect() indicates FD_WRITE, and never reset to FALSE. Don't do the WSASetEvent() in g_io_win32_prepare() unless ever_writable is TRUE. Don't automatically indicate G_IO_OUT in g_io_win32_check() unless ever_writable is TRUE. This fixes the behaviour of the test case program in bug #548278, and the "Testcase for the spurious OUT event bug" in bug #324234. It also doesn't seem to break anything. Not that there is any exhaustive test suite... Add a comment with a list of bugs that are related to the code in this file. svn path=/trunk/; revision=7372
2008-08-20 01:48:16 +02:00
channel->ever_writable &&
When WSAEnumNetworkEvents() signals FD_CONNECT that means that the 2007-07-06 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_check): When WSAEnumNetworkEvents() signals FD_CONNECT that means that the connection attempt finished, either successfully or failed. Test explicitly whether the connnection succeeded and set either G_IO_OUT if it did, G_IO_ERR|G_IO_HUP if it failed. Make sure we never set both G_IO_OUT and G_IO_HUP simultaneously because in Unix poll(2) POLLOUT and POLLHUP are mutually exclusive. Ignore whether the caller wants to watch G_IO_HUP or not. Always select for FD_CLOSE because Unix poll(2) also ignores whether POLLHUP in set the requested events bitmask or not. svn path=/trunk/; revision=5600
2007-07-06 03:22:53 +02:00
!channel->write_would_have_blocked &&
(channel->event_mask & FD_WRITE))
watch->pollfd.revents |= G_IO_OUT;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print ("\n revents={%s} retval={%s}\n",
condition_to_string (watch->pollfd.revents),
condition_to_string ((watch->pollfd.revents | buffer_condition) & watch->condition));
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
return ((watch->pollfd.revents | buffer_condition) & watch->condition);
default:
g_assert_not_reached ();
abort ();
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
static gboolean
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
g_io_win32_dispatch (GSource *source,
GSourceFunc callback,
gpointer user_data)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Warn if no callback. Call callback correctly. (g_io_win32_create_watch): 2000-12-14 Tor Lillqvist <tml@iki.fi> * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. (g_io_win32_fd_create_watch): Ditto. (g_io_channel_unix_new): If it is a file descriptor (i.e., a Unix fd lookalike provided by the C library), call g_io_channel_win32_new_fd(). If it is a socket (from WinSock), call g_io_cahnnel_win32_new_stream_socket(). Hopefully sockets and fds don't overlap. TODO: Implement also datagram sockets. (g_io_channel_win32_poll): Call g_main_context_get_poll_func(). * gcompletion.h: Include <unistd.h> only on Unix. Is this inclusion really needed here? OTOH, do include <stddef.h>, for size_t. * gmessages.c: (Win32) Don't define a function called "write" that might clash with the prototype from <io.h>, use a #define. * glib.def: Update. * gmain.c (g_source_add_poll): Don't return a value from void function. (g_main_context_get_poll_func): Compile also for non-Win32, as presumably was intended. The result var is a GPollFunc, not a GPollFunc*. Return the result! gobject: 2000-12-14 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Update, include parts from Makefile.am to build gmarshal.[ch]. Some day, we won't need these separate makefiles for Win32 compilation. I hope. * makefile.msc.in: Update. No use trying to build gmarshal.[ch] here, it would require Unixish tools. MSVC users building from CVS sources are out of luck. * gobject.def: Update.
2000-12-14 22:02:20 +01:00
GIOFunc func = (GIOFunc)callback;
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
GIOWin32Watch *watch = (GIOWin32Watch *)source;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel;
glib/giowin32.c (g_io_win32_dispatch): Check buffer condition here, too. 2002-03-16 Tor Lillqvist <tml@iki.fi> glib/giowin32.c (g_io_win32_dispatch): Check buffer condition here, too.
2002-03-16 00:34:53 +01:00
GIOCondition buffer_condition = g_io_channel_get_buffer_condition (watch->channel);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Warn if no callback. Call callback correctly. (g_io_win32_create_watch): 2000-12-14 Tor Lillqvist <tml@iki.fi> * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. (g_io_win32_fd_create_watch): Ditto. (g_io_channel_unix_new): If it is a file descriptor (i.e., a Unix fd lookalike provided by the C library), call g_io_channel_win32_new_fd(). If it is a socket (from WinSock), call g_io_cahnnel_win32_new_stream_socket(). Hopefully sockets and fds don't overlap. TODO: Implement also datagram sockets. (g_io_channel_win32_poll): Call g_main_context_get_poll_func(). * gcompletion.h: Include <unistd.h> only on Unix. Is this inclusion really needed here? OTOH, do include <stddef.h>, for size_t. * gmessages.c: (Win32) Don't define a function called "write" that might clash with the prototype from <io.h>, use a #define. * glib.def: Update. * gmain.c (g_source_add_poll): Don't return a value from void function. (g_main_context_get_poll_func): Compile also for non-Win32, as presumably was intended. The result var is a GPollFunc, not a GPollFunc*. Return the result! gobject: 2000-12-14 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Update, include parts from Makefile.am to build gmarshal.[ch]. Some day, we won't need these separate makefiles for Win32 compilation. I hope. * makefile.msc.in: Update. No use trying to build gmarshal.[ch] here, it would require Unixish tools. MSVC users building from CVS sources are out of luck. * gobject.def: Update.
2000-12-14 22:02:20 +01:00
if (!func)
{
Improve run-time warning messages. Drop some #if 0 code. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Improve run-time warning messages. Drop some #if 0 code. svn path=/trunk/; revision=7383
2008-08-21 13:35:51 +02:00
g_warning ("IO Watch dispatched without callback\n"
Warn if no callback. Call callback correctly. (g_io_win32_create_watch): 2000-12-14 Tor Lillqvist <tml@iki.fi> * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. (g_io_win32_fd_create_watch): Ditto. (g_io_channel_unix_new): If it is a file descriptor (i.e., a Unix fd lookalike provided by the C library), call g_io_channel_win32_new_fd(). If it is a socket (from WinSock), call g_io_cahnnel_win32_new_stream_socket(). Hopefully sockets and fds don't overlap. TODO: Implement also datagram sockets. (g_io_channel_win32_poll): Call g_main_context_get_poll_func(). * gcompletion.h: Include <unistd.h> only on Unix. Is this inclusion really needed here? OTOH, do include <stddef.h>, for size_t. * gmessages.c: (Win32) Don't define a function called "write" that might clash with the prototype from <io.h>, use a #define. * glib.def: Update. * gmain.c (g_source_add_poll): Don't return a value from void function. (g_main_context_get_poll_func): Compile also for non-Win32, as presumably was intended. The result var is a GPollFunc, not a GPollFunc*. Return the result! gobject: 2000-12-14 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Update, include parts from Makefile.am to build gmarshal.[ch]. Some day, we won't need these separate makefiles for Win32 compilation. I hope. * makefile.msc.in: Update. No use trying to build gmarshal.[ch] here, it would require Unixish tools. MSVC users building from CVS sources are out of luck. * gobject.def: Update.
2000-12-14 22:02:20 +01:00
"You must call g_source_connect().");
return FALSE;
}
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
if (channel->debug)
g_print ("g_io_win32_dispatch: pollfd.revents=%s condition=%s result=%s\n",
condition_to_string (watch->pollfd.revents),
condition_to_string (watch->condition),
condition_to_string ((watch->pollfd.revents | buffer_condition) & watch->condition));
Warn if no callback. Call callback correctly. (g_io_win32_create_watch): 2000-12-14 Tor Lillqvist <tml@iki.fi> * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. (g_io_win32_fd_create_watch): Ditto. (g_io_channel_unix_new): If it is a file descriptor (i.e., a Unix fd lookalike provided by the C library), call g_io_channel_win32_new_fd(). If it is a socket (from WinSock), call g_io_cahnnel_win32_new_stream_socket(). Hopefully sockets and fds don't overlap. TODO: Implement also datagram sockets. (g_io_channel_win32_poll): Call g_main_context_get_poll_func(). * gcompletion.h: Include <unistd.h> only on Unix. Is this inclusion really needed here? OTOH, do include <stddef.h>, for size_t. * gmessages.c: (Win32) Don't define a function called "write" that might clash with the prototype from <io.h>, use a #define. * glib.def: Update. * gmain.c (g_source_add_poll): Don't return a value from void function. (g_main_context_get_poll_func): Compile also for non-Win32, as presumably was intended. The result var is a GPollFunc, not a GPollFunc*. Return the result! gobject: 2000-12-14 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Update, include parts from Makefile.am to build gmarshal.[ch]. Some day, we won't need these separate makefiles for Win32 compilation. I hope. * makefile.msc.in: Update. No use trying to build gmarshal.[ch] here, it would require Unixish tools. MSVC users building from CVS sources are out of luck. * gobject.def: Update.
2000-12-14 22:02:20 +01:00
return (*func) (watch->channel,
glib/giowin32.c (g_io_win32_dispatch): Check buffer condition here, too. 2002-03-16 Tor Lillqvist <tml@iki.fi> glib/giowin32.c (g_io_win32_dispatch): Check buffer condition here, too.
2002-03-16 00:34:53 +01:00
(watch->pollfd.revents | buffer_condition) & watch->condition,
Warn if no callback. Call callback correctly. (g_io_win32_create_watch): 2000-12-14 Tor Lillqvist <tml@iki.fi> * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. (g_io_win32_fd_create_watch): Ditto. (g_io_channel_unix_new): If it is a file descriptor (i.e., a Unix fd lookalike provided by the C library), call g_io_channel_win32_new_fd(). If it is a socket (from WinSock), call g_io_cahnnel_win32_new_stream_socket(). Hopefully sockets and fds don't overlap. TODO: Implement also datagram sockets. (g_io_channel_win32_poll): Call g_main_context_get_poll_func(). * gcompletion.h: Include <unistd.h> only on Unix. Is this inclusion really needed here? OTOH, do include <stddef.h>, for size_t. * gmessages.c: (Win32) Don't define a function called "write" that might clash with the prototype from <io.h>, use a #define. * glib.def: Update. * gmain.c (g_source_add_poll): Don't return a value from void function. (g_main_context_get_poll_func): Compile also for non-Win32, as presumably was intended. The result var is a GPollFunc, not a GPollFunc*. Return the result! gobject: 2000-12-14 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Update, include parts from Makefile.am to build gmarshal.[ch]. Some day, we won't need these separate makefiles for Win32 compilation. I hope. * makefile.msc.in: Update. No use trying to build gmarshal.[ch] here, it would require Unixish tools. MSVC users building from CVS sources are out of luck. * gobject.def: Update.
2000-12-14 22:02:20 +01:00
user_data);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
static void
Rename GSourceFuncs::destroy to GSourceFuncs::finalize. (#56858) Sat Jun 30 16:03:16 2001 Owen Taylor <otaylor@redhat.com> * glib/giowin32.c glib/giounix.c glib/gmain.[ch]: Rename GSourceFuncs::destroy to GSourceFuncs::finalize. (#56858)
2001-06-30 22:06:16 +02:00
g_io_win32_finalize (GSource *source)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
GIOWin32Watch *watch = (GIOWin32Watch *)source;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print ("g_io_win32_finalize: source=%p channel=%p", source, channel);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
switch (channel->type)
{
case G_IO_WIN32_WINDOWS_MESSAGES:
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print (" MSG");
break;
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
case G_IO_WIN32_CONSOLE:
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print (" CON");
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
break;
Resolved thread deadlocks in socket ichannel code to support * glib/giowin32.c: Resolved thread deadlocks in socket ichannel code to support Add-Cancel-Add watch functionality on windows. Also cleaned up socket error handling to not segfault and do the right thing.
2003-06-07 22:31:28 +02:00
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
case G_IO_WIN32_FILE_DESC:
if (channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print (" FD thread=%#x", channel->thread_id);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
break;
case G_IO_WIN32_SOCKET:
if (channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print (" SOCK sock=%d", channel->fd);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
break;
default:
g_assert_not_reached ();
abort ();
}
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
if (channel->debug)
g_print ("\n");
Fix a write to freed memory: Unlock the channel's mutex before unrefing 2004-12-06 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c (g_io_win32_finalize): Fix a write to freed memory: Unlock the channel's mutex before unrefing the channel.
2004-12-07 00:43:43 +01:00
g_io_channel_unref (watch->channel);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Add closure_marshal/closure_callback fields to GSourceFuncs for use by Mon Aug 27 14:56:12 2001 Owen Taylor <otaylor@redhat.com> * glib/gmain.h: Add closure_marshal/closure_callback fields to GSourceFuncs for use by g_source_set_closure(). * glib/gmain.c glib/giounix.c glib/giowin32.c glib/gmain.h: Export the SourceFuncs vtables so GObject can use them to figure out closure callbacks/marshallers for the default source types. Mon Aug 27 14:55:27 2001 Owen Taylor <otaylor@redhat.com> * gsourceclosure.[ch] (g_source_set_closure): Implement. * gsourceclosure.[ch]: Add GType's for GIOChannel, GIOCondition.
2001-09-04 00:12:51 +02:00
GSourceFuncs g_io_watch_funcs = {
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
g_io_win32_prepare,
g_io_win32_check,
g_io_win32_dispatch,
Rename GSourceFuncs::destroy to GSourceFuncs::finalize. (#56858) Sat Jun 30 16:03:16 2001 Owen Taylor <otaylor@redhat.com> * glib/giowin32.c glib/giounix.c glib/gmain.[ch]: Rename GSourceFuncs::destroy to GSourceFuncs::finalize. (#56858)
2001-06-30 22:06:16 +02:00
g_io_win32_finalize
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
};
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
static GIOStatus
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
g_io_win32_msg_read (GIOChannel *channel,
gchar *buf,
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
gsize count,
gsize *bytes_read,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
MSG msg; /* In case of alignment problems */
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
if (count < sizeof (MSG))
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
{
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_INVAL,
"Incorrect message size"); /* Informative enough error message? */
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return G_IO_STATUS_ERROR;
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (win32_channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("g_io_win32_msg_read: channel=%p hwnd=%p\n",
channel, win32_channel->hwnd);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
if (!PeekMessage (&msg, win32_channel->hwnd, 0, 0, PM_REMOVE))
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return G_IO_STATUS_AGAIN;
make the code actually have an effect (Use |= to set bits). Not absolutely 2001-07-22 Hans Breuer <hans@breuer.org> * glib/giochannel.c (g_io_channel_get_buffer_condition) : make the code actually have an effect (Use |= to set bits). Not absolutely sure if is the right one. * glib/giowin32.c (g_io_win32_<check|prepare>) : don't modify watch->condition but restored the previous behaviour. Now gio-test as well as The Gimp work again ...
2001-07-22 23:15:22 +02:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
memmove (buf, &msg, sizeof (MSG));
*bytes_read = sizeof (MSG);
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
return G_IO_STATUS_NORMAL;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
static GIOStatus
g_io_win32_msg_write (GIOChannel *channel,
const gchar *buf,
gsize count,
gsize *bytes_written,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
MSG msg;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
if (count != sizeof (MSG))
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
{
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_INVAL,
"Incorrect message size"); /* Informative enough error message? */
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return G_IO_STATUS_ERROR;
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
/* In case of alignment problems */
memmove (&msg, buf, sizeof (MSG));
if (!PostMessage (win32_channel->hwnd, msg.message, msg.wParam, msg.lParam))
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
{
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
gchar *emsg = g_win32_error_message (GetLastError ());
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_FAILED, emsg);
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
g_free (emsg);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return G_IO_STATUS_ERROR;
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
*bytes_written = sizeof (MSG);
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return G_IO_STATUS_NORMAL;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c glib/glib/giochannel.h glib/glib/giounix.c glib/glib/giowin32.c glib/docs/reference/glib/glib-sections.txt glib/tests/iochannel-test.c glib/tests/unicode-collate.c glib/tests/unicode-normalize.c Added Files: glib/tests/iochannel-test-infile * glib/giochannel.c: API changes, fixes to error handling, some internal restructuring * glib/giochannel.h: API changes, documentation for elements in GIOChannel structure * glib/giounix.c: Matched API changes, implemented backend to set is_readable, is_writeable, is_seekable flags, added a test to catch large values of count for which the behavior of write() is undefined * glib/giowin32.c: Changed to match new prototypes for io_close() and io_seek(), removed references to G_IO_STATUS_INTR, set is_seekable flag in channel creation functions * glib.def: Renamed g_channel_error_quark() and g_channel_error_from_errno() to g_io_channel_error_quark() and g_io_channel_error_from_errno(); added new functions g_io_channel_get_buffered() and g_io_channel_set_buffered() * docs/reference/glib/glib-sections.txt: Modified iochannel section to reflect new functions and API changes * tests/iochannel-test.c: Fixed to work with API changes * tests/iochannel-test-infile: New file; input file for iochannel-test * tests/unicode-collate.c tests/unicode-normalize.c: Changed G_IO_FILE_MODE_READ to "r" to match API change
2001-07-20 22:14:37 +02:00
static GIOStatus
g_io_win32_msg_close (GIOChannel *channel,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
/* Nothing to be done. Or should we set hwnd to some invalid value? */
Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c glib/glib/giochannel.h glib/glib/giounix.c glib/glib/giowin32.c glib/docs/reference/glib/glib-sections.txt glib/tests/iochannel-test.c glib/tests/unicode-collate.c glib/tests/unicode-normalize.c Added Files: glib/tests/iochannel-test-infile * glib/giochannel.c: API changes, fixes to error handling, some internal restructuring * glib/giochannel.h: API changes, documentation for elements in GIOChannel structure * glib/giounix.c: Matched API changes, implemented backend to set is_readable, is_writeable, is_seekable flags, added a test to catch large values of count for which the behavior of write() is undefined * glib/giowin32.c: Changed to match new prototypes for io_close() and io_seek(), removed references to G_IO_STATUS_INTR, set is_seekable flag in channel creation functions * glib.def: Renamed g_channel_error_quark() and g_channel_error_from_errno() to g_io_channel_error_quark() and g_io_channel_error_from_errno(); added new functions g_io_channel_get_buffered() and g_io_channel_set_buffered() * docs/reference/glib/glib-sections.txt: Modified iochannel section to reflect new functions and API changes * tests/iochannel-test.c: Fixed to work with API changes * tests/iochannel-test-infile: New file; input file for iochannel-test * tests/unicode-collate.c tests/unicode-normalize.c: Changed G_IO_FILE_MODE_READ to "r" to match API change
2001-07-20 22:14:37 +02:00
return G_IO_STATUS_NORMAL;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
static void
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
g_io_win32_free (GIOChannel *channel)
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
if (win32_channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print ("g_io_win32_free channel=%p fd=%d\n", channel, win32_channel->fd);
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
DeleteCriticalSection (&win32_channel->mutex);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (win32_channel->data_avail_event)
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
if (!CloseHandle (win32_channel->data_avail_event))
if (win32_channel->debug)
{
gchar *emsg = g_win32_error_message (GetLastError ());
g_print (" CloseHandle(%p) failed: %s\n",
win32_channel->data_avail_event, emsg);
g_free (emsg);
}
g_free (win32_channel->buffer);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (win32_channel->space_avail_event)
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
if (!CloseHandle (win32_channel->space_avail_event))
if (win32_channel->debug)
{
gchar *emsg = g_win32_error_message (GetLastError ());
g_print (" CloseHandle(%p) failed: %s\n",
win32_channel->space_avail_event, emsg);
g_free (emsg);
}
Don't call WSAEventSelect() on -1 If g_io_win32_sock_close() has been called on a socket channel, don't later in g_io_win32_free() call WSAEventSelect() on its fd which has been set to -1.
2009-11-04 22:59:18 +01:00
if (win32_channel->type == G_IO_WIN32_SOCKET &&
win32_channel->fd != -1)
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
if (WSAEventSelect (win32_channel->fd, NULL, 0) == SOCKET_ERROR)
if (win32_channel->debug)
{
gchar *emsg = g_win32_error_message (WSAGetLastError ());
g_print (" WSAEventSelect(%d,NULL,{}) failed: %s\n",
win32_channel->fd, emsg);
g_free (emsg);
}
if (win32_channel->event)
if (!WSACloseEvent (win32_channel->event))
if (win32_channel->debug)
{
gchar *emsg = g_win32_error_message (WSAGetLastError ());
g_print (" WSACloseEvent(%p) failed: %s\n",
win32_channel->event, emsg);
g_free (emsg);
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
g_free (win32_channel);
}
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
static GSource *
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
g_io_win32_msg_create_watch (GIOChannel *channel,
GIOCondition condition)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
GIOWin32Watch *watch;
GSource *source;
Update. Don't mention pthreads. 2001-09-04 Tor Lillqvist <tml@iki.fi> * README.win32: Update. Don't mention pthreads. * build-dll: Remove, moved to the build module. * glibconfig.h.win32.in: Don't mention pthreds here, either. * glib/gstrfuncs.c: Mark the correct variable for export from DLL. * glib/giowin32.c (g_io_win32_msg_create_watch): Owen forgot to rename the win32_watch_funcs variable here, too. * */makefile.mingw.in: Don't use version number in import library name. Use whole version number in DLL name. Use build-dll from the build module.
2001-09-04 07:09:35 +02:00
source = g_source_new (&g_io_watch_funcs, sizeof (GIOWin32Watch));
Annotate all custom GIO GSource using g_source_set_name Naming the sources allows easier debugging with e.g. SystemTap probes. https://bugzilla.gnome.org/show_bug.cgi?id=620536
2010-07-11 02:09:34 +02:00
g_source_set_name (source, "GIOChannel (Win32)");
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
watch = (GIOWin32Watch *)source;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
watch->channel = channel;
g_io_channel_ref (channel);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
watch->condition = condition;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
glib/giowin32.c glib/gmain.c glib/gspawn-win32.c Change gssize casts 2008-08-04 Tor Lillqvist <tml@novell.com> * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Change gssize casts introduced on 2008-07-28 to gintptr casts now that we have that. gssize is as such the same as gintptr on both 32- and 64-bit Windows, but the gintptr name indicates that it is used to hold pointers, i.e. also HANDLEs. svn path=/trunk/; revision=7306
2008-08-04 20:46:59 +02:00
watch->pollfd.fd = (gintptr) G_WIN32_MSG_HANDLE;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
watch->pollfd.events = condition;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
g_source_add_poll (source, &watch->pollfd);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
return source;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
static GIOStatus
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
g_io_win32_fd_and_console_read (GIOChannel *channel,
gchar *buf,
gsize count,
gsize *bytes_read,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
gint result;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Some indentation and spacing fixes. Add some more logging. 2000-08-12 Tor Lillqvist <tml@iki.fi> * giowin32.c: Some indentation and spacing fixes. Add some more logging. (g_io_win32_add_watch): New function, with common code from g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start more than one reader thread for a GIOChannel. We should obviously have just one reader thread reading a file descriptor or socket.
2000-08-11 23:36:00 +02:00
if (win32_channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("g_io_win32_fd_read: fd=%d count=%" G_GSIZE_FORMAT "\n",
Some indentation and spacing fixes. Add some more logging. 2000-08-12 Tor Lillqvist <tml@iki.fi> * giowin32.c: Some indentation and spacing fixes. Add some more logging. (g_io_win32_add_watch): New function, with common code from g_io_win32_fd_add_watch and g_io_win32_sock_add_watch. Don't start more than one reader thread for a GIOChannel. We should obviously have just one reader thread reading a file descriptor or socket.
2000-08-11 23:36:00 +02:00
win32_channel->fd, count);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
if (win32_channel->thread_id)
{
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return buffer_read (win32_channel, buf, count, bytes_read, err);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
result = read (win32_channel->fd, buf, count);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
if (win32_channel->debug)
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
g_print ("g_io_win32_fd_read: read() => %d\n", result);
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
if (result < 0)
{
*bytes_read = 0;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
switch (errno)
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
{
#ifdef EAGAIN
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
case EAGAIN:
return G_IO_STATUS_AGAIN;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
#endif
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
default:
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno),
g_strerror (errno));
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
return G_IO_STATUS_ERROR;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
*bytes_read = result;
return (result > 0) ? G_IO_STATUS_NORMAL : G_IO_STATUS_EOF;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
static GIOStatus
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
g_io_win32_fd_and_console_write (GIOChannel *channel,
const gchar *buf,
gsize count,
gsize *bytes_written,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
gint result;
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
if (win32_channel->thread_id)
{
return buffer_write (win32_channel, buf, count, bytes_written, err);
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
result = write (win32_channel->fd, buf, count);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
if (win32_channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("g_io_win32_fd_write: fd=%d count=%" G_GSIZE_FORMAT " => %d\n",
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
win32_channel->fd, count, result);
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
if (result < 0)
{
*bytes_written = 0;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
switch (errno)
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
{
#ifdef EAGAIN
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
case EAGAIN:
return G_IO_STATUS_AGAIN;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
#endif
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
default:
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno),
g_strerror (errno));
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
return G_IO_STATUS_ERROR;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
*bytes_written = result;
return G_IO_STATUS_NORMAL;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
static GIOStatus
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
g_io_win32_fd_seek (GIOChannel *channel,
Updated. Fri Feb 15 10:41:51 2002 Owen Taylor <otaylor@redhat.com> * NEWS: Updated. * configure.in: Require autoconf-2.52, run AC_SYS_LARGEFILE. (#71410, Sven Neumann) * glib/giounix.c glib/giowin32.c glib/giochannel.[ch]: Change offset type for g_io_channel_seek[_position] to gint64.
2002-02-15 17:41:54 +01:00
gint64 offset,
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
GSeekType type,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
int whence;
Updated. Fri Feb 15 10:41:51 2002 Owen Taylor <otaylor@redhat.com> * NEWS: Updated. * configure.in: Require autoconf-2.52, run AC_SYS_LARGEFILE. (#71410, Sven Neumann) * glib/giounix.c glib/giowin32.c glib/giochannel.[ch]: Change offset type for g_io_channel_seek[_position] to gint64.
2002-02-15 17:41:54 +01:00
off_t tmp_offset;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
off_t result;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
switch (type)
{
case G_SEEK_SET:
whence = SEEK_SET;
break;
case G_SEEK_CUR:
whence = SEEK_CUR;
break;
case G_SEEK_END:
whence = SEEK_END;
break;
default:
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
whence = -1; /* Keep the compiler quiet */
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
g_assert_not_reached ();
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
abort ();
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Updated. Fri Feb 15 10:41:51 2002 Owen Taylor <otaylor@redhat.com> * NEWS: Updated. * configure.in: Require autoconf-2.52, run AC_SYS_LARGEFILE. (#71410, Sven Neumann) * glib/giounix.c glib/giowin32.c glib/giochannel.[ch]: Change offset type for g_io_channel_seek[_position] to gint64.
2002-02-15 17:41:54 +01:00
tmp_offset = offset;
if (tmp_offset != offset)
{
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (EINVAL),
g_strerror (EINVAL));
Updated. Fri Feb 15 10:41:51 2002 Owen Taylor <otaylor@redhat.com> * NEWS: Updated. * configure.in: Require autoconf-2.52, run AC_SYS_LARGEFILE. (#71410, Sven Neumann) * glib/giounix.c glib/giowin32.c glib/giochannel.[ch]: Change offset type for g_io_channel_seek[_position] to gint64.
2002-02-15 17:41:54 +01:00
return G_IO_STATUS_ERROR;
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Updated. Fri Feb 15 10:41:51 2002 Owen Taylor <otaylor@redhat.com> * NEWS: Updated. * configure.in: Require autoconf-2.52, run AC_SYS_LARGEFILE. (#71410, Sven Neumann) * glib/giounix.c glib/giowin32.c glib/giochannel.[ch]: Change offset type for g_io_channel_seek[_position] to gint64.
2002-02-15 17:41:54 +01:00
result = lseek (win32_channel->fd, tmp_offset, whence);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
if (result < 0)
{
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno),
g_strerror (errno));
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return G_IO_STATUS_ERROR;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return G_IO_STATUS_NORMAL;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c glib/glib/giochannel.h glib/glib/giounix.c glib/glib/giowin32.c glib/docs/reference/glib/glib-sections.txt glib/tests/iochannel-test.c glib/tests/unicode-collate.c glib/tests/unicode-normalize.c Added Files: glib/tests/iochannel-test-infile * glib/giochannel.c: API changes, fixes to error handling, some internal restructuring * glib/giochannel.h: API changes, documentation for elements in GIOChannel structure * glib/giounix.c: Matched API changes, implemented backend to set is_readable, is_writeable, is_seekable flags, added a test to catch large values of count for which the behavior of write() is undefined * glib/giowin32.c: Changed to match new prototypes for io_close() and io_seek(), removed references to G_IO_STATUS_INTR, set is_seekable flag in channel creation functions * glib.def: Renamed g_channel_error_quark() and g_channel_error_from_errno() to g_io_channel_error_quark() and g_io_channel_error_from_errno(); added new functions g_io_channel_get_buffered() and g_io_channel_set_buffered() * docs/reference/glib/glib-sections.txt: Modified iochannel section to reflect new functions and API changes * tests/iochannel-test.c: Fixed to work with API changes * tests/iochannel-test-infile: New file; input file for iochannel-test * tests/unicode-collate.c tests/unicode-normalize.c: Changed G_IO_FILE_MODE_READ to "r" to match API change
2001-07-20 22:14:37 +02:00
static GIOStatus
g_io_win32_fd_close (GIOChannel *channel,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
if (win32_channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print ("g_io_win32_fd_close: thread=%#x: fd=%d\n",
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
win32_channel->thread_id,
win32_channel->fd);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&win32_channel->mutex);
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
if (win32_channel->running)
{
if (win32_channel->debug)
Rework the changes to needed to pass mainloop-test. Now we don't need to 2001-01-09 Tor Lillqvist <tml@iki.fi> * giowin32.c (create_reader_thread): Rework the changes to needed to pass mainloop-test. Now we don't need to call TerminateThread() after all, which is a relief, as the docs have a BIG RED WARNING SIGN about using that API. Instead, when closing a fd channel that has a reader thread running, just mark it as non-running and additionally mark the fd as ripe for closing. When the reader thread hopefully eventually gets something (and EOF or some actual data), it will note that it shouldn't be running, break out of the loop, and close the fd. The socket channel closing code should probably be changed similarily, but that will have to wait until I have a test case. (g_pipe_readable_msg, g_io_channel_win32_new_pipe, g_io_channel_win32_new_pipe_with_wakeups, g_io_channel_win32_pipe_request_wakeups, g_io_channel_win32_pipe_readable): Remove these, have been obsolete for some time. * glib.def: Update.
2001-01-09 21:46:49 +01:00
g_print ("thread %#x: running, marking fd %d for later close\n",
win32_channel->thread_id, win32_channel->fd);
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
win32_channel->running = FALSE;
Rework the changes to needed to pass mainloop-test. Now we don't need to 2001-01-09 Tor Lillqvist <tml@iki.fi> * giowin32.c (create_reader_thread): Rework the changes to needed to pass mainloop-test. Now we don't need to call TerminateThread() after all, which is a relief, as the docs have a BIG RED WARNING SIGN about using that API. Instead, when closing a fd channel that has a reader thread running, just mark it as non-running and additionally mark the fd as ripe for closing. When the reader thread hopefully eventually gets something (and EOF or some actual data), it will note that it shouldn't be running, break out of the loop, and close the fd. The socket channel closing code should probably be changed similarily, but that will have to wait until I have a test case. (g_pipe_readable_msg, g_io_channel_win32_new_pipe, g_io_channel_win32_new_pipe_with_wakeups, g_io_channel_win32_pipe_request_wakeups, g_io_channel_win32_pipe_readable): Remove these, have been obsolete for some time. * glib.def: Update.
2001-01-09 21:46:49 +01:00
win32_channel->needs_close = TRUE;
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
if (win32_channel->direction == 0)
SetEvent (win32_channel->data_avail_event);
else
SetEvent (win32_channel->space_avail_event);
Get len using strlen() if arg is negative in the Win32 code, too. 2001-01-06 Tor Lillqvist <tml@iki.fi> * gconvert.c (g_locale_to_utf8, g_locale_from_utf8): Get len using strlen() if arg is negative in the Win32 code, too. * giowin32.c: Changes necessary to be able to run mainloop-test. We can't close the fd that our (internal) reader thread is sitting doing a blocking read() from. We must terminate the thread first. Keep track of thread handle, and close it when thread is dying. Start reader thread with the lower-level CreateThread() instead of _beginthreadex() from the C runtime, in order to be able to use TerminateThread(). Hopefuly this isn't harmful. * glib.def: Update. * tests/makefile.{mingw,msc}.in (TESTS): Add mainloop-test and unicode-encoding. * tests/mainloop-test.c: Portability: <unistd.h>, need <fcntl.h> on Win32. * tests/unicode-encoding.c (process): Add missing "line" argument to fail(). On Win32, convert UTF-16LE, as libiconv'c ivonf always converts to UTF-16BE if we ask for unspecific UTF-16. (main) Handle also '\r'.
2001-01-06 04:09:46 +01:00
}
Rework the changes to needed to pass mainloop-test. Now we don't need to 2001-01-09 Tor Lillqvist <tml@iki.fi> * giowin32.c (create_reader_thread): Rework the changes to needed to pass mainloop-test. Now we don't need to call TerminateThread() after all, which is a relief, as the docs have a BIG RED WARNING SIGN about using that API. Instead, when closing a fd channel that has a reader thread running, just mark it as non-running and additionally mark the fd as ripe for closing. When the reader thread hopefully eventually gets something (and EOF or some actual data), it will note that it shouldn't be running, break out of the loop, and close the fd. The socket channel closing code should probably be changed similarily, but that will have to wait until I have a test case. (g_pipe_readable_msg, g_io_channel_win32_new_pipe, g_io_channel_win32_new_pipe_with_wakeups, g_io_channel_win32_pipe_request_wakeups, g_io_channel_win32_pipe_readable): Remove these, have been obsolete for some time. * glib.def: Update.
2001-01-09 21:46:49 +01:00
else
{
if (win32_channel->debug)
g_print ("closing fd %d\n", win32_channel->fd);
close (win32_channel->fd);
if (win32_channel->debug)
g_print ("closed fd %d, setting to -1\n",
win32_channel->fd);
win32_channel->fd = -1;
}
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&win32_channel->mutex);
Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c glib/glib/giochannel.h glib/glib/giounix.c glib/glib/giowin32.c glib/docs/reference/glib/glib-sections.txt glib/tests/iochannel-test.c glib/tests/unicode-collate.c glib/tests/unicode-normalize.c Added Files: glib/tests/iochannel-test-infile * glib/giochannel.c: API changes, fixes to error handling, some internal restructuring * glib/giochannel.h: API changes, documentation for elements in GIOChannel structure * glib/giounix.c: Matched API changes, implemented backend to set is_readable, is_writeable, is_seekable flags, added a test to catch large values of count for which the behavior of write() is undefined * glib/giowin32.c: Changed to match new prototypes for io_close() and io_seek(), removed references to G_IO_STATUS_INTR, set is_seekable flag in channel creation functions * glib.def: Renamed g_channel_error_quark() and g_channel_error_from_errno() to g_io_channel_error_quark() and g_io_channel_error_from_errno(); added new functions g_io_channel_get_buffered() and g_io_channel_set_buffered() * docs/reference/glib/glib-sections.txt: Modified iochannel section to reflect new functions and API changes * tests/iochannel-test.c: Fixed to work with API changes * tests/iochannel-test-infile: New file; input file for iochannel-test * tests/unicode-collate.c tests/unicode-normalize.c: Changed G_IO_FILE_MODE_READ to "r" to match API change
2001-07-20 22:14:37 +02:00
/* FIXME error detection? */
return G_IO_STATUS_NORMAL;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
static GSource *
g_io_win32_fd_create_watch (GIOChannel *channel,
GIOCondition condition)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
GSource *source = g_source_new (&g_io_watch_funcs, sizeof (GIOWin32Watch));
GIOWin32Watch *watch = (GIOWin32Watch *)source;
watch->channel = channel;
g_io_channel_ref (channel);
watch->condition = condition;
if (win32_channel->data_avail_event == NULL)
create_events (win32_channel);
glib/giowin32.c glib/gmain.c glib/gspawn-win32.c Change gssize casts 2008-08-04 Tor Lillqvist <tml@novell.com> * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Change gssize casts introduced on 2008-07-28 to gintptr casts now that we have that. gssize is as such the same as gintptr on both 32- and 64-bit Windows, but the gintptr name indicates that it is used to hold pointers, i.e. also HANDLEs. svn path=/trunk/; revision=7306
2008-08-04 20:46:59 +02:00
watch->pollfd.fd = (gintptr) win32_channel->data_avail_event;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
watch->pollfd.events = condition;
if (win32_channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("g_io_win32_fd_create_watch: channel=%p fd=%d condition={%s} event=%p\n",
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
channel, win32_channel->fd,
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
condition_to_string (condition), (HANDLE) watch->pollfd.fd);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
EnterCriticalSection (&win32_channel->mutex);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
if (win32_channel->thread_id == 0)
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
{
if (condition & G_IO_IN)
create_thread (win32_channel, condition, read_thread);
else if (condition & G_IO_OUT)
create_thread (win32_channel, condition, write_thread);
}
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
g_source_add_poll (source, &watch->pollfd);
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
LeaveCriticalSection (&win32_channel->mutex);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
return source;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
static GIOStatus
g_io_win32_console_close (GIOChannel *channel,
GError **err)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
if (close (win32_channel->fd) < 0)
{
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR,
g_io_channel_error_from_errno (errno),
g_strerror (errno));
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
return G_IO_STATUS_ERROR;
}
return G_IO_STATUS_NORMAL;
}
static GSource *
g_io_win32_console_create_watch (GIOChannel *channel,
GIOCondition condition)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
GSource *source = g_source_new (&g_io_watch_funcs, sizeof (GIOWin32Watch));
GIOWin32Watch *watch = (GIOWin32Watch *)source;
watch->channel = channel;
g_io_channel_ref (channel);
watch->condition = condition;
glib/giowin32.c glib/gmain.c glib/gspawn-win32.c Change gssize casts 2008-08-04 Tor Lillqvist <tml@novell.com> * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Change gssize casts introduced on 2008-07-28 to gintptr casts now that we have that. gssize is as such the same as gintptr on both 32- and 64-bit Windows, but the gintptr name indicates that it is used to hold pointers, i.e. also HANDLEs. svn path=/trunk/; revision=7306
2008-08-04 20:46:59 +02:00
watch->pollfd.fd = _get_osfhandle (win32_channel->fd);
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
watch->pollfd.events = condition;
g_source_add_poll (source, &watch->pollfd);
return source;
}
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
static GIOStatus
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
g_io_win32_sock_read (GIOChannel *channel,
gchar *buf,
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
gsize count,
gsize *bytes_read,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
gint result;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
GIOChannelError error;
int winsock_error;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (win32_channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("g_io_win32_sock_read: channel=%p sock=%d count=%" G_GSIZE_FORMAT,
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
channel, win32_channel->fd, count);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
result = recv (win32_channel->fd, buf, count, 0);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
if (result == SOCKET_ERROR)
winsock_error = WSAGetLastError ();
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (win32_channel->debug)
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
g_print (" recv=%d", result);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (result == SOCKET_ERROR)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
gchar *emsg = g_win32_error_message (winsock_error);
if (win32_channel->debug)
g_print (" %s\n", emsg);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
*bytes_read = 0;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
switch (winsock_error)
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
{
case WSAEINVAL:
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
error = G_IO_CHANNEL_ERROR_INVAL;
break;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
case WSAEWOULDBLOCK:
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
g_free (emsg);
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return G_IO_STATUS_AGAIN;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
default:
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
error = G_IO_CHANNEL_ERROR_FAILED;
break;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
}
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR, error, emsg);
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
g_free (emsg);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
return G_IO_STATUS_ERROR;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
else
{
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
if (win32_channel->debug)
g_print ("\n");
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
*bytes_read = result;
Resolved thread deadlocks in socket ichannel code to support * glib/giowin32.c: Resolved thread deadlocks in socket ichannel code to support Add-Cancel-Add watch functionality on windows. Also cleaned up socket error handling to not segfault and do the right thing.
2003-06-07 22:31:28 +02:00
if (result == 0)
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
return G_IO_STATUS_EOF;
else
return G_IO_STATUS_NORMAL;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
static GIOStatus
g_io_win32_sock_write (GIOChannel *channel,
const gchar *buf,
gsize count,
gsize *bytes_written,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
gint result;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
GIOChannelError error;
int winsock_error;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (win32_channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("g_io_win32_sock_write: channel=%p sock=%d count=%" G_GSIZE_FORMAT,
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
channel, win32_channel->fd, count);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
result = send (win32_channel->fd, buf, count, 0);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
if (result == SOCKET_ERROR)
winsock_error = WSAGetLastError ();
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
if (win32_channel->debug)
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
g_print (" send=%d", result);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
if (result == SOCKET_ERROR)
{
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
gchar *emsg = g_win32_error_message (winsock_error);
if (win32_channel->debug)
g_print (" %s\n", emsg);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
*bytes_written = 0;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
switch (winsock_error)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
case WSAEINVAL:
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
error = G_IO_CHANNEL_ERROR_INVAL;
break;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
case WSAEWOULDBLOCK:
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
win32_channel->write_would_have_blocked = TRUE;
win32_channel->last_events = 0;
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
g_free (emsg);
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return G_IO_STATUS_AGAIN;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
default:
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
error = G_IO_CHANNEL_ERROR_FAILED;
break;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR, error, emsg);
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
g_free (emsg);
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
Fix indentation and spacing. Use INADDR_LOOPBACK instead of 2003-06-08 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c: Fix indentation and spacing. Use INADDR_LOOPBACK instead of inet_addr("127.0.0.1") and gethostbyaddr().
2003-06-08 03:38:13 +02:00
return G_IO_STATUS_ERROR;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
else
{
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
if (win32_channel->debug)
g_print ("\n");
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
*bytes_written = result;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
win32_channel->write_would_have_blocked = FALSE;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
return G_IO_STATUS_NORMAL;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
}
Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c glib/glib/giochannel.h glib/glib/giounix.c glib/glib/giowin32.c glib/docs/reference/glib/glib-sections.txt glib/tests/iochannel-test.c glib/tests/unicode-collate.c glib/tests/unicode-normalize.c Added Files: glib/tests/iochannel-test-infile * glib/giochannel.c: API changes, fixes to error handling, some internal restructuring * glib/giochannel.h: API changes, documentation for elements in GIOChannel structure * glib/giounix.c: Matched API changes, implemented backend to set is_readable, is_writeable, is_seekable flags, added a test to catch large values of count for which the behavior of write() is undefined * glib/giowin32.c: Changed to match new prototypes for io_close() and io_seek(), removed references to G_IO_STATUS_INTR, set is_seekable flag in channel creation functions * glib.def: Renamed g_channel_error_quark() and g_channel_error_from_errno() to g_io_channel_error_quark() and g_io_channel_error_from_errno(); added new functions g_io_channel_get_buffered() and g_io_channel_set_buffered() * docs/reference/glib/glib-sections.txt: Modified iochannel section to reflect new functions and API changes * tests/iochannel-test.c: Fixed to work with API changes * tests/iochannel-test-infile: New file; input file for iochannel-test * tests/unicode-collate.c tests/unicode-normalize.c: Changed G_IO_FILE_MODE_READ to "r" to match API change
2001-07-20 22:14:37 +02:00
static GIOStatus
g_io_win32_sock_close (GIOChannel *channel,
GError **err)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
*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.
2001-06-22 17:44:44 +02:00
if (win32_channel->fd != -1)
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
{
if (win32_channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print ("g_io_win32_sock_close: channel=%p sock=%d\n",
channel, win32_channel->fd);
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
closesocket (win32_channel->fd);
win32_channel->fd = -1;
}
Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c glib/glib/giochannel.h glib/glib/giounix.c glib/glib/giowin32.c glib/docs/reference/glib/glib-sections.txt glib/tests/iochannel-test.c glib/tests/unicode-collate.c glib/tests/unicode-normalize.c Added Files: glib/tests/iochannel-test-infile * glib/giochannel.c: API changes, fixes to error handling, some internal restructuring * glib/giochannel.h: API changes, documentation for elements in GIOChannel structure * glib/giounix.c: Matched API changes, implemented backend to set is_readable, is_writeable, is_seekable flags, added a test to catch large values of count for which the behavior of write() is undefined * glib/giowin32.c: Changed to match new prototypes for io_close() and io_seek(), removed references to G_IO_STATUS_INTR, set is_seekable flag in channel creation functions * glib.def: Renamed g_channel_error_quark() and g_channel_error_from_errno() to g_io_channel_error_quark() and g_io_channel_error_from_errno(); added new functions g_io_channel_get_buffered() and g_io_channel_set_buffered() * docs/reference/glib/glib-sections.txt: Modified iochannel section to reflect new functions and API changes * tests/iochannel-test.c: Fixed to work with API changes * tests/iochannel-test-infile: New file; input file for iochannel-test * tests/unicode-collate.c tests/unicode-normalize.c: Changed G_IO_FILE_MODE_READ to "r" to match API change
2001-07-20 22:14:37 +02:00
/* FIXME error detection? */
return G_IO_STATUS_NORMAL;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
static GSource *
g_io_win32_sock_create_watch (GIOChannel *channel,
GIOCondition condition)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
GSource *source = g_source_new (&g_io_watch_funcs, sizeof (GIOWin32Watch));
GIOWin32Watch *watch = (GIOWin32Watch *)source;
watch->channel = channel;
g_io_channel_ref (channel);
watch->condition = condition;
if (win32_channel->event == 0)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
win32_channel->event = WSACreateEvent ();
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
glib/giowin32.c glib/gmain.c glib/gspawn-win32.c Change gssize casts 2008-08-04 Tor Lillqvist <tml@novell.com> * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Change gssize casts introduced on 2008-07-28 to gintptr casts now that we have that. gssize is as such the same as gintptr on both 32- and 64-bit Windows, but the gintptr name indicates that it is used to hold pointers, i.e. also HANDLEs. svn path=/trunk/; revision=7306
2008-08-04 20:46:59 +02:00
watch->pollfd.fd = (gintptr) win32_channel->event;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
watch->pollfd.events = condition;
if (win32_channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("g_io_win32_sock_create_watch: channel=%p sock=%d event=%p condition={%s}\n",
channel, win32_channel->fd, (HANDLE) watch->pollfd.fd,
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
condition_to_string (watch->condition));
g_source_add_poll (source, &watch->pollfd);
return source;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
GIOChannel *
g_io_channel_new_file (const gchar *filename,
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
const gchar *mode,
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
GError **error)
{
set the corresponding p(ermission)mode of the file when creating, 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c (g_io_channel_new_file) : set the corresponding p(ermission)mode of the file when creating, otherwise a wronly file couldn't be overwritten (at least not on Win9x).
2001-07-21 19:26:01 +02:00
int fid, flags, pmode;
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
GIOChannel *channel;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
enum { /* Cheesy hack */
MODE_R = 1 << 0,
MODE_W = 1 << 1,
MODE_A = 1 << 2,
MODE_PLUS = 1 << 3,
} mode_num;
g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (mode != NULL, NULL);
g_return_val_if_fail ((error == NULL) || (*error == NULL), NULL);
switch (mode[0])
{
case 'r':
mode_num = MODE_R;
break;
case 'w':
mode_num = MODE_W;
break;
case 'a':
mode_num = MODE_A;
break;
default:
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
g_warning ("Invalid GIOFileMode %s.", mode);
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
return NULL;
}
switch (mode[1])
{
case '\0':
break;
case '+':
if (mode[2] == '\0')
{
mode_num |= MODE_PLUS;
break;
}
/* Fall through */
default:
Stylistic changes. Plug an unlikely memory leak that occurred in 2008-08-27 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Stylistic changes. Plug an unlikely memory leak that occurred in create_thread() if closing the thread handle failed. Add more error messages to g_io_win32_free() that are printed only when debugging. Plug handle leak, a socket channel's event was never closed. svn path=/trunk/; revision=7405
2008-08-27 18:49:17 +02:00
g_warning ("Invalid GIOFileMode %s.", mode);
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
return NULL;
}
switch (mode_num)
{
case MODE_R:
flags = O_RDONLY;
set the corresponding p(ermission)mode of the file when creating, 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c (g_io_channel_new_file) : set the corresponding p(ermission)mode of the file when creating, otherwise a wronly file couldn't be overwritten (at least not on Win9x).
2001-07-21 19:26:01 +02:00
pmode = _S_IREAD;
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
break;
case MODE_W:
flags = O_WRONLY | O_TRUNC | O_CREAT;
set the corresponding p(ermission)mode of the file when creating, 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c (g_io_channel_new_file) : set the corresponding p(ermission)mode of the file when creating, otherwise a wronly file couldn't be overwritten (at least not on Win9x).
2001-07-21 19:26:01 +02:00
pmode = _S_IWRITE;
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
break;
case MODE_A:
flags = O_WRONLY | O_APPEND | O_CREAT;
set the corresponding p(ermission)mode of the file when creating, 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c (g_io_channel_new_file) : set the corresponding p(ermission)mode of the file when creating, otherwise a wronly file couldn't be overwritten (at least not on Win9x).
2001-07-21 19:26:01 +02:00
pmode = _S_IWRITE;
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
break;
case MODE_R | MODE_PLUS:
flags = O_RDWR;
set the corresponding p(ermission)mode of the file when creating, 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c (g_io_channel_new_file) : set the corresponding p(ermission)mode of the file when creating, otherwise a wronly file couldn't be overwritten (at least not on Win9x).
2001-07-21 19:26:01 +02:00
pmode = _S_IREAD | _S_IWRITE;
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
break;
case MODE_W | MODE_PLUS:
flags = O_RDWR | O_TRUNC | O_CREAT;
set the corresponding p(ermission)mode of the file when creating, 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c (g_io_channel_new_file) : set the corresponding p(ermission)mode of the file when creating, otherwise a wronly file couldn't be overwritten (at least not on Win9x).
2001-07-21 19:26:01 +02:00
pmode = _S_IREAD | _S_IWRITE;
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
break;
case MODE_A | MODE_PLUS:
flags = O_RDWR | O_APPEND | O_CREAT;
set the corresponding p(ermission)mode of the file when creating, 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c (g_io_channel_new_file) : set the corresponding p(ermission)mode of the file when creating, otherwise a wronly file couldn't be overwritten (at least not on Win9x).
2001-07-21 19:26:01 +02:00
pmode = _S_IREAD | _S_IWRITE;
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
break;
default:
g_assert_not_reached ();
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
abort ();
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
}
added rule for glibconfig.h 2001-09-21 Hans Breuer <hans@breuer.org> * makefile.msc : added rule for glibconfig.h * glib/giowin32.c (g_io_channel_new_file) : always open in binary mode * glib/glib.def : updated externals * glib/gwin32.c : re-added LANG_* and SUBLANG_* definitions, which are missing from the msvc 5.0 win32 sdk * glib/makefile.msc.in : added gbsearcharry
2001-09-21 21:48:59 +02:00
/* always open 'untranslated' */
Introduce the idea of a filename encoding, which is *literally* the 2004-10-27 Matthias Clasen <mclasen@redhat.com> Introduce the idea of a filename encoding, which is *literally* the filename encoding on Unix. On windows, use the Unicode name converted to UTF-8. (#156325, Tor Lillqvist, Owen Taylor) * glib/gdir.[hc]: * glib/gconvert.[hc]: * glib/gfileutils.[hc]: * glib/gutils.[hc]: * glib/giowin32.c: On Windows, keep old ABI versions of GLib pathname api for DLL ABI stability. Use different names for the new-style UTF-8 versions. Hide this through a #define. * glib/gstdio.[hc]: New files containing wrappers for POSIX pathname api. * glib/glib.symbols: Add new symbols. * glib/makegalias.pl: Drop Win32 specific .def syntax, include gstdio.h
2004-10-27 18:46:29 +02:00
fid = g_open (filename, flags | _O_BINARY, pmode);
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
if (g_io_win32_get_debug_flag ())
{
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print ("g_io_channel_win32_new_file: open(\"%s\",", filename);
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
g_win32_print_access_mode (flags|_O_BINARY);
g_print (",%#o)=%d\n", pmode, fid);
}
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
if (fid < 0)
{
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (error, G_FILE_ERROR,
g_file_error_from_errno (errno),
g_strerror (errno));
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
return (GIOChannel *)NULL;
}
channel = g_io_channel_win32_new_fd (fid);
/* XXX: move this to g_io_channel_win32_new_fd () */
channel->close_on_unref = TRUE;
channel->is_seekable = TRUE;
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
/* g_io_channel_win32_new_fd sets is_readable and is_writeable to
* correspond to actual readability/writeability. Set to FALSE those
* that mode doesn't allow
*/
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
switch (mode_num)
{
case MODE_R:
channel->is_writeable = FALSE;
break;
case MODE_W:
case MODE_A:
channel->is_readable = FALSE;
break;
case MODE_R | MODE_PLUS:
case MODE_W | MODE_PLUS:
case MODE_A | MODE_PLUS:
break;
default:
g_assert_not_reached ();
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
abort ();
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
}
return channel;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
}
glib/glib.symbols glib/gconvert.c glib/gdir.c glib/gfileutils.c 2008-07-27 Tor Lillqvist <tml@novell.com> * glib/glib.symbols * glib/gconvert.c * glib/gdir.c * glib/gfileutils.c * glib/giowin32.c * glib/gspawn-win32.c * glib/gutils.c * glib/gwin32.c: Bypass the Windows "ABI compatibility" symbols on _WIN64. As there hasn't been any widely deployed 64-bit Windows builds of the really old GLib (pre-2.8.1) versions those refer to, there is no need to have the "ABI compatibility" versions in the DLL. * glib/makegalias.pl: Handle #ifndef _WIN64: Just output it, too. svn path=/trunk/; revision=7257
2008-07-27 19:15:16 +02:00
#if !defined (_WIN64)
Introduce the idea of a filename encoding, which is *literally* the 2004-10-27 Matthias Clasen <mclasen@redhat.com> Introduce the idea of a filename encoding, which is *literally* the filename encoding on Unix. On windows, use the Unicode name converted to UTF-8. (#156325, Tor Lillqvist, Owen Taylor) * glib/gdir.[hc]: * glib/gconvert.[hc]: * glib/gfileutils.[hc]: * glib/gutils.[hc]: * glib/giowin32.c: On Windows, keep old ABI versions of GLib pathname api for DLL ABI stability. Use different names for the new-style UTF-8 versions. Hide this through a #define. * glib/gstdio.[hc]: New files containing wrappers for POSIX pathname api. * glib/glib.symbols: Add new symbols. * glib/makegalias.pl: Drop Win32 specific .def syntax, include gstdio.h
2004-10-27 18:46:29 +02:00
#undef g_io_channel_new_file
/* Binary compatibility version. Not for newly compiled code. */
GIOChannel *
g_io_channel_new_file (const gchar *filename,
const gchar *mode,
GError **error)
{
gchar *utf8_filename = g_locale_to_utf8 (filename, -1, NULL, NULL, error);
GIOChannel *retval;
if (utf8_filename == NULL)
return NULL;
retval = g_io_channel_new_file_utf8 (utf8_filename, mode, error);
g_free (utf8_filename);
return retval;
}
#endif
static correctness 2001-11-03 Hans Breuer <hans@breuer.org> * glib/giowin32.c : static correctness * glib/gwin32.c : some more #if defined (SUBLANG_* ... (g_win32_get_package_installation_subdirectory) use g_build_filename instead of duplicating its logic * glib/glib.def : removed duplicates, added mising, removed compat cruft
2001-11-03 17:51:10 +01:00
static GIOStatus
Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to 2006-05-12 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_sock_set_flags): Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to sockets. (#341192) (g_io_win32_unimpl_set_flags): set_flags method for the unimplemented case.
2006-05-12 15:20:36 +02:00
g_io_win32_unimpl_set_flags (GIOChannel *channel,
GIOFlags flags,
GError **err)
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
{
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
if (win32_channel->debug)
{
Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to 2006-05-12 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_sock_set_flags): Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to sockets. (#341192) (g_io_win32_unimpl_set_flags): set_flags method for the unimplemented case.
2006-05-12 15:20:36 +02:00
g_print ("g_io_win32_unimpl_set_flags: ");
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
g_win32_print_gioflags (flags);
g_print ("\n");
}
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED,
"Not implemented on Win32");
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
Don't call g_warning(). (#320688) Instead set error and return failure. 2005-11-05 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_set_flags): Don't call g_warning(). (#320688) Instead set error and return failure.
2005-11-08 09:46:57 +01:00
return G_IO_STATUS_ERROR;
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
}
static correctness 2001-11-03 Hans Breuer <hans@breuer.org> * glib/giowin32.c : static correctness * glib/gwin32.c : some more #if defined (SUBLANG_* ... (g_win32_get_package_installation_subdirectory) use g_build_filename instead of duplicating its logic * glib/glib.def : removed duplicates, added mising, removed compat cruft
2001-11-03 17:51:10 +01:00
static GIOFlags
Internally use the _stati64 API explicitly on Windows Avoids warnings and confusion when compiling with MSVC.
2010-02-04 18:20:08 +01:00
g_io_win32_fd_get_flags_internal (GIOChannel *channel,
struct _stati64 *st)
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
{
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
gchar c;
DWORD count;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
if (st->st_mode & _S_IFIFO)
{
channel->is_readable =
Don't claim broken pipes are unreadable. (Well, they are, but read() 2003-01-04 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c (g_io_win32_fd_get_flags_internal): Don't claim broken pipes are unreadable. (Well, they are, but read() handles it, and treats it like EOF.)
2003-01-04 06:43:06 +01:00
(PeekNamedPipe ((HANDLE) _get_osfhandle (win32_channel->fd), &c, 0, &count, NULL, NULL) != 0) || GetLastError () == ERROR_BROKEN_PIPE;
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
channel->is_writeable =
Correct the comment telling what headers have the declarations of some 2003-01-02 Tor Lillqvist <tml@iki.fi> * glib/gwin32.h: Correct the comment telling what headers have the declarations of some POSIXish functions. * glib/giowin32.c (g_io_win32_fd_get_flags_internal): Fix braino: The checks for readability/writeability were backwards.
2003-01-02 01:30:22 +01:00
(WriteFile ((HANDLE) _get_osfhandle (win32_channel->fd), &c, 0, &count, NULL) != 0);
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
channel->is_seekable = FALSE;
}
else
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
{
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
channel->is_readable =
Correct the comment telling what headers have the declarations of some 2003-01-02 Tor Lillqvist <tml@iki.fi> * glib/gwin32.h: Correct the comment telling what headers have the declarations of some POSIXish functions. * glib/giowin32.c (g_io_win32_fd_get_flags_internal): Fix braino: The checks for readability/writeability were backwards.
2003-01-02 01:30:22 +01:00
(ReadFile ((HANDLE) _get_osfhandle (win32_channel->fd), &c, 0, &count, NULL) != 0);
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
channel->is_writeable =
Correct the comment telling what headers have the declarations of some 2003-01-02 Tor Lillqvist <tml@iki.fi> * glib/gwin32.h: Correct the comment telling what headers have the declarations of some POSIXish functions. * glib/giowin32.c (g_io_win32_fd_get_flags_internal): Fix braino: The checks for readability/writeability were backwards.
2003-01-02 01:30:22 +01:00
(WriteFile ((HANDLE) _get_osfhandle (win32_channel->fd), &c, 0, &count, NULL) != 0);
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
channel->is_seekable = TRUE;
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
}
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
/* XXX: G_IO_FLAG_APPEND */
/* XXX: G_IO_FLAG_NONBLOCK */
return 0;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
}
static correctness 2001-11-03 Hans Breuer <hans@breuer.org> * glib/giowin32.c : static correctness * glib/gwin32.c : some more #if defined (SUBLANG_* ... (g_win32_get_package_installation_subdirectory) use g_build_filename instead of duplicating its logic * glib/glib.def : removed duplicates, added mising, removed compat cruft
2001-11-03 17:51:10 +01:00
static GIOFlags
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
g_io_win32_fd_get_flags (GIOChannel *channel)
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
{
Internally use the _stati64 API explicitly on Windows Avoids warnings and confusion when compiling with MSVC.
2010-02-04 18:20:08 +01:00
struct _stati64 st;
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
g_return_val_if_fail (win32_channel != NULL, 0);
g_return_val_if_fail (win32_channel->type == G_IO_WIN32_FILE_DESC, 0);
Internally use the _stati64 API explicitly on Windows Avoids warnings and confusion when compiling with MSVC.
2010-02-04 18:20:08 +01:00
if (0 == _fstati64 (win32_channel->fd, &st))
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
return g_io_win32_fd_get_flags_internal (channel, &st);
else
return 0;
}
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
static GIOFlags
g_io_win32_console_get_flags_internal (GIOChannel *channel)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *) channel;
HANDLE handle = (HANDLE) _get_osfhandle (win32_channel->fd);
gchar c;
DWORD count;
INPUT_RECORD record;
channel->is_readable = PeekConsoleInput (handle, &record, 1, &count);
channel->is_writeable = WriteFile (handle, &c, 0, &count, NULL);
channel->is_seekable = FALSE;
return 0;
}
static GIOFlags
g_io_win32_console_get_flags (GIOChannel *channel)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
g_return_val_if_fail (win32_channel != NULL, 0);
g_return_val_if_fail (win32_channel->type == G_IO_WIN32_CONSOLE, 0);
return g_io_win32_console_get_flags_internal (channel);
}
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
static GIOFlags
g_io_win32_msg_get_flags (GIOChannel *channel)
{
return 0;
}
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to 2006-05-12 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_sock_set_flags): Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to sockets. (#341192) (g_io_win32_unimpl_set_flags): set_flags method for the unimplemented case.
2006-05-12 15:20:36 +02:00
static GIOStatus
g_io_win32_sock_set_flags (GIOChannel *channel,
GIOFlags flags,
GError **err)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
u_long arg;
if (win32_channel->debug)
{
g_print ("g_io_win32_sock_set_flags: ");
g_win32_print_gioflags (flags);
g_print ("\n");
}
if (flags & G_IO_FLAG_NONBLOCK)
{
arg = 1;
if (ioctlsocket (win32_channel->fd, FIONBIO, &arg) == SOCKET_ERROR)
{
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
gchar *emsg = g_win32_error_message (WSAGetLastError ());
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED,
emsg);
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
g_free (emsg);
Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to 2006-05-12 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_sock_set_flags): Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to sockets. (#341192) (g_io_win32_unimpl_set_flags): set_flags method for the unimplemented case.
2006-05-12 15:20:36 +02:00
return G_IO_STATUS_ERROR;
}
}
else
{
arg = 0;
if (ioctlsocket (win32_channel->fd, FIONBIO, &arg) == SOCKET_ERROR)
{
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
gchar *emsg = g_win32_error_message (WSAGetLastError ());
Use g_set_error_literal where appropriate. Patch from bug #535947. svn path=/trunk/; revision=7051
2008-06-16 18:53:58 +02:00
g_set_error_literal (err, G_IO_CHANNEL_ERROR,
G_IO_CHANNEL_ERROR_FAILED,
emsg);
g_win32_error_message() works fine for the Winsock WSA* error codes, too, 2008-06-11 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: g_win32_error_message() works fine for the Winsock WSA* error codes, too, so drop the winsock_error_message() function. svn path=/trunk/; revision=7010
2008-06-11 20:06:46 +02:00
g_free (emsg);
Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to 2006-05-12 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_sock_set_flags): Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to sockets. (#341192) (g_io_win32_unimpl_set_flags): set_flags method for the unimplemented case.
2006-05-12 15:20:36 +02:00
return G_IO_STATUS_ERROR;
}
}
return G_IO_STATUS_NORMAL;
}
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
static GIOFlags
g_io_win32_sock_get_flags (GIOChannel *channel)
{
Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to 2006-05-12 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_sock_set_flags): Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to sockets. (#341192) (g_io_win32_unimpl_set_flags): set_flags method for the unimplemented case.
2006-05-12 15:20:36 +02:00
/* Could we do something here? */
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
return 0;
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
static GIOFuncs win32_channel_msg_funcs = {
g_io_win32_msg_read,
g_io_win32_msg_write,
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
NULL,
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
g_io_win32_msg_close,
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
g_io_win32_msg_create_watch,
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
g_io_win32_free,
Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to 2006-05-12 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_sock_set_flags): Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to sockets. (#341192) (g_io_win32_unimpl_set_flags): set_flags method for the unimplemented case.
2006-05-12 15:20:36 +02:00
g_io_win32_unimpl_set_flags,
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
g_io_win32_msg_get_flags,
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
};
static GIOFuncs win32_channel_fd_funcs = {
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
g_io_win32_fd_and_console_read,
g_io_win32_fd_and_console_write,
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
g_io_win32_fd_seek,
g_io_win32_fd_close,
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
g_io_win32_fd_create_watch,
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
g_io_win32_free,
Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to 2006-05-12 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_sock_set_flags): Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to sockets. (#341192) (g_io_win32_unimpl_set_flags): set_flags method for the unimplemented case.
2006-05-12 15:20:36 +02:00
g_io_win32_unimpl_set_flags,
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
g_io_win32_fd_get_flags,
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
};
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
static GIOFuncs win32_channel_console_funcs = {
g_io_win32_fd_and_console_read,
g_io_win32_fd_and_console_write,
NULL,
g_io_win32_console_close,
g_io_win32_console_create_watch,
g_io_win32_free,
g_io_win32_unimpl_set_flags,
g_io_win32_console_get_flags,
};
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
static GIOFuncs win32_channel_sock_funcs = {
g_io_win32_sock_read,
g_io_win32_sock_write,
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
NULL,
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
g_io_win32_sock_close,
Major change in API for creating sources to handle multiple main loops Tue Dec 5 12:23:04 2000 Owen Taylor <otaylor@redhat.com> * gmain.[hc]: Major change in API for creating sources to handle multiple main loops (GMainContext *). GSources are now exposed as GSource * and implemented with structure derivation. * giochannel.[ch]: Changed vtable for GIOChannel to correspond to the new mainloop API, add g_io_channel_create_watch(). * gtypes.h: Move GTimeVal here. * gthread.h: Remove gmain.h include to avoid circularity. * giounix.c: Update for new GMain API. * giowin32.c: Update for new GMain API. (No check for proper compilation or working.) * timeloop.c timeloop-basic.c: A benchmarking program for the main loop comparing the main loop against a hand-written (timeloop-basic.c) variant. * tests/mainloop-test.c: New torture test of mainloop. * docs/Changes-2.0.txt: Started. Added text about changes to GMain. * gmain.c (g_main_add_poll_unlocked): Initial fd->revents to zero. (#8482, Benjamin Kahn)
2000-12-05 21:45:33 +01:00
g_io_win32_sock_create_watch,
Jun 29 13:36:39 2001 Owen Taylor <otaylor@redhat.com> * glib/gstring.[ch] (g_string_set_size): Add function to allow setting the length of a string greater than the current length (for buffering usage) * glib/gstring.[ch]: Expose string->allocated_len, since that is useful when using GString simply as a buffer. (Renamed from string->alloc) * glib/giochannel.[ch] glib/giounix.c glib/giowin32.c: Major patch from Hidetoshi Tajima and Ron Steinke reworking GIOChannel to have: - Buffering - Sane and useful error reporting - Streaming encoding conversion with iconv - Convenience functions to read by lines or an entire file. Also fix remaining 64 bit cleanliness issues. * tests/iochannel-test.c tests/Makefile.am: Test case for IO channel streaming conversion. Still needs some fixing up.
2001-06-30 17:22:13 +02:00
g_io_win32_free,
Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to 2006-05-12 Tor Lillqvist <tml@novell.com> * glib/giowin32.c (g_io_win32_sock_set_flags): Implement setting/clearing G_IO_FLAG_NONBLOCK for channels attached to sockets. (#341192) (g_io_win32_unimpl_set_flags): set_flags method for the unimplemented case.
2006-05-12 15:20:36 +02:00
g_io_win32_sock_set_flags,
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
g_io_win32_sock_get_flags,
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
};
GIOChannel: move docs from tmpl to .c
2010-01-31 06:39:40 +01:00
/**
* g_io_channel_win32_new_messages:
* @hwnd: a window handle.
* @Returns: a new #GIOChannel.
*
* Creates a new #GIOChannel given a window handle on Windows.
*
* This function creates a #GIOChannel that can be used to poll for
* Windows messages for the window in question.
**/
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
GIOChannel *
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
#if GLIB_SIZEOF_VOID_P == 8
g_io_channel_win32_new_messages (gsize hwnd)
#else
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
g_io_channel_win32_new_messages (guint hwnd)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
#endif
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
GIOWin32Channel *win32_channel = g_new (GIOWin32Channel, 1);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOChannel *channel = (GIOChannel *)win32_channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
g_io_channel_init (channel);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
g_io_channel_win32_init (win32_channel);
Rework the changes to needed to pass mainloop-test. Now we don't need to 2001-01-09 Tor Lillqvist <tml@iki.fi> * giowin32.c (create_reader_thread): Rework the changes to needed to pass mainloop-test. Now we don't need to call TerminateThread() after all, which is a relief, as the docs have a BIG RED WARNING SIGN about using that API. Instead, when closing a fd channel that has a reader thread running, just mark it as non-running and additionally mark the fd as ripe for closing. When the reader thread hopefully eventually gets something (and EOF or some actual data), it will note that it shouldn't be running, break out of the loop, and close the fd. The socket channel closing code should probably be changed similarily, but that will have to wait until I have a test case. (g_pipe_readable_msg, g_io_channel_win32_new_pipe, g_io_channel_win32_new_pipe_with_wakeups, g_io_channel_win32_pipe_request_wakeups, g_io_channel_win32_pipe_readable): Remove these, have been obsolete for some time. * glib.def: Update.
2001-01-09 21:46:49 +01:00
if (win32_channel->debug)
Fix problems on 64-bit Windows. Avoid warnings, some of which indicated 2008-07-28 Tor Lillqvist <tml@novell.com> Fix problems on 64-bit Windows. Avoid warnings, some of which indicated actual problems, some which were just annoyances. Where casts to an integer type are needed for pointers, use gssize. Technically intptr_t would be the more proper type, but we still want to be compilable with MSVS6 and 7 which don't have intptr_t. MSVS8 and 9 do have intptr_t, but in <crtdefs.h>, not <stdint.h>. Use %p to print out handles. Use gssize casts when assigning GPollFD::fd fields. Use G_GSIZE_FORMAT when printing size_t values. * configure.in: Define automake conditional G_OS_WIN32_X64 which is true on Win64. * glib/giochannel.h: Use slightly different prototype for g_io_channel_win32_new_messages() on Win64 with gsize instead of guint. * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * tests/testglib.c: Generic changes as described above. * glib/gmain.h: Don't bother mentioning GIMP in comment. * glib/grel.c (tuple_hash_2): Use all bits of pointer. * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Use gssize types in the communication between parent and helper process, so that we can pass process handles, which are pointers, also on Win64. * glib/gtimer.c (g_time_val_to_iso8601): time_t is 64 bits on Win64 so we can't pass the address of a GTimeVal::tv_sec which is a long directly to gmtime(). On the other hand, changing GTimeVal::tv_sec to be a gint64 on Win64 is not really feasible either, as that would then require changes in much code that uses GTimeVals. * glib/gspawn-win32.c * glib/Makefile.am: Call the helper programs gspawn-win64-helper.exe and gspawn-win64-helper-console.exe on Win64, to avoid potential risk of running a 32-bit version of the helper. svn path=/trunk/; revision=7260
2008-07-28 02:24:14 +02:00
g_print ("g_io_channel_win32_new_messages: channel=%p hwnd=%p\n",
channel, (HWND) hwnd);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
channel->funcs = &win32_channel_msg_funcs;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
win32_channel->type = G_IO_WIN32_WINDOWS_MESSAGES;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
win32_channel->hwnd = (HWND) hwnd;
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
/* XXX: check this. */
channel->is_readable = IsWindow (win32_channel->hwnd);
channel->is_writeable = IsWindow (win32_channel->hwnd);
Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c glib/glib/giochannel.h glib/glib/giounix.c glib/glib/giowin32.c glib/docs/reference/glib/glib-sections.txt glib/tests/iochannel-test.c glib/tests/unicode-collate.c glib/tests/unicode-normalize.c Added Files: glib/tests/iochannel-test-infile * glib/giochannel.c: API changes, fixes to error handling, some internal restructuring * glib/giochannel.h: API changes, documentation for elements in GIOChannel structure * glib/giounix.c: Matched API changes, implemented backend to set is_readable, is_writeable, is_seekable flags, added a test to catch large values of count for which the behavior of write() is undefined * glib/giowin32.c: Changed to match new prototypes for io_close() and io_seek(), removed references to G_IO_STATUS_INTR, set is_seekable flag in channel creation functions * glib.def: Renamed g_channel_error_quark() and g_channel_error_from_errno() to g_io_channel_error_quark() and g_io_channel_error_from_errno(); added new functions g_io_channel_get_buffered() and g_io_channel_set_buffered() * docs/reference/glib/glib-sections.txt: Modified iochannel section to reflect new functions and API changes * tests/iochannel-test.c: Fixed to work with API changes * tests/iochannel-test-infile: New file; input file for iochannel-test * tests/unicode-collate.c tests/unicode-normalize.c: Changed G_IO_FILE_MODE_READ to "r" to match API change
2001-07-20 22:14:37 +02:00
channel->is_seekable = FALSE;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
return channel;
}
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
static GIOChannel *
Internally use the _stati64 API explicitly on Windows Avoids warnings and confusion when compiling with MSVC.
2010-02-04 18:20:08 +01:00
g_io_channel_win32_new_fd_internal (gint fd,
struct _stati64 *st)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
GIOWin32Channel *win32_channel;
GIOChannel *channel;
win32_channel = g_new (GIOWin32Channel, 1);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
channel = (GIOChannel *)win32_channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
g_io_channel_init (channel);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
g_io_channel_win32_init (win32_channel);
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
win32_channel->fd = fd;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
if (win32_channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print ("g_io_channel_win32_new_fd: channel=%p fd=%u\n",
channel, fd);
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
if (st->st_mode & _S_IFCHR) /* console */
{
channel->funcs = &win32_channel_console_funcs;
win32_channel->type = G_IO_WIN32_CONSOLE;
g_io_win32_console_get_flags_internal (channel);
}
else
{
channel->funcs = &win32_channel_fd_funcs;
win32_channel->type = G_IO_WIN32_FILE_DESC;
g_io_win32_fd_get_flags_internal (channel, st);
}
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
return channel;
}
Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c glib/glib/giochannel.h glib/glib/giounix.c glib/glib/giowin32.c glib/docs/reference/glib/glib-sections.txt glib/tests/iochannel-test.c glib/tests/unicode-collate.c glib/tests/unicode-normalize.c Added Files: glib/tests/iochannel-test-infile * glib/giochannel.c: API changes, fixes to error handling, some internal restructuring * glib/giochannel.h: API changes, documentation for elements in GIOChannel structure * glib/giounix.c: Matched API changes, implemented backend to set is_readable, is_writeable, is_seekable flags, added a test to catch large values of count for which the behavior of write() is undefined * glib/giowin32.c: Changed to match new prototypes for io_close() and io_seek(), removed references to G_IO_STATUS_INTR, set is_seekable flag in channel creation functions * glib.def: Renamed g_channel_error_quark() and g_channel_error_from_errno() to g_io_channel_error_quark() and g_io_channel_error_from_errno(); added new functions g_io_channel_get_buffered() and g_io_channel_set_buffered() * docs/reference/glib/glib-sections.txt: Modified iochannel section to reflect new functions and API changes * tests/iochannel-test.c: Fixed to work with API changes * tests/iochannel-test-infile: New file; input file for iochannel-test * tests/unicode-collate.c tests/unicode-normalize.c: Changed G_IO_FILE_MODE_READ to "r" to match API change
2001-07-20 22:14:37 +02:00
GIOChannel: move docs from tmpl to .c
2010-01-31 06:39:40 +01:00
/**
* g_io_channel_win32_new_fd:
* @fd: a C library file descriptor.
* @Returns: a new #GIOChannel.
*
* Creates a new #GIOChannel given a file descriptor on Windows. This
* works for file descriptors from the C runtime.
*
* This function works for file descriptors as returned by the open(),
* creat(), pipe() and fileno() calls in the Microsoft C runtime. In
* order to meaningfully use this function your code should use the
* same C runtime as GLib uses, which is msvcrt.dll. Note that in
* current Microsoft compilers it is near impossible to convince it to
* build code that would use msvcrt.dll. The last Microsoft compiler
* version that supported using msvcrt.dll as the C runtime was version
* 6. The GNU compiler and toolchain for Windows, also known as Mingw,
* fully supports msvcrt.dll.
*
* If you have created a #GIOChannel for a file descriptor and started
* watching (polling) it, you shouldn't call read() on the file
* descriptor. This is because adding polling for a file descriptor is
* implemented in GLib on Windows by starting a thread that sits
* blocked in a read() from the file descriptor most of the time. All
* reads from the file descriptor should be done by this internal GLib
* thread. Your code should call only g_io_channel_read().
*
* This function is available only in GLib on Windows.
**/
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
GIOChannel *
g_io_channel_win32_new_fd (gint fd)
{
Internally use the _stati64 API explicitly on Windows Avoids warnings and confusion when compiling with MSVC.
2010-02-04 18:20:08 +01:00
struct _stati64 st;
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
Internally use the _stati64 API explicitly on Windows Avoids warnings and confusion when compiling with MSVC.
2010-02-04 18:20:08 +01:00
if (_fstati64 (fd, &st) == -1)
simply setting is_readable and is_writeable to TRUE does make Gimp 2001-09-22 Hans Breuer <hans@breuer.org> * glib/giowin32.c : simply setting is_readable and is_writeable to TRUE does make Gimp plug-ins work again. Still no API known to request this info on Win32 (see #57690)
2001-09-22 21:40:58 +02:00
{
Improve run-time warning messages. Drop some #if 0 code. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Improve run-time warning messages. Drop some #if 0 code. svn path=/trunk/; revision=7383
2008-08-21 13:35:51 +02:00
g_warning ("g_io_channel_win32_new_fd: %d isn't an open file descriptor in the C library GLib uses.", fd);
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
return NULL;
simply setting is_readable and is_writeable to TRUE does make Gimp 2001-09-22 Hans Breuer <hans@breuer.org> * glib/giowin32.c : simply setting is_readable and is_writeable to TRUE does make Gimp plug-ins work again. Still no API known to request this info on Win32 (see #57690)
2001-09-22 21:40:58 +02:00
}
Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c glib/glib/giochannel.h glib/glib/giounix.c glib/glib/giowin32.c glib/docs/reference/glib/glib-sections.txt glib/tests/iochannel-test.c glib/tests/unicode-collate.c glib/tests/unicode-normalize.c Added Files: glib/tests/iochannel-test-infile * glib/giochannel.c: API changes, fixes to error handling, some internal restructuring * glib/giochannel.h: API changes, documentation for elements in GIOChannel structure * glib/giounix.c: Matched API changes, implemented backend to set is_readable, is_writeable, is_seekable flags, added a test to catch large values of count for which the behavior of write() is undefined * glib/giowin32.c: Changed to match new prototypes for io_close() and io_seek(), removed references to G_IO_STATUS_INTR, set is_seekable flag in channel creation functions * glib.def: Renamed g_channel_error_quark() and g_channel_error_from_errno() to g_io_channel_error_quark() and g_io_channel_error_from_errno(); added new functions g_io_channel_get_buffered() and g_io_channel_set_buffered() * docs/reference/glib/glib-sections.txt: Modified iochannel section to reflect new functions and API changes * tests/iochannel-test.c: Fixed to work with API changes * tests/iochannel-test-infile: New file; input file for iochannel-test * tests/unicode-collate.c tests/unicode-normalize.c: Changed G_IO_FILE_MODE_READ to "r" to match API change
2001-07-20 22:14:37 +02:00
Improvement based on suggestion by Thorsten Maerz: 2002-12-17 Tor Lillqvist <tml@iki.fi> Improvement based on suggestion by Thorsten Maerz: * glib/giowin32.c (struct _GIOWin32Channel): Don't need thread_handle. (create_thread): We can close thread handle right away, it isn't used for anything. (read_thread, select_thread): Thus, don't close it here. Fix #57690, partial fix for #57689: * glib/giowin32.c (g_io_win32_set_flags): Don't set the GError, instead call g_warning(). (g_io_win32_fd_get_flags_internal): New function, sets the is_readable, is_writeable and is_seekable flags based on the actual access modes of the underlying Win32 HANDLE, by trying Win32 ReadFile() and WriteFile() of zero bytes, and PeekNamedPipe(). Should work for disk files and pipes. For devices (consoles) unfortunately not. (g_io_win32_fd_get_flags): Don't set the G_IO_FLAG_IS_{READ,WRITE}ABLE flags, g_io_channel_get_flags() already does. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_win32_msg_get_flags, g_io_win32_sock_get_flags): Splice the generic g_io_win32_get_flags() into these specific functions, as they need to do different things. Not implemented yet, though. (g_io_channel_win32_new_fd_internal): New function, to avoid duplicate fstat() calls. Most code from g_io_channel_win32_new_fd() moved here. Call g_io_win32_fd_get_flags_internal() to set the is_* flags. (g_io_channel_win32_new_fd, g_io_channel_unix_new): Call g_io_channel_win32_new_fd_internal(). (g_io_win32_no_seek): Remove. Don't set is_seekable for those channel types.
2002-12-17 05:48:03 +01:00
return g_io_channel_win32_new_fd_internal (fd, &st);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
gint
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
g_io_channel_win32_get_fd (GIOChannel *channel)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
return win32_channel->fd;
}
GIOChannel: move docs from tmpl to .c
2010-01-31 06:39:40 +01:00
/**
* g_io_channel_win32_new_socket:
* @socket: a Winsock socket
* @Returns: a new #GIOChannel
*
* Creates a new #GIOChannel given a socket on Windows.
*
* This function works for sockets created by Winsock. It's available
* only in GLib on Windows.
*
* Polling a #GSource created to watch a channel for a socket puts the
* socket in non-blocking mode. This is a side-effect of the
* implementation and unavoidable.
**/
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
GIOChannel *
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
g_io_channel_win32_new_socket (int socket)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
GIOWin32Channel *win32_channel = g_new (GIOWin32Channel, 1);
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOChannel *channel = (GIOChannel *)win32_channel;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
g_io_channel_init (channel);
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
g_io_channel_win32_init (win32_channel);
Rework the changes to needed to pass mainloop-test. Now we don't need to 2001-01-09 Tor Lillqvist <tml@iki.fi> * giowin32.c (create_reader_thread): Rework the changes to needed to pass mainloop-test. Now we don't need to call TerminateThread() after all, which is a relief, as the docs have a BIG RED WARNING SIGN about using that API. Instead, when closing a fd channel that has a reader thread running, just mark it as non-running and additionally mark the fd as ripe for closing. When the reader thread hopefully eventually gets something (and EOF or some actual data), it will note that it shouldn't be running, break out of the loop, and close the fd. The socket channel closing code should probably be changed similarily, but that will have to wait until I have a test case. (g_pipe_readable_msg, g_io_channel_win32_new_pipe, g_io_channel_win32_new_pipe_with_wakeups, g_io_channel_win32_pipe_request_wakeups, g_io_channel_win32_pipe_readable): Remove these, have been obsolete for some time. * glib.def: Update.
2001-01-09 21:46:49 +01:00
if (win32_channel->debug)
Make debugging printout more compact and add more information to it. No 2008-05-17 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Make debugging printout more compact and add more information to it. No changes to actual functionality. svn path=/trunk/; revision=6898
2008-05-17 04:34:17 +02:00
g_print ("g_io_channel_win32_new_socket: channel=%p sock=%d\n",
channel, socket);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
channel->funcs = &win32_channel_sock_funcs;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
win32_channel->type = G_IO_WIN32_SOCKET;
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
win32_channel->fd = socket;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
intial implementation of new API functions. Not sure if it behaves as 2001-07-21 Hans Breuer <hans@breuer.org> * glib/giowin32.c : intial implementation of new API functions. Not sure if it behaves as intended ... * glib.def : removed, glib/glib.def is the file used since moved * glib/glib.def : updated * tests/makefile.msc : added iochannel-test
2001-07-21 15:15:58 +02:00
channel->is_readable = TRUE;
channel->is_writeable = TRUE;
Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c Modified Files: glib/ChangeLog glib/glib.def glib/glib/giochannel.c glib/glib/giochannel.h glib/glib/giounix.c glib/glib/giowin32.c glib/docs/reference/glib/glib-sections.txt glib/tests/iochannel-test.c glib/tests/unicode-collate.c glib/tests/unicode-normalize.c Added Files: glib/tests/iochannel-test-infile * glib/giochannel.c: API changes, fixes to error handling, some internal restructuring * glib/giochannel.h: API changes, documentation for elements in GIOChannel structure * glib/giounix.c: Matched API changes, implemented backend to set is_readable, is_writeable, is_seekable flags, added a test to catch large values of count for which the behavior of write() is undefined * glib/giowin32.c: Changed to match new prototypes for io_close() and io_seek(), removed references to G_IO_STATUS_INTR, set is_seekable flag in channel creation functions * glib.def: Renamed g_channel_error_quark() and g_channel_error_from_errno() to g_io_channel_error_quark() and g_io_channel_error_from_errno(); added new functions g_io_channel_get_buffered() and g_io_channel_set_buffered() * docs/reference/glib/glib-sections.txt: Modified iochannel section to reflect new functions and API changes * tests/iochannel-test.c: Fixed to work with API changes * tests/iochannel-test-infile: New file; input file for iochannel-test * tests/unicode-collate.c tests/unicode-normalize.c: Changed G_IO_FILE_MODE_READ to "r" to match API change
2001-07-20 22:14:37 +02:00
channel->is_seekable = FALSE;
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
return channel;
}
GIOChannel *
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
g_io_channel_unix_new (gint fd)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Avoid UNLOCKing the critical section twice, which might cause a hang. 2003-08-25 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c (read_thread): Avoid UNLOCKing the critical section twice, which might cause a hang. (#120653) * glib/giowin32.c (g_io_channel_unix_new): Warn if fd is both a valid file descriptor and socket.
2003-08-25 23:37:57 +02:00
gboolean is_fd, is_socket;
Internally use the _stati64 API explicitly on Windows Avoids warnings and confusion when compiling with MSVC.
2010-02-04 18:20:08 +01:00
struct _stati64 st;
Pass real &optval and &optlen to getsockopt() instead of NULL. Don't 2003-06-25 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c (g_io_channel_unix_new): Pass real &optval and &optlen to getsockopt() instead of NULL. Don't remember why I thought that NULL could be used (as we don't actually use the returned value for anything), the Platform SDK documentation doesn't imply so.
2003-06-25 05:06:24 +02:00
int optval, optlen;
Warn if no callback. Call callback correctly. (g_io_win32_create_watch): 2000-12-14 Tor Lillqvist <tml@iki.fi> * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. (g_io_win32_fd_create_watch): Ditto. (g_io_channel_unix_new): If it is a file descriptor (i.e., a Unix fd lookalike provided by the C library), call g_io_channel_win32_new_fd(). If it is a socket (from WinSock), call g_io_cahnnel_win32_new_stream_socket(). Hopefully sockets and fds don't overlap. TODO: Implement also datagram sockets. (g_io_channel_win32_poll): Call g_main_context_get_poll_func(). * gcompletion.h: Include <unistd.h> only on Unix. Is this inclusion really needed here? OTOH, do include <stddef.h>, for size_t. * gmessages.c: (Win32) Don't define a function called "write" that might clash with the prototype from <io.h>, use a #define. * glib.def: Update. * gmain.c (g_source_add_poll): Don't return a value from void function. (g_main_context_get_poll_func): Compile also for non-Win32, as presumably was intended. The result var is a GPollFunc, not a GPollFunc*. Return the result! gobject: 2000-12-14 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Update, include parts from Makefile.am to build gmarshal.[ch]. Some day, we won't need these separate makefiles for Win32 compilation. I hope. * makefile.msc.in: Update. No use trying to build gmarshal.[ch] here, it would require Unixish tools. MSVC users building from CVS sources are out of luck. * gobject.def: Update.
2000-12-14 22:02:20 +01:00
Internally use the _stati64 API explicitly on Windows Avoids warnings and confusion when compiling with MSVC.
2010-02-04 18:20:08 +01:00
is_fd = (_fstati64 (fd, &st) == 0);
Avoid UNLOCKing the critical section twice, which might cause a hang. 2003-08-25 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c (read_thread): Avoid UNLOCKing the critical section twice, which might cause a hang. (#120653) * glib/giowin32.c (g_io_channel_unix_new): Warn if fd is both a valid file descriptor and socket.
2003-08-25 23:37:57 +02:00
Pass real &optval and &optlen to getsockopt() instead of NULL. Don't 2003-06-25 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c (g_io_channel_unix_new): Pass real &optval and &optlen to getsockopt() instead of NULL. Don't remember why I thought that NULL could be used (as we don't actually use the returned value for anything), the Platform SDK documentation doesn't imply so.
2003-06-25 05:06:24 +02:00
optlen = sizeof (optval);
Avoid UNLOCKing the critical section twice, which might cause a hang. 2003-08-25 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c (read_thread): Avoid UNLOCKing the critical section twice, which might cause a hang. (#120653) * glib/giowin32.c (g_io_channel_unix_new): Warn if fd is both a valid file descriptor and socket.
2003-08-25 23:37:57 +02:00
is_socket = (getsockopt (fd, SOL_SOCKET, SO_TYPE, (char *) &optval, &optlen) != SOCKET_ERROR);
if (is_fd && is_socket)
Improve run-time warning messages. Drop some #if 0 code. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Improve run-time warning messages. Drop some #if 0 code. svn path=/trunk/; revision=7383
2008-08-21 13:35:51 +02:00
g_warning ("g_io_channel_unix_new: %d is both a file descriptor and a socket. File descriptor interpretation assumed. To avoid ambiguity, call either g_io_channel_win32_new_fd() or g_io_channel_win32_new_socket() instead.", fd);
Avoid UNLOCKing the critical section twice, which might cause a hang. 2003-08-25 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c (read_thread): Avoid UNLOCKing the critical section twice, which might cause a hang. (#120653) * glib/giowin32.c (g_io_channel_unix_new): Warn if fd is both a valid file descriptor and socket.
2003-08-25 23:37:57 +02:00
if (is_fd)
return g_io_channel_win32_new_fd_internal (fd, &st);
if (is_socket)
Pass real &optval and &optlen to getsockopt() instead of NULL. Don't 2003-06-25 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c (g_io_channel_unix_new): Pass real &optval and &optlen to getsockopt() instead of NULL. Don't remember why I thought that NULL could be used (as we don't actually use the returned value for anything), the Platform SDK documentation doesn't imply so.
2003-06-25 05:06:24 +02:00
return g_io_channel_win32_new_socket(fd);
Warn if no callback. Call callback correctly. (g_io_win32_create_watch): 2000-12-14 Tor Lillqvist <tml@iki.fi> * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. (g_io_win32_fd_create_watch): Ditto. (g_io_channel_unix_new): If it is a file descriptor (i.e., a Unix fd lookalike provided by the C library), call g_io_channel_win32_new_fd(). If it is a socket (from WinSock), call g_io_cahnnel_win32_new_stream_socket(). Hopefully sockets and fds don't overlap. TODO: Implement also datagram sockets. (g_io_channel_win32_poll): Call g_main_context_get_poll_func(). * gcompletion.h: Include <unistd.h> only on Unix. Is this inclusion really needed here? OTOH, do include <stddef.h>, for size_t. * gmessages.c: (Win32) Don't define a function called "write" that might clash with the prototype from <io.h>, use a #define. * glib.def: Update. * gmain.c (g_source_add_poll): Don't return a value from void function. (g_main_context_get_poll_func): Compile also for non-Win32, as presumably was intended. The result var is a GPollFunc, not a GPollFunc*. Return the result! gobject: 2000-12-14 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Update, include parts from Makefile.am to build gmarshal.[ch]. Some day, we won't need these separate makefiles for Win32 compilation. I hope. * makefile.msc.in: Update. No use trying to build gmarshal.[ch] here, it would require Unixish tools. MSVC users building from CVS sources are out of luck. * gobject.def: Update.
2000-12-14 22:02:20 +01:00
Improve run-time warning messages. Drop some #if 0 code. 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Improve run-time warning messages. Drop some #if 0 code. svn path=/trunk/; revision=7383
2008-08-21 13:35:51 +02:00
g_warning ("g_io_channel_unix_new: %d is neither a file descriptor or a socket.", fd);
Pass real &optval and &optlen to getsockopt() instead of NULL. Don't 2003-06-25 Tor Lillqvist <tml@iki.fi> * glib/giowin32.c (g_io_channel_unix_new): Pass real &optval and &optlen to getsockopt() instead of NULL. Don't remember why I thought that NULL could be used (as we don't actually use the returned value for anything), the Platform SDK documentation doesn't imply so.
2003-06-25 05:06:24 +02:00
Warn if no callback. Call callback correctly. (g_io_win32_create_watch): 2000-12-14 Tor Lillqvist <tml@iki.fi> * giowin32.c (g_io_win32_dispatch): Warn if no callback. Call callback correctly. (g_io_win32_create_watch): Fix typo. (g_io_win32_fd_create_watch): Ditto. (g_io_channel_unix_new): If it is a file descriptor (i.e., a Unix fd lookalike provided by the C library), call g_io_channel_win32_new_fd(). If it is a socket (from WinSock), call g_io_cahnnel_win32_new_stream_socket(). Hopefully sockets and fds don't overlap. TODO: Implement also datagram sockets. (g_io_channel_win32_poll): Call g_main_context_get_poll_func(). * gcompletion.h: Include <unistd.h> only on Unix. Is this inclusion really needed here? OTOH, do include <stddef.h>, for size_t. * gmessages.c: (Win32) Don't define a function called "write" that might clash with the prototype from <io.h>, use a #define. * glib.def: Update. * gmain.c (g_source_add_poll): Don't return a value from void function. (g_main_context_get_poll_func): Compile also for non-Win32, as presumably was intended. The result var is a GPollFunc, not a GPollFunc*. Return the result! gobject: 2000-12-14 Tor Lillqvist <tml@iki.fi> * makefile.mingw.in: Update, include parts from Makefile.am to build gmarshal.[ch]. Some day, we won't need these separate makefiles for Win32 compilation. I hope. * makefile.msc.in: Update. No use trying to build gmarshal.[ch] here, it would require Unixish tools. MSVC users building from CVS sources are out of luck. * gobject.def: Update.
2000-12-14 22:02:20 +01:00
return NULL;
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
}
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
gint
g_io_channel_unix_get_fd (GIOChannel *channel)
{
return g_io_channel_win32_get_fd (channel);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
void
g_io_channel_win32_set_debug (GIOChannel *channel,
gboolean flag)
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
Compile in the debugging code all the time, but only output debug messages 2000-07-30 Tor Lillqvist <tml@iki.fi> * giowin32.c: Compile in the debugging code all the time, but only output debug messages if told so. Add (unadvertised) function to turn on/off debug messages for a channel. (buffer_read): Don't loop. It is expected behaviour to return a short read occasionally, for instance when reading from pipes. It's the calling code that should loop if it *knows* how much the writer has written. * tests/gio-test.c: Correct the program's name in the output. (recv_message): Loop calling g_io_channel_read() (in a new function read_all()) until we have all the bytes we want (that we know the writer has written/will write).
2000-07-30 02:27:39 +02:00
win32_channel->debug = flag;
}
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
gint
glib.h glib.def New function, to make a GPollFD from a GIOChannel. Creates 2000-08-31 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def * giowin32.c (g_io_channel_win32_make_pollfd): New function, to make a GPollFD from a GIOChannel. Creates the events and starts the reader thread if necessary.
2000-09-01 00:47:24 +02:00
g_io_channel_win32_poll (GPollFD *fds,
gint n_fds,
gint timeout)
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
{
Hmm, the parameter to g_io_channel_win32_poll() should be a GPollFD array, 2000-08-27 Tor Lillqvist <tml@iki.fi> Hmm, the parameter to g_io_channel_win32_poll() should be a GPollFD array, not GIOChannel. That way the caller can know which channels cause the callback.
2000-08-27 17:33:15 +02:00
g_return_val_if_fail (n_fds >= 0, 0);
Finally, a new and improved IO Channel and condition watch implementation 2000-07-30 Tor Lillqvist <tml@iki.fi> Finally, a new and improved IO Channel and condition watch implementation for Win32. Based on code provided by Craig Setera. When watching file descriptors, for which there is no select() like functionality on Win32 that would work on all Win32 platforms for all types of file descriptors (including anonymous pipes), we start a new thread that blocks while trying to read from the file descriptor. When the read returns, a Win32 Event is signalled that the polling routine eventually notices. Meanwhile, the data being read is stored in a circular buffer, from where the IO channel's read() method picks it up. If the buffer fills up the reading thread has to wait for space becoming available. For this another Win32 Event is used. The IO Channel's read() method signals this when it has read some data out of the buffer. The separate reader thread(s), and the circular buffer(s) with associated events mean lots of possibilities for fun parallellism errors. But it seems to work OK, i.e. GIMP runs. * gmain.c: Small changes to the Win32 polling function. (g_main_win32_get_poll_func): New function. Perhaps it would be a good idea to provide this on all platforms. * giowin32.c: The bulk of the new implementation. (g_io_channel_win32_wait_for_condition): New function. To be used where on Unix one does a select() on the channel's fd, like libgimp's gimp_extension_process(). Could be provided on all platforms. * glib.h: Update documentation for IO Channels on Win32. Remove the declarations for the as of now obsolete old functions related to IO Channels for pipes with "wakeup" messages. * glib.def: Some new functions. * tests/gio-test.c: New file, to test GIOChannel and main loop. * tests/Makefile.am * tests/makefile.mingw.in: Add it.
2000-07-29 22:59:07 +02:00
Move this out of gmain.c and make it part of the public API. (Part of Bug * glib/gpoll.c (g_poll): Move this out of gmain.c and make it part of the public API. (Part of Bug 505361 - gunixinputstream.c assumes poll() available.) svn path=/trunk/; revision=7535
2008-09-23 18:32:30 +02:00
return g_poll (fds, n_fds, timeout);
Merge in current Win32 version. Almost no Unix code touched. * README.win32: More text. * config.h.win32 glibconfig.h.win32: Update to match the corresponding generated files on Unix. * makefile.msc: Update with new source files, and gthread library. Use the compiler flag -MD instead of using -D_DLL and "/nodefaultlib:libc msvcrt.lib" in the link phase. * glib.def: Include new functions, drop removed ones. * glib.h: Add comments about main loop and polling on Win32. (In general, it's only for the GIMP's use.) Add Win32 IO Channel functions. Remove the obsoleted old IO Channel stuff (which was in #if 0 already). * giowin32.c: New file. * gmain.c: Include config.h, conditionalize <sys/time.h> inclusion. Add g_poll implementation for Win32 (only for the GIMP's needs for now, it's hard or even impossible to be as clean and generic as on Unix). Implement g_get_current_time on Win32. If threads aren't supported, don't try to wake up main thread's loop. On Win32, use a semaphore and not a pipe to wake up the main loop. * gmessages.c: On Win32, allocate a console window if the standard output handle is invalid before writing to stdout, and reopen stdout to that console window. * giochannel.c: Conditionalize unistd.h inclusion. Some indentation cleanup. * gstrfuncs.c: Include <signal.h>. * gutils.c: On Win32, also check the HOMEDRIVE and HOMEPATH environment variables. * gmodule-dl.c gmodule-dld.c: In _g_module_build_path, don't add the "lib" prefix and ".so" or ".sl" suffix if already there. * gmodule-win32.c: Likewise for the ".dll" suffix. * gthread-posix.c: Conditionalize <sys/time.h> inclusion.
1999-01-17 00:46:42 +01:00
}
glib.h glib.def New function, to make a GPollFD from a GIOChannel. Creates 2000-08-31 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def * giowin32.c (g_io_channel_win32_make_pollfd): New function, to make a GPollFD from a GIOChannel. Creates the events and starts the reader thread if necessary.
2000-09-01 00:47:24 +02:00
void
g_io_channel_win32_make_pollfd (GIOChannel *channel,
GIOCondition condition,
GPollFD *fd)
{
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
glib.h glib.def New function, to make a GPollFD from a GIOChannel. Creates 2000-08-31 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def * giowin32.c (g_io_channel_win32_make_pollfd): New function, to make a GPollFD from a GIOChannel. Creates the events and starts the reader thread if necessary.
2000-09-01 00:47:24 +02:00
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
switch (win32_channel->type)
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
{
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
case G_IO_WIN32_FILE_DESC:
if (win32_channel->data_avail_event == NULL)
create_events (win32_channel);
glib/giowin32.c glib/gmain.c glib/gspawn-win32.c Change gssize casts 2008-08-04 Tor Lillqvist <tml@novell.com> * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Change gssize casts introduced on 2008-07-28 to gintptr casts now that we have that. gssize is as such the same as gintptr on both 32- and 64-bit Windows, but the gintptr name indicates that it is used to hold pointers, i.e. also HANDLEs. svn path=/trunk/; revision=7306
2008-08-04 20:46:59 +02:00
fd->fd = (gintptr) win32_channel->data_avail_event;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
Bug 500246 - Bug fixes for giowin32 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 500246 - Bug fixes for giowin32 * glib/giowin32.c (read_thread) (write_thread): Change the nbytes variables to signed. (g_io_channel_win32_make_pollfd): Fix an obvious error in the file descriptor case leftover after the patch from bug #333098 on 2006-03-02. Thanks to Marcus Brinkmann. svn path=/trunk/; revision=7373
2008-08-20 03:30:31 +02:00
if (win32_channel->thread_id == 0)
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
{
Bug 500246 - Bug fixes for giowin32 2008-08-20 Tor Lillqvist <tml@novell.com> Bug 500246 - Bug fixes for giowin32 * glib/giowin32.c (read_thread) (write_thread): Change the nbytes variables to signed. (g_io_channel_win32_make_pollfd): Fix an obvious error in the file descriptor case leftover after the patch from bug #333098 on 2006-03-02. Thanks to Marcus Brinkmann. svn path=/trunk/; revision=7373
2008-08-20 03:30:31 +02:00
/* Is it meaningful for a file descriptor to be polled for
* both IN and OUT? For what kind of file descriptor would
* that be? Doesn't seem to make sense, in practise the file
* descriptors handled here are always read or write ends of
* pipes surely, and thus unidirectional.
*/
Implement watches for GIOChannels for write file descriptors on Win32 2006-03-02 Marcus Brinkmann <mb@g10code.de> Implement watches for GIOChannels for write file descriptors on Win32 (#333098). * glib/giowin32.c (GIOWin32Channel): Add a new direction field. (read_thread): Initialize direction. (write_thread): New function. (buffer_write): New function. (g_io_win32_prepare): Handle the G_IO_WIN32_FILE_DESC case for the write direction. (g_io_win32_fd_write): Call buffer_write() if there is a writer thread. (g_io_win32_fd_close): Set space_avail_event for writer threads. (g_io_win32_fd_create_watch): Create the writer thread if condition is G_IO_OUT. (g_io_channel_win32_make_pollfd): Likewise here.
2006-03-11 22:03:00 +01:00
if (condition & G_IO_IN)
create_thread (win32_channel, condition, read_thread);
else if (condition & G_IO_OUT)
create_thread (win32_channel, condition, write_thread);
}
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
break;
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
case G_IO_WIN32_CONSOLE:
glib/giowin32.c glib/gmain.c glib/gspawn-win32.c Change gssize casts 2008-08-04 Tor Lillqvist <tml@novell.com> * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Change gssize casts introduced on 2008-07-28 to gintptr casts now that we have that. gssize is as such the same as gintptr on both 32- and 64-bit Windows, but the gintptr name indicates that it is used to hold pointers, i.e. also HANDLEs. svn path=/trunk/; revision=7306
2008-08-04 20:46:59 +02:00
fd->fd = _get_osfhandle (win32_channel->fd);
Handle GIOChannels for file descriptors connected to the console 2007-01-07 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Handle GIOChannels for file descriptors connected to the console separately. This would typically be the fd 0, 1, or 2 (if not redirected) in a console application. For such fds we don't need a separate thread, as console HANDLEs are waitable objects. (#359202, Michiel de Hoon) svn path=/trunk/; revision=5222
2007-01-07 04:02:28 +01:00
break;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
case G_IO_WIN32_SOCKET:
glib/giowin32.c glib/gmain.c glib/gspawn-win32.c Change gssize casts 2008-08-04 Tor Lillqvist <tml@novell.com> * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Change gssize casts introduced on 2008-07-28 to gintptr casts now that we have that. gssize is as such the same as gintptr on both 32- and 64-bit Windows, but the gintptr name indicates that it is used to hold pointers, i.e. also HANDLEs. svn path=/trunk/; revision=7306
2008-08-04 20:46:59 +02:00
fd->fd = (gintptr) WSACreateEvent ();
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
break;
case G_IO_WIN32_WINDOWS_MESSAGES:
glib/giowin32.c glib/gmain.c glib/gspawn-win32.c Change gssize casts 2008-08-04 Tor Lillqvist <tml@novell.com> * glib/giowin32.c * glib/gmain.c * glib/gspawn-win32.c * glib/gspawn-win32-helper.c: Change gssize casts introduced on 2008-07-28 to gintptr casts now that we have that. gssize is as such the same as gintptr on both 32- and 64-bit Windows, but the gintptr name indicates that it is used to hold pointers, i.e. also HANDLEs. svn path=/trunk/; revision=7306
2008-08-04 20:46:59 +02:00
fd->fd = G_WIN32_MSG_HANDLE;
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
break;
default:
g_assert_not_reached ();
abort ();
When the sublangid is SUBLANG_DEFAULT, return the locale of the language's 2001-09-24 Bruno Haible <haible@clisp.cons.org> * glib/gwin32.c (g_win32_getlocale): When the sublangid is SUBLANG_DEFAULT, return the locale of the language's main country, not a country-neutral locale. E.g. "en_US" instead of "en". Add handling of LANG_SORBIAN. Fix typo for SUBLANG_CHINESE_SIMPLIFIED (China == CN, CH == Switzerland). Ignore empty environment variable values. 2001-09-28 Tor Lillqvist <tml@iki.fi> * glib/makefile.{mingw,msc}.in: Add localcharset.o. Just copy the source file from libcharset and compile in this directory. * glib/giochannel.c: Mark rest of g_set_error strings for translation, too. * glib/giowin32.c: Add some debugging output functions, call them when debugging. (create_events, g_io_win32_msg_write): Free message fetched with g_win32_error_message (). (g_io_win32_check): Indentation fixes. (g_io_win32_fd_read,g_io_win32_sock_read): Don't always return G_IO_STATUS_NORMAL. Do return G_IO_STATUS_EOF if we got 0 bytes, like on Unix. This helps making the test programs run successfully. * glib/gmain.c (g_poll): Return the code ifdeffed out with TEST_WITHOUT_THIS. Can't remember why it was ifdeffed out. Things seem to work as previously with the code in place. Especially spawn-test didn't work with the code ifdeffed out (Bug#61067). * glib/grand.c (g_rand_new): Don't try to use /dev/urandom unless on Unix. * glib/gspawn-win32-helper.c (WinMain): Remove Sleep(10000) accidentally left in. gthread: 2001-09-28 Tor Lillqvist <tml@iki.fi> * gthread-win32.c: Use an extra level of indirection for GMutex. It is now a pointer either to a pointer to a CRITICAL_SECTION struct, or to a mutex HANDLE. This is needed in case the user defines G_ERRORCHECK_MUTEXES. G_MUTEX_SIZE must correctly reflect the size of *GMutex, but this used to vary depending on whether we at run-time chose to use CRITICAL_SECTIONs or mutexes. (g_mutex_free_win32_cs_impl, g_cond_free_win32_impl): Call DeleteCriticalSection() when done with it. * gthread-impl.c (g_thread_init_with_errorcheck_mutexes): Call g_thread_impl_init() before accessing g_thread_functions_for_glib_use_default, as the g_thread_impl_init() function might modify it. po: 2001-09-28 Tor Lillqvist <tml@iki.fi> * POTFILES.in: Add iochannel.c and giowin32.c. * sv.po: Remove a bogus fuzziness indicator.
2001-09-28 00:07:00 +02:00
}
Totally rewritten socket channel implementation. See discussion in bug 2005-07-09 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Totally rewritten socket channel implementation. See discussion in bug #147392.
2005-07-09 01:27:31 +02:00
fd->events = condition;
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
}
Don't bother compiling the binary compatibility 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Don't bother compiling the binary compatibility g_io_channel_win32_new_stream_socket() function that has not been mentioned in any header since 2.0 on Win64. * glib/glib.symbols: Mark it, too, private, and don't export it on Win64. svn path=/trunk/; revision=7384
2008-08-21 13:47:04 +02:00
#ifndef _WIN64
Socket support rewritten. It was utterly broken, and untested in fact. We 2001-01-25 Tor Lillqvist <tml@iki.fi> * giowin32.c: Socket support rewritten. It was utterly broken, and untested in fact. We still do use a thread for each socket being watched, but instead of blocking in recv() (which of course was plain stupid for sockets being liste()ed on), we block in select(). The read method for sockets calls recv(). It is now possible for the application to call accept(), recv() or send() in the callback, just like on Unix. Tested with code kindly provided by Andrew Lanoix. Rename g_io_channel_win32_new_stream_socket() to g_io_channel_win32_new_socket() as it isn't restricted to stream sockets. * gmain.c (g_poll): Related changes in the Win32 version of g_poll(). When polling for messages, always do a PeekMessage() first. We used to miss messages if several were posted between calls to g_poll(). * giochannel.h: Improve Win32-related comments. * gutf8.c: (Win32) Include <stdio.h> for sprintf. * tests/gio-test.c: (Win32) Add tests for polling for Windows messages. * tests/makefile.mingw.in: Remove superfluous compilation command line.
2001-01-25 22:16:46 +01:00
/* Binary compatibility */
GIOChannel *
g_io_channel_win32_new_stream_socket (int socket)
{
return g_io_channel_win32_new_socket (socket);
glib.h glib.def New function, to make a GPollFD from a GIOChannel. Creates 2000-08-31 Tor Lillqvist <tml@iki.fi> * glib.h * glib.def * giowin32.c (g_io_channel_win32_make_pollfd): New function, to make a GPollFD from a GIOChannel. Creates the events and starts the reader thread if necessary.
2000-09-01 00:47:24 +02:00
}
Make PLT-reduction work with gcc4, and don't include everything in 2005-03-13 Matthias Clasen <mclasen@redhat.com> Make PLT-reduction work with gcc4, and don't include everything in galias.h: * glib/glib.symbols: Group symbols by header and source file. * glib/makegalias.pl: Protect definitions by the same preprocessor symbols used to guard the headers. Move the alias declarations to a separate file which is produced when calling makegalias.pl -def * glib/Makefile.am (galiasdef.c): Add a rule to generate this file. * glib/*.c: Include galias.h after the other GLib headers, include galiasdef.c at the bottom.
2005-03-14 05:26:57 +01:00
Don't bother compiling the binary compatibility 2008-08-21 Tor Lillqvist <tml@novell.com> * glib/giowin32.c: Don't bother compiling the binary compatibility g_io_channel_win32_new_stream_socket() function that has not been mentioned in any header since 2.0 on Win64. * glib/glib.symbols: Mark it, too, private, and don't export it on Win64. svn path=/trunk/; revision=7384
2008-08-21 13:47:04 +02:00
#endif
Reference in New Issue Copy Permalink