Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

machinarium: remove data arg from scheduler_init()

This commit is contained in:
Dmitry Simonenko 2017-05-18 13:27:10 +03:00
parent 94b0ce6b30
commit 5a49eaf0a4
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mm_machine.c
View File

@ -77,7 +77,7 @@ machine_create(char *name, machine_function_t function, void *arg)
} }
} }
mm_list_init(&machine->link); mm_list_init(&machine->link);
mm_scheduler_init(&machine->scheduler, 2048 /* 16K */, machine); mm_scheduler_init(&machine->scheduler, 2048 /* 16K */);
int rc; int rc;
rc = mm_loop_init(&machine->loop); rc = mm_loop_init(&machine->loop);
if (rc < 0) { if (rc < 0) {

3
src/mm_scheduler.c
View File

@ -22,7 +22,7 @@ mm_scheduler_main(void *arg)
mm_scheduler_yield(scheduler); mm_scheduler_yield(scheduler);
} }
int mm_scheduler_init(mm_scheduler_t *scheduler, int size_stack, void *data) int mm_scheduler_init(mm_scheduler_t *scheduler, int size_stack)
{ {
mm_list_init(&scheduler->list_ready); mm_list_init(&scheduler->list_ready);
mm_list_init(&scheduler->list_active); mm_list_init(&scheduler->list_active);
@ -32,7 +32,6 @@ int mm_scheduler_init(mm_scheduler_t *scheduler, int size_stack, void *data)
scheduler->count_active = 0; scheduler->count_active = 0;
scheduler->count_free = 0; scheduler->count_free = 0;
scheduler->size_stack = size_stack; scheduler->size_stack = size_stack;
scheduler->data = data;
mm_fiber_init(&scheduler->main); mm_fiber_init(&scheduler->main);
scheduler->current = &scheduler->main; scheduler->current = &scheduler->main;
return 0; return 0;

3
src/mm_scheduler.h
View File

@ -20,7 +20,6 @@ struct mm_scheduler_t {
mm_list_t list_free; mm_list_t list_free;
int size_stack; int size_stack;
uint64_t id_seq; uint64_t id_seq;
void *data;
}; };
static inline mm_fiber_t* static inline mm_fiber_t*
@ -33,7 +32,7 @@ mm_scheduler_online(mm_scheduler_t *scheduler) {
return scheduler->count_active + scheduler->count_ready; return scheduler->count_active + scheduler->count_ready;
} }
int mm_scheduler_init(mm_scheduler_t*, int, void*); int mm_scheduler_init(mm_scheduler_t*, int);
void mm_scheduler_free(mm_scheduler_t*); void mm_scheduler_free(mm_scheduler_t*);
mm_fiber_t* mm_fiber_t*