Commit 7938f4bb authored by Greg Williams's avatar Greg Williams
Browse files

Started refactoring session/connection relationship to prepare for... 

Started refactoring session/connection relationship to prepare for consolidation of connection into session to eliminate forward/backward references.
Added session pointer to operation to eliminate need for back reference from connection to session, but more cleanup is still desired.
parent 8b0062ec

include/kinetic_admin_client.h

+12 −12
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ KineticStatus KineticAdminClient_DestroySession(KineticSession * const session); 
 *

 * @return          Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_SetErasePin(KineticSession const * const session,

KineticStatus KineticAdminClient_SetErasePin(KineticSession * const session,

    ByteArray old_pin, ByteArray new_pin);



/**
@@ -101,7 +101,7 @@ KineticStatus KineticAdminClient_SetErasePin(KineticSession const * const sessio 
 *

 * @return          Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_SecureErase(KineticSession const * const session,

KineticStatus KineticAdminClient_SecureErase(KineticSession * const session,

    ByteArray pin);



/**
@@ -112,7 +112,7 @@ KineticStatus KineticAdminClient_SecureErase(KineticSession const * const sessio 
 *

 * @return          Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_InstantErase(KineticSession const * const session,

KineticStatus KineticAdminClient_InstantErase(KineticSession * const session,

    ByteArray pin);



/**
@@ -126,7 +126,7 @@ KineticStatus KineticAdminClient_InstantErase(KineticSession const * const sessi 
 *

 * @return          Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_SetLockPin(KineticSession const * const session,

KineticStatus KineticAdminClient_SetLockPin(KineticSession * const session,

    ByteArray old_pin, ByteArray new_pin);



/**
@@ -137,7 +137,7 @@ KineticStatus KineticAdminClient_SetLockPin(KineticSession const * const session 
 *

 * @return          Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_LockDevice(KineticSession const * const session,

KineticStatus KineticAdminClient_LockDevice(KineticSession * const session,

    ByteArray pin);



/**
@@ -148,7 +148,7 @@ KineticStatus KineticAdminClient_LockDevice(KineticSession const * const session 
 *

 * @return          Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_UnlockDevice(KineticSession const * const session,

KineticStatus KineticAdminClient_UnlockDevice(KineticSession * const session,

    ByteArray pin);



/**
@@ -168,7 +168,7 @@ KineticStatus KineticAdminClient_UnlockDevice(KineticSession const * const sessi 
 *

 * @return          Returns the resulting KineticStatus

 */

KineticStatus KineticAdminClient_GetLog(KineticSession const * const session,

KineticStatus KineticAdminClient_GetLog(KineticSession * const session,

                                   KineticLogInfo_Type type,

                                   KineticLogInfo** info,

                                   KineticCompletionClosure* closure);
@@ -189,7 +189,7 @@ KineticStatus KineticAdminClient_GetLog(KineticSession const * const session, 
 *

 * @return          Returns the resulting KineticStatus

 */

KineticStatus KineticAdminClient_GetDeviceSpecificLog(KineticSession const * const session,

KineticStatus KineticAdminClient_GetDeviceSpecificLog(KineticSession * const session,

                                   ByteArray name,

                                   KineticLogInfo** info,

                                   KineticCompletionClosure* closure);
@@ -200,7 +200,7 @@ KineticStatus KineticAdminClient_GetDeviceSpecificLog(KineticSession const * con 
 * @param session       The connected KineticSession to use for the operation

 * @param info          The KineticLogInfo result to free.

 */

void KineticAdminClient_FreeLogInfo(KineticSession const * const session,

void KineticAdminClient_FreeLogInfo(KineticSession * const session,

                                  KineticLogInfo* info);



/**
@@ -211,7 +211,7 @@ void KineticAdminClient_FreeLogInfo(KineticSession const * const session, 
 *

 * @return          Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_SetClusterVersion(KineticSession const * const session,

KineticStatus KineticAdminClient_SetClusterVersion(KineticSession * const session,

    int64_t version);



/**
@@ -222,7 +222,7 @@ KineticStatus KineticAdminClient_SetClusterVersion(KineticSession const * const 
 *

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_SetACL(KineticSession const * const session,

KineticStatus KineticAdminClient_SetACL(KineticSession * const session,

                                        const char *ACLPath);



/**
@@ -233,7 +233,7 @@ KineticStatus KineticAdminClient_SetACL(KineticSession const * const session, 
 *

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticAdminClient_UpdateFirmware(KineticSession const * const session,

KineticStatus KineticAdminClient_UpdateFirmware(KineticSession * const session,

    char const * const fw_path);



#endif // _KINETIC_ADMIN_CLIENT_H

include/kinetic_client.h

+9 −9
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ KineticStatus KineticClient_DestroySession(KineticSession * const session); 
 *

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticClient_NoOp(KineticSession const * const session);

KineticStatus KineticClient_NoOp(KineticSession* const session);



/**

 * @brief Executes a `PUT` operation to store/update an entry on the Kinetic Device.
@@ -105,7 +105,7 @@ KineticStatus KineticClient_NoOp(KineticSession const * const session); 
 * 

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticClient_Put(KineticSession const * const session,

KineticStatus KineticClient_Put(KineticSession* const session,

                                KineticEntry* const entry,

                                KineticCompletionClosure* closure);
@@ -119,7 +119,7 @@ KineticStatus KineticClient_Put(KineticSession const * const session, 
 *                      

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticClient_Flush(KineticSession const * const session,

KineticStatus KineticClient_Flush(KineticSession* const session,

                                  KineticCompletionClosure* closure);



/**
@@ -136,7 +136,7 @@ KineticStatus KineticClient_Flush(KineticSession const * const session, 
 *

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticClient_Get(KineticSession const * const session,

KineticStatus KineticClient_Get(KineticSession* const session,

                                KineticEntry* const entry,

                                KineticCompletionClosure* closure);
@@ -158,7 +158,7 @@ KineticStatus KineticClient_Get(KineticSession const * const session, 
 *

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticClient_GetPrevious(KineticSession const * const session,

KineticStatus KineticClient_GetPrevious(KineticSession* const session,

                                        KineticEntry* const entry,

                                        KineticCompletionClosure* closure);
@@ -180,7 +180,7 @@ KineticStatus KineticClient_GetPrevious(KineticSession const * const session, 
 *

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticClient_GetNext(KineticSession const * const session,

KineticStatus KineticClient_GetNext(KineticSession* const session,

                                    KineticEntry* const entry,

                                    KineticCompletionClosure* closure);
@@ -196,7 +196,7 @@ KineticStatus KineticClient_GetNext(KineticSession const * const session, 
 *

 * @return              Returns the resulting KineticStatus.

 */

KineticStatus KineticClient_Delete(KineticSession const * const session,

KineticStatus KineticClient_Delete(KineticSession* const session,

                                   KineticEntry* const entry,

                                   KineticCompletionClosure* closure);
@@ -217,7 +217,7 @@ KineticStatus KineticClient_Delete(KineticSession const * const session, 
 * @return              Returns 0 upon success, -1 or the Kinetic status code

 *                      upon failure

 */

KineticStatus KineticClient_GetKeyRange(KineticSession const * const session,

KineticStatus KineticClient_GetKeyRange(KineticSession* const session,

                                        KineticKeyRange* range, ByteBufferArray* keys,

                                        KineticCompletionClosure* closure);
@@ -241,7 +241,7 @@ KineticStatus KineticClient_GetKeyRange(KineticSession const * const session, 
 *                      You'll need to check the resultStatus in the p2pOp structure

 *                      to check the status of the individual P2P operations.

 */

KineticStatus KineticClient_P2POperation(KineticSession const * const session,

KineticStatus KineticClient_P2POperation(KineticSession* const session,

                                         KineticP2P_Operation* const p2pOp,

                                         KineticCompletionClosure* closure);

src/examples/blocking_getkeyrange.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


#include <openssl/sha.h>



static void do_put_and_getkeyrange(KineticSession *session) {

static void do_put_and_getkeyrange(KineticSession * const session) {

    for (int i = 0; i < 5; i++) {

        char key[] = "keyX";

        key[3] = '0' + i;

src/examples/get_key_range.c

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <sys/stat.h>

#include <sys/file.h>



static bool create_entries(KineticSession const * const session, const int count);

static bool create_entries(KineticSession * const session, const int count);



int main(int argc, char** argv)

{
@@ -114,7 +114,7 @@ int main(int argc, char** argv) 
    return 0;

}



static bool create_entries(KineticSession const * const session, const int count)

static bool create_entries(KineticSession * const session, const int count)

{

    static const ssize_t sz = 20;

    char key_buf[sz];

src/lib/kinetic_admin_client.c

+23 −23
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ KineticStatus KineticAdminClient_DestroySession(KineticSession * const session) 
}





KineticStatus KineticAdminClient_SetErasePin(KineticSession const * const session,

KineticStatus KineticAdminClient_SetErasePin(KineticSession * const session,

    ByteArray old_pin, ByteArray new_pin)

{

    KineticStatus status;
@@ -67,14 +67,14 @@ KineticStatus KineticAdminClient_SetErasePin(KineticSession const * const sessio 
        return KINETIC_STATUS_MISSING_PIN;

    }



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

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



    KineticBuilder_BuildSetPin(operation, old_pin, new_pin, false);

    return KineticController_ExecuteOperation(operation, NULL);

}



KineticStatus KineticAdminClient_SecureErase(KineticSession const * const session,

KineticStatus KineticAdminClient_SecureErase(KineticSession * const session,

    ByteArray pin)

{

    assert(session != NULL);
@@ -89,14 +89,14 @@ KineticStatus KineticAdminClient_SecureErase(KineticSession const * const sessio 
        return KINETIC_STATUS_MISSING_PIN;

    }



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

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



    KineticBuilder_BuildErase(operation, true, &pin);

    return KineticController_ExecuteOperation(operation, NULL);

}



KineticStatus KineticAdminClient_InstantErase(KineticSession const * const session,

KineticStatus KineticAdminClient_InstantErase(KineticSession * const session,

    ByteArray pin)

{

    assert(session != NULL);
@@ -111,7 +111,7 @@ KineticStatus KineticAdminClient_InstantErase(KineticSession const * const sessi 
        return KINETIC_STATUS_MISSING_PIN;

    }



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

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



    KineticBuilder_BuildErase(operation, false, &pin);
@@ -119,7 +119,7 @@ KineticStatus KineticAdminClient_InstantErase(KineticSession const * const sessi 
}





KineticStatus KineticAdminClient_SetLockPin(KineticSession const * const session,

KineticStatus KineticAdminClient_SetLockPin(KineticSession * const session,

    ByteArray old_pin, ByteArray new_pin)

{

    KineticStatus status;
@@ -132,14 +132,14 @@ KineticStatus KineticAdminClient_SetLockPin(KineticSession const * const session 
        return KINETIC_STATUS_MISSING_PIN;

    }



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

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



    KineticBuilder_BuildSetPin(operation, old_pin, new_pin, true);

    return KineticController_ExecuteOperation(operation, NULL);

}



KineticStatus KineticAdminClient_LockDevice(KineticSession const * const session,

KineticStatus KineticAdminClient_LockDevice(KineticSession * const session,

    ByteArray pin)

{

    assert(session != NULL);
@@ -154,14 +154,14 @@ KineticStatus KineticAdminClient_LockDevice(KineticSession const * const session 
        return KINETIC_STATUS_MISSING_PIN;

    }



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

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



    KineticBuilder_BuildLockUnlock(operation, true, &pin);

    return KineticController_ExecuteOperation(operation, NULL);

}



KineticStatus KineticAdminClient_UnlockDevice(KineticSession const * const session,

KineticStatus KineticAdminClient_UnlockDevice(KineticSession * const session,

    ByteArray pin)

{

    assert(session != NULL);
@@ -176,14 +176,14 @@ KineticStatus KineticAdminClient_UnlockDevice(KineticSession const * const sessi 
        return KINETIC_STATUS_MISSING_PIN;

    }



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

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



    KineticBuilder_BuildLockUnlock(operation, false, &pin);

    return KineticController_ExecuteOperation(operation, NULL);

}



KineticStatus KineticAdminClient_GetLog(KineticSession const * const session,

KineticStatus KineticAdminClient_GetLog(KineticSession * const session,

                                   KineticLogInfo_Type type,

                                   KineticLogInfo** info,

                                   KineticCompletionClosure* closure)
@@ -198,7 +198,7 @@ KineticStatus KineticAdminClient_GetLog(KineticSession const * const session, 
        return KINETIC_STATUS_INVALID_LOG_TYPE;

    }



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

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



    // Initialize request
@@ -208,7 +208,7 @@ KineticStatus KineticAdminClient_GetLog(KineticSession const * const session, 
    return KineticController_ExecuteOperation(operation, closure);

}



KineticStatus KineticAdminClient_GetDeviceSpecificLog(KineticSession const * const session,

KineticStatus KineticAdminClient_GetDeviceSpecificLog(KineticSession * const session,

                                   ByteArray name,

                                   KineticLogInfo** info,

                                   KineticCompletionClosure* closure)
@@ -217,7 +217,7 @@ KineticStatus KineticAdminClient_GetDeviceSpecificLog(KineticSession const * con 
    assert(session->connection != NULL);

    assert(info != NULL);



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

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



    // Initialize request
@@ -227,7 +227,7 @@ KineticStatus KineticAdminClient_GetDeviceSpecificLog(KineticSession const * con 
    return KineticController_ExecuteOperation(operation, closure);

}



void KineticClient_FreeLogInfo(KineticSession const * const session,

void KineticClient_FreeLogInfo(KineticSession * const session,

                                  KineticLogInfo* info)

{

    assert(session != NULL);
@@ -238,20 +238,20 @@ void KineticClient_FreeLogInfo(KineticSession const * const session, 
    (void)session;

}



KineticStatus KineticAdminClient_SetClusterVersion(KineticSession const * const session,

KineticStatus KineticAdminClient_SetClusterVersion(KineticSession * const session,

    int64_t version)

{

    assert(session != NULL);

    assert(session->connection != NULL);



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

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



    KineticBuilder_BuildSetClusterVersion(operation, version);

    return KineticController_ExecuteOperation(operation, NULL);

}



KineticStatus KineticAdminClient_SetACL(KineticSession const * const session,

KineticStatus KineticAdminClient_SetACL(KineticSession * const session,

        const char *ACLPath) {

    assert(session != NULL);

    assert(session->connection != NULL);
@@ -267,7 +267,7 @@ KineticStatus KineticAdminClient_SetACL(KineticSession const * const session, 
        return KINETIC_STATUS_ACL_ERROR;

    }



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

    if (operation == NULL) {

        printf("!operation\n");

        return KINETIC_STATUS_MEMORY_ERROR;
@@ -282,13 +282,13 @@ KineticStatus KineticAdminClient_SetACL(KineticSession const * const session, 
    return status;

}



KineticStatus KineticAdminClient_UpdateFirmware(KineticSession const * const session,

KineticStatus KineticAdminClient_UpdateFirmware(KineticSession * const session,

    char const * const fw_path)

{

    assert(session != NULL);

    assert(session->connection != NULL);



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

    KineticOperation* operation = KineticAllocator_NewOperation(session);

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

    

    KineticStatus status = KineticBuilder_BuildUpdateFirmware(operation, fw_path);