Commit 9f078e19 authored by Matt Caswell's avatar Matt Caswell
Browse files

Optimise ASYNC_CTX handling 



Don't recreate a new ASYNC_CTX every time we call ASYNC_start_job() - the
same one can be used for the life of the thread. Instead we only free it
up when we call ASYNC_free_pool().

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 7240557b

crypto/async/async.c

+4 −8
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static ASYNC_JOB *async_get_pool_job(void) { 
    if (pool == NULL) {

        /*

         * Pool has not been initialised, so init with the defaults, i.e.

         * global pool, with no max size and no pre-created jobs

         * no max size and no pre-created jobs

         */

        if (ASYNC_init_pool(0, 0) == 0)

            return NULL;
@@ -191,7 +191,7 @@ void ASYNC_start_func(void) 
int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *),

                         void *args, size_t size)

{

    if(ASYNC_get_ctx() || !ASYNC_CTX_new()) {

    if(!ASYNC_get_ctx() && !ASYNC_CTX_new()) {

        return ASYNC_ERR;

    }
@@ -206,14 +206,13 @@ int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *), 
                async_release_job(ASYNC_get_ctx()->currjob);

                ASYNC_get_ctx()->currjob = NULL;

                *job = NULL;

                ASYNC_CTX_free();

                return ASYNC_FINISH;

            }



            if(ASYNC_get_ctx()->currjob->status == ASYNC_JOB_PAUSING) {

                *job = ASYNC_get_ctx()->currjob;

                ASYNC_get_ctx()->currjob->status = ASYNC_JOB_PAUSED;

                ASYNC_CTX_free();

                ASYNC_get_ctx()->currjob = NULL;

                return ASYNC_PAUSE;

            }
@@ -230,13 +229,11 @@ int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *), 
            async_release_job(ASYNC_get_ctx()->currjob);

            ASYNC_get_ctx()->currjob = NULL;

            *job = NULL;

            ASYNC_CTX_free();

            return ASYNC_ERR;

        }



        /* Start a new job */

        if(!(ASYNC_get_ctx()->currjob = async_get_pool_job())) {

            ASYNC_CTX_free();

            return ASYNC_NO_JOBS;

        }
@@ -245,7 +242,6 @@ int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *), 
            if(!ASYNC_get_ctx()->currjob->funcargs) {

                async_release_job(ASYNC_get_ctx()->currjob);

                ASYNC_get_ctx()->currjob = NULL;

                ASYNC_CTX_free();

                return ASYNC_ERR;

            }

            memcpy(ASYNC_get_ctx()->currjob->funcargs, args, size);
@@ -263,7 +259,6 @@ err: 
    async_release_job(ASYNC_get_ctx()->currjob);

    ASYNC_get_ctx()->currjob = NULL;

    *job = NULL;

    ASYNC_CTX_free();

    return ASYNC_ERR;

}
@@ -347,6 +342,7 @@ void ASYNC_free_pool(void) 


    async_empty_pool(pool);

    async_release_pool();

    ASYNC_CTX_free();

}



ASYNC_JOB *ASYNC_get_current_job(void)