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

Relocated KineticController_CreateOperation to KineticOperation_Create

parent 23bfeca4

src/lib/kinetic_admin_client.c

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ KineticStatus KineticAdminClient_GetLog(KineticSession const * const session, 
    assert(session->connection != NULL);

    assert(info != NULL);



    KineticOperation* operation = KineticController_CreateOperation(session);

    KineticOperation* operation = KineticOperation_Create(session);

    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}



    // Initialize request
@@ -75,7 +75,7 @@ KineticStatus KineticAdminClient_InstantSecureErase(KineticSession const * const 
    status = KineticAuth_EnsureSslEnabled(&session->config);

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



    KineticOperation* operation = KineticController_CreateOperation(session);

    KineticOperation* operation = KineticOperation_Create(session);

    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}



    KineticOperation_BuildInstantSecureErase(operation);

src/lib/kinetic_client.c

+7 −7
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ KineticStatus KineticClient_NoOp(KineticSession const * const session) 
    assert(session != NULL);

    assert(session->connection != NULL);



    KineticOperation* operation = KineticController_CreateOperation(session);

    KineticOperation* operation = KineticOperation_Create(session);

    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}



    KineticOperation_BuildNoop(operation);
@@ -118,7 +118,7 @@ KineticStatus KineticClient_Put(KineticSession const * const session, 
    assert(entry != NULL);

    assert(entry->value.array.data != NULL);



    KineticOperation* operation = KineticController_CreateOperation(session);

    KineticOperation* operation = KineticOperation_Create(session);

    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}



    // Initialize request
@@ -134,7 +134,7 @@ KineticStatus KineticClient_Flush(KineticSession const * const session, 
    assert(session != NULL);

    assert(session->connection != NULL);



    KineticOperation* operation = KineticController_CreateOperation(session);

    KineticOperation* operation = KineticOperation_Create(session);

    if (operation == NULL) { return KINETIC_STATUS_MEMORY_ERROR; }



    // Initialize request
@@ -174,7 +174,7 @@ static KineticStatus handle_get_command(GET_COMMAND cmd, 
        return KINETIC_STATUS_MISSING_VALUE_BUFFER;

    }



    KineticOperation* operation = KineticController_CreateOperation(session);

    KineticOperation* operation = KineticOperation_Create(session);

    if (operation == NULL) {

        return KINETIC_STATUS_MEMORY_ERROR;

    }
@@ -228,7 +228,7 @@ KineticStatus KineticClient_Delete(KineticSession const * const session, 
    assert(session->connection != NULL);

    assert(entry != NULL);



    KineticOperation* operation = KineticController_CreateOperation(session);

    KineticOperation* operation = KineticOperation_Create(session);

    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}



    // Initialize request
@@ -250,7 +250,7 @@ KineticStatus KineticClient_GetKeyRange(KineticSession const * const session, 
    assert(keys->buffers != NULL);

    assert(keys->count > 0);



    KineticOperation* operation = KineticController_CreateOperation(session);

    KineticOperation* operation = KineticOperation_Create(session);

    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}



    // Initialize request
@@ -268,7 +268,7 @@ KineticStatus KineticClient_P2POperation(KineticSession const * const session, 
    assert(session->connection != NULL);

    assert(p2pOp != NULL);



    KineticOperation* operation = KineticController_CreateOperation(session);

    KineticOperation* operation = KineticOperation_Create(session);

    if (operation == NULL) {return KINETIC_STATUS_MEMORY_ERROR;}



    // Initialize request

src/lib/kinetic_controller.c

+0 −27
Original line number Diff line number Diff line
@@ -48,33 +48,6 @@ KineticStatus KineticController_Init(KineticSession const * const session) 
    return KINETIC_STATUS_SUCCESS;

}



KineticOperation* KineticController_CreateOperation(KineticSession const * const session)

{

    if (session == NULL) {

        LOG0("Specified session is NULL");

        return NULL;

    }



    if (session->connection == NULL) {

        LOG0("Specified session is not associated with a connection");

        return NULL;

    }



    LOGF1("\n"

         "--------------------------------------------------\n"

         "Building new operation on session @ %p", session);



    KineticOperation* operation = KineticAllocator_NewOperation(session->connection);

    if (operation == NULL) {return NULL;}

    if (operation->request == NULL) {

        KineticAllocator_FreeOperation(session->connection, operation);

        return NULL;

    }

    KINETIC_PDU_INIT_WITH_COMMAND(operation->request, session->connection, session->config.clusterVersion);



    return operation;

}



typedef struct {

    pthread_mutex_t receiveCompleteMutex;

    pthread_cond_t receiveComplete;

src/lib/kinetic_controller.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#include "kinetic_types_internal.h"



KineticStatus KineticController_Init(KineticSession const * const session);

KineticOperation* KineticController_CreateOperation(KineticSession const * const session);

KineticStatus KineticController_ExecuteOperation(KineticOperation* operation, KineticCompletionClosure* closure);

void KineticController_Pause(KineticSession const * const session, bool pause);

void* KineticController_ReceiveThread(void* thread_arg);

src/lib/kinetic_operation.c

+28 −0
Original line number Diff line number Diff line
@@ -33,6 +33,34 @@ 
#include <errno.h>

#include <sys/time.h>





KineticOperation* KineticOperation_Create(KineticSession const * const session)

{

    if (session == NULL) {

        LOG0("Specified session is NULL");

        return NULL;

    }



    if (session->connection == NULL) {

        LOG0("Specified session is not associated with a connection");

        return NULL;

    }



    LOGF1("\n"

         "--------------------------------------------------\n"

         "Building new operation on session @ %p", session);



    KineticOperation* operation = KineticAllocator_NewOperation(session->connection);

    if (operation == NULL) {return NULL;}

    if (operation->request == NULL) {

        KineticAllocator_FreeOperation(session->connection, operation);

        return NULL;

    }

    KINETIC_PDU_INIT_WITH_COMMAND(operation->request, session->connection, session->config.clusterVersion);



    return operation;

}



static void KineticOperation_ValidateOperation(KineticOperation* operation);



static KineticStatus WritePDU(KineticOperation* const operation)