-
Notifications
You must be signed in to change notification settings - Fork 123
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Patrick Donnelly
committed
Jun 29, 2014
1 parent
cb3112c
commit 20bfbb3
Showing
59 changed files
with
490 additions
and
698 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,4 +7,4 @@ | |
| *.swp | ||
| cctools.test.log | ||
| configure.rerun | ||
| Makefile.config | ||
| config.mk | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| ../.src.Makefile | ||
| ../.module.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,22 @@ | ||
| CCTOOLS_HOME = ../../ | ||
| include ../../config.mk | ||
| include ../../rules.mk | ||
|
|
||
| include ${CCTOOLS_HOME}/Makefile.config | ||
| include ${CCTOOLS_HOME}/Makefile.rules | ||
| LOCAL_LINKAGE = -lpthread | ||
|
|
||
| TARGETS = allpairs_multicore allpairs_master | ||
| EXTERNAL_DEPENDENCIES = ../../sand/src/libsandtools.a ../../work_queue/src/libwork_queue.a ../../dttools/src/libdttools.a | ||
| OBJECTS = allpairs_compare.o | ||
| PROGRAMS = allpairs_multicore allpairs_master | ||
| TARGETS = $(PROGRAMS) | ||
|
|
||
| LOCAL_LDFLAGS=../../sand/src/libsandtools.a -lwork_queue -ldttools ${CCTOOLS_INTERNAL_LDFLAGS} | ||
| all: $(TARGETS) | ||
|
|
||
| all: ${TARGETS} | ||
|
|
||
| allpairs_multicore: allpairs_multicore.o allpairs_compare.o ${CCTOOLS_HOME}/dttools/src/libdttools.a | ||
| ${CCTOOLS_LD} -o $@ allpairs_multicore.o allpairs_compare.o -lpthread ${LOCAL_LDFLAGS} | ||
|
|
||
| allpairs_master: allpairs_master.o allpairs_compare.o ${CCTOOLS_HOME}/dttools/src/libdttools.a | ||
| ${CCTOOLS_LD} -o $@ allpairs_master.o allpairs_compare.o ${LOCAL_LDFLAGS} | ||
| $(PROGRAMS): $(OBJECTS) $(EXTERNAL_DEPENDENCIES) | ||
|
|
||
| test: | ||
|
|
||
| clean: | ||
| rm -f core *~ *.o *.a ${TARGETS} | ||
| rm -f $(OBJECTS) $(TARGETS) | ||
|
|
||
| install: all | ||
| mkdir -p ${CCTOOLS_INSTALL_DIR}/bin | ||
| cp ${TARGETS} ${CCTOOLS_INSTALL_DIR}/bin | ||
| mkdir -p $(CCTOOLS_INSTALL_DIR)/bin | ||
| cp $(PROGRAMS) $(CCTOOLS_INSTALL_DIR)/bin/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
|
|
||
| include ../../Makefile.config | ||
| include ../../Makefile.rules | ||
| include ../../config.mk | ||
| include ../../rules.mk | ||
|
|
||
| all: | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| ../.src.Makefile | ||
| ../.module.mk |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,92 +1,54 @@ | ||
| include ../../Makefile.config | ||
| include ../../Makefile.rules | ||
|
|
||
| LOCAL_LDFLAGS = -ldttools -lchirp ${CCTOOLS_INTERNAL_LDFLAGS} | ||
|
|
||
| LIBRARY_SOURCES = chirp_global.c chirp_multi.c chirp_recursive.c chirp_reli.c chirp_client.c chirp_matrix.c chirp_stream.c chirp_ticket.c | ||
| SERVER_SOURCES = sqlite3.c chirp_stats.c chirp_thirdput.c chirp_alloc.c chirp_audit.c chirp_acl.c chirp_group.c chirp_filesystem.c chirp_fs_hdfs.c chirp_fs_local.c chirp_fs_local_scheduler.c chirp_fs_chirp.c chirp_ticket.c chirp_job.c | ||
|
|
||
| PROGRAMS=chirp chirp_get chirp_put chirp_server chirp_status chirp_benchmark chirp_stream_files chirp_fuse chirp_distribute | ||
| SCRIPTS=chirp_audit_cluster chirp_server_hdfs | ||
| LIBRARIES=libchirp.a libchirp_client.${CCTOOLS_DYNAMIC_SUFFIX} | ||
| PUBLIC_HEADERS=chirp_global.h chirp_multi.h chirp_reli.h chirp_client.h chirp_stream.h chirp_protocol.h chirp_matrix.h chirp_types.h chirp_recursive.h | ||
|
|
||
| TARGETS = ${PROGRAMS} ${LIBRARIES} | ||
| LIBRARY_OBJECTS = ${LIBRARY_SOURCES:%.c=%.o} | ||
| SERVER_OBJECTS = ${SERVER_SOURCES:%.c=%.o} | ||
|
|
||
| DTTOOLS_STATIC_LIBRARY = ../../dttools/src/libdttools.a | ||
| CHIRP_STATIC_LIBRARY = libchirp.a | ||
| STATIC_LIBRARIES = ${CHIRP_STATIC_LIBRARY} ${DTTOOLS_STATIC_LIBRARY} | ||
|
|
||
| all: ${TARGETS} | ||
| include ../../config.mk | ||
| include ../../rules.mk | ||
|
|
||
| # We only use sqlite3 multi-process (i.e. no threads). So we can turn off | ||
| # SQLITE_THREADSAFE. This disables somewhat costly mutex locks. | ||
| sqlite3.o: sqlite3.c | ||
| $(CCTOOLS_CC) -o $@ -c -DSQLITE_THREADSAFE=0 $(CCTOOLS_INTERNAL_CCFLAGS) $^ | ||
| LOCAL_CCFLAGS = -DSQLITE_THREADSAFE=0 | ||
|
|
||
| CHIRPSO = libchirp_client.$(CCTOOLS_DYNAMIC_SUFFIX) | ||
| EXTERNAL_DEPENDENCIES = ../../dttools/src/libdttools.a | ||
| LIBRARIES = libchirp.a $(CHIRPSO) | ||
| OBJECTS = $(OBJECTS_LIBRARY) $(OBJECTS_SERVER) | ||
| OBJECTS_LIBRARY = $(SOURCES_LIBRARY:%.c=%.o) | ||
| OBJECTS_SERVER = $(SOURCES_SERVER:%.c=%.o) | ||
| PROGRAMS = chirp chirp_get chirp_put chirp_server chirp_status chirp_benchmark chirp_stream_files chirp_fuse chirp_distribute | ||
| PUBLIC_HEADERS = chirp_global.h chirp_multi.h chirp_reli.h chirp_client.h chirp_stream.h chirp_protocol.h chirp_matrix.h chirp_types.h chirp_recursive.h | ||
| SCRIPTS = chirp_audit_cluster chirp_server_hdfs | ||
| SOURCES_LIBRARY = chirp_global.c chirp_multi.c chirp_recursive.c chirp_reli.c chirp_client.c chirp_matrix.c chirp_stream.c chirp_ticket.c | ||
| SOURCES_SERVER = sqlite3.c chirp_stats.c chirp_thirdput.c chirp_alloc.c chirp_audit.c chirp_acl.c chirp_group.c chirp_filesystem.c chirp_fs_hdfs.c chirp_fs_local.c chirp_fs_local_scheduler.c chirp_fs_chirp.c chirp_job.c | ||
| TARGETS = $(PROGRAMS) $(LIBRARIES) | ||
|
|
||
| all: $(TARGETS) | ||
|
|
||
| # This object exists primarily to get a linkable object for use by ROOT and | ||
| # other systems that want to load Chirp dynamically. Note that we explicitly | ||
| # include auth_all.o to force the inclusion of the various authentication | ||
| # infrastructures. We remove $(CCTOOLS_EXTERNAL_LINKAGE) because many archives | ||
| # we use were not compiled with -fPIC, which is required for shared object | ||
| # creation. | ||
| $(CHIRPSO): $(OBJECTS_LIBRARY) ../../dttools/src/auth_all.o $(EXTERNAL_DEPENDENCIES) | ||
| # $(CCTOOLS_LD) -o $@ -fPIC $(CCTOOLS_DYNAMIC_FLAG) $(CCTOOLS_INTERNAL_LDFLAGS) $(LOCAL_LDFLAGS) $^ $(CCTOOLS_DYNAMIC_AUTH_LIBS) | ||
|
|
||
| chirp: chirp_tool.o | ||
| $(CCTOOLS_LD) -o $@ $(CCTOOLS_INTERNAL_LDFLAGS) $(LOCAL_LDFLAGS) $^ $(LOCAL_LINKAGE) $(CCTOOLS_EXTERNAL_LINKAGE) $(CCTOOLS_READLINE_LDFLAGS) | ||
|
|
||
| # This is the library intended to be used by clients of the system. | ||
| libchirp.a: $(OBJECTS_LIBRARY) | ||
|
|
||
| libchirp.a: ${LIBRARY_OBJECTS} | ||
| ${CCTOOLS_AR} rv $@ $^ | ||
| ranlib $@ | ||
|
|
||
| # This object exists primarily to get a linkable object for use | ||
| # by ROOT and other systems that want to load Chirp dynamically. | ||
| # Note that we explicitly include auth_all.o and ${CCTOOLS_DYNAMIC_AUTH_LIBS} | ||
| # to force the inclusion of the various authentication infrastructures. | ||
|
|
||
| libchirp_client.${CCTOOLS_DYNAMIC_SUFFIX}: ${LIBRARY_OBJECTS} ../../dttools/src/auth_all.o ${DTTOOLS_STATIC_LIBRARY} | ||
| ${CCTOOLS_LD} ${CCTOOLS_DYNAMIC_FLAG} -o $@ $^ ${CCTOOLS_DYNAMIC_AUTH_LIBS} | ||
|
|
||
| chirp: chirp_tool.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${CCTOOLS_READLINE_LDFLAGS} ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_server: chirp_server.o ${SERVER_OBJECTS} ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_get: chirp_get.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_put: chirp_put.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_benchmark: chirp_benchmark.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_status: chirp_status.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_fuse: chirp_fuse.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_distribute: chirp_distribute.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_matrix_benchmark: chirp_matrix_benchmark.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_matrix_roc: chirp_matrix_roc.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_matrix_verify: chirp_matrix_verify.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
|
|
||
| chirp_stream_files: chirp_stream_files.o ${STATIC_LIBRARIES} | ||
| ${CCTOOLS_LD} -o $@ $^ ${LOCAL_LDFLAGS} | ||
| chirp_server: $(OBJECTS_SERVER) | ||
| $(PROGRAMS): libchirp.a $(EXTERNAL_DEPENDENCIES) | ||
|
|
||
| test: all | ||
|
|
||
| clean: | ||
| rm -f core *~ *.o *.os *.a *.${CCTOOLS_DYNAMIC_SUFFIX} ${TARGETS} | ||
| rm -f $(OBJECTS) $(TARGETS) | ||
|
|
||
| install: all | ||
| mkdir -p ${CCTOOLS_INSTALL_DIR}/bin | ||
| mkdir -p ${CCTOOLS_INSTALL_DIR}/lib | ||
| mkdir -p ${CCTOOLS_INSTALL_DIR}/include/cctools | ||
| if [ -f ${CCTOOLS_INSTALL_DIR}/bin/chirp_server ]; then mv ${CCTOOLS_INSTALL_DIR}/bin/chirp_server ${CCTOOLS_INSTALL_DIR}/bin/chirp_server.old; fi | ||
| chmod 755 ${SCRIPTS} | ||
| cp ${PROGRAMS} ${SCRIPTS} ${CCTOOLS_INSTALL_DIR}/bin | ||
| cp ${LIBRARIES} ${CCTOOLS_INSTALL_DIR}/lib | ||
| cp ${PUBLIC_HEADERS} ${CCTOOLS_INSTALL_DIR}/include/cctools | ||
| mkdir -p $(CCTOOLS_INSTALL_DIR)/bin | ||
| if [ -f $(CCTOOLS_INSTALL_DIR)/bin/chirp_server ]; then mv $(CCTOOLS_INSTALL_DIR)/bin/chirp_server $(CCTOOLS_INSTALL_DIR)/bin/chirp_server.old; fi | ||
| chmod 755 $(SCRIPTS) | ||
| cp $(PROGRAMS) $(SCRIPTS) $(CCTOOLS_INSTALL_DIR)/bin/ | ||
| mkdir -p $(CCTOOLS_INSTALL_DIR)/lib | ||
| cp $(LIBRARIES) $(CCTOOLS_INSTALL_DIR)/lib/ | ||
| mkdir -p $(CCTOOLS_INSTALL_DIR)/include/cctools | ||
| cp $(PUBLIC_HEADERS) $(CCTOOLS_INSTALL_DIR)/include/cctools/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| chirp_tool.c |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.