jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 07:20:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update: convert upserver and client from LWP to pthreads

Browse Source 
Build the upserver and the upclient with phreads instead of LWP
and convert the IOMRG sleeps in the client to regular sleeps.

Change-Id: I183765ef180f34d38b87a13ec49f16f4a60afcc8
Reviewed-on: https://gerrit.openafs.org/12754
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
This commit is contained in:
Michael Meffie 2017-10-27 23:25:10 -04:00 committed by Benjamin Kaduk
parent 066b3a9fd7
commit dc25b9f509
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/update/Makefile.in
View File

@ -7,20 +7,15 @@
srcdir=@srcdir@ srcdir=@srcdir@
include @TOP_OBJDIR@/src/config/Makefile.config include @TOP_OBJDIR@/src/config/Makefile.config
include @TOP_OBJDIR@/src/config/Makefile.lwp include @TOP_OBJDIR@/src/config/Makefile.pthread
LIBS= \
LIBS=${TOP_LIBDIR}/libauth.a \ $(top_builddir)/src/auth/liboafs_auth.la \
${TOP_LIBDIR}/librxkad.a \ $(top_builddir)/src/rx/liboafs_rx.la \
${TOP_LIBDIR}/librx.a \ $(top_builddir)/src/rxkad/liboafs_rxkad.la \
${TOP_LIBDIR}/libsys.a \ $(top_builddir)/src/cmd/liboafs_cmd.la \
${TOP_LIBDIR}/librx.a \ $(top_builddir)/src/util/liboafs_util.la \
${TOP_LIBDIR}/liblwp.a \ $(top_builddir)/src/opr/liboafs_opr.la
${TOP_LIBDIR}/libafscom_err.a \
${TOP_LIBDIR}/util.a \
${TOP_LIBDIR}/libopr.a \
${TOP_LIBDIR}/libafsrfc3961.a \
${TOP_LIBDIR}/libafshcrypto_lwp.a
all: upserver upclient all: upserver upclient
@ -30,11 +25,11 @@ generated: update.cs.c update.ss.c update.xdr.c update.h
# Build targets # Build targets
# #
upclient: client.o update.cs.o utils.o ${LIBS} upclient: client.o update.cs.o utils.o ${LIBS}
$(AFS_LDRULE) client.o update.cs.o utils.o \ $(LT_LDRULE_static) client.o update.cs.o utils.o \
${LIBS} $(LIB_roken) ${XLIBS} ${LIBS} $(LIB_roken) ${XLIBS}
upserver: server.o utils.o update.ss.o ${LIBS} upserver: server.o utils.o update.ss.o ${LIBS}
$(AFS_LDRULE) server.o utils.o update.ss.o \ $(LT_LDRULE_static) server.o utils.o update.ss.o \
${LIBS} $(LIB_roken) ${XLIBS} ${LIBS} $(LIB_roken) ${XLIBS}
utils.o: utils.c update.h global.h utils.o: utils.c update.h global.h

4
src/update/client.c
View File

@ -375,14 +375,14 @@ main(int argc, char **argv)
free(curDir); free(curDir);
} /* end for each dir loop */ } /* end for each dir loop */
/*delete the file with info on files in directory df->name */ /*delete the file with info on files in directory df->name */
IOMGR_Sleep(interval); sleep(interval);
continue; continue;
fail_dirbuf: fail_dirbuf:
fclose(stream); fclose(stream);
unlink(dirbuf); unlink(dirbuf);
fail: fail:
IOMGR_Sleep(retrytime); sleep(retrytime);
if (cnt > 10) { if (cnt > 10) {
rx_DestroyConnection(conn); rx_DestroyConnection(conn);
goto again; goto again;