DEVEL15-tubik-vos-20080403

LICENSE IPL10

build pthreaded vos

(cherry picked from commit 65e701fee4968b17066bb81e25b7adaa4024d4f3)

diff --git a/src/tvolser/Makefile.in b/src/tvolser/Makefile.in
index 834f984759acb12b125307b44c772833ffdc1d36..4c34d38fa481c5c7f040f76e4a880b4147b9efc7 100644 (file)
--- a/src/tvolser/Makefile.in
+++ b/src/tvolser/Makefile.in
@@ -27,7 +27,9 @@ RX=../rx
 
 VOLSEROBJS=volmain.o volprocs.o physio.o voltrans.o volerr.o volint.cs.o dumpstuff.o  volint.ss.o volint.xdr.o vscommon.o
 
-VLSERVEROBJS=#vldbint.cs.o vldbint.xdr.o
+VLSERVEROBJS=vldbint.cs.o vldbint.xdr.o vl_errors.o
+
+VOSOBJS= vsprocs.o vsutils.o lockprocs.o volint.xdr.o volerr.o volint.cs.o
 
 LWPOBJS=lock.o threadname.o
 
@@ -45,12 +47,20 @@ FSINTOBJS=# afsaux.o afscbint.cs.o afsint.ss.o afsint.xdr.o
 
 RXOBJS=rx_pthread.o
 
-objects= ${VOLSEROBJS} ${VLSERVEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
+objects= ${VOLSEROBJS} ${LWPOBJS} ${LIBACLOBJS} \
         ${UTILOBJS} ${DIROBJS} ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
 
-LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util.a
+vosobjects= ${VOSOBJS} ${VLSERVEROBJS} ${LIBACLOBJS} ${UTILOBJS} ${DIROBJS} \
+       ${VOLOBJS} ${FSINTOBJS} ${RXOBJS}
+
+LIBS=  ${TOP_LIBDIR}/libcmd.a          \
+       ${TOP_LIBDIR}/libafsauthent.a   \
+       ${TOP_LIBDIR}/libafsrpc.a       \
+       ${TOP_LIBDIR}/libafsutil.a      \
+       ${TOP_LIBDIR}/libubik_pthread.a \
+       ${TOP_LIBDIR}/libusd.a
 
-all: volserver
+all: volserver vos
 
 COMPILE=${CC} ${CFLAGS} -c $?
 
@@ -74,6 +84,12 @@ volint.ss.o: ${VOLSER}/volint.ss.c
        ${COMPILE}
 volint.xdr.o: ${VOLSER}/volint.xdr.c
        ${COMPILE}
+vsprocs.o: ${VOLSER}/vsprocs.c
+       ${COMPILE}
+vsutils.o: ${VOLSER}/vsutils.c
+       ${COMPILE}
+lockprocs.o: ${VOLSER}/lockprocs.c
+       ${COMPILE}
 
 assert.o: ${UTIL}/assert.c
        ${COMPILE}
@@ -114,6 +130,12 @@ aclprocs.o: ${LIBACL}/aclprocs.c
 netprocs.o: ${LIBACL}/netprocs.c
        ${COMPILE}
 
+vlserver.h vl_errors.c: ${VLSERVER}/vl_errors.et ${VLSERVER}/vlserver.p.h
+       $(RM) -f vlserver.h vl_errors.c; ${COMPILE_ET} -p ${VLSERVER} vl_errors -h vlserver
+
+vl_errors.o: vl_errors.c
+       ${COMPILE}
+
 vldbint.cs.o: ${VLSERVER}/vldbint.cs.c
        ${COMPILE}
 
@@ -195,21 +217,33 @@ afsint.ss.o: ${FSINT}/afsint.ss.c
 afsint.xdr.o: ${FSINT}/afsint.xdr.c
        ${COMPILE}
 
+vos.o: ${VOLSER}/vos.c
+       ${COMPILE}
+
+
+vos: vos.o  ${VOSOBJS} ${VLSERVEROBJS} ${LIBS}
+       ${CC} ${LDFLAGS} -o vos vos.o ${VOSOBJS} ${VLSERVEROBJS} ${LIBS} ${MT_LIBS} ${XLIBS}
+
 volserver: ${objects} ${LIBS}
        ${CC} ${LDFLAGS} -o volserver ${objects} ${LIBS} ${MT_LIBS} ${XLIBS}
 
 ${DEST}/root.server/usr/afs/bin/volserver: volserver
        ${INSTALL} -ns $? $@
 
-install: ${DESTDIR}${afssrvlibexecdir}/volserver
+${DEST}/root.server/usr/afs/bin/vos: vos
+       ${INSTALL} -ns $? $@
 
+install: ${DESTDIR}${afssrvlibexecdir}/volserver ${DESTDIR}${afssrvlibexecdir}/vos
 clean:
-       $(RM) -f *.o volserver core AFS_component_version_number.c
+       $(RM) -f *.o volserver vos core AFS_component_version_number.c
 
 include ../config/Makefile.version
 
 ${DESTDIR}${afssrvlibexecdir}/volserver: volserver
        ${INSTALL} -ns $? $@
 
-dest: ${DEST}/root.server/usr/afs/bin/volserver
+${DESTDIR}${afssrvlibexecdir}/vos: vos
+       ${INSTALL} -ns $? $@
+
+dest: ${DEST}/root.server/usr/afs/bin/volserver ${DEST}/root.server/usr/afs/bin/vos
 

diff --git a/src/volser/vos.c b/src/volser/vos.c
index b436a66a433bc80ba7868c368572bbd62013fb1a..309e7a5699b45253d8f984ef25d348b3f206d681 100644 (file)
--- a/src/volser/vos.c
+++ b/src/volser/vos.c
@@ -280,7 +280,11 @@ SendFile(usd_handle_t ufd, register struct rx_call *call, long blksize)
        FD_ZERO(&in);
        FD_SET((int)(ufd->handle), &in);
        /* don't timeout if read blocks */
+#if defined(AFS_PTHREAD_ENV)
+       select(((int)(ufd->handle)) + 1, &in, 0, 0, 0);
+#else
        IOMGR_Select(((int)(ufd->handle)) + 1, &in, 0, 0, 0);
+#endif
 #endif
        error = USD_READ(ufd, buffer, blksize, &nbytes);
        if (error) {
@@ -390,7 +394,11 @@ ReceiveFile(usd_handle_t ufd, struct rx_call *call, long blksize)
            FD_ZERO(&out);
            FD_SET((int)(ufd->handle), &out);
            /* don't timeout if write blocks */
+#if defined(AFS_PTHREAD_ENV)
+           select(((int)(ufd->handle)) + 1, &out, 0, 0, 0);
+#else
            IOMGR_Select(((int)(ufd->handle)) + 1, 0, &out, 0, 0);
+#endif
 #endif
            error =
                USD_WRITE(ufd, &buffer[bytesread - bytesleft], bytesleft, &w);

diff --git a/src/volser/vsprocs.c b/src/volser/vsprocs.c
index 75a7c1a84dff1fc80fb2866ebb86ae668d6a4b89..1c07dd3cb57f8c57ac921f1d4448ef43b8623155 100644 (file)
--- a/src/volser/vsprocs.c
+++ b/src/volser/vsprocs.c
@@ -55,7 +55,7 @@ RCSID
 #include <afs/procmgmt.h>      /* signal(), kill(), wait(), etc. */
 #include <setjmp.h>
 
-#include <volser_prototypes.h>
+#include "volser_prototypes.h"
 
 struct ubik_client *cstruct;
 int verbose = 0;