* cygtls.h (_threadinfo::call): Remove regparm declaration to work around

[pf3gnuchains/sourceware.git] / winsup / cygwin / dtable.h

diff --git a/winsup/cygwin/dtable.h b/winsup/cygwin/dtable.h
index 0223af7..573467d 100644 (file)
--- a/winsup/cygwin/dtable.h
+++ b/winsup/cygwin/dtable.h
@@ -1,6 +1,6 @@
 /* dtable.h: fd table definition.
 
-   Copyright 2000, 2001 Red Hat, Inc.
+   Copyright 2000, 2001, 2003 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -12,34 +12,39 @@ details. */
 #define NOFILE_INCR    32
 
 #include "thread.h"
+#include "sync.h"
 
 class suffix_info;
+class fhandler_fifo;
+
+#define BFH_OPTS (PC_NULLEMPTY | PC_FULL | PC_POSIX)
 class dtable
 {
+  muto *lock_cs;
   fhandler_base **fds;
   fhandler_base **fds_on_hold;
+  fhandler_base **archetypes;
+  unsigned narchetypes;
+  unsigned farchetype;
+  static const int initial_archetype_size = 8;
   int first_fd_for_open;
   int cnt_need_fixup_before;
-  int console_fds;
+  void lock () {lock_cs->acquire ();}
+  void unlock () {lock_cs->release ();}
+  void init_lock ();
 public:
   size_t size;
 
-  dtable () : first_fd_for_open(3), cnt_need_fixup_before(0), console_fds(0) {}
+  dtable () : archetypes (NULL), narchetypes (0), farchetype (0), first_fd_for_open(3), cnt_need_fixup_before(0) {}
   void init () {first_fd_for_open = 3;}
 
   void dec_need_fixup_before ()
     { if (cnt_need_fixup_before > 0) --cnt_need_fixup_before; }
   void inc_need_fixup_before ()
     { cnt_need_fixup_before++; }
-  BOOL need_fixup_before ()
+  bool need_fixup_before ()
     { return cnt_need_fixup_before > 0; }
 
-  void dec_console_fds ();
-  void inc_console_fds ()
-    { console_fds++; }
-  BOOL has_console_fds ()
-    { return console_fds > 0; }
-
   int vfork_child_dup ();
   void vfork_parent_restore ();
   void vfork_child_fixup ();
@@ -48,21 +53,11 @@ public:
   void fixup_before_exec (DWORD win_proc_id);
   void fixup_before_fork (DWORD win_proc_id);
   void fixup_after_fork (HANDLE);
-  fhandler_base *build_fhandler (int fd, DWORD dev, const char *unix_name,
-                                const char *win32_name = NULL, int unit = -1);
-  fhandler_base *build_fhandler (int fd, DWORD dev, char *unix_name = NULL,
-                                const char *win32_name = NULL, int unit = -1);
-  fhandler_base *build_fhandler_from_name (int fd, const char *name, HANDLE h,
-                                          path_conv& pc,
-                                          unsigned opts = PC_SYM_FOLLOW,
-                                          suffix_info *si = NULL);
   inline int not_open (int fd)
   {
-    SetResourceLock (LOCK_FD_LIST, READ_LOCK, "not_open");
-
+    lock ();
     int res = fd < 0 || fd >= (int) size || fds[fd] == NULL;
-
-    ReleaseResourceLock (LOCK_FD_LIST, READ_LOCK, "not open");
+    unlock ();
     return res;
   }
   int find_unused_handle (int start);
@@ -71,7 +66,7 @@ public:
   void init_std_file_from_handle (int fd, HANDLE handle);
   int dup2 (int oldfd, int newfd);
   void fixup_after_exec (HANDLE);
-  inline fhandler_base *operator [](int fd) const { return fds[fd]; }
+  inline fhandler_base *&operator [](int fd) const { return fds[fd]; }
   select_record *select_read (int fd, select_record *s);
   select_record *select_write (int fd, select_record *s);
   select_record *select_except (int fd, select_record *s);
@@ -79,8 +74,22 @@ public:
   void stdio_init ();
   void get_debugger_info ();
   void set_file_pointers_for_exec ();
+  bool in_vfork_cleanup () {return fds_on_hold == fds;}
+  fhandler_fifo *find_fifo (ATOM);
+  fhandler_base *find_archetype (device& dev);
+  fhandler_base **add_archetype ();
+  void delete_archetype (fhandler_base *);
+  friend void dtable_init ();
+  friend void __stdcall close_all_files ();
+  friend class cygheap_fdmanip;
+  friend class cygheap_fdget;
+  friend class cygheap_fdnew;
 };
 
+fhandler_base *build_fh_dev (const device&, const char * = NULL);
+fhandler_base *build_fh_name (const char *unix_name, HANDLE = NULL, unsigned = 0, suffix_info * = NULL);
+fhandler_base *build_fh_pc (path_conv& pc);
+
 void dtable_init (void);
 void stdio_init (void);
 extern dtable fdtab;