[Gpg4win-commits] r108 - in trunk: . patches/glib patches/glib-2.6.6 patches/glib-2.8.4

[scm-commit at wald.intevation.org]

Author: marcus
Date: 2006-01-04 23:33:25 +0100 (Wed, 04 Jan 2006)
New Revision: 108

Modified:
   trunk/ChangeLog
   trunk/patches/glib-2.6.6/01-giowin32.patch
   trunk/patches/glib-2.8.4/01-giowin32.patch
   trunk/patches/glib/01-giowin32.patch
Log:
2006-01-04  Marcus Brinkmann  <marcus at g10code.de>

	* patches/glib/01-giowin32.patch,
	patches/glib-2.6.6/01-giowin32.patch,
	patches/glib-2.8.4/01-giowin32.patch: Flush write buffer in write
	thread before closing FD.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-01-04 21:52:53 UTC (rev 107)
+++ trunk/ChangeLog	2006-01-04 22:33:25 UTC (rev 108)
@@ -2,6 +2,11 @@
 
 	* patches/glib/01-giowin32.patch,
 	patches/glib-2.6.6/01-giowin32.patch,
+	patches/glib-2.8.4/01-giowin32.patch: Flush write buffer in write
+	thread before closing FD.
+
+	* patches/glib/01-giowin32.patch,
+	patches/glib-2.6.6/01-giowin32.patch,
 	patches/glib-2.8.4/01-giowin32.patch: Notify write thread about fd
 	close.
 

Modified: trunk/patches/glib/01-giowin32.patch
===================================================================
--- trunk/patches/glib/01-giowin32.patch	2006-01-04 21:52:53 UTC (rev 107)
+++ trunk/patches/glib/01-giowin32.patch	2006-01-04 22:33:25 UTC (rev 108)
@@ -78,7 +78,7 @@
 +  SetEvent (channel->space_avail_event);
 +  
 +  LOCK (channel->mutex);
-+  while (channel->running)
++  while (channel->running || channel->rdp != channel->wrp)
 +    {
 +      if (channel->debug)
 +	g_print ("write_thread %#x: rdp=%d, wrp=%d\n",
@@ -99,7 +99,7 @@
 +	  WaitForSingleObject (channel->space_avail_event, INFINITE);
 +
 +	  LOCK (channel->mutex);
-+	  if (!channel->running)
++	  if (channel->rdp == channel->wrp)
 +	    break;
 +
 +	  if (channel->debug)

Modified: trunk/patches/glib-2.6.6/01-giowin32.patch
===================================================================
--- trunk/patches/glib-2.6.6/01-giowin32.patch	2006-01-04 21:52:53 UTC (rev 107)
+++ trunk/patches/glib-2.6.6/01-giowin32.patch	2006-01-04 22:33:25 UTC (rev 108)
@@ -78,7 +78,7 @@
 +  SetEvent (channel->space_avail_event);
 +  
 +  LOCK (channel->mutex);
-+  while (channel->running)
++  while (channel->running || channel->rdp != channel->wrp)
 +    {
 +      if (channel->debug)
 +	g_print ("write_thread %#x: rdp=%d, wrp=%d\n",
@@ -99,7 +99,7 @@
 +	  WaitForSingleObject (channel->space_avail_event, INFINITE);
 +
 +	  LOCK (channel->mutex);
-+	  if (!channel->running)
++	  if (channel->rdp == channel->wrp)
 +	    break;
 +
 +	  if (channel->debug)

Modified: trunk/patches/glib-2.8.4/01-giowin32.patch
===================================================================
--- trunk/patches/glib-2.8.4/01-giowin32.patch	2006-01-04 21:52:53 UTC (rev 107)
+++ trunk/patches/glib-2.8.4/01-giowin32.patch	2006-01-04 22:33:25 UTC (rev 108)
@@ -78,7 +78,7 @@
 +  SetEvent (channel->space_avail_event);
 +  
 +  LOCK (channel->mutex);
-+  while (channel->running)
++  while (channel->running || channel->rdp != channel->wrp)
 +    {
 +      if (channel->debug)
 +	g_print ("write_thread %#x: rdp=%d, wrp=%d\n",
@@ -99,7 +99,7 @@
 +	  WaitForSingleObject (channel->space_avail_event, INFINITE);
 +
 +	  LOCK (channel->mutex);
-+	  if (!channel->running)
++	  if (channel->rdp == channel->wrp)
 +	    break;
 +
 +	  if (channel->debug)