Skip to content

Commit 9447014

Browse files
committed
Remove fcontext names.
1 parent e226d8e commit 9447014

2 files changed

Lines changed: 19 additions & 20 deletions

File tree

include/yafl.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ extern "C" {
2424
* Configuration
2525
* ======================================================================== */
2626

27-
#ifndef FCONTEXT_DEFAULT_STACK_SIZE
28-
#define FCONTEXT_DEFAULT_STACK_SIZE (24 * 1024)
27+
#ifndef YAFL_DEFAULT_STACK_SIZE
28+
#define YAFL_DEFAULT_STACK_SIZE (24 * 1024)
2929
#endif
3030

3131
/* ========================================================================
@@ -77,8 +77,7 @@ typedef void *(*yafl_fiber_fn)(void *arg);
7777
* - YAFL_STACK_FLAGS_WATERMARK is optional
7878
* - YAFL_STACK_FLAGS_NONE (no flags) is invalid
7979
*/
80-
extern yafl_fiber_t *yafl_fiber_create(yafl_fiber_fn fiber_fn, size_t stack_size,
81-
yafl_stack_flags_t flags);
80+
extern yafl_fiber_t *yafl_fiber_create(yafl_fiber_fn fiber_fn, size_t stack_size, yafl_stack_flags_t flags);
8281

8382

8483
/* ========================================================================

src/yafl.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ extern void *yafl_switch(yafl_t *save, yafl_t target, void *data);
4545
* Constants and Types
4646
* ======================================================================== */
4747

48-
#define FCONTEXT_FIBER_MAGIC 0xF1BE7001
49-
#define FCONTEXT_STACK_WATERMARK 0xA5
50-
#define FCONTEXT_STACK_ALIGNMENT 16
48+
#define YAFL_FIBER_MAGIC 0xF1BE7001
49+
#define YAFL_STACK_WATERMARK 0xA5
50+
#define YAFL_STACK_ALIGNMENT 16
5151

52-
typedef enum { FCONTEXT_ALLOC_MALLOC, FCONTEXT_ALLOC_VMEM } yafl_alloc_type_t;
52+
typedef enum { YAFL_ALLOC_MALLOC, YAFL_ALLOC_VMEM } yafl_alloc_type_t;
5353

5454
/* Internal fiber structure */
5555
struct yafl_fiber {
@@ -84,9 +84,9 @@ static void fiber_entry_trampoline(void *arg);
8484
static void free_fiber_stack(yafl_fiber_t *fiber) {
8585
if(fiber == NULL || fiber->stack_region == NULL) { return; }
8686

87-
if(fiber->alloc_type == FCONTEXT_ALLOC_MALLOC) {
87+
if(fiber->alloc_type == YAFL_ALLOC_MALLOC) {
8888
free(fiber->stack_region);
89-
} else if(fiber->alloc_type == FCONTEXT_ALLOC_VMEM) {
89+
} else if(fiber->alloc_type == YAFL_ALLOC_VMEM) {
9090
#ifdef _WIN32
9191
VirtualFree(fiber->stack_region, 0, MEM_RELEASE);
9292
#else
@@ -106,7 +106,7 @@ static bool initialize_fiber_context(yafl_fiber_t *fiber) {
106106
}
107107

108108
static bool reinitialize_fiber_context_with_watermark(yafl_fiber_t *fiber) {
109-
memset((char *)fiber->stack_top - fiber->stack_size, FCONTEXT_STACK_WATERMARK, fiber->stack_size);
109+
memset((char *)fiber->stack_top - fiber->stack_size, YAFL_STACK_WATERMARK, fiber->stack_size);
110110
return initialize_fiber_context(fiber);
111111
}
112112

@@ -128,7 +128,7 @@ static size_t get_page_size(void) {
128128

129129
static void *align_stack_pointer(void *ptr) {
130130
uintptr_t addr = (uintptr_t)ptr;
131-
return (void *)(addr & ~((uintptr_t)FCONTEXT_STACK_ALIGNMENT - 1));
131+
return (void *)(addr & ~((uintptr_t)YAFL_STACK_ALIGNMENT - 1));
132132
}
133133

134134
/* ========================================================================
@@ -182,8 +182,8 @@ extern yafl_fiber_t *yafl_fiber_create(yafl_fiber_fn fiber_fn, size_t stack_size
182182
if(fiber == NULL) { return NULL; }
183183

184184
/* Initialize fiber structure */
185-
fiber->magic = FCONTEXT_FIBER_MAGIC;
186-
fiber->alloc_type = use_vmem ? FCONTEXT_ALLOC_VMEM : FCONTEXT_ALLOC_MALLOC;
185+
fiber->magic = YAFL_FIBER_MAGIC;
186+
fiber->alloc_type = use_vmem ? YAFL_ALLOC_VMEM : YAFL_ALLOC_MALLOC;
187187
fiber->status = YAFL_FIBER_STATUS_SUSPENDED;
188188
fiber->user_entry = fiber_fn;
189189
fiber->cached_result = NULL;
@@ -196,7 +196,7 @@ extern yafl_fiber_t *yafl_fiber_create(yafl_fiber_fn fiber_fn, size_t stack_size
196196
fiber->stack_size = 0;
197197

198198
/* Use default stack size if not specified */
199-
if(stack_size == 0) { stack_size = FCONTEXT_DEFAULT_STACK_SIZE; }
199+
if(stack_size == 0) { stack_size = YAFL_DEFAULT_STACK_SIZE; }
200200

201201
/* Allocate stack based on allocation type */
202202
if(use_vmem) {
@@ -271,7 +271,7 @@ extern yafl_fiber_t *yafl_fiber_create(yafl_fiber_fn fiber_fn, size_t stack_size
271271

272272
extern void *yafl_fiber_resume(yafl_fiber_t *fiber, void *arg) {
273273
/* Validation */
274-
if(fiber == NULL || fiber->magic != FCONTEXT_FIBER_MAGIC) { return NULL; }
274+
if(fiber == NULL || fiber->magic != YAFL_FIBER_MAGIC) { return NULL; }
275275

276276
/* If complete, return cached result (idempotent) */
277277
if(fiber->status == YAFL_FIBER_STATUS_COMPLETE) { return fiber->cached_result; }
@@ -317,18 +317,18 @@ extern void *yafl_fiber_suspend(void *result) {
317317
* ======================================================================== */
318318

319319
extern yafl_fiber_status_t yafl_fiber_status(yafl_fiber_t *fiber) {
320-
if(fiber == NULL || fiber->magic != FCONTEXT_FIBER_MAGIC) { return YAFL_FIBER_STATUS_ERR; }
320+
if(fiber == NULL || fiber->magic != YAFL_FIBER_MAGIC) { return YAFL_FIBER_STATUS_ERR; }
321321
return fiber->status;
322322
}
323323

324324
extern size_t yafl_fiber_stack_high_watermark(yafl_fiber_t *fiber) {
325-
if(fiber == NULL || fiber->magic != FCONTEXT_FIBER_MAGIC || !fiber->watermark_filled) { return 0; }
325+
if(fiber == NULL || fiber->magic != YAFL_FIBER_MAGIC || !fiber->watermark_filled) { return 0; }
326326

327327
/* Scan from stack base for watermark bytes */
328328
unsigned char *stack_base = (unsigned char *)fiber->stack_top - fiber->stack_size;
329329
size_t unused = 0;
330330

331-
while(unused < fiber->stack_size && stack_base[unused] == FCONTEXT_STACK_WATERMARK) { unused++; }
331+
while(unused < fiber->stack_size && stack_base[unused] == YAFL_STACK_WATERMARK) { unused++; }
332332

333333
return fiber->stack_size - unused;
334334
}
@@ -338,7 +338,7 @@ extern size_t yafl_fiber_stack_high_watermark(yafl_fiber_t *fiber) {
338338
* ======================================================================== */
339339

340340
extern void yafl_fiber_destroy(yafl_fiber_t *fiber) {
341-
if(fiber == NULL || fiber->magic != FCONTEXT_FIBER_MAGIC) { return; }
341+
if(fiber == NULL || fiber->magic != YAFL_FIBER_MAGIC) { return; }
342342

343343
/* Cannot destroy running fiber */
344344
if(fiber->status == YAFL_FIBER_STATUS_RUNNING) { return; }

0 commit comments

Comments
 (0)