Commit 5bb9a3a8 authored by Greg Williams's avatar Greg Williams
Browse files

Updated vendor/kinetic-protocol to 2.0.6 tag. Updated kinetic_proto module to... 

Updated vendor/kinetic-protocol to 2.0.6 tag. Updated kinetic_proto module to new version generated from protobuf-c. Updated vendor/kinetic-java JAR files to new build based off of 2.0.7 tag of kinetic-java.
Added zlog as a new submodule, since it has support for config file, logging levels, timestamps and in-memory cacheing for fast performance, but have NOT updated to use it yet.
parent ee65f2a2

.gitmodules

+7 −3
Original line number Diff line number Diff line 
[submodule "vendor/protobuf-c"]

[submodule "protobuf-c"]

	path = vendor/protobuf-c

	url = https://github.com/atomicobject/protobuf-c

	branch = master

[submodule "vendor/kinetic-protocol"]

[submodule "kinetic-protocol"]

	path = vendor/kinetic-protocol

	url = https://github.com/Seagate/kinetic-protocol.git

	branch = 2.0.4

[submodule "vendor/socket99"]

[submodule "socket99"]

	path = vendor/socket99

	url = https://github.com/silentbicycle/socket99.git

	branch = master

[submodule "zlog"]

	path = vendor/zlog

	url = https://github.com/zma/zlog.git

	branch = master

project.yml

+21 −9
Original line number Diff line number Diff line
@@ -22,23 +22,23 @@ 
  :test:

    - +:test/**

    - -:test/support

    - src/**

  :support:

    - test/support/**

  :source:

    - src/lib/*

    - src/utility/*

    - vendor/protobuf-c/protobuf-c/*

    - src/**/*.c

    - vendor/protobuf-c/protobuf-c/protobuf-c.c

    - vendor/socket99/socket99.c

  :include:

    - src/**

    - include/**

    - vendor/socket99/

    - vendor/protobuf-c/protobuf-c/

    - vendor/

    - vendor/protobuf-c/

  # Refactor release build once the Kinetic-C library is built, and link to it sepearately

  :release_toolchain_include:

    - src/*

    - include/**

    - vendor/protobuf-c/protobuf-c/

    - vendor/socket99/

    - vendor/

    - vendor/protobuf-c/



:defines:

  # in order to add common defines:
@@ -64,10 +64,19 @@ 


:cmock:

  :mock_prefix: mock_

  :when_no_prototypes: :warn

  :when_no_prototypes: :error

  :enforce_strict_ordering: true

  :plugins:

    - :ignore

    # - :ignore_args

    - :array

    - :cexception

    - :callback

    - :return_thru_ptr

  :unity_helper_path: test/support/unity_helper.h

  :includes_h_post_orig_header:

    - "unity.h"

    - "unity_helper.h"

  :treat_as:

    uint8_t:    HEX8

    uint16_t:   HEX16
@@ -75,6 +84,7 @@ 
    int8_t:     INT8

    bool_t:     BOOL

    size_t:     INT

  :callback_include_count: true



:tools:

  :test_includes_preprocessor:
@@ -142,6 +152,8 @@ 
    - "#{Ceedling.load_path}"

  :enabled:

    - stdout_ide_tests_report

    - xml_tests_report

    # - warnings_report

    - module_generator

    - gcov

...

src/lib/kinetic_client.c

+4 −19
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ void KineticClient_Disconnect( 
KineticOperation KineticClient_CreateOperation(

    KineticConnection* connection,

    KineticPDU* request,

    KineticMessage* requestMsg,

    KineticPDU* response)

{

    KineticOperation op;
@@ -109,28 +108,20 @@ KineticOperation KineticClient_CreateOperation( 
        assert(request != NULL);

    }



    if (requestMsg == NULL)

    {

        LOG("Specified KineticMessage request is NULL!");

        assert(requestMsg != NULL);

    }



    if (response == NULL)

    {

        LOG("Specified KineticPDU response is NULL!");

        assert(response != NULL);

    }



    KineticMessage_Init(requestMsg);

    KineticPDU_Init(request, connection, requestMsg);

    KineticPDU_Init(response, connection, NULL);

    KineticPDU_Init(request, connection);

    KineticPDU_Init(response, connection);



    op.connection = connection;

    op.request = request;

    op.request->message = requestMsg;

    // op.request->message = requestMsg;

    op.response = response;

    op.response->message = NULL;

    op.response->proto = NULL;

    // op.response->message = NULL;



    return op;

}
@@ -139,9 +130,7 @@ KineticProto_Status_StatusCode KineticClient_NoOp(KineticOperation* operation) 
{

    assert(operation->connection != NULL);

    assert(operation->request != NULL);

    assert(operation->request->message != NULL);

    assert(operation->response != NULL);

    assert(operation->response->message == NULL);



    // Initialize request

    KineticOperation_BuildNoop(operation);
@@ -156,9 +145,7 @@ KineticProto_Status_StatusCode KineticClient_Put(KineticOperation* operation, 
{

    assert(operation->connection != NULL);

    assert(operation->request != NULL);

    assert(operation->request->message != NULL);

    assert(operation->response != NULL);

    assert(operation->response->message == NULL);

    assert(value.data != NULL);

    assert(value.len <= PDU_VALUE_MAX_LEN);
@@ -175,9 +162,7 @@ KineticProto_Status_StatusCode KineticClient_Get(KineticOperation* operation, 
{

    assert(operation->connection != NULL);

    assert(operation->request != NULL);

    assert(operation->request->message != NULL);

    assert(operation->response != NULL);

    assert(operation->response->message == NULL);

    assert(metadata != NULL);

    assert(metadata->key.data != NULL);

    assert(metadata->key.len <= KINETIC_MAX_KEY_LEN);

src/lib/kinetic_client.h

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ void KineticClient_Disconnect(KineticConnection* connection); 
KineticOperation KineticClient_CreateOperation(

    KineticConnection* connection,

    KineticPDU* request,

    KineticMessage* requestMsg,

    KineticPDU* response);



/**

src/lib/kinetic_hmac.c

+0 −4
Original line number Diff line number Diff line
@@ -96,17 +96,14 @@ static void KineticHMAC_Compute(KineticHMAC* hmac, 
    const KineticProto* proto,

    const ByteArray key)

{

    LOG_LOCATION;

    assert(proto->command);

    uint32_t len = protobuf_c_message_get_packed_size((ProtobufCMessage*)proto->command);

    LOGF("  packedLen=%zu", len);

    uint32_t lenNBO = KineticNBO_FromHostU32(len);

    uint8_t* packed = malloc(len);

    assert(packed);

    uint32_t lenPacked = protobuf_c_message_pack((ProtobufCMessage*)proto->command, packed);

    assert(lenPacked == len);



#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wdeprecated-declarations"

    HMAC_CTX ctx;

    HMAC_CTX_init(&ctx);
@@ -115,7 +112,6 @@ static void KineticHMAC_Compute(KineticHMAC* hmac, 
    HMAC_Update(&ctx, packed, len);

    HMAC_Final(&ctx, hmac->data, &hmac->len);

    HMAC_CTX_cleanup(&ctx);

#pragma GCC diagnostic pop



    free(packed);

}