From 7eed34dc81e4543e31007e5f33f9913a5b9584c4 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 2 May 2013 08:32:51 -0400 Subject: [PATCH] dasalvager: use pthreads salvageserver already uses this code, and it appears to do the right thing. Change-Id: I4c0f2ec503f2388a1483e89a04ff78eda270659b Reviewed-on: http://gerrit.openafs.org/9843 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Jeffrey Altman --- src/tsalvaged/Makefile.in | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/tsalvaged/Makefile.in b/src/tsalvaged/Makefile.in index 2ad5936f7..013574fc5 100644 --- a/src/tsalvaged/Makefile.in +++ b/src/tsalvaged/Makefile.in @@ -18,7 +18,7 @@ MODULE_CFLAGS = -DRXDEBUG -DFSSYNC_BUILD_CLIENT \ -DAFS_DEMAND_ATTACH_FS SCFLAGS=$(COMMON_CFLAGS) -I.. -DRXDEBUG -DFSSYNC_BUILD_CLIENT \ - -DAFS_DEMAND_ATTACH_UTIL + -DAFS_DEMAND_ATTACH_UTIL $(PTH_CFLAGS) SCCRULE=$(RUN_CC) ${MT_CC} ${SCFLAGS} -c $? -o $@ @@ -29,6 +29,7 @@ SALVAGEDOBJS=salvaged.o vol-salvage.o physio.o SALVAGEROBJS=salvager.o s_vol-salvage.o s_physio.o DIROBJS=buffer.o dir.o salvage.o +SDIROBJS=s_buffer.o s_dir.o s_salvage.o VLIBOBJS=volume.o vnode.o vutil.o partition.o fssync-client.o \ clone.o nuke.o devname.o listinodes.o ihandle.o \ @@ -38,7 +39,7 @@ SVLIBOBJS=s_volume.o s_vnode.o s_vutil.o s_partition.o s_fssync-client.o \ s_namei_ops.o s_salvsync-server.o s_salvsync-client.o s_daemon_com.o OBJECTS= ${SALVAGEDOBJS} ${VLIBOBJS} ${DIROBJS} -SOBJECTS= ${SALVAGEROBJS} ${SVLIBOBJS} +SOBJECTS= ${SALVAGEROBJS} ${SVLIBOBJS} ${SDIROBJS} FSSDEBUG_OBJS = fssync-debug.o physio.o common.o ${VLIBOBJS} ${DIROBJS} @@ -51,15 +52,6 @@ LIBS= \ $(top_builddir)/src/lwp/liboafs_lwpcompat.la \ $(top_builddir)/src/opr/liboafs_opr.la -SLIBS= ${top_builddir}/src/cmd/liboafs_cmd.la \ - ${TOP_LIBDIR}/libdir.a \ - ${TOP_LIBDIR}/librx.a \ - ${TOP_LIBDIR}/liblwp.a \ - ${TOP_LIBDIR}/libsys.a \ - ${TOP_LIBDIR}/libacl.a \ - $(top_builddir)/src/util/liboafs_util.la \ - $(top_builddir)/src/opr/liboafs_opr.la - all: salvageserver dafssync-debug salvsync-debug dasalvager salvager.o: ${VOL}/salvager.c @@ -96,6 +88,12 @@ s_salvsync-client.o: ${VOL}/salvsync-client.c ${SCCRULE} s_daemon_com.o: ${VOL}/daemon_com.c ${SCCRULE} +s_buffer.o: ${DIR}/buffer.c + $(SCCRULE) +s_dir.o: ${DIR}/dir.c + $(SCCRULE) +s_salvage.o: ${DIR}/salvage.c + $(SCCRULE) salvaged.o: ${VOL}/salvaged.c $(AFS_CCRULE) $(VOL)/salvaged.c @@ -167,9 +165,9 @@ salvageserver: ${OBJECTS} ${LIBS} $(LT_LDRULE_static) ${OBJECTS} ${LIBS} \ $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS} -dasalvager: ${SOBJECTS} ${SLIBS} - $(LT_LDRULE_static) ${SOBJECTS} ${SLIBS} \ - $(LIB_roken) ${XLIBS} +dasalvager: ${SOBJECTS} ${LIBS} + $(LT_LDRULE_static) ${SOBJECTS} ${LIBS} \ + $(LIB_hcrypto) $(LIB_roken) $(LIB_crypt) ${MT_LIBS} ${XLIBS} dafssync-debug: ${FSSDEBUG_OBJS} ${LIBS} $(LT_LDRULE_static) ${FSSDEBUG_OBJS} ${LIBS} \ -- 2.39.5