Tidied up the naming of functions and structures to be consistent
Reviewed-by: Rich Salz <rsalz@openssl.org>
typedef struct async_fibre_st {
int dummy;
typedef struct async_fibre_st {
int dummy;
-
-# define ASYNC_set_ctx(nctx) 0
-# define ASYNC_get_ctx() ((ASYNC_CTX *)NULL)
-# define ASYNC_FIBRE_swapcontext(o,n,r) 0
-# define ASYNC_FIBRE_makecontext(c)
-# define ASYNC_FIBRE_free(f)
-# define ASYNC_FIBRE_init_dispatcher(f)
+# define async_set_ctx(nctx) 0
+# define async_get_ctx() ((async_ctx *)NULL)
+# define async_fibre_swapcontext(o,n,r) 0
+# define async_fibre_makecontext(c)
+# define async_fibre_free(f)
+# define async_fibre_init_dispatcher(f)
#include "../async_locl.h"
#include <openssl/async.h>
#include "../async_locl.h"
#include <openssl/async.h>
# include <stddef.h>
# include <ucontext.h>
# include <unistd.h>
# include <openssl/crypto.h>
# include <openssl/async.h>
# include <stddef.h>
# include <ucontext.h>
# include <unistd.h>
# include <openssl/crypto.h>
# include <openssl/async.h>
-__thread ASYNC_CTX *sysvctx;
+__thread async_ctx *sysvctx;
__thread size_t pool_curr_size = 0;
__thread STACK_OF(ASYNC_JOB) *pool = NULL;
__thread size_t pool_curr_size = 0;
__thread STACK_OF(ASYNC_JOB) *pool = NULL;
-int ASYNC_FIBRE_init(ASYNC_FIBRE *fibre)
+int async_fibre_init(async_fibre *fibre)
-void ASYNC_FIBRE_free(ASYNC_FIBRE *fibre)
+void async_fibre_free(async_fibre *fibre)
{
if (fibre->fibre.uc_stack.ss_sp)
OPENSSL_free(fibre->fibre.uc_stack.ss_sp);
{
if (fibre->fibre.uc_stack.ss_sp)
OPENSSL_free(fibre->fibre.uc_stack.ss_sp);
# if _POSIX_VERSION >= 200112L
# if _POSIX_VERSION >= 200112L
# define ASYNC_ARCH
# include <ucontext.h>
# include <setjmp.h>
# include "e_os.h"
# define ASYNC_ARCH
# include <ucontext.h>
# include <setjmp.h>
# include "e_os.h"
-extern __thread ASYNC_CTX *sysvctx;
+extern __thread async_ctx *sysvctx;
typedef struct async_fibre_st {
ucontext_t fibre;
jmp_buf env;
int env_init;
typedef struct async_fibre_st {
ucontext_t fibre;
jmp_buf env;
int env_init;
-# define ASYNC_set_ctx(nctx) (sysvctx = (nctx))
-# define ASYNC_get_ctx() (sysvctx)
+# define async_set_ctx(nctx) (sysvctx = (nctx))
+# define async_get_ctx() (sysvctx)
-static inline int ASYNC_FIBRE_swapcontext(ASYNC_FIBRE *o, ASYNC_FIBRE *n, int r)
+static inline int async_fibre_swapcontext(async_fibre *o, async_fibre *n, int r)
-# define ASYNC_FIBRE_makecontext(c) \
- (ASYNC_FIBRE_init(c) \
+# define async_fibre_makecontext(c) \
+ (async_fibre_init(c) \
&& !getcontext(&(c)->fibre) \
&& !getcontext(&(c)->fibre) \
- && (makecontext(&(c)->fibre, ASYNC_start_func, 0), 1))
-# define ASYNC_FIBRE_init_dispatcher(d)
+ && (makecontext(&(c)->fibre, async_start_func, 0), 1))
+# define async_fibre_init_dispatcher(d)
-int ASYNC_FIBRE_init(ASYNC_FIBRE *fibre);
-void ASYNC_FIBRE_free(ASYNC_FIBRE *fibre);
+int async_fibre_init(async_fibre *fibre);
+void async_fibre_free(async_fibre *fibre);
-void ASYNC_start_func(void);
+void async_start_func(void);
-int ASYNC_FIBRE_init_dispatcher(ASYNC_FIBRE *fibre)
+int async_fibre_init_dispatcher(async_fibre *fibre)
-VOID CALLBACK ASYNC_start_func_win(PVOID unused)
+VOID CALLBACK async_start_func_win(PVOID unused)
}
int async_pipe(int *pipefds)
}
int async_pipe(int *pipefds)
typedef struct async_fibre_st {
LPVOID fibre;
typedef struct async_fibre_st {
LPVOID fibre;
-# define ASYNC_set_ctx(nctx) \
+# define async_set_ctx(nctx) \
(CRYPTO_set_thread_local(CRYPTO_THREAD_LOCAL_ASYNC_CTX, (void *)(nctx)))
(CRYPTO_set_thread_local(CRYPTO_THREAD_LOCAL_ASYNC_CTX, (void *)(nctx)))
-# define ASYNC_get_ctx() \
- ((ASYNC_CTX *)CRYPTO_get_thread_local(CRYPTO_THREAD_LOCAL_ASYNC_CTX))
-# define ASYNC_FIBRE_swapcontext(o,n,r) \
+# define async_get_ctx() \
+ ((async_ctx *)CRYPTO_get_thread_local(CRYPTO_THREAD_LOCAL_ASYNC_CTX))
+# define async_fibre_swapcontext(o,n,r) \
(SwitchToFiber((n)->fibre), 1)
(SwitchToFiber((n)->fibre), 1)
-# define ASYNC_FIBRE_makecontext(c) \
- ((c)->fibre = CreateFiber(0, ASYNC_start_func_win, 0))
-# define ASYNC_FIBRE_free(f) (DeleteFiber((f)->fibre))
+# define async_fibre_makecontext(c) \
+ ((c)->fibre = CreateFiber(0, async_start_func_win, 0))
+# define async_fibre_free(f) (DeleteFiber((f)->fibre))
-int ASYNC_FIBRE_init_dispatcher(ASYNC_FIBRE *fibre);
-VOID CALLBACK ASYNC_start_func_win(PVOID unused);
+int async_fibre_init_dispatcher(async_fibre *fibre);
+VOID CALLBACK async_start_func_win(PVOID unused);
#define ASYNC_JOB_PAUSED 2
#define ASYNC_JOB_STOPPING 3
#define ASYNC_JOB_PAUSED 2
#define ASYNC_JOB_STOPPING 3
-static ASYNC_CTX *ASYNC_CTX_new(void)
+static async_ctx *async_ctx_new(void)
- ASYNC_CTX *nctx = NULL;
+ async_ctx *nctx = NULL;
- if(!(nctx = OPENSSL_malloc(sizeof (ASYNC_CTX)))) {
+ if(!(nctx = OPENSSL_malloc(sizeof (async_ctx)))) {
/* Error here */
goto err;
}
/* Error here */
goto err;
}
- ASYNC_FIBRE_init_dispatcher(&nctx->dispatcher);
+ async_fibre_init_dispatcher(&nctx->dispatcher);
- if(!ASYNC_set_ctx(nctx))
+ if(!async_set_ctx(nctx))
-static int ASYNC_CTX_free(void)
+static int async_ctx_free(void)
- if(ASYNC_get_ctx()) {
- OPENSSL_free(ASYNC_get_ctx());
+ if(async_get_ctx()) {
+ OPENSSL_free(async_get_ctx());
- if(!ASYNC_set_ctx(NULL))
+ if(!async_set_ctx(NULL))
-static ASYNC_JOB *ASYNC_JOB_new(void)
+static ASYNC_JOB *async_job_new(void)
{
ASYNC_JOB *job = NULL;
int pipefds[2];
{
ASYNC_JOB *job = NULL;
int pipefds[2];
-static void ASYNC_JOB_free(ASYNC_JOB *job)
+static void async_job_free(ASYNC_JOB *job)
{
if(job) {
if(job->funcargs)
OPENSSL_free(job->funcargs);
{
if(job) {
if(job->funcargs)
OPENSSL_free(job->funcargs);
- ASYNC_FIBRE_free(&job->fibrectx);
+ async_fibre_free(&job->fibrectx);
if (!async_pool_can_grow())
return NULL;
if (!async_pool_can_grow())
return NULL;
- ASYNC_FIBRE_makecontext(&job->fibrectx);
+ async_fibre_makecontext(&job->fibrectx);
async_increment_pool_size();
}
}
async_increment_pool_size();
}
}
async_release_job_to_pool(job);
}
async_release_job_to_pool(job);
}
-void ASYNC_start_func(void)
+void async_start_func(void)
{
ASYNC_JOB *job;
while (1) {
/* Run the job */
{
ASYNC_JOB *job;
while (1) {
/* Run the job */
- job = ASYNC_get_ctx()->currjob;
+ job = async_get_ctx()->currjob;
job->ret = job->func(job->funcargs);
/* Stop the job */
job->status = ASYNC_JOB_STOPPING;
job->ret = job->func(job->funcargs);
/* Stop the job */
job->status = ASYNC_JOB_STOPPING;
- if(!ASYNC_FIBRE_swapcontext(&job->fibrectx,
- &ASYNC_get_ctx()->dispatcher, 1)) {
+ if(!async_fibre_swapcontext(&job->fibrectx,
+ &async_get_ctx()->dispatcher, 1)) {
/*
* Should not happen. Getting here will close the thread...can't do much
* about it
/*
* Should not happen. Getting here will close the thread...can't do much
* about it
int ASYNC_start_job(ASYNC_JOB **job, int *ret, int (*func)(void *),
void *args, size_t size)
{
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;
}
if(*job) {
return ASYNC_ERR;
}
if(*job) {
- ASYNC_get_ctx()->currjob = *job;
+ async_get_ctx()->currjob = *job;
- if(ASYNC_get_ctx()->currjob) {
- if(ASYNC_get_ctx()->currjob->status == ASYNC_JOB_STOPPING) {
- *ret = ASYNC_get_ctx()->currjob->ret;
- async_release_job(ASYNC_get_ctx()->currjob);
- ASYNC_get_ctx()->currjob = NULL;
+ if(async_get_ctx()->currjob) {
+ if(async_get_ctx()->currjob->status == ASYNC_JOB_STOPPING) {
+ *ret = async_get_ctx()->currjob->ret;
+ async_release_job(async_get_ctx()->currjob);
+ async_get_ctx()->currjob = NULL;
*job = NULL;
return ASYNC_FINISH;
}
*job = NULL;
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_get_ctx()->currjob = NULL;
+ if(async_get_ctx()->currjob->status == ASYNC_JOB_PAUSING) {
+ *job = async_get_ctx()->currjob;
+ async_get_ctx()->currjob->status = ASYNC_JOB_PAUSED;
+ async_get_ctx()->currjob = NULL;
- if(ASYNC_get_ctx()->currjob->status == ASYNC_JOB_PAUSED) {
- ASYNC_get_ctx()->currjob = *job;
+ if(async_get_ctx()->currjob->status == ASYNC_JOB_PAUSED) {
+ async_get_ctx()->currjob = *job;
/* Resume previous job */
/* Resume previous job */
- if(!ASYNC_FIBRE_swapcontext(&ASYNC_get_ctx()->dispatcher,
- &ASYNC_get_ctx()->currjob->fibrectx, 1))
+ if(!async_fibre_swapcontext(&async_get_ctx()->dispatcher,
+ &async_get_ctx()->currjob->fibrectx, 1))
goto err;
continue;
}
/* Should not happen */
goto err;
continue;
}
/* Should not happen */
- async_release_job(ASYNC_get_ctx()->currjob);
- ASYNC_get_ctx()->currjob = NULL;
+ async_release_job(async_get_ctx()->currjob);
+ async_get_ctx()->currjob = NULL;
*job = NULL;
return ASYNC_ERR;
}
/* Start a new job */
*job = NULL;
return ASYNC_ERR;
}
/* Start a new job */
- if(!(ASYNC_get_ctx()->currjob = async_get_pool_job())) {
+ if(!(async_get_ctx()->currjob = async_get_pool_job())) {
return ASYNC_NO_JOBS;
}
if(args != NULL) {
return ASYNC_NO_JOBS;
}
if(args != NULL) {
- ASYNC_get_ctx()->currjob->funcargs = OPENSSL_malloc(size);
- if(!ASYNC_get_ctx()->currjob->funcargs) {
- async_release_job(ASYNC_get_ctx()->currjob);
- ASYNC_get_ctx()->currjob = NULL;
+ async_get_ctx()->currjob->funcargs = OPENSSL_malloc(size);
+ if(!async_get_ctx()->currjob->funcargs) {
+ async_release_job(async_get_ctx()->currjob);
+ async_get_ctx()->currjob = NULL;
- memcpy(ASYNC_get_ctx()->currjob->funcargs, args, size);
+ memcpy(async_get_ctx()->currjob->funcargs, args, size);
- ASYNC_get_ctx()->currjob->funcargs = NULL;
+ async_get_ctx()->currjob->funcargs = NULL;
- ASYNC_get_ctx()->currjob->func = func;
- if(!ASYNC_FIBRE_swapcontext(&ASYNC_get_ctx()->dispatcher,
- &ASYNC_get_ctx()->currjob->fibrectx, 1))
+ async_get_ctx()->currjob->func = func;
+ if(!async_fibre_swapcontext(&async_get_ctx()->dispatcher,
+ &async_get_ctx()->currjob->fibrectx, 1))
- async_release_job(ASYNC_get_ctx()->currjob);
- ASYNC_get_ctx()->currjob = NULL;
+ async_release_job(async_get_ctx()->currjob);
+ async_get_ctx()->currjob = NULL;
*job = NULL;
return ASYNC_ERR;
}
*job = NULL;
return ASYNC_ERR;
}
- if(!ASYNC_get_ctx() || !ASYNC_get_ctx()->currjob)
+ if(!async_get_ctx() || !async_get_ctx()->currjob)
- job = ASYNC_get_ctx()->currjob;
+ job = async_get_ctx()->currjob;
job->status = ASYNC_JOB_PAUSING;
job->status = ASYNC_JOB_PAUSING;
- if(!ASYNC_FIBRE_swapcontext(&job->fibrectx,
- &ASYNC_get_ctx()->dispatcher, 1)) {
+ if(!async_fibre_swapcontext(&job->fibrectx,
+ &async_get_ctx()->dispatcher, 1)) {
do {
job = sk_ASYNC_JOB_pop(pool);
do {
job = sk_ASYNC_JOB_pop(pool);
/* Pre-create jobs as required */
while (init_size) {
ASYNC_JOB *job;
/* Pre-create jobs as required */
while (init_size) {
ASYNC_JOB *job;
- ASYNC_FIBRE_makecontext(&job->fibrectx);
+ async_fibre_makecontext(&job->fibrectx);
job->funcargs = NULL;
sk_ASYNC_JOB_push(pool, job);
curr_size++;
job->funcargs = NULL;
sk_ASYNC_JOB_push(pool, job);
curr_size++;
async_empty_pool(pool);
async_release_pool();
async_empty_pool(pool);
async_release_pool();
}
ASYNC_JOB *ASYNC_get_current_job(void)
{
}
ASYNC_JOB *ASYNC_get_current_job(void)
{
- ASYNC_CTX *ctx;
- if((ctx = ASYNC_get_ctx()) == NULL)
+ async_ctx *ctx;
+ if((ctx = async_get_ctx()) == NULL)
return NULL;
return ctx->currjob;
return NULL;
return ctx->currjob;
#include <openssl/async.h>
#include <openssl/crypto.h>
#include <openssl/async.h>
#include <openssl/crypto.h>
-typedef struct async_ctx_st ASYNC_CTX;
+typedef struct async_ctx_st async_ctx;
#include "arch/async_win.h"
#include "arch/async_posix.h"
#include "arch/async_null.h"
struct async_ctx_st {
#include "arch/async_win.h"
#include "arch/async_posix.h"
#include "arch/async_null.h"
struct async_ctx_st {
- ASYNC_FIBRE dispatcher;
+ async_fibre dispatcher;
ASYNC_JOB *currjob;
};
struct async_job_st {
ASYNC_JOB *currjob;
};
struct async_job_st {
int (*func) (void *);
void *funcargs;
int ret;
int (*func) (void *);
void *funcargs;
int ret;
DECLARE_STACK_OF(ASYNC_JOB)
DECLARE_STACK_OF(ASYNC_JOB)
-void ASYNC_start_func(void);
+void async_start_func(void);
STACK_OF(ASYNC_JOB) *async_get_pool(void);
int async_set_pool(STACK_OF(ASYNC_JOB) *poolin, size_t curr_size,
size_t max_size);
STACK_OF(ASYNC_JOB) *async_get_pool(void);
int async_set_pool(STACK_OF(ASYNC_JOB) *poolin, size_t curr_size,
size_t max_size);