Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16504/src
Modified Files:
file_hack.c
Log Message:
lustre hack code to follow the changes of sysio_fd_set()
Index: file_hack.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/file_hack.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -b -B -p -r1.4 -r1.5
--- file_hack.c 27 Jul 2004 15:00:43 -0000 1.4
+++ file_hack.c 28 Jul 2004 06:39:21 -0000 1.5
@@ -203,24 +203,27 @@ _sysio_fd_shutdown()
#endif
/*
- * Find a free slot in the open files table.
- * target < 0: any free slot
- * target >= 0: get slot [target]
+ * Find a free slot in the open files table which >= @low
+ * low < 0 means any
*/
static int
-find_free_fildes(oftab_t *oftab, int target)
+find_free_fildes(oftab_t *oftab, int low)
{
int n;
int err;
struct file **filp;
- if (target < 0) {
- for (n = 0, filp = oftab->table;
+ if (low < 0)
+ low = oftab->offset;
+
+ n = low - oftab->offset;
+ if (n < 0)
+ return -ENFILE;
+
+ for (filp = oftab->table + n;
n < oftab->size && *filp;
n++, filp++)
;
- } else
- n = target - oftab->offset;
if (n >= oftab->size) {
err = fd_grow(oftab, n);
@@ -230,18 +233,6 @@ find_free_fildes(oftab_t *oftab, int tar
assert(!*filp);
}
-#ifdef HAVE_LUSTRE_HACK
- /* FIXME sometimes we could intercept open/socket to create
- * a fd, but missing close()? currently we have this problem
- * with resolv lib. as a workaround simply destroy the file
- * struct here.
- */
- if (oftab->table[n]) {
- free(oftab->table[n]);
- oftab->table[n] = NULL;
- }
-#endif
-
return oftab->offset + n;
}
@@ -298,35 +289,55 @@ _sysio_fd_close(int fd)
}
/*
- * Associate open file record with given file descriptor or any available
- * file descriptor if less than zero.
+ * Associate open file record with given file descriptor (if forced), or any
+ * available file descriptor if less than zero, or any available descriptor
+ * greater than or equal to the given one if not forced.
*/
int
-_sysio_fd_set(struct file *fil, int fd)
+_sysio_fd_set(struct file *fil, int fd, int force)
{
int err;
struct file *ofil;
oftab_t *oftab;
+ if (force && fd < 0)
+ abort();
+
init_oftab();
oftab = select_oftab(fd);
/*
- * New fd < 0 => any available descriptor.
+ * Search for a free descriptor if needed.
*/
+ if (!force) {
fd = find_free_fildes(oftab, fd);
if (fd < 0)
return fd;
+ }
- assert(fd < oftab->offset + oftab->size);
+ if (fd - oftab->offset >= oftab->size) {
+ err = fd_grow(oftab, fd - oftab->offset);
+ if (err)
+ return err;
+ }
/*
* Remember old.
*/
ofil = __sysio_fd_get(fd, 1);
- if (ofil)
+ if (ofil) {
+ /* FIXME sometimes we could intercept open/socket to create
+ * a fd, but missing close()? currently we have this problem
+ * with resolv lib. as a workaround simply destroy the file
+ * struct here. And this hack will break the behavior of
+ * DUPFD.
+ */
+ if (fd >= 0 && oftab == &_sysio_oftab[0])
+ free(ofil);
+ else
F_RELE(ofil);
+ }
oftab->table[fd - oftab->offset] = fil;
@@ -337,10 +348,12 @@ _sysio_fd_set(struct file *fil, int fd)
* Duplicate old file descriptor.
*
* If the new file descriptor is less than zero, the new file descriptor
- * is chosen freely.
+ * is chosen freely. Otherwise, choose an available descriptor greater
+ * than or equal to the new, if not forced. Otherwise, if forced, (re)use
+ * the new.
*/
int
-_sysio_fd_dup2(int oldfd, int newfd)
+_sysio_fd_dup(int oldfd, int newfd, int force)
{
struct file *fil;
int fd;
@@ -358,7 +371,7 @@ _sysio_fd_dup2(int oldfd, int newfd)
if (select_oftab(oldfd) != select_oftab(newfd))
return -EINVAL;
- fd = _sysio_fd_set(fil, newfd);
+ fd = _sysio_fd_set(fil, newfd, force);
if (fd >= 0)
F_REF(fil);
return fd;
|
