libsysio-commit Mailing List for libsysio (Page 35)
Brought to you by:
lward
Menu
▾
▴
libsysio-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(25) |
May
(28) |
Jun
(25) |
Jul
(30) |
Aug
(60) |
Sep
(52) |
Oct
(100) |
Nov
(15) |
Dec
(34) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(89) |
Feb
(48) |
Mar
(22) |
Apr
(59) |
May
(16) |
Jun
(15) |
Jul
(50) |
Aug
(26) |
Sep
(40) |
Oct
(27) |
Nov
(12) |
Dec
|
| 2005 |
Jan
(24) |
Feb
(11) |
Mar
|
Apr
|
May
(3) |
Jun
(6) |
Jul
|
Aug
(14) |
Sep
(21) |
Oct
(10) |
Nov
|
Dec
|
| 2006 |
Jan
(8) |
Feb
(5) |
Mar
(2) |
Apr
(6) |
May
(11) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(3) |
| 2007 |
Jan
(3) |
Feb
(5) |
Mar
(20) |
Apr
(41) |
May
(21) |
Jun
(3) |
Jul
(5) |
Aug
(12) |
Sep
(21) |
Oct
(5) |
Nov
(16) |
Dec
|
| 2008 |
Jan
|
Feb
(2) |
Mar
(4) |
Apr
(23) |
May
|
Jun
(22) |
Jul
(13) |
Aug
|
Sep
|
Oct
(9) |
Nov
(3) |
Dec
(13) |
| 2009 |
Jan
(14) |
Feb
(10) |
Mar
(2) |
Apr
(11) |
May
(7) |
Jun
(1) |
Jul
(1) |
Aug
(36) |
Sep
(12) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|
From: Lee W. <lw...@us...> - 2004-01-21 14:44:56
|
Update of /cvsroot/libsysio/libsysio/drivers/sockets
In directory sc8-pr-cvs1:/tmp/cvs-serv23555/drivers/sockets
Added Files:
module.mk sockets.c
Log Message:
A roll-up patch from CFS (Eric Mei <er...@cl...>)
- intent.diff
small changes on intent related behavior. I simply follow the lustre
kernel code here.
- open() need to pass down param 'flags'.
- 'setattr' related syscalls, like chown/chmod/utime/..., don't need
intent during path resolution.
- sockets.diff
your socket driver.
- nativefs.diff
only add fcntl code into native driver. not sure whether it's
complete, but ok for current testing.
- trace.diff
this patch add SYSIO_ENTER/SYSIO_LEAVE macros.
|
|
From: Ruth K. <rk...@us...> - 2004-01-15 20:27:44
|
Update of /cvsroot/libsysio/libsysio/drivers/yod In directory sc8-pr-cvs1:/tmp/cvs-serv9456 Modified Files: fs_yod.c Log Message: symlink args order on yod driver was wrong Index: fs_yod.c =================================================================== RCS file: /cvsroot/libsysio/libsysio/drivers/yod/fs_yod.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -b -B -p -r1.9 -r1.10 --- fs_yod.c 12 Jan 2004 18:09:44 -0000 1.9 +++ fs_yod.c 15 Jan 2004 20:27:40 -0000 1.10 @@ -808,7 +808,7 @@ yod_inop_symlink(struct pnode *pno, cons if (!path) return -ENOMEM; - err = symlink_yod(path, data); + err = symlink_yod(data, path); free(path); return err; } |
|
From: Lee W. <lw...@us...> - 2004-01-13 17:18:09
|
Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv31782
Modified Files:
Tag: strided-io
ioctx.c
Log Message:
-Made aioq static instead of globally visible
-Drop a reference to the inode in _sysio_complete -- Fast or not.
-Realized we have no need for a global aio queue. Ifdef'd it all out.
Index: ioctx.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/ioctx.c,v
retrieving revision 1.6
retrieving revision 1.6.6.1
diff -u -w -b -B -p -r1.6 -r1.6.6.1
--- ioctx.c 17 Oct 2003 21:30:29 -0000 1.6
+++ ioctx.c 13 Jan 2004 17:18:03 -0000 1.6.6.1
@@ -56,11 +56,13 @@
* Asynchronous IO context support.
*/
+#if 0
/*
* List of all outstanding (in-flight) asynch IO requests tracked
* by the system.
*/
-LIST_HEAD( ,ioctx) aioq;
+static LIST_HEAD( ,ioctx) aioq;
+#endif
/*
* Initialization. Must be called before using any other routine in this
@@ -70,7 +72,9 @@ int
_sysio_ioctx_init()
{
+#if 0
LIST_INIT(&aioq);
+#endif
return 0;
}
@@ -104,10 +108,12 @@ _sysio_ioctx_new(struct inode *ino,
iovlen,
offset);
+#if 0
/*
* Link request onto the outstanding requests queue.
*/
LIST_INSERT_HEAD(&aioq, ioctx, ioctx_link);
+#endif
return ioctx;
}
@@ -133,7 +139,9 @@ _sysio_ioctx_cb(struct ioctx *ioctx,
entry->iocb_f = f;
entry->iocb_data = data;
+#if 0
TAILQ_INSERT_TAIL(&ioctx->ioctx_cbq, entry, iocb_next);
+#endif
return 0;
}
@@ -209,14 +217,17 @@ _sysio_ioctx_complete(struct ioctx *ioct
free(entry);
}
- if (ioctx->ioctx_fast)
- return;
-
+#if 0
/*
* Unlink from the file record's outstanding request queue.
*/
LIST_REMOVE(ioctx, ioctx_link);
+#endif
I_RELE(ioctx->ioctx_ino);
+
+ if (ioctx->ioctx_fast)
+ return;
+
free(ioctx);
}
|
|
From: Ruth K. <rk...@us...> - 2004-01-12 23:02:15
|
Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv18100
Modified Files:
namei.c
Log Message:
Fortran libs prepend cwd to path, if first char is not '/', so
remove everything up to the first ':' to get rid of Cplant prefix
Index: namei.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/namei.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -b -B -p -r1.8 -r1.9
--- namei.c 28 Oct 2003 20:59:39 -0000 1.8
+++ namei.c 12 Jan 2004 23:02:08 -0000 1.9
@@ -435,28 +435,12 @@ _sysio_path_walk(struct pnode *parent, s
}
#ifdef CPLANT_YOD
-static const char *
-strip_prefix(const char *path)
-{
-
/*
* for backward compatibility w/protocol switch
- * remove 'prefix:' iff first ':' immediately
- * precedes first '/'
+ * remove everything up to the first ':'
+ * fortran libs prepend cwd to path, so not much choice
*/
-
- char *colon, *slash;
-
- colon = strchr(path, ':');
- slash = strchr(path, '/');
-
- if (slash == colon + 1)
- return(slash);
- else
- return(path);
-
-}
-#define STRIP_PREFIX(p) strip_prefix(p)
+#define STRIP_PREFIX(p) strchr(p,':') ? strchr(p,':')+1 : p
#else
#define STRIP_PREFIX(p) p
#endif
|
|
From: Ruth K. <rk...@us...> - 2004-01-12 18:10:35
|
Update of /cvsroot/libsysio/libsysio
In directory sc8-pr-cvs1:/tmp/cvs-serv5172
Modified Files:
configure.in
Log Message:
tweak for compatibility with alpha RH6 env
Index: configure.in
===================================================================
RCS file: /cvsroot/libsysio/libsysio/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -b -B -p -r1.12 -r1.13
--- configure.in 16 Dec 2003 15:43:14 -0000 1.12
+++ configure.in 12 Jan 2004 18:10:32 -0000 1.13
@@ -32,7 +32,7 @@ AC_ARG_WITH(lib-dir,
esac;],
[ LIBBUILD_DIR=`pwd`/lib;
test -d ${LIBBUILD_DIR} || mkdir ${LIBBUILD_DIR} || have_lib_dir=no;])
-if test x${have_lib_dir} == xyes; then
+if test x${have_lib_dir} = xyes; then
echo "Using sysio library directory ${LIBBUILD_DIR}"
else
AC_MSG_ERROR(Need writeable path to sysio library directory ${LIBBUILD_DIR})
@@ -224,7 +224,7 @@ fi
# Check for fdatasync syscall
#
AC_MSG_CHECKING(for fdatasync system call)
-if test x$alpha_linux_env == xyes; then
+if test x$alpha_linux_env = xyes; then
_syscallnum=SYS_osf_fdatasync
else
_syscallnum=SYS_fdatasync
|
|
From: Ruth K. <rk...@us...> - 2004-01-12 18:09:49
|
Update of /cvsroot/libsysio/libsysio/drivers/yod
In directory sc8-pr-cvs1:/tmp/cvs-serv4997
Modified Files:
fs_yod.c
Log Message:
add native driver changes to yod driver
Index: fs_yod.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/yod/fs_yod.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -b -B -p -r1.8 -r1.9
--- fs_yod.c 12 Nov 2003 21:51:40 -0000 1.8
+++ fs_yod.c 12 Jan 2004 18:09:44 -0000 1.9
@@ -987,7 +987,11 @@ doio(ssize_t (*f)(int, const struct iove
assert(nino->ni_fd >= 0);
- if (ioctx->ioctx_iovlen && (int )ioctx->ioctx_iovlen < 0)
+ if ((ioctx->ioctx_iovlen && (int )ioctx->ioctx_iovlen < 0) ||
+ !(S_ISREG(ino->i_mode) ||
+ S_ISCHR(ino->i_mode) ||
+ S_ISSOCK(ino->i_mode) ||
+ S_ISFIFO(ino->i_mode)))
return -EINVAL;
/*
@@ -1002,30 +1006,29 @@ doio(ssize_t (*f)(int, const struct iove
* Avoid the reposition call if we're already at the right place.
* Allows us to access pipes and fifos.
*/
- result = nino->ni_fpos;
- if (ioctx->ioctx_offset != nino->ni_fpos &&
- !(S_ISCHR(ino->i_mode) ||
- S_ISSOCK(ino->i_mode) ||
- S_ISFIFO(ino->i_mode)) &&
- (result = lseek_yod(nino->ni_fd,
+ result = ioctx->ioctx_offset;
+ if (ioctx->ioctx_offset != nino->ni_fpos) {
+ result = lseek_yod(nino->ni_fd,
ioctx->ioctx_offset,
- SEEK_SET) == -1)) {
+ SEEK_SET);
+ if (result == -1) {
ioctx->ioctx_cc = -1;
ioctx->ioctx_errno = errno;
- } else {
+ goto out;
+ }
+ nino->ni_fpos = result;
+ }
/*
* Call the appropriate (read/write) IO function to
* transfer the data now.
*/
- nino->ni_fpos = result;
ioctx->ioctx_cc =
(*f)(nino->ni_fd, ioctx->ioctx_iovec, ioctx->ioctx_iovlen);
if (ioctx->ioctx_cc < 0)
ioctx->ioctx_errno = errno;
if (ioctx->ioctx_cc > 0)
nino->ni_fpos += ioctx->ioctx_cc;
- }
-
+out:
ioctx->ioctx_done = 1;
return 0;
}
|
|
From: Ruth K. <rk...@us...> - 2004-01-12 18:07:18
|
Update of /cvsroot/libsysio/libsysio/drivers/native
In directory sc8-pr-cvs1:/tmp/cvs-serv4575
Modified Files:
fs_native.c
Log Message:
remove obsolete macro
Index: fs_native.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/native/fs_native.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -b -B -p -r1.25 -r1.26
--- fs_native.c 22 Oct 2003 15:57:23 -0000 1.25
+++ fs_native.c 12 Jan 2004 18:07:16 -0000 1.26
@@ -137,11 +137,6 @@ do {
(dest)->st_gen = (src)->st_gen; \
} while (0);
-/* SYS_lseek has a different interface on alpha
- */
-#define CALL_LSEEK(fd, off, rc, wh) \
- (rc = syscall(SYS_lseek, fd, off, wh))
-
#else
#define __native_stat intnl_stat
|
|
From: Ruth K. <rk...@us...> - 2004-01-12 18:06:14
|
Update of /cvsroot/libsysio/libsysio/drivers/incore
In directory sc8-pr-cvs1:/tmp/cvs-serv4404
Modified Files:
fs_incore.c
Log Message:
allow FIFO creation
Index: fs_incore.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/incore/fs_incore.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -b -B -p -r1.11 -r1.12
--- fs_incore.c 17 Oct 2003 21:30:29 -0000 1.11
+++ fs_incore.c 12 Jan 2004 18:06:11 -0000 1.12
@@ -1312,7 +1312,7 @@ incore_create(struct pnode *pno, struct
incore_directory_insert(I2IC(dino),
&pno->p_base->pb_name,
st->st_ino,
- INCORE_D_TYPEOF(S_IFREG));
+ INCORE_D_TYPEOF(icino->ici_st.st_mode));
if (err) {
I_RELE(ino);
_sysio_i_gone(ino);
@@ -1625,6 +1625,8 @@ _sysio_incore_dirop_mknod(struct pnode *
m = mode & S_IFMT;
if (S_ISCHR(m))
m &= ~S_IFCHR;
+ else if (S_ISFIFO(m))
+ m &= ~S_IFIFO;
else if (S_ISBLK(m))
m &= ~S_IFCHR;
else
|
|
From: Ruth K. <rk...@us...> - 2004-01-12 18:05:25
|
Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4244
Modified Files:
dev.c inode.c mknod.c
Log Message:
allow FIFO creation
Index: dev.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/dev.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -b -B -p -r1.4 -r1.5
--- dev.c 10 Oct 2003 18:50:31 -0000 1.4
+++ dev.c 12 Jan 2004 18:05:21 -0000 1.5
@@ -158,7 +158,7 @@ _sysio_dev_lookup(mode_t mode, dev_t dev
struct device *devtbl;
dev_t major;
- if (S_ISCHR(mode))
+ if (S_ISCHR(mode) || S_ISFIFO(mode))
devtbl = cdev;
else
return (struct inode_ops *)&_sysio_nodev_ops;
Index: inode.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/inode.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -b -B -p -r1.11 -r1.12
--- inode.c 15 Oct 2003 18:00:57 -0000 1.11
+++ inode.c 12 Jan 2004 18:05:22 -0000 1.12
@@ -217,7 +217,7 @@ _sysio_i_new(struct filesys *fs,
if (!ino)
return NULL;
ino->i_ops = *ops;
- if (S_ISBLK(type) || S_ISCHR(type)) {
+ if (S_ISBLK(type) || S_ISCHR(type) || S_ISFIFO(type)) {
struct inode_ops *o;
/*
Index: mknod.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/mknod.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -b -B -p -r1.4 -r1.5
--- mknod.c 10 Oct 2003 18:50:31 -0000 1.4
+++ mknod.c 12 Jan 2004 18:05:22 -0000 1.5
@@ -81,7 +81,8 @@ __xmknod(int __ver, const char *path, mo
/*
* Support only character-special right now.
*/
- if ((mode & S_IFMT) != S_IFCHR) {
+ if (((mode & S_IFMT) != S_IFIFO) &&
+ ((mode & S_IFMT) != S_IFCHR)) {
err = -EPERM;
goto out;
}
|
|
From: Sonja T. <so...@us...> - 2004-01-12 15:50:12
|
Update of /cvsroot/libsysio/libsysio/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv3742/tests
Modified Files:
Tag: namespace_assembly
test_namespace.c
Log Message:
Removed init command from namespace assembly. Added header file.
Index: test_namespace.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/tests/Attic/test_namespace.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -b -B -p -r1.1.2.1 -r1.1.2.2
--- test_namespace.c 18 Dec 2003 18:44:03 -0000 1.1.2.1
+++ test_namespace.c 12 Jan 2004 15:50:08 -0000 1.1.2.2
@@ -27,7 +27,7 @@ int usage()
*/
char *envname = "NAMESPACE";
-char *cmdseq = "{init,dn=incore}{mnt,dev=incore:\"0777+0+0\",dir=/}{creat,ft=dir,nm=/proc,pm=0777}{creat,ft=dir,nm=/proc/self,pm=0777}{creat,ft=dir,nm=/proc/self/fd,pm=0777}{creat,ft=chr,nm=/proc/self/fd/stdin,pm=0400,mm=0+0}{creat,ft=chr,nm=/proc/self/fd/stdout,pm=0200,mm=0+1}{creat,ft=chr,nm=/proc/self/fd/stderr,pm=0200,mm=0+2}{init,dn=native}{creat,ft=dir,nm=/tmp,pm=0777}{mnt,dev=native:/tmp,dir=/tmp}{creat,ft=file,nm=/tmp/.mount,pm=0777}{put,str=\"native:/home\",src=/tmp/.mount}{chmd,src=/tmp/.mount,pm=0400}";
+char *cmdseq = "{mnt,dev=incore:\"0777+0+0\",dir=/}{creat,ft=dir,nm=/proc,pm=0777}{creat,ft=dir,nm=/proc/self,pm=0777}{creat,ft=dir,nm=/proc/self/fd,pm=0777}{creat,ft=chr,nm=/proc/self/fd/stdin,pm=0400,mm=0+0}{creat,ft=chr,nm=/proc/self/fd/stdout,pm=0200,mm=0+1}{creat,ft=chr,nm=/proc/self/fd/stderr,pm=0200,mm=0+2}{init,dn=native}{creat,ft=dir,nm=/tmp,pm=0777}{mnt,dev=native:/tmp,dir=/tmp}{creat,ft=file,nm=/tmp/.mount,pm=0777}{put,str=\"native:/home\",src=/tmp/.mount}{chmd,src=/tmp/.mount,pm=0400}";
@@ -56,6 +56,19 @@ int main(int argc, char** argv)
exit(1);
}
+ /* Initilize sysio */
+#ifndef CPLANT_YOD
+ if (_sysio_init() != 0) {
+ perror("init sysio");
+ exit(1);
+ }
+ err = drv_init_all();
+ if (err) {
+ perror("init drivers");
+ exit(1);
+ }
+#endif
+
size = strlen(msg)+1;
|
|
From: Sonja T. <so...@us...> - 2004-01-12 15:50:12
|
Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs1:/tmp/cvs-serv3742/include
Added Files:
Tag: namespace_assembly
namespace.h
Log Message:
Removed init command from namespace assembly. Added header file.
--- NEW FILE ---
/*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Questions or comments about this library should be sent to:
*
* Lee Ward
* Sandia National Laboratories, New Mexico
* P.O. Box 5800
* Albuquerque, NM 87185-1110
*
* le...@sa...
*/
/*
* Boot time namespace assembly function
*/
extern int run_cmds(char *buf);
|
|
From: Sonja T. <so...@us...> - 2004-01-12 15:50:12
|
Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv3742/src
Modified Files:
Tag: namespace_assembly
command.c parser.c
Log Message:
Removed init command from namespace assembly. Added header file.
Index: command.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/Attic/command.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -b -B -p -r1.1.2.1 -r1.1.2.2
--- command.c 18 Dec 2003 18:44:02 -0000 1.1.2.1
+++ command.c 12 Jan 2004 15:50:08 -0000 1.1.2.2
@@ -12,13 +12,6 @@
#define MAXDRIVERSIZE 100 /* Maximum size for a driver name */
-/*
- * REVISIT:
- * There should probably be some form of #define around this..
- */
-#include "../drivers/native/fs_native.h"
-#include "../drivers/incore/fs_incore.h"
-
#define SYSIO_MKDEV(major, minor) \
((((major) & 0xff) << 8) | ((minor) & 0xff))
@@ -64,43 +57,6 @@ static char *get_arg(char *arg, char** p
return NULL;
}
-struct init_function_t {
- char *driverName;
- int (*initFunc)();
-};
-
-struct init_function_t init_funcs[] = {
- {"native", _sysio_native_init},
- {"incore", _sysio_incore_init},
-#ifdef CPLANT_YOD
- {"yod", _sysio_yod_init},
-#endif
- {NULL, NULL}
-};
-
-int do_init(struct arg_list *args)
-{
- int i;
- char *prefix[] = {"dn", NULL};
- char *driverName;
-
- /* Must be exactly one argument */
- if ((args == NULL) || (args->next != NULL)) {
- return EINVAL;
- }
-
- /* Extract the driver from the argument */
- driverName = get_arg(args->arg, prefix, NULL);
-
- for (i=0; init_funcs[i].driverName != NULL; i++) {
-
- if (strcmp(init_funcs[i].driverName, driverName) == 0)
- return (init_funcs[i].initFunc)();
- }
-
- return EINVAL;
-}
-
static int get_perms(char *perms)
{
int total, i, j, digit;
@@ -445,7 +401,6 @@ int do_chmod(struct arg_list *args) {
}
struct command_function_t cmd_funcs[] = {
- {"init", do_init},
{"creat", do_creat},
{"mnt", do_mnt},
{"cd", do_cd},
Index: parser.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/Attic/parser.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -w -b -B -p -r1.1.2.1 -r1.1.2.2
--- parser.c 18 Dec 2003 18:44:02 -0000 1.1.2.1
+++ parser.c 12 Jan 2004 15:50:08 -0000 1.1.2.2
@@ -237,9 +237,6 @@ int run_cmds(char *buf)
char *cmdStr = buf;
int err;
- /* Initilize sysio first */
- _sysio_init();
-
while (1) {
cmd = (struct command_t *)malloc(sizeof(struct command_t));
|
|
From: Mei <me...@us...> - 2004-01-11 07:29:18
|
Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv17306/src
Modified Files:
Tag: b_lustre
inode.c fcntl.c
Log Message:
remove some old & obsolete code.
Index: inode.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/inode.c,v
retrieving revision 1.7.2.4
retrieving revision 1.7.2.5
diff -u -w -b -B -p -r1.7.2.4 -r1.7.2.5
--- inode.c 1 Nov 2003 03:08:22 -0000 1.7.2.4
+++ inode.c 11 Jan 2004 07:29:14 -0000 1.7.2.5
@@ -278,14 +278,8 @@ void
_sysio_i_gone(struct inode *ino)
{
-#if 0
if (ino->i_ref)
abort();
-#else
- if (ino->i_ref)
- printf("_sysio_i_gone: inode(mode 0%o) still have ref %d\n",
- ino->i_mode, ino->i_ref);
-#endif
if (!ino->i_zombie)
LIST_REMOVE(ino, i_link);
TAILQ_REMOVE(&_sysio_inodes, ino, i_nodes);
Index: fcntl.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v
retrieving revision 1.3.2.14
retrieving revision 1.3.2.15
diff -u -w -b -B -p -r1.3.2.14 -r1.3.2.15
--- fcntl.c 11 Jan 2004 06:43:22 -0000 1.3.2.14
+++ fcntl.c 11 Jan 2004 07:29:15 -0000 1.3.2.15
@@ -47,10 +47,6 @@
#include <fcntl.h>
#include <sys/queue.h>
-#ifndef __CYGWIN__
-#include <syscall.h>
-#endif
-
#include "sysio.h"
#include "inode.h"
#include "file.h"
|
|
From: Mei <me...@us...> - 2004-01-11 06:43:26
|
Update of /cvsroot/libsysio/libsysio/drivers/sockets
In directory sc8-pr-cvs1:/tmp/cvs-serv11587/drivers/sockets
Modified Files:
Tag: b_lustre
sockets.c
Log Message:
remove the obsolete fcntl hack.
Index: sockets.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/sockets/Attic/sockets.c,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -w -b -B -p -r1.1.2.5 -r1.1.2.6
--- sockets.c 15 Dec 2003 08:25:43 -0000 1.1.2.5
+++ sockets.c 11 Jan 2004 06:43:22 -0000 1.1.2.6
@@ -239,9 +239,29 @@ sockets_inop_fcntl(struct inode *ino __I
int cmd __IS_UNUSED,
va_list ap __IS_UNUSED)
{
+ long arg;
+
assert(I2SKI(ino)->ski_fd >= 0);
- return _sysio_fcntl_common(I2SKI(ino)->ski_fd, cmd, ap);
+ switch (cmd) {
+ case F_GETFD:
+ case F_GETFL:
+ case F_GETOWN:
+ return syscall(SYS_fcntl, I2SKI(ino)->ski_fd, cmd);
+ case F_DUPFD:
+ case F_SETFD:
+ case F_SETFL:
+ case F_GETLK:
+ case F_SETLK:
+ case F_SETLKW:
+ case F_SETOWN:
+ arg = va_arg(ap, long);
+ return syscall(SYS_fcntl, I2SKI(ino)->ski_fd, cmd, arg);
+ default:
+ printf("uncatched cmd %d\n", cmd);
+ abort();
+ }
+ return -1;
}
static int
|
|
From: Mei <me...@us...> - 2004-01-11 06:43:26
|
Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs1:/tmp/cvs-serv11587/include
Modified Files:
Tag: b_lustre
file.h
Log Message:
remove the obsolete fcntl hack.
Index: file.h
===================================================================
RCS file: /cvsroot/libsysio/libsysio/include/file.h,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -u -w -b -B -p -r1.5.4.2 -r1.5.4.3
--- file.h 1 Nov 2003 03:38:27 -0000 1.5.4.2
+++ file.h 11 Jan 2004 06:43:22 -0000 1.5.4.3
@@ -98,4 +98,3 @@ extern struct file *_sysio_fd_find(int f
extern int _sysio_fd_set(struct file *fil, int fd);
extern int _sysio_fd_dup2(int oldfd, int newfd);
extern int _sysio_fd_close_all(void);
-extern int _sysio_fcntl_common(int fd, int cmd, va_list ap);
|
|
From: Mei <me...@us...> - 2004-01-11 06:43:25
|
Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv11587/src
Modified Files:
Tag: b_lustre
fcntl.c
Log Message:
remove the obsolete fcntl hack.
Index: fcntl.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/src/fcntl.c,v
retrieving revision 1.3.2.13
retrieving revision 1.3.2.14
diff -u -w -b -B -p -r1.3.2.13 -r1.3.2.14
--- fcntl.c 22 Dec 2003 02:33:48 -0000 1.3.2.13
+++ fcntl.c 11 Jan 2004 06:43:22 -0000 1.3.2.14
@@ -57,31 +57,6 @@
#include "sysio-symbols.h"
-int _sysio_fcntl_common(int fd, int cmd, va_list ap)
-{
- int err;
- long arg;
-
- switch (cmd) {
- case F_GETFD:
- case F_GETFL:
- case F_GETOWN:
- return syscall(SYS_fcntl, fd, cmd);
- case F_DUPFD:
- case F_SETFD:
- case F_SETFL:
- case F_GETLK:
- case F_SETLK:
- case F_SETLKW:
- case F_SETOWN:
- arg = va_arg(ap, long);
- return syscall(SYS_fcntl, fd, cmd, arg);
- }
-
- printf("sysio: unrecongnized fcntl cmd %d on fd %d\n", cmd, fd);
- return -ENOSYS;
-}
-
int
fcntl(int fd, int cmd, ...)
{
@@ -93,11 +68,8 @@ fcntl(int fd, int cmd, ...)
err = 0;
fil = _sysio_fd_find(fd);
if (!fil) {
- va_start(ap, cmd);
- err = _sysio_fcntl_common(fd, cmd, ap);
- va_end(ap);
- SYSIO_LEAVE;
- return err;
+ err = -EBADF;
+ goto out;
}
switch (cmd) {
|
|
From: Mei <me...@us...> - 2004-01-11 05:55:57
|
Update of /cvsroot/libsysio/libsysio/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/tests
Modified Files:
Tag: b_lustre
Makefile.am
Added Files:
Tag: b_lustre
module.mk
Log Message:
merge HEAD to b_lustre
--- NEW FILE ---
TESTS_EXTRA = $(shell ls tests/*.[ch] tests/*.sh tests/*.p[lm]) \
tests/Makefile.am tests/Makefile.in tests/module.mk
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/tests/Makefile.am,v
retrieving revision 1.8.4.3
retrieving revision 1.8.4.4
diff -u -w -b -B -p -r1.8.4.3 -r1.8.4.4
--- Makefile.am 1 Nov 2003 03:08:23 -0000 1.8.4.3
+++ Makefile.am 11 Jan 2004 05:55:53 -0000 1.8.4.4
@@ -6,37 +6,30 @@ CLEANFILES=drv_data.c
if WITH_NATIVE_DRIVER
NATIVE_DRIVER_NAME=native
NATIVE_DRIVER_CFLAGS= -I$(top_srcdir)/drivers/native
-NATIVE_DRIVER_LIB= $(top_builddir)/drivers/native/libsysio_native.a
else
NATIVE_DRIVER_NAME=native
NATIVE_DRIVER_CFLAGS=
-NATIVE_DRIVER_LIB=
endif
if WITH_INCORE_DRIVER
INCORE_DRIVER_NAME=incore
INCORE_DRIVER_CFLAGS= -I$(top_srcdir)/drivers/incore
-INCORE_DRIVER_LIB= $(top_builddir)/drivers/incore/libsysio_incore.a
else
INCORE_DRIVER_NAME=incore
INCORE_DRIVER_CFLAGS=
-INCORE_DRIVER_LIB=
endif
if WITH_STDFD_DEV
STDFD_DEV_NAME=stdfd
STDFD_DEV_CFLAGS= -I$(top_srcdir)/dev/stdfd
-STDFD_DEV_LIB= $(top_builddir)/dev/stdfd/libsysio_stdfd.a
else
STDFD_DEV_NAME=stdfd
STDFD_DEV_CFLAGS=
-STDFD_DEV_LIB=
endif
if WITH_CPLANT_YOD
YOD_DRIVER_NAME=yod
YOD_DRIVER_CFLAGS= -DCPLANT_YOD
-YOD_DRIVER_LIB=$(top_builddir)/drivers/yod/libsysio_yod.a
else
YOD_DRIVER_NAME=
YOD_DRIVER_CFLAGS=
@@ -67,10 +60,7 @@ CFL=$(AM_CFLAGS) $(AM_CPPFLAGS) \
$(NATIVE_DRIVER_CFLAGS) $(INCORE_DRIVER_CFLAGS) \
$(STDFD_DEV_CFLAGS) $(YOD_DRIVER_CFLAGS)
-LIBS=$(NATIVE_DRIVER_LIB) $(INCORE_DRIVER_LIB) \
- $(STDFD_DEV_LIB) $(YOD_DRIVER_LIB) \
- $(SOCKETS_DRIVER_LIB) \
- $(top_builddir)/src/libsysio.a
+LIBS=$(LIBBUILD_DIR)/libsysio.a
test_copy_SOURCES=test_copy.c $(CMNSRC)
test_copy_CFLAGS=$(CFL)
@@ -127,10 +117,9 @@ test_driver_CFLAGS=$(CFL)
test_driver_LDADD=$(LIBS)
test_driver_DEPENDENCIES=$(LIBS)
-EXTRA_DIST=$(shell ls *.pl *.pm) gendrvdata.sh test.h test_driver.h
-
drv_data.c: $(CONFIG_DEPENDENCIES) $(top_srcdir)/tests/gendrvdata.sh
test -z "drv_data.c" && rm -f drv_data.c; \
$(SHELL) $(top_srcdir)/tests/gendrvdata.sh $(DRIVERS) > drv_data.c
+AM_CFLAGS = -L$(LIBBUILD_DIR)
include $(top_srcdir)/Rules.make
|
|
From: Mei <me...@us...> - 2004-01-11 05:55:57
|
Update of /cvsroot/libsysio/libsysio/drivers/incore
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/drivers/incore
Added Files:
Tag: b_lustre
module.mk
Removed Files:
Tag: b_lustre
Makefile.am
Log Message:
merge HEAD to b_lustre
--- NEW FILE ---
INCORE_SRCS = drivers/incore/fs_incore.c
INCORE_EXTRA = drivers/incore/fs_incore.h drivers/incore/module.mk
--- Makefile.am DELETED ---
|
|
From: Mei <me...@us...> - 2004-01-11 05:55:57
|
Update of /cvsroot/libsysio/libsysio/drivers/native
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/drivers/native
Added Files:
Tag: b_lustre
module.mk
Removed Files:
Tag: b_lustre
Makefile.am
Log Message:
merge HEAD to b_lustre
--- NEW FILE ---
NATIVE_SRCS = drivers/native/fs_native.c
NATIVE_EXTRA = drivers/native/fs_native.h drivers/native/module.mk
--- Makefile.am DELETED ---
|
|
From: Mei <me...@us...> - 2004-01-11 05:55:57
|
Update of /cvsroot/libsysio/libsysio/drivers/sockets
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/drivers/sockets
Added Files:
Tag: b_lustre
module.mk
Removed Files:
Tag: b_lustre
Makefile.am
Log Message:
merge HEAD to b_lustre
--- NEW FILE ---
SOCKETS_SRCS = drivers/sockets/sockets.c
SOCKETS_EXTRA = drivers/sockets/module.mk
--- Makefile.am DELETED ---
|
|
From: Mei <me...@us...> - 2004-01-11 05:55:57
|
Update of /cvsroot/libsysio/libsysio/src
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/src
Added Files:
Tag: b_lustre
module.mk
Removed Files:
Tag: b_lustre
Makefile.am
Log Message:
merge HEAD to b_lustre
--- NEW FILE ---
SRCDIR_SRCS = src/access.c src/chdir.c src/chmod.c \
src/chown.c src/dev.c src/dup.c src/fcntl.c \
src/file.c src/fs.c src/fsync.c \
src/getdirentries.c src/init.c src/inode.c \
src/ioctl.c src/ioctx.c src/iowait.c \
src/link.c src/lseek.c src/mkdir.c \
src/mknod.c src/mount.c src/namei.c \
src/open.c src/read.c src/rename.c \
src/rmdir.c src/stat64.c src/stat.c \
src/statvfs64.c src/statvfs.c src/symlink.c \
src/truncate.c src/unlink.c src/utime.c \
src/write.c src/stdlib.c
SRCDIR_EXTRA = src/module.mk
--- Makefile.am DELETED ---
|
|
From: Mei <me...@us...> - 2004-01-11 05:55:57
|
Update of /cvsroot/libsysio/libsysio/drivers/yod
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/drivers/yod
Modified Files:
Tag: b_lustre
fs_yod.c
Added Files:
Tag: b_lustre
module.mk
Removed Files:
Tag: b_lustre
Makefile.am
Log Message:
merge HEAD to b_lustre
--- NEW FILE ---
if WITH_CPLANT_YOD
YOD_SRCS = drivers/yod/fs_yod.c
YOD_DRIVER_FLAGS = -DCPLANT_YOD
else
YOD_SRCS =
YOD_DRIVER_FLAGS =
endif
# Bring yod files along in the distribution regardless
YOD_EXTRA = include/cplant-yod.h drivers/yod/fs_yod.h drivers/yod/module.mk
Index: fs_yod.c
===================================================================
RCS file: /cvsroot/libsysio/libsysio/drivers/yod/fs_yod.c,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -w -b -B -p -r1.2.2.2 -r1.2.2.3
--- fs_yod.c 1 Nov 2003 03:08:22 -0000 1.2.2.2
+++ fs_yod.c 11 Jan 2004 05:55:53 -0000 1.2.2.3
@@ -904,12 +904,14 @@ yod_inop_close(struct inode *ino)
if (nino->ni_fd < 0)
abort();
- err = close_yod(nino->ni_fd);
- if (err)
- return -errno;
assert(nino->ni_nopens);
if (--nino->ni_nopens)
return 0;
+
+ err = close_yod(nino->ni_fd);
+ if (err)
+ return -errno;
+
nino->ni_fd = -1;
nino->ni_fpos = 0;
return 0;
--- Makefile.am DELETED ---
|
|
From: Mei <me...@us...> - 2004-01-11 05:55:57
|
Update of /cvsroot/libsysio/libsysio/drivers
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/drivers
Removed Files:
Tag: b_lustre
Makefile.am
Log Message:
merge HEAD to b_lustre
--- Makefile.am DELETED ---
|
|
From: Mei <me...@us...> - 2004-01-11 05:55:57
|
Update of /cvsroot/libsysio/libsysio/include
In directory sc8-pr-cvs1:/tmp/cvs-serv5899/include
Added Files:
Tag: b_lustre
module.mk
Log Message:
merge HEAD to b_lustre
--- NEW FILE ---
INCLUDE_EXTRA = include/dev.h include/file.h include/fs.h \
include/inode.h include/mount.h include/sysio.h \
include/sysio-symbols.h include/cplant-yod.h include/module.mk
|
|
From: Mei <me...@us...> - 2004-01-11 05:55:57
|
Update of /cvsroot/libsysio/libsysio
In directory sc8-pr-cvs1:/tmp/cvs-serv5899
Modified Files:
Tag: b_lustre
Makefile.am configure.in
Log Message:
merge HEAD to b_lustre
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libsysio/libsysio/Makefile.am,v
retrieving revision 1.7.4.1
retrieving revision 1.7.4.2
diff -u -w -b -B -p -r1.7.4.1 -r1.7.4.2
--- Makefile.am 15 Aug 2003 07:43:14 -0000 1.7.4.1
+++ Makefile.am 11 Jan 2004 05:55:52 -0000 1.7.4.2
@@ -1,34 +1,49 @@
+AUTOMAKE_OPTIONS=1.6
if WITH_TESTS
-TESTS = tests
+TESTDIR = tests
else
-TESTS =
+TESTDIR =
endif
-if WITH_CPLANT_TESTS
-SUBDIRS = $(TESTS)
-else
-if WITH_CPLANT_YOD
-SUBDIRS = src drivers dev
-else
-SUBDIRS = src drivers dev $(TESTS)
-endif
-endif
+include $(top_srcdir)/src/module.mk
+include $(top_srcdir)/include/module.mk
+include $(top_srcdir)/tests/module.mk
+include $(top_srcdir)/dev/stdfd/module.mk
+include $(top_srcdir)/drivers/incore/module.mk
+include $(top_srcdir)/drivers/sockets/module.mk
+include $(top_srcdir)/drivers/native/module.mk
+include $(top_srcdir)/drivers/yod/module.mk
+
+lib_LIBRARIES = ${LIBBUILD_DIR}/libsysio.a
-EXTRA_DIST = Rules.make \
- include/dev.h include/file.h include/fs.h include/inode.h \
- include/mount.h include/sysio.h include/sysio-symbols.h
+__LIBBUILD_DIR__libsysio_a_SOURCES = $(SRCDIR_SRCS) $(STDFD_SRCS) \
+ $(INCORE_SRCS) $(SOCKETS_SRCS) $(NATIVE_SRCS) $(YOD_SRCS)
-really-clean: maintainer-clean
+__LIBBUILD_DIR__libsysio_a_CFLAGS = -fPIC
+
+include $(top_srcdir)/Rules.make
+
+EXTRA_DIST = Rules.make $(TESTS_EXTRA) $(SRCDIR_EXTRA) \
+ $(INCLUDE_EXTRA) $(STDFD_EXTRA) $(INCORE_EXTRA) \
+ $(SOCKETS_EXTRA) $(NATIVE_EXTRA) $(YOD_EXTRA)
+
+AM_CPPFLAGS += ${YOD_DRIVER_FLAGS}
+
+really-clean: testsclean maintainer-clean
-rm -rf autom4te-2.53.cache
-rm -rf .deps
- -rm -f Makefile.in \
- drivers/native/Makefile.in drivers/incore/Makefile.in \
- drivers/yod/Makefile.in \
- drivers/Makefile.in \
- dev/stdfd/Makefile.in \
- dev/Makefile.in \
- src/Makefile.in tests/Makefile.in
+ -rm -f Makefile.in
-rm -f compile depcomp INSTALL install-sh missing mkinstalldirs \
configure aclocal.m4
-rm -f config.guess config.sub
+ -rm -rf $(LIBBUILD_DIR)
+ -rm -f libsysio*.tar.gz
+ cd $(TESTDIR); rm -rf Makefile Makefile.in .deps
+
+tests: $(lib_LIBRARIES) FORCE
+ cd $(TESTDIR); make
+testsclean: FORCE
+ cd $(TESTDIR); make clean
+clean: testsclean clean-am
+FORCE:
Index: configure.in
===================================================================
RCS file: /cvsroot/libsysio/libsysio/configure.in,v
retrieving revision 1.5.4.5
retrieving revision 1.5.4.6
diff -u -w -b -B -p -r1.5.4.5 -r1.5.4.6
--- configure.in 15 Dec 2003 08:32:01 -0000 1.5.4.5
+++ configure.in 11 Jan 2004 05:55:52 -0000 1.5.4.6
@@ -12,7 +12,8 @@ case "$host_os" in
;;
esac
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([subdir-objects])
+AM_PROG_CC_C_O
AC_PROG_CC
AC_PROG_RANLIB
@@ -21,6 +22,25 @@ AC_HEADER_STDC
AC_HEADER_STAT
AC_HEADER_TIME
+have_lib_dir=yes;
+AC_ARG_WITH(lib-dir,
+ AC_HELP_STRING([--with-lib-dir=<sysio lib build directory>],
+ [directory for sysio library]),
+ [ case "${withval}" in
+ "yes"|"no"|"") have_lib_dir=no ;;
+ *) LIBBUILD_DIR=${withval};
+ test -d ${LIBBUILD_DIR} || mkdir ${LIBBUILD_DIR} ||
+ have_lib_dir=no;;
+ esac;],
+ [ LIBBUILD_DIR=`pwd`/lib;
+ test -d ${LIBBUILD_DIR} || mkdir ${LIBBUILD_DIR} || have_lib_dir=no;])
+if test x${have_lib_dir} == xyes; then
+ echo "Using sysio library directory ${LIBBUILD_DIR}"
+else
+ AC_MSG_ERROR(Need writeable path to sysio library directory ${LIBBUILD_DIR})
+fi
+AC_SUBST(LIBBUILD_DIR)
+
AC_ARG_WITH(native_driver,
AC_HELP_STRING([--with-native-driver],[build native test driver]),
[ case "${withval}" in
@@ -382,13 +402,5 @@ fi
AC_OUTPUT(
Makefile
- src/Makefile
- drivers/Makefile
- drivers/native/Makefile
- drivers/incore/Makefile
- drivers/yod/Makefile
- drivers/sockets/Makefile
- dev/Makefile
- dev/stdfd/Makefile
tests/Makefile)
|
