Changeset 1368

Timestamp:

Apr 15, 2004, 12:54:39 AM (21 years ago)

Author:

bird

Message:

#1023: libc_FHMoreHandles(). Wrote away the _file2 part of streams.

Location:

trunk/src/emx/include

Files:

• emx/io.h (modified) (6 diffs, 1 prop)
• stdio.h (modified) (2 diffs, 1 prop)

trunk/src/emx/include/emx/io.h

@@ -131 +131 @@
 #define _IOWIDE     0x00010000
 
+/** This bit is set for standard streams which should not be closed by _fcloseall(). */
+#define _IONOCLOSEALL   0x00020000
+
 
 #define _FLUSH_FLUSH  (-1)
 #define _FLUSH_FILL   (-2)
-
-struct _FILE;
-
-struct _file2
-{
-  struct _FILE *owner;
-#if defined (_SYS_RMUTEX_H)
-  _rmutex rsem;
-#else
-  char rsem_ersatz[16];
-#endif
-};
 
 #define nbuf(s) (((s)->_flags & _IOBUFMASK) == _IOBUFNONE)
@@ -163 +154 @@
 struct streamvec
 {
-  struct _FILE *vec;
-  struct streamvec *next;
-  int n;
+    /** Number of free entries in the vector. */
+    int               cFree;
+    /** Pointer to the previous node in the list. */
+    struct streamvec *pPrev;
+    /** Array of file stream structure. */
+    struct _FILE     *aFiles;
+    /** Pointer to the next entry in the list */
+    struct streamvec *pNext;
+    /** Number of entries in the vector. */
+    int               cFiles;
 };
 
@@ -177 +175 @@
 
 extern struct streamvec    *_streamvec_head;
+extern struct streamvec    *_streamvec_tail;
 extern int                  _io_ninherit;
 extern struct fdvec         _fdvec_head;
@@ -195 +194 @@
 
 #define STREAM_LOCK(f) \
-  (_rmutex_request (&(f)->_more->rsem, _FMR_IGNINT) != 0 \
+  (_rmutex_request (&(f)->__u.__rsem, _FMR_IGNINT) != 0 \
    ? abort () : (void)0)
 
 #define STREAM_UNLOCK(f) \
-  (_rmutex_release (&(f)->_more->rsem) != 0 ? abort () : (void)0)
+  (_rmutex_release (&(f)->__u.__rsem) != 0 ? abort () : (void)0)
 
 #define STREAM_LOCK_NOWAIT(f) \
-  (_rmutex_request (&(f)->_more->rsem, _FMR_NOWAIT) == 0)
-
-#define STREAM_UNLOCKED(f) _rmutex_available (&(f)->_more->rsem)
+  (_rmutex_request (&(f)->__u.__rsem, _FMR_NOWAIT) == 0)
+
+#define STREAM_UNLOCKED(f) _rmutex_available (&(f)->__u.__rsem)
 
 #endif /* defined (_SYS_RMUTEX_H) */
@@ -330 +329 @@
 
 int     __libc_FHEnsureHandles(int fh);
+int     __libc_FHMoreHandles(void);
 int     __libc_FHAllocate(int fh, unsigned fFlags, int cb, PLIBCFHOPS pOps, PLIBCFH *ppFH, int *pfh);
 int     __libc_FHClose(int fh);
@@ -351 +351 @@
 struct _FILE *_newstream (void);
 int _output (struct _FILE *, __const__ char *, char *);
-void _setdummymore (struct _FILE *, struct _file2 *);
-int _setmore (struct _FILE *, int);
 int _stream_read (int, void *, size_t);
 int _stream_write (int, __const__ void *, size_t);

trunk/src/emx/include/stdio.h

@@ -180 +180 @@
 typedef struct _FILE
 {
-  char * _ptr;
-  char * _buffer;
-  int    _rcount;
-  int    _wcount;
-  int    _handle;
-  int    _flags;
-  int    _buf_size;
-  int    _tmpidx;
-  int    _pid;
-  char   _char_buf;
-  unsigned char _ungetc_count;
-  short  _mbstate;
-  int    (*_flush)(struct _FILE *, int);
-  struct _file2 *_more;
+    char * _ptr;
+    char * _buffer;
+    int    _rcount;
+    int    _wcount;
+    int    _handle;
+    int    _flags;
+    int    _buf_size;
+    int    _tmpidx;
+    int    _pid;
+    char   _char_buf;
+    unsigned char _ungetc_count;
+    short  _mbstate;
+    int    (*_flush)(struct _FILE *, int);
+
+    /** The Mutex Semaphore. */
+    union
+    {
+#if defined (_SYS_RMUTEX_H)
+        _rmutex   __rsem;
+#endif
+        char      __rsem_ersatz[16];
+    } __u;
+    /** Pointer to the stream vector which thie FILE belongs to.
+     * This member is the first which should not be zeroed by _newstream()! */
+    void    *__pSV;
 } FILE;
 
@@ -538 +549 @@
 
 int _fcloseall (void);
-FILE *_fassign (FILE *, FILE *);
 FILE *_fdopen (int, __const__ char *);
 int _fgetchar (void);