Commit 0ca44206 authored by Greg Williams's avatar Greg Williams
Browse files

Merged branch 'master' into develop. 

Fixed conflicts in:
	Makefile
	src/lib/kinetic_controller.c
	src/lib/kinetic_logger.c
	src/lib/kinetic_operation.c
	test/system/test_system_async_throughput.c
	test/system/test_system_getkeyrange.c
	test/system/test_system_getnext_getprevious.c
	test/system/test_system_noop.c
	test/system/test_system_stress_session_per_thread.c
	test/system/test_system_stress_single_session_threaded.c
	vendor/kinetic-simulator/startSimulators.sh
	vendor/kinetic-simulator/stopSimulators.sh
Removed erroneous license addition to greatest test framework.
parents 4c2f9056 9a089389

Makefile

+12 −41
Original line number Diff line number Diff line
@@ -148,13 +148,18 @@ $(OUT_DIR)/%.o: ${LIB_DIR}/bus/%.c ${LIB_DIR}/bus/%.h 


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





ci: uninstall stop_simulator start_simulator all stop_simulator install uninstall

ci: stop_sims start_sims all stop_sims

	@echo 

	@echo --------------------------------------------------------------------------------

	@echo Testing install/uninstall of kinetic-c

	@echo --------------------------------------------------------------------------------

	sudo make install

	sudo make uninstall

	@echo

	@echo --------------------------------------------------------------------------------

	@echo $(PROJECT) build completed successfully!

	@echo --------------------------------------------------------------------------------

	@echo $(PROJECT) v$(VERSION) is in working order

	@echo $(PROJECT) v$(VERSION) is in working order!

	@echo
@@ -171,6 +176,8 @@ json_install: json 
json_uninstall:

	if [ -f ${JSONC}/Makefile ]; then cd ${JSONC} && make uninstall; fi;



.PHONY: json_install json_uninstall



${JSONC}/Makefile:

	cd ${JSONC} && \

	sh autogen.sh && \
@@ -183,6 +190,7 @@ ${JSONC}/.libs/libjson-c.a: ${JSONC}/Makefile 
${OUT_DIR}/libjson-c.a: ${JSONC}/.libs/libjson-c.a

	cp ${JSONC}/.libs/libjson-c.a ${OUT_DIR}/libjson-c.a





#-------------------------------------------------------------------------------

# Test Support

#-------------------------------------------------------------------------------
@@ -304,7 +312,7 @@ stop_sims: 


stop_simulator: stop_sims



.PHONY: update_simulator erase_simulator stop_simulator

.PHONY: update_simulator start_sims start_simulator stop_sims stop_simulator





#===============================================================================
@@ -314,43 +322,6 @@ UNITY_INC = ./vendor/unity/src 
UNITY_SRC = ./vendor/unity/src/unity.c





#===============================================================================

# CMock Tests

#===============================================================================



UNIT_SRC = ./test/unit

UNIT_OUT = $(BIN_DIR)/unit

UNIT_LDFLAGS += -lm -l ssl $(KINETIC_LIB) -l crypto -l pthread

UNIT_WARN = -Wall -Wextra -Wstrict-prototypes -pedantic -Wno-missing-field-initializers -Werror=strict-prototypes

UNIT_CFLAGS += -std=c99 -fPIC -g $(UNIT_WARN) $(CDEFS) $(OPTIMIZE) -DTEST



unit_sources = $(wildcard $(UNIT_SRC)/*.c)

unit_executables = $(patsubst $(UNIT_SRC)/%.c,$(UNIT_OUT)/run_%,$(unit_sources))

unit_results = $(patsubst $(UNIT_OUT)/run_%,$(UNIT_OUT)/%.log,$(unit_executables))

unit_passfiles = $(patsubst $(UNIT_OUT)/run_%,$(UNIT_OUT)/%.testpass,$(unit_executables))

unit_names = $(patsubst $(UNIT_OUT)/run_%,%,$(unit_executables))



list_unit_tests:

	echo $(unit_names)



$(UNIT_OUT)/%_runner.c: $(UNIT_SRC)/%.c

	./test/support/generate_unit_runner.sh $< > $@



$(UNIT_OUT)/run_%: $(UNIT_SRC)/%.c $(UNIT_OUT)/%_runner.c $(KINETIC_LIB)

	@echo

	@echo ================================================================================

	@echo System test: '$<'

	@echo --------------------------------------------------------------------------------

	$(CC) -o $@ $< $(word 2,$^) ./test/support/unit_unit_fixture.c $(UNITY_SRC) $(UNIT_CFLAGS) $(LIB_INCS) -I$(UNITY_INC) -I./test/support $(UNIT_LDFLAGS) $(KINETIC_LIB)



$(UNIT_OUT)/%.testpass : $(UNIT_OUT)/run_%

	./scripts/runSystemTest.sh $*



$(unit_names) : % : $(UNIT_OUT)/%.testpass



unit_tests: $(unit_passfiles)





#===============================================================================

# System Tests

#===============================================================================

RELEASE.md

+5 −0
Original line number Diff line number Diff line 
v0.11.1 (kinetic-protocol 3.0.5)

--------------------------------

* Fixed race condition causing timeouts to not be handled resulting in a deadlock.

* Fixed extremely high CPU usage during loaded and idle times.



v0.11.0 (kinetic-protocol 3.0.5)

--------------------------------

* Changed API to use a `KineticClientConfig` struct, to keep future configuration changes from breaking the source API.

config/Doxyfile

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ PROJECT_NAME = kinetic-c 
# could be handy for archiving the generated documentation or if some version

# control system is used.



PROJECT_NUMBER           = "v0.11.0"

PROJECT_NUMBER           = "v0.11.1"



# Using the PROJECT_BRIEF tag one can provide an optional one line description

# for a project that appears at the top of each page and should give viewer a

config/VERSION

+1 −1
Original line number Diff line number Diff line 
0.11.0
 
0.12

include/byte_array.h

+19 −0
Original line number Diff line number Diff line 
/*

* kinetic-c-client

* Copyright (C) 2014 Seagate Technology.

*

* This program is free software; you can redistribute it and/or

* modify it under the terms of the GNU General Public License

* as published by the Free Software Foundation; either version 2

* of the License, or (at your option) any later version.

*

* This program is distributed in the hope that it will be useful,

* but WITHOUT ANY WARRANTY; without even the implied warranty of

* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

* GNU General Public License for more details.

*

* You should have received a copy of the GNU General Public License

* along with this program; if not, write to the Free Software

* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

*

*/

#ifndef _BYTE_ARRAY_H

#define _BYTE_ARRAY_H