Merge pull request #742 from civetweb/pr-thread-and-ctx

Several fixes and improvements about threading

src/mod_lua.inl

@@ -1780,14 +1780,18 @@ lua_action(struct laction_arg *arg)
 
 	err = luaL_loadstring(arg->state, arg->txt);
 	if (err != 0) {
-		lua_cry(fc(ctx), err, arg->state, arg->script, "timer");
+		struct mg_connection fc;
+		lua_cry(fake_connection(&fc, ctx), err, arg->state, arg->script,
+		        "timer");
 		(void)pthread_mutex_unlock(arg->pmutex);
 		mg_free(arg);
 		return 0;
 	}
 	err = lua_pcall(arg->state, 0, 1, 0);
 	if (err != 0) {
-		lua_cry(fc(ctx), err, arg->state, arg->script, "timer");
+		struct mg_connection fc;
+		lua_cry(fake_connection(&fc, ctx), err, arg->state, arg->script,
+		        "timer");
 		(void)pthread_mutex_unlock(arg->pmutex);
 		mg_free(arg);
 		return 0;

src/timer.inl

@@ -19,13 +19,18 @@ struct ttimer {
 struct ttimers {
 	pthread_t threadid;               /* Timer thread ID */
 	pthread_mutex_t mutex;            /* Protects timer lists */
-	struct ttimer timers[MAX_TIMERS]; /* List of timers */
+	struct ttimer *timers;            /* List of timers */
 	unsigned timer_count;             /* Current size of timer list */
+	unsigned timer_capacity;          /* Capacity of timer list */
+#if defined(_WIN32)
+	DWORD last_tick;
+	uint64_t now_tick64;
+#endif
 };
 
 
 TIMER_API double
-timer_getcurrenttime(void)
+timer_getcurrenttime(struct mg_context *ctx)
 {
 #if defined(_WIN32)
 	/* GetTickCount returns milliseconds since system start as
@@ -34,17 +39,21 @@ timer_getcurrenttime(void)
 	 * by adding the 32 bit difference since the last call to a
 	 * 64 bit counter. This algorithm will only work, if this
 	 * function is called at least once every 7 weeks. */
-	static DWORD last_tick;
-	static uint64_t now_tick64;
-
+	uint64_t now_tick64 = 0;
 	DWORD now_tick = GetTickCount();
 
-	now_tick64 += ((DWORD)(now_tick - last_tick));
-	last_tick = now_tick;
+	if (ctx->timers) {
+		pthread_mutex_lock(&ctx->timers->mutex);
+		ctx->timers->now_tick64 += now_tick - ctx->timers->last_tick;
+		now_tick64 = ctx->timers->now_tick64;
+		ctx->timers->last_tick = now_tick;
+		pthread_mutex_unlock(&ctx->timers->mutex);
+	}
 	return (double)now_tick64 * 1.0E-3;
 #else
 	struct timespec now_ts;
 
+	(void)ctx;
 	clock_gettime(CLOCK_MONOTONIC, &now_ts);
 	return (double)now_ts.tv_sec + (double)now_ts.tv_nsec * 1.0E-9;
 #endif
@@ -59,15 +68,14 @@ timer_add(struct mg_context *ctx,
           taction action,
           void *arg)
 {
-	unsigned u, v;
 	int error = 0;
 	double now;
 
-	if (ctx->stop_flag) {
-		return 0;
+	if (!ctx->timers) {
+		return 1;
 	}
 
-	now = timer_getcurrenttime();
+	now = timer_getcurrenttime(ctx);
 
 	/* HCP24: if is_relative = 0 and next_time < now
 	 *        action will be called so fast as possible
@@ -92,19 +100,25 @@ timer_add(struct mg_context *ctx,
 	pthread_mutex_lock(&ctx->timers->mutex);
 	if (ctx->timers->timer_count == MAX_TIMERS) {
 		error = 1;
-	} else {
+	} else if (ctx->timers->timer_count == ctx->timers->timer_capacity) {
+		unsigned capacity = (ctx->timers->timer_capacity * 2) + 1;
+		struct ttimer *timers = (struct ttimer *)mg_realloc_ctx(
+		    ctx->timers->timers, capacity * sizeof(struct ttimer), ctx);
+		if (timers) {
+			ctx->timers->timers = timers;
+			ctx->timers->timer_capacity = capacity;
+		} else {
+			error = 1;
+		}
+	}
+	if (!error) {
 		/* Insert new timer into a sorted list. */
 		/* The linear list is still most efficient for short lists (small
 		 * number of timers) - if there are many timers, different
 		 * algorithms will work better. */
-		for (u = 0; u < ctx->timers->timer_count; u++) {
-			if (ctx->timers->timers[u].time > next_time) {
-				/* HCP24: moving all timers > next_time */
-				for (v = ctx->timers->timer_count; v > u; v--) {
-					ctx->timers->timers[v] = ctx->timers->timers[v - 1];
-				}
-				break;
-			}
+		unsigned u = ctx->timers->timer_count;
+		for (; (u > 0) && (ctx->timers->timers[u - 1].time > next_time); u--) {
+			ctx->timers->timers[u] = ctx->timers->timers[u - 1];
 		}
 		ctx->timers->timers[u].time = next_time;
 		ctx->timers->timers[u].period = period;
@@ -133,7 +147,7 @@ timer_thread_run(void *thread_func_param)
 		ctx->callbacks.init_thread(ctx, 2);
 	}
 
-	d = timer_getcurrenttime();
+	d = timer_getcurrenttime(ctx);
 
 	while (ctx->stop_flag == 0) {
 		pthread_mutex_lock(&ctx->timers->mutex);
@@ -164,12 +178,8 @@ timer_thread_run(void *thread_func_param)
 		usleep(10000);
 #endif
 
-		d = timer_getcurrenttime();
+		d = timer_getcurrenttime(ctx);
 	}
-
-	pthread_mutex_lock(&ctx->timers->mutex);
-	ctx->timers->timer_count = 0;
-	pthread_mutex_unlock(&ctx->timers->mutex);
 }
 
 
@@ -206,19 +216,27 @@ timers_init(struct mg_context *ctx)
 	if (!ctx->timers) {
 		return -1;
 	}
+	ctx->timers->timers = NULL;
 
 	/* Initialize mutex */
 	if (0 != pthread_mutex_init(&ctx->timers->mutex, NULL)) {
-		mg_free((void *)(ctx->timers));
+		mg_free(ctx->timers);
+		ctx->timers = NULL;
 		return -1;
 	}
 
 	/* For some systems timer_getcurrenttime does some initialization
 	 * during the first call. Call it once now, ignore the result. */
-	(void)timer_getcurrenttime();
+	(void)timer_getcurrenttime(ctx);
 
 	/* Start timer thread */
-	mg_start_thread_with_id(timer_thread, ctx, &ctx->timers->threadid);
+	if (mg_start_thread_with_id(timer_thread, ctx, &ctx->timers->threadid)
+	    != 0) {
+		(void)pthread_mutex_destroy(&ctx->timers->mutex);
+		mg_free(ctx->timers);
+		ctx->timers = NULL;
+		return -1;
+	}
 
 	return 0;
 }
@@ -228,17 +246,11 @@ TIMER_API void
 timers_exit(struct mg_context *ctx)
 {
 	if (ctx->timers) {
-		pthread_mutex_lock(&ctx->timers->mutex);
-		ctx->timers->timer_count = 0;
-
 		mg_join_thread(ctx->timers->threadid);
-
-		/* TODO: Do we really need to unlock the mutex, before
-		 * destroying it, if it's destroyed by the thread currently
-		 * owning the mutex? */
-		pthread_mutex_unlock(&ctx->timers->mutex);
 		(void)pthread_mutex_destroy(&ctx->timers->mutex);
+		mg_free(ctx->timers->timers);
 		mg_free(ctx->timers);
+		ctx->timers = NULL;
 	}
 }
 

unittest/private.c

@@ -498,11 +498,11 @@ START_TEST(test_mg_vsnprintf)
 	/* If the string is truncated, mg_snprintf calls mg_cry.
 	 * If DEBUG is defined, mg_cry calls DEBUG_TRACE.
 	 * In DEBUG_TRACE_FUNC, flockfile(stdout) is called.
-	 * For Windows, flockfile/funlockfile calls Enter-/
-	 * LeaveCriticalSection(&global_log_file_lock).
+	 * For Windows, flockfile/funlockfile calls
+	 * pthread_mutex_lock/_unlock(&global_log_file_lock).
 	 * So, we need to initialize global_log_file_lock:
 	 */
-	InitializeCriticalSection(&global_log_file_lock);
+	pthread_mutex_init(&global_log_file_lock, &pthread_mutex_attr);
 #endif
 
 	memset(buf, 0, sizeof(buf));