Skip to content

Commit 45c1d41

Browse files
committed
Removed fibers from compilation.
It's not used anyway, but breaks building with musl. This closes issue #5 on GitHub.
1 parent 6a78aed commit 45c1d41

File tree

7 files changed

+22
-7
lines changed

7 files changed

+22
-7
lines changed

auto/sources

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ NXT_LIB_DEPS=" \
5757
src/nxt_thread_pool.h \
5858
src/nxt_work_queue.h \
5959
src/nxt_service.h \
60-
src/nxt_fiber.h \
6160
src/nxt_log_moderation.h \
6261
src/nxt_event_engine.h \
6362
src/nxt_timer.h \
@@ -128,7 +127,6 @@ NXT_LIB_SRCS=" \
128127
src/nxt_time_parse.c \
129128
src/nxt_work_queue.c \
130129
src/nxt_service.c \
131-
src/nxt_fiber.c \
132130
src/nxt_log_moderation.c \
133131
src/nxt_event_engine.c \
134132
src/nxt_timer.c \

src/nxt_app_log.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ nxt_log_time_handler(nxt_uint_t level, nxt_log_t *log, const char *fmt, ...)
2121
{
2222
u_char *p, *syslogmsg, *end;
2323
va_list args;
24-
nxt_fid_t fid;
25-
const char *id;
26-
nxt_fiber_t *fib;
2724
nxt_thread_t *thr;
2825
nxt_time_string_t *time_cache;
2926
u_char msg[NXT_MAX_ERROR_STR];
@@ -39,6 +36,11 @@ nxt_log_time_handler(nxt_uint_t level, nxt_log_t *log, const char *fmt, ...)
3936

4037
syslogmsg = p;
4138

39+
#if 0
40+
nxt_fid_t fid;
41+
const char *id;
42+
nxt_fiber_t *fib;
43+
4244
fib = nxt_fiber_self(thr);
4345

4446
if (fib != NULL) {
@@ -52,6 +54,10 @@ nxt_log_time_handler(nxt_uint_t level, nxt_log_t *log, const char *fmt, ...)
5254

5355
p = nxt_sprintf(p, end, id, &nxt_log_levels[level], nxt_pid,
5456
nxt_thread_tid(thr), fid);
57+
#else
58+
p = nxt_sprintf(p, end, "[%V] %PI#%PT ", &nxt_log_levels[level], nxt_pid,
59+
nxt_thread_tid(thr));
60+
#endif
5561

5662
if (log->ident != 0) {
5763
p = nxt_sprintf(p, end, "*%D ", log->ident);

src/nxt_event_engine.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,14 @@ nxt_event_engine_create(nxt_task_t *task,
4848

4949
engine->batch = batch;
5050

51+
#if 0
5152
if (flags & NXT_ENGINE_FIBERS) {
5253
engine->fibers = nxt_fiber_main_create(engine);
5354
if (engine->fibers == NULL) {
5455
goto fibers_fail;
5556
}
5657
}
58+
#endif
5759

5860
engine->current_work_queue = &engine->fast_work_queue;
5961

@@ -138,9 +140,12 @@ nxt_event_engine_create(nxt_task_t *task,
138140
nxt_work_queue_cache_destroy(&engine->work_queue_cache);
139141
nxt_free(engine->fibers);
140142

143+
#if 0
141144
fibers_fail:
142145

143146
nxt_free(engine);
147+
#endif
148+
144149
return NULL;
145150
}
146151

src/nxt_router.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1814,7 +1814,9 @@ nxt_router_thread_start(void *data)
18141814
engine->task.log = thread->log;
18151815
thread->engine = engine;
18161816
thread->task = &engine->task;
1817+
#if 0
18171818
thread->fiber = &engine->fibers->fiber;
1819+
#endif
18181820

18191821
engine->mem_pool = nxt_mp_create(4096, 128, 1024, 64);
18201822

src/nxt_runtime.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,9 @@ nxt_runtime_event_engines(nxt_task_t *task, nxt_runtime_t *rt)
292292

293293
thread = task->thread;
294294
thread->engine = engine;
295+
#if 0
295296
thread->fiber = &engine->fibers->fiber;
297+
#endif
296298

297299
engine->id = rt->last_engine_id++;
298300

src/nxt_sprintf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,12 +500,12 @@ nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args)
500500
ui64 = (uint64_t) va_arg(args, nxt_tid_t);
501501
sign = 0;
502502
goto number;
503-
503+
#if 0
504504
case 'F':
505505
ui64 = (uint64_t) va_arg(args, nxt_fid_t);
506506
sign = 0;
507507
goto number;
508-
508+
#endif
509509
case 'H':
510510
ui64 = (uint64_t) (uintptr_t) va_arg(args, pthread_t);
511511
spf.hex = HEXADECIMAL;

src/nxt_thread.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,13 @@ struct nxt_thread_s {
159159
nxt_event_engine_t *engine;
160160
void *data;
161161

162+
#if 0
162163
/*
163164
* Although pointer to a current fiber should be a property of
164165
* engine->fibers, its placement here eliminates 2 memory accesses.
165166
*/
166167
nxt_fiber_t *fiber;
168+
#endif
167169

168170
nxt_random_t random;
169171
};

0 commit comments

Comments
 (0)