Commit 6c9aa495 authored by Scott Vokes's avatar Scott Vokes
Browse files

Eliminate temporary log (used for debugging race condition).

parent 382b3fcd

src/lib/kinetic_client.c

+0 −16
Original line number Diff line number Diff line
@@ -148,31 +148,15 @@ KineticStatus KineticClient_Put(KineticSession const * const session, 
    assert(session->connection->pSession == session);

    assert(session->connection == session->connection->pSession->connection);



#define PUT_LOCK 1



#if PUT_LOCK

    KineticSession_Lock(session);

#endif



    KineticOperation* operation = KineticController_CreateOperation(session);

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



#if PUT_LOCK

    if (0) {  // Debugging: change to 1 to force race condition

        KineticSession_Unlock(session);

        KineticSession_Lock(session);

    }

#endif



    // Initialize request

    KineticOperation_BuildPut(operation, entry);



    // Execute the operation

    assert(operation->connection == session->connection);

    KineticStatus res = KineticController_ExecuteOperation(operation, closure);

#if PUT_LOCK

    KineticSession_Unlock(session);

#endif

    return res;

}

src/lib/kinetic_session.c

+0 −12
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ KineticStatus KineticSession_Create(KineticSession * const session, KineticClien 
        return KINETIC_STATUS_MEMORY_ERROR;

    }

    

    pthread_mutex_init(&session->coarse_lock, NULL);



    // init connection send mutex

    if (pthread_mutex_init(&session->connection->sendMutex, NULL) != 0) {

        LOG0("Failed initializing connection send mutex!");
@@ -153,13 +151,3 @@ KineticStatus KineticSession_Disconnect(KineticSession const * const session) 


    return KINETIC_STATUS_SUCCESS;

}
 


void KineticSession_Lock(KineticSession const *const ses) {

    KineticSession *s = (KineticSession *)ses;

    pthread_mutex_lock(&s->coarse_lock);

}



void KineticSession_Unlock(KineticSession const * const ses) {

    KineticSession *s = (KineticSession *)ses;

    pthread_mutex_unlock(&s->coarse_lock);

}

src/lib/kinetic_session.h

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,4 @@ KineticStatus KineticSession_Connect(KineticSession const * const session); 
KineticStatus KineticSession_Disconnect(KineticSession const * const session);

void KineticSession_IncrementSequence(KineticSession const * const session);



void KineticSession_Lock(KineticSession const * const ses);

void KineticSession_Unlock(KineticSession const * const ses);



#endif // _KINETIC_SESSION_H