Merged thread pool 'bus' branch into admin_api branch. Disabled a... (b677bf38) · Commits · kinetic-archive / kinetic-c

Makefile

+67 −7

Original line number	Diff line number	Diff line
		@@ -33,9 +33,12 @@ PROTOBUFC = $(VENDOR)/protobuf-c
		SOCKET99 = $(VENDOR)/socket99
		VERSION_FILE = ./config/VERSION
		VERSION = ${shell head -n1 $(VERSION_FILE)}
		THREADPOOL_PATH = ${LIB_DIR}/threadpool
		BUS_PATH = ${LIB_DIR}/bus
		KINETIC_LIB_NAME = $(PROJECT).$(VERSION)
		KINETIC_LIB = $(BIN_DIR)/lib$(KINETIC_LIB_NAME).a
		LIB_INCS = -I$(LIB_DIR) -I$(PUB_INC) -I$(PROTOBUFC) -I$(SOCKET99) -I$(VENDOR)
		LIB_INCS = -I$(LIB_DIR) -I$(PUB_INC) -I$(PROTOBUFC) -I$(SOCKET99) -I$(VENDOR) \
		-I$(THREADPOOL_PATH) -I$(BUS_PATH)

		C_SRC=${LIB_DIR}/*.[ch] $(SOCKET99)/socket99.[ch] $(PROTOBUFC)/protobuf-c/protobuf-c.[ch]

		@@ -60,7 +63,15 @@ LIB_OBJS = \
		$(OUT_DIR)/kinetic_types.o \
		$(OUT_DIR)/byte_array.o \
		$(OUT_DIR)/kinetic_client.o \
		$(OUT_DIR)/kinetic_admin_client.o
		$(OUT_DIR)/kinetic_admin_client.o \
		$(OUT_DIR)/threadpool.o \
		$(OUT_DIR)/bus.o \
		$(OUT_DIR)/casq.o \
		$(OUT_DIR)/listener.o \
		$(OUT_DIR)/sender.o \
		$(OUT_DIR)/util.o \
		$(OUT_DIR)/yacht.o \


		KINETIC_LIB_OTHER_DEPS = Makefile Rakefile $(VERSION_FILE)

		@@ -70,14 +81,19 @@ default: makedirs $(KINETIC_LIB)
		makedirs:
		@echo; mkdir -p ./bin/examples &> /dev/null; mkdir -p ./bin/unit &> /dev/null; mkdir -p ./bin/systest &> /dev/null; mkdir -p ./out &> /dev/null

		all: default test system_tests run examples
		all: default test system_tests test_internals run examples

		clean: makedirs
		clean: makedirs update_git_submodules
		rm -rf ./bin/**
		rm -f $(OUT_DIR)/.o .core *.log
		rm -f $(OUT_DIR)/.o $(OUT_DIR)/.a .core .log
		bundle exec rake clobber
		git submodule update --init
		-./vendor/kinetic-simulator/stopSimulator.sh &> /dev/null;
		cd ${SOCKET99} && make clean
		cd ${LIB_DIR}/threadpool && make clean
		cd ${LIB_DIR}/bus && make clean

		update_git_submodules:
		git submodule update --init

		TAGS: ${C_SRC} Makefile
		@find . -name "*.[ch]" \| grep -v vendor \| grep -v build \| xargs etags
		@@ -102,10 +118,16 @@ $(OUT_DIR)/protobuf-c.o: $(PROTOBUFC)/protobuf-c/protobuf-c.c $(PROTOBUFC)/proto
		$(CC) -c -o $@ $< -std=c99 -fPIC -g -Wall -Wno-unused-parameter $(OPTIMIZE) -I$(PROTOBUFC)
		${OUT_DIR}/kinetic_types.o: ${LIB_DIR}/kinetic_types_internal.h

		$(OUT_DIR)/threadpool.o: ${LIB_DIR}/threadpool/threadpool.c ${LIB_DIR}/threadpool/threadpool.h
		$(CC) -o $@ -c $< $(CFLAGS)

		$(OUT_DIR)/%.o: ${LIB_DIR}/bus/%.c ${LIB_DIR}/bus/%.h
		$(CC) -o $@ -c $< $(CFLAGS) -I${THREADPOOL_PATH} -I${BUS_PATH}

		${OUT_DIR}/*.o: src/lib/kinetic_types_internal.h


		ci: uninstall all install
		ci: uninstall all test_internals install
		@echo
		@echo --------------------------------------------------------------------------------
		@echo $(PROJECT) build completed successfully!
		@@ -114,6 +136,44 @@ ci: uninstall all install
		@echo


		#-------------------------------------------------------------------------------
		# Test Support
		#-------------------------------------------------------------------------------

		test: Rakefile $(LIB_OBJS)
		@echo
		@echo --------------------------------------------------------------------------------
		@echo Testing $(PROJECT)
		@echo --------------------------------------------------------------------------------
		bundle install
		bundle exec rake test_all

		JAVA_HOME ?= /usr
		JAVA_BIN = $(JAVA_HOME)/bin/java

		.PHONY: test

		test_internals: test_threadpool test_bus

		test_threadpool:
		cd ${LIB_DIR}/threadpool && make test

		test_bus: test_threadpool ${OUT_DIR}/libsocket99.a ${OUT_DIR}/libthreadpool.a
		cd ${LIB_DIR}/bus && make test

		#-------------------------------------------------------------------------------
		# Internal Libraries
		#-------------------------------------------------------------------------------

		${OUT_DIR}/libsocket99.a: ${SOCKET99}/*.[ch]
		cd ${SOCKET99} && make all
		cp ${SOCKET99}/libsocket99.a $@

		${OUT_DIR}/libthreadpool.a: ${LIB_DIR}/threadpool/*.[ch]
		cd ${LIB_DIR}/threadpool && make all
		cp ${LIB_DIR}/threadpool/libthreadpool.a $@


		#-------------------------------------------------------------------------------
		# Static and Dynamic Library Build Support
		#-------------------------------------------------------------------------------

include/kinetic_admin_client.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -124,4 +124,16 @@ KineticStatus KineticAdminClient_GetLog(KineticSession const * const session,
		*/
		KineticStatus KineticAdminClient_InstantSecureErase(KineticSession const * const session);

		/**
		* @brief Updates the cluster version.
		*
		* @param clusterVersion Current cluster version.
		* @param newClusterVersion New cluster version.
		*
		* @return Returns the resulting KineticStatus.
		*/
		KineticStatus KineticAdminClient_SetClusterVersion(KineticSession const * const session,
		int64_t clusterVersion,
		int64_t newClusterVersion);

		#endif // _KINETIC_ADMIN_CLIENT_H

src/examples/write_file_nonblocking_threads.c

+15 −13

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ int main(int argc, char** argv)
		// Establish connection
		KineticStatus status = KineticClient_CreateConnection(&session);
		if (status != KINETIC_STATUS_SUCCESS) {
		fprintf(stderr, "Failed connecting to the Kinetic device w/status: %s\n",
		fprintf(stdout, "Failed connecting to the Kinetic device w/status: %s\n",
		Kinetic_GetStatusDescription(status));
		return -1;
		}
		@@ -109,24 +109,26 @@ int main(int argc, char** argv)

		// Store the file(s) and wait for completion
		bool success = true;
		const int maxOverlappedChunks = 15;

		StoreFileOperation ops[] = {
		{
		.session = &session,
		.filename = "./test/support/data/file_a.png",
		.keyPrefix = prefix,
		.maxOverlappedChunks = 4,
		.maxOverlappedChunks = maxOverlappedChunks,
		},
		{
		.session = &session,
		.filename = "./test/support/data/file_b.png",
		.keyPrefix = prefix,
		.maxOverlappedChunks = 4,
		.maxOverlappedChunks = maxOverlappedChunks,
		},
		{
		.session = &session,
		.filename = "./test/support/data/file_c.png",
		.keyPrefix = prefix,
		.maxOverlappedChunks = 4,
		.maxOverlappedChunks = maxOverlappedChunks,
		},
		};
		const int numFiles = sizeof(ops) / sizeof(StoreFileOperation);
		@@ -135,7 +137,7 @@ int main(int argc, char** argv)
		int pthreadStatus = pthread_create(&ops[i].thread, NULL, store_file_thread, &ops[i]);
		if (pthreadStatus != 0) {
		REPORT_ERRNO(pthreadStatus, "pthread_create");
		fprintf(stderr, "Failed creating store thread for '%s'!\n", ops[i].filename);
		fprintf(stdout, "Failed creating store thread for '%s'!\n", ops[i].filename);
		success = false;
		}
		}
		@@ -146,7 +148,7 @@ int main(int argc, char** argv)
		}
		else {
		REPORT_ERRNO(pthreadStatus, "pthread_join");
		fprintf(stderr, "Failed storing '%s' to disk! status: %s\n",
		fprintf(stdout, "Failed storing '%s' to disk! status: %s\n",
		ops[i].filename, Kinetic_GetStatusDescription(ops[i].status));
		success = false;
		}
		@@ -168,8 +170,9 @@ void* store_file_thread(void* storeArgs)
		start_file_transfer(op->session, op->filename, op->keyPrefix, op->maxOverlappedChunks);
		op->status = wait_for_transfer_complete(transfer);
		if (op->status != KINETIC_STATUS_SUCCESS) {
		fprintf(stderr, "Transfer failed w/status: %s\n", Kinetic_GetStatusDescription(op->status));
		fprintf(stdout, "Transfer failed w/status: %s\n", Kinetic_GetStatusDescription(op->status));
		}

		return (void*)storeArgs;
		}

		@@ -184,6 +187,7 @@ FileTransferProgress * start_file_transfer(KineticSession* session,
		sizeof(transferState->keyPrefixBuffer), &prefix, sizeof(prefix)),
		.fd = open(filename, O_RDONLY),
		};

		pthread_mutex_init(&transferState->transferMutex, NULL);
		pthread_mutex_init(&transferState->completeMutex, NULL);
		pthread_cond_init(&transferState->completeCond, NULL);
		@@ -243,7 +247,7 @@ int put_chunk_of_file(FileTransferProgress* transfer)
		if (status != KINETIC_STATUS_SUCCESS) {
		transfer->opsInProgress--;
		free(closureData);
		fprintf(stderr, "Failed writing chunk! PUT request reported status: %s\n",
		fprintf(stdout, "Failed writing chunk! PUT request reported status: %s\n",
		Kinetic_GetStatusDescription(status));
		}
		}
		@@ -254,7 +258,7 @@ int put_chunk_of_file(FileTransferProgress* transfer)
		else {
		transfer->opsInProgress--;
		free(closureData);
		fprintf(stderr, "Failed reading data from file!\n");
		fprintf(stdout, "Failed reading data from file!\n");
		REPORT_ERRNO(bytesRead, "read");
		}

		@@ -289,9 +293,7 @@ void put_chunk_of_file_finished(KineticCompletionData* kinetic_data, void* clien
		// if there is no more data to read (or error), and no outstanding operations,
		// then signal
		pthread_cond_signal(&transfer->completeCond);
		pthread_mutex_destroy(&transfer->transferMutex);
		pthread_mutex_destroy(&transfer->completeMutex);
		fprintf(stderr, "Failed writing chunk! PUT response reported status: %s\n",
		fprintf(stdout, "Failed writing chunk! PUT response reported status: %s\n",
		Kinetic_GetStatusDescription(kinetic_data->status));
		}
		}

src/lib/bus/.gitignore

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		TAGS
		*.dSYM/
		bus_example
		echosrv
		notes
		test_casq
		test_yacht

src/lib/bus/Makefile

0 → 100644

+57 −0

Original line number	Diff line number	Diff line
		SOCKET99_PATH= ../../../vendor/socket99
		THREADPOOL_PATH= ../threadpool
		LIB_PATH= ../../../obj

		OPT= -O3
		LIB_INC = -I${SOCKET99_PATH} -I${THREADPOOL_PATH}
		CFLAGS += -std=c99 ${OPT} -Wall -g ${LIB_INC}
		LDFLAGS += -L. -lsocket99 -L${LIB_PATH} -lthreadpool

		BUS_OBJS = \
		bus.o \
		casq.o \
		listener.o \
		sender.o \
		util.o \
		yacht.o \

		ECHOSRV_OBJS = \
		echosrv.o \
		util.o \

		all: bus.png test_casq test_yacht echosrv bus_example

		test: test_casq test_yacht
		./test_casq
		./test_yacht

		%.png: %.dot
		dot -Tpng -o $@ $^

		libbus.a: ${BUS_OBJS}
		ar -rcs $@ $^

		test_casq: test_casq.o casq.o
		${CC} -o $@ $^ ${LDFLAGS}

		test_yacht: test_yacht.o yacht.o
		${CC} -o $@ $^ ${LDFLAGS}

		echosrv: ${ECHOSRV_OBJS}
		${CC} -o $@ $^ ${LDFLAGS}

		bus_example: bus_example.o libbus.a
		${CC} -o $@ $^ ${LDFLAGS} -lbus

		clean:
		rm -f .a .o test_casq echosrv bus_example

		tags: TAGS

		TAGS: *.[ch]
		etags *.[ch]

		*.o: bus_types.h bus_internal_types.h Makefile
		sender.o: sender_internal.h
		listener.o: listener_internal.h
		%.o: %.h