Patch provided by Sylvain Le Gall:

- Fix #4894: Windows (mingw): Unix.select and non-blocking sockets,
  add a filedescr.flags_fd in win32unix/unixsupport.h. It contains the
  non-blocking status of the associated filedescr and helps to restore
  this status after a select.
- Fix #4789: Windows: Unix.select failing with EPIPE error,
  Apply patch provided by J. Vouillon
- Fix #4973: Failure "Unknown handle",
  Be consistent between Windows and Linux, raise an EBADF Unix_error
  for a closed pipe handle.
- Fix #4844: Unix.select bug (triggered if linked against threads),
  Apply patch by C. Bauer, replace lpOrig by lpOrigIdx which can survive
  a GC collection

For otherlibs/win32unix/{select|windbug}.c:
- Remove Heap* fucntions to allocate/free memory and replace it by
  caml_stat_* function, which are more OCaml compliant
- Rework DBUG message, use DEBUG_PRINT rather than #ifdef DBUG... #endif
  and use DEBUG variable (more OCaml compliant), also remove dbug_init
  functions and use a static variable to replace it (subject to race
  condition but this not really important, because every path lead to
  same initialization)
- Use a fast start scheme for pipe polling, rather than always waiting
  10ms, start by 1, 2, 4, 8 and then 10ms. The 4 first times give select
  a chance to a fast answer.



git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10467 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 12 insertions, 12 deletions

diff --git a/otherlibs/win32unix/windbug.c b/otherlibs/win32unix/windbug.c
index 5bf494e70..e3a2772db 100644
--- a/otherlibs/win32unix/windbug.c
+++ b/otherlibs/win32unix/windbug.c
@@ -13,20 +13,20 @@
 
 /* $Id$ */
 
-#include <windows.h>
+#include "windbug.h"
 
-int dbug = 0;
-
-void dbug_init (void)
+int debug_test (void)
 {
-  dbug = (getenv("OCAMLDBUG") != NULL);
-}
+  static int debug_init = 0;
+  static int debug = 0;
 
-void dbug_cleanup (void)
-{
-}
+#ifdef DEBUG
+  if (!debug_init)
+  {
+    debug = (getenv("OCAMLDEBUG") != NULL);
+    debug_init = 1;
+  };
+#endif 
 
-int dbug_test (void)
-{
-  return dbug;
+  return debug;
 }