Commit ae667396 authored by Greg Williams's avatar Greg Williams
Browse files

Merge branch 'master' into develop 

Cleaned up logging in stress tests.

Conflicts:
	RELEASE.md
	config/VERSION
	src/lib/bus/listener.c
	src/lib/kinetic_allocator.c
	src/lib/kinetic_client.c
	src/lib/kinetic_hmac.c
	src/lib/kinetic_operation.c
	src/lib/kinetic_types_internal.c
	test/system/test_system_bus.c
	test/system/test_system_erase.c
	test/system/test_system_get.c
	test/system/test_system_get_log.c
	test/system/test_system_getkeyrange.c
	test/system/test_system_getnext_getprevious.c
	test/system/test_system_p2pop.c
	test/system/test_system_put.c
	test/unit/test_kinetic_pdu.c
parents ffa5bce2 9f666f70

RELEASE.md

+4 −0
Original line number Diff line number Diff line
@@ -10,6 +10,10 @@ v0.12.0 (kinetic-protocol 3.0.5) 
* *KNOWN ISSUES*

    * KineticAdminClient_UpdateFirmware and KineticAdminClient_SetAcl are incomplete



v0.11.2 (kinetic-protocol 3.0.5)

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

* Changed all threads to be block indefinitely and be fully event-driven.



v0.11.1 (kinetic-protocol 3.0.5)

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

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

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.1"

PROJECT_NUMBER           = "v0.11.2-beta"



# 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

kinetic-c.sublime-project

+4 −4
Original line number Diff line number Diff line
@@ -40,10 +40,10 @@ 
			"cmd":

			[

				"make",

				"utility"

				"${file_base_name}"

			],

			"file_regex": "([A-Za-z][A-Za-z0-9/_]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"name": "kinetic-c - Build test utility",

			"name": "kinetic-c - Build and run system test",

			"working_dir": "${project_path}",

			"path": "/usr/local/bin:/usr/local/sbin:/usr/bin:/Users/greg/bin:~/.local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",

		},
@@ -51,10 +51,10 @@ 
			"cmd":

			[

				"make",

				"${file_base_name}"

				"utility"

			],

			"file_regex": "([A-Za-z][A-Za-z0-9/_]+\\.[ch])[:,] ?l?i?n?e? ?([0-9]+)[\\.:,]*([0-9]*)",

			"name": "kinetic-c - Build and run system test",

			"name": "kinetic-c - Build test utility",

			"working_dir": "${project_path}",

			"path": "/usr/local/bin:/usr/local/sbin:/usr/bin:/Users/greg/bin:~/.local/bin:/opt/local/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin",

		},

src/examples/write_file_blocking_threads.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void* store_data(void* args) 
            return (void*)NULL;

        }

    }

    printf("File stored to successfully to Kinetic Device across %d entries!\n", objIndex);

    printf("File stored successfully to Kinetic device across %d entries!\n", objIndex);

    return (void*)NULL;

}

src/lib/bus/bus_example.c

+15 −6
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <err.h>

#include <signal.h>

#include <sys/time.h>

#include <poll.h>



#ifdef __Linux__

// some Linux distros put this in a nonstandard place.
@@ -454,7 +455,6 @@ static void run_bus(example_state *s, struct bus *b) { 
        bus_register_socket(b, BUS_SOCKET_PLAIN, s->sockets[i], s->info[i]);

    }



    bool should_send = true;

    int cur_socket_i = 0;

    int64_t seq_id = 1;
@@ -464,19 +464,26 @@ static void run_bus(example_state *s, struct bus *b) { 


    s->last_second = get_cur_second();



    int sleep_counter = 0;



    while (loop_flag) {

        time_t cur_second = get_cur_second();

        if (cur_second != s->last_second) {

            tick_handler(s);

            s->last_second = cur_second;

            payload_size = 8;

            should_send = true;

        } else {

            should_send = true;

            if (sleep_counter > 0) {

                sleep_counter--;

                if (sleep_counter == 0) {

                    printf(" -- resuming\n");

                }

            } else if ((cur_second & 0x3f) == 0x00) {

                printf(" -- sleeping for 10 seconds\n");

                sleep_counter = 10;

            }

        }



        if (should_send) {

            should_send = false;

        if (sleep_counter == 0) {

            size_t msg_size = construct_msg(msg_buf, buf_size,

                100 * /*payload_size * */ 1024L, seq_id);

            LOG(3, " @@ sending message with %zd bytes\n", msg_size);
@@ -503,6 +510,8 @@ static void run_bus(example_state *s, struct bus *b) { 
            if (seq_id == s->max_seq_id) {

                loop_flag = false;

            }

        } else {

            poll(NULL, 0, 1000);

        }

    }

}