Commit 7ef7208d authored by Job Vranish's avatar Job Vranish
Browse files

finished chained write implementation for p2p operations

parent 8d2752d8

config/project.yml

+4 −1
Original line number Diff line number Diff line
@@ -35,9 +35,12 @@ 
:defines:

  :commmon: &common_defines

    - TEST

    - SYSTEM_TEST_HOST=\"<%= ENV.fetch('SYSTEM_TEST_HOST', 'localhost') %>\"

    # - SYSTEM_TEST_HOST=\"<%= ENV.fetch('SYSTEM_TEST_HOST', 'localhost') %>\"

  :test:

    - *common_defines

    # - SYSTEM_TEST_HOST="\"10.138.123.171\""

    # - SYSTEM_TEST_HOST="\"localhost\""

    # - SYSTEM_TEST_HOST2="\"10.138.123.122\""

  :test_preprocess:

    - *common_defines

include/kinetic_types.h

+5 −2
Original line number Diff line number Diff line
@@ -339,18 +339,21 @@ typedef struct { 
    bool    tls; // optional, defaults to false

} KineticP2P_Peer;



typedef struct _KineticP2P_Operation KineticP2P_Operation;



typedef struct {

    ByteBuffer    key;

    ByteBuffer    version; // optional (defaults to force if not specified)

    ByteBuffer    newKey;

    KineticP2P_Operation* chainedOperation;

    KineticStatus resultStatus; // populated with the result of the operation

} KineticP2P_OperationData;



typedef struct {

struct _KineticP2P_Operation {

    KineticP2P_Peer peer; 

    size_t numOperations;

    KineticP2P_OperationData* operations; // pointer must remain valid until operations complete

} KineticP2P_Operation;

};



const char* KineticMessageType_GetName(KineticMessageType type);

kinetic-c.sublime-project

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
      "-Werror=implicit-function-declaration",

      "-D_POSIX_C_SOURCE=199309L",

      "-D_C99_SOURCE=1",

      "-DSYSTEM_TEST_HOST2=\"\"",

      "-Wno-nonnull",

      "-Wno-address",

      "-Wno-missing-field-initializers",

src/lib/kinetic_client.c

+3 −1
Original line number Diff line number Diff line
@@ -286,7 +286,9 @@ KineticStatus KineticClient_P2POperation(KineticSession const * const session, 
    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}



    // Initialize request

    KineticOperation_BuildP2POperation(operation, p2pOp);

    KineticStatus status = KineticOperation_BuildP2POperation(operation, p2pOp);

    if (status != KINETIC_STATUS_SUCCESS) {return status; }

    // TODO I probably need to call the callback here?



    // Execute the operation

    return KineticController_ExecuteOperation(operation, closure);

src/lib/kinetic_logger.c

+3 −3
Original line number Diff line number Diff line
@@ -180,17 +180,17 @@ void KineticLogger_LogHeader(int log_level, const KineticPDUHeader* header) 


#define LOG_PROTO_LEVEL_START(__name) \

    KineticLogger_LogPrintf(2, "%s%s {", (_indent), (__name)); \

    strcat(_indent, "  ");

    (strlen(_indent) < (sizeof(_indent) - 3 )) ? strcat(_indent, "  ") : 0;

#define LOG_PROTO_LEVEL_START_NO_INDENT() \

    KineticLogger_LogPrintf(2, "{"); \

    strcat(_indent, "  ");

    (strlen(_indent) < (sizeof(_indent) - 3)) ? strcat(_indent, "  ") : 0;

#define LOG_PROTO_LEVEL_END() \

    _indent[strlen(_indent) - 2] = '\0'; \

    KineticLogger_LogPrintf(2, "%s}", _indent);



#define LOG_PROTO_LEVEL_START_ARRAY(__name, __quantity) \

    KineticLogger_LogPrintf(2, "%s%s: (%u elements) [", (_indent), (__name), (__quantity)); \

    strcat(_indent, "  ");

    (strlen(_indent) < (sizeof(_indent) - 3)) ? strcat(_indent, "  ") : 0;

#define LOG_PROTO_LEVEL_END_ARRAY() \

    _indent[strlen(_indent) - 2] = '\0'; \

    KineticLogger_LogPrintf(2, "%s]", _indent);