Commit 0561804c authored by Scott Vokes's avatar Scott Vokes
Browse files

Merge remote-tracking branch 'origin/develop' into develop

parents 864b5df8 b7c55f33

.travis.yml

+1 −0
Original line number Diff line number Diff line
@@ -8,4 +8,5 @@ compiler: 
install:

  - bundle install

script:

  - make start_simulator

  - make all

Gemfile

+0 −1
Original line number Diff line number Diff line 
source "http://rubygems.org/"

gem 'bundler', '>= 1.3.5'

gem 'ceedling', '>= 0.15'
 
gem 'kinetic-ruby'

Gemfile.lock

+1 −21
Original line number Diff line number Diff line 
GEM

  remote: http://rubygems.org/

  specs:

    beefcake (0.5.0)

    ceedling (0.15.6)

    ceedling (0.16.0)

      rake (>= 0.8.7)

      thor (>= 0.14.5)

    diff-lcs (1.2.5)

    kinetic-ruby (0.6.3)

      beefcake

      rake (>= 0.9.2.2)

      rspec

    rake (10.3.2)

    rspec (3.0.0)

      rspec-core (~> 3.0.0)

      rspec-expectations (~> 3.0.0)

      rspec-mocks (~> 3.0.0)

    rspec-core (3.0.3)

      rspec-support (~> 3.0.0)

    rspec-expectations (3.0.3)

      diff-lcs (>= 1.2.0, < 2.0)

      rspec-support (~> 3.0.0)

    rspec-mocks (3.0.3)

      rspec-support (~> 3.0.0)

    rspec-support (3.0.3)

    rake (10.4.2)

    thor (0.19.1)



PLATFORMS
@@ -32,4 +13,3 @@ PLATFORMS 
DEPENDENCIES

  bundler (>= 1.3.5)

  ceedling (>= 0.15)
 
  kinetic-ruby

Makefile

+3 −61
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ $(OUT_DIR)/%.o: ${LIB_DIR}/bus/%.c ${LIB_DIR}/bus/%.h 
${OUT_DIR}/*.o: src/lib/kinetic_types_internal.h





ci: uninstall all test_internals install

ci: uninstall all stop_simulator test_internals install

	@echo

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

	@echo $(PROJECT) build completed successfully!
@@ -307,50 +307,7 @@ $(SYSTEST_OUT)/%.testpass : $(SYSTEST_OUT)/run_% 


$(systest_names) : % : $(SYSTEST_OUT)/%.testpass



# system_tests: start_simulator $(systest_results)

system_tests: start_simulator $(systest_passfiles)





# run_systest_%: $(SYSTEST_OUT)/%

# 	@echo

# 	@echo ================================================================================

# 	@echo Executing system test: '$<'

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

# 	$<

# 	@echo ================================================================================

# 	@echo

# 	./vendor/kinetic-simulator/stopSimulator.sh

# run_systest_%: start_simulator



# valgrind_systest_%: $(SYSTEST_OUT)/%

# 	@echo

# 	@echo ================================================================================

# 	@echo Executing system test: '$<'

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

# 	${VALGRIND} ${VALGRIND_ARGS} $<

# 	@echo ================================================================================

# 	@echo



# setup_system_tests: $(systest_executables) \

# 	build_system_tests



# system_tests: setup_system_tests \

# 	start_simulator \

# 	run_example_write_file_blocking \

# 	run_example_write_file_blocking_threads \

# 	run_example_write_file_nonblocking \

# 	run_example_write_file_nonblocking_threads \

# 	stop_simulator



# valgrind_system_tests: setup_system_tests \

# 	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





system_tests: $(systest_passfiles)





#===============================================================================
@@ -387,7 +344,7 @@ CLASSPATH = $(JAVA_HOME)/lib/tools.jar:$(SIM_JARS_PREFIX)-jar-with-dependencies. 
SIM_RUNNER = com.seagate.kinetic.simulator.internal.SimulatorRunner

SIM_ADMIN = com.seagate.kinetic.admin.cli.KineticAdminCLI



run: $(UTIL_EXEC) start_simulator

run: $(UTIL_EXEC)

	@echo

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

	@echo Running test utility: $(UTIL_EXEC)
@@ -425,17 +382,6 @@ $(BIN_DIR)/examples/%: $(EXAMPLE_SRC)/%.c $(KINETIC_LIB) 


build_examples: $(example_executables)



test_example_%: $(BIN_DIR)/examples/%

	@echo

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

	@echo Executing example: '$<'

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

	$<

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

	@echo

	./vendor/kinetic-simulator/stopSimulator.sh

test_example_%: start_simulator



run_example_%: $(BIN_DIR)/examples/%

	@echo

	@echo ================================================================================
@@ -458,21 +404,17 @@ setup_examples: $(example_executables) \ 
	build_examples



examples: setup_examples \

	start_simulator \

	run_example_put_nonblocking \

	run_example_get_nonblocking \

	run_example_write_file_blocking \

	run_example_write_file_blocking_threads \

	run_example_write_file_nonblocking \

	run_example_get_key_range \

	stop_simulator



valgrind_examples: setup_examples \

	start_simulator \

	valgrind_put_nonblocking \

	valgrind_get_nonblocking \

	valgrind_example_write_file_blocking \

	valgrind_example_write_file_blocking_threads \

	valgrind_example_write_file_nonblocking \

	valgrind_example_get_key_range \
 
	stop_simulator

RELEASE.md

+3 −2
Original line number Diff line number Diff line 
v0.10.1 (kinetic-protocol 3.0.5)

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

* Fixed regression in 0.10.0 where a GET with metadataOnly=true would result in a crash if a value field was not provided

* Added system tests for P2P operations

* Added system tests for P2P operations which are now fully validated and working on HW



v0.10.0 (kinetic-protocol 3.0.5)

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

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

* Added put_nonblocking and get_nonblocking examples

* Added KineticSemaphore API to provide a simpler wrapper around a common use of pthread condition variables as a thread safe way to signal when an async operation has finished

* Switched internal message infrastructure to use a threadpool. This will allow for a much higher number active connections and outstanding commands.