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

Merged in develop branch

parents ef7691d1 fceafc29

Makefile

+23 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ PUB_INC = ./include 
#===============================================================================

CC ?= gcc

OPTIMIZE = -O3

WARN = -Wall -Wextra -Wstrict-prototypes -Wcast-align -pedantic -Wno-missing-field-initializers

WARN = -Wall -Wextra -Wstrict-prototypes -Wcast-align -pedantic -Wno-missing-field-initializers -Werror=strict-prototypes

CDEFS += -D_POSIX_C_SOURCE=199309L -D_C99_SOURCE=1

CFLAGS += -std=c99 -fPIC -g $(WARN) $(CDEFS) $(OPTIMIZE)

LDFLAGS += -lm -lcrypto -lssl -lpthread
@@ -70,7 +70,7 @@ all: default test run examples 
clean: makedirs

	rm -rf ./bin/**/*

	rm -f $(OUT_DIR)/*.o *.core *.log

	rake clobber

	bundle exec rake clobber

	git submodule update --init

	-./vendor/kinetic-simulator/stopSimulator.sh &> /dev/null;
@@ -97,6 +97,8 @@ $(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}/*.o: src/lib/kinetic_types_internal.h





ci: uninstall all install

	@echo
@@ -256,6 +258,8 @@ run: $(UTIL_EXEC) start_simulator 
EXAMPLE_SRC = ./src/examples

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

EXAMPLES = write_file_blocking

VALGRIND = valgrind

VALGRIND_ARGS = --track-origins=yes #--leak-check=full



example_sources = $(wildcard $(EXAMPLE_SRC)/*.c)

example_executables = $(patsubst $(EXAMPLE_SRC)/%.c,$(BIN_DIR)/examples/%,$(example_sources))
@@ -294,6 +298,15 @@ run_example_%: $(BIN_DIR)/examples/% 
	@echo ================================================================================

	@echo



valgrind_example_%: $(BIN_DIR)/examples/%

	@echo

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

	@echo Executing example: '$<'

	@echo --------------------------------------------------------------------------------;

	${VALGRIND} ${VALGRIND_ARGS} $<

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

	@echo



setup_examples: $(example_executables) \

	build_examples
@@ -304,3 +317,11 @@ examples: setup_examples \ 
	run_example_write_file_nonblocking \

	run_example_write_file_nonblocking_threads \

	stop_simulator



valgrind_examples: setup_examples \

	start_simulator \

	valgrind_example_write_file_blocking \

	valgrind_example_write_file_blocking_threads \

	valgrind_example_write_file_nonblocking \

	valgrind_example_write_file_nonblocking_threads \

	stop_simulator

README.md

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Getting Started 


**Clone the repo**



    > git clone --recursive https://github.com/atomicobject/kinetic-c.git

    > git clone --recursive https://github.com/seagate/kinetic-c.git

    > cd kinetic-c

    > bundle install # ensure you have all RubyGems at the proper versions

RELEASE.md

+4 −0
Original line number Diff line number Diff line 
v0.8.2

------

* Added FLUSHALLDATA operation.



v0.8.1 (kinetic-protocol 3.0.5)

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

* Added GETLOG operation.

config/VERSION

+1 −1
Original line number Diff line number Diff line 
0.8.1
 
0.8.2

config/project.yml

+1 −1
Original line number Diff line number Diff line
@@ -111,8 +111,8 @@ 
      - -Wstrict-prototypes

      # - -Werror=strict-prototypes

      - -Werror=implicit-function-declaration

      # - -Werror=incompatible-pointer-types

      # - -Wincompatible-pointer-types

      # - -Werror=incompatible-pointer-types

      # - -Wcast-align

      - -D_POSIX_C_SOURCE=199309L

      - -D_C99_SOURCE=1