Fix #1520 - move state to struct mg_mgr

examples/complete/main.c

@@ -192,15 +192,12 @@ static void log_cb(void *arg) {
 
 int main(void) {
   struct mg_mgr mgr;
-  struct mg_timer t1, t2;
 
   mg_mgr_init(&mgr);
   mg_http_listen(&mgr, "http://localhost:8000", cb, &mgr);
-  mg_timer_init(&t1, 500, MG_TIMER_REPEAT, mjpeg_cb, &mgr);
-  mg_timer_init(&t2, 1000, MG_TIMER_REPEAT, log_cb, &mgr);
+  mg_timer_add(&mgr, 500, MG_TIMER_REPEAT, mjpeg_cb, &mgr);
+  mg_timer_add(&mgr, 1000, MG_TIMER_REPEAT, log_cb, &mgr);
   for (;;) mg_mgr_poll(&mgr, 50);
-  mg_timer_free(&t1);
-  mg_timer_free(&t2);
   mg_mgr_free(&mgr);
 
   return 0;

examples/form-upload/main.c

@@ -39,7 +39,6 @@ static void cb(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
 
 int main(void) {
   struct mg_mgr mgr;
-  struct mg_timer t1;
 
   mg_mgr_init(&mgr);
   mg_log_set("3");

examples/http-client/main.c

@@ -13,16 +13,16 @@
 
 // The very first web page in history. You can replace it from command line
 static const char *s_url = "http://info.cern.ch/";
-static const char *s_post_data = NULL;     // POST data
-static const int64_t s_timeout_ms = 1500;  // Connect timeout in milliseconds
+static const char *s_post_data = NULL;      // POST data
+static const uint64_t s_timeout_ms = 1500;  // Connect timeout in milliseconds
 
 // Print HTTP response and signal that we're done
 static void fn(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
   if (ev == MG_EV_OPEN) {
     // Connection created. Store connect expiration time in c->label
-    *(int64_t *) c->label = mg_millis() + s_timeout_ms;
+    *(uint64_t *) c->label = mg_millis() + s_timeout_ms;
   } else if (ev == MG_EV_POLL) {
-    if (mg_millis() > *(int64_t *) c->label &&
+    if (mg_millis() > *(uint64_t *) c->label &&
         (c->is_connecting || c->is_resolving)) {
       mg_error(c, "Connect timeout");
     }

examples/huge-response/main.c

@@ -76,14 +76,12 @@ static void timer_fn(void *arg) {
 
 int main(void) {
   struct mg_mgr mgr;
-  struct mg_timer t1;
   mg_mgr_init(&mgr);
   srand(time(NULL));
-  mg_timer_init(&t1, 1000, MG_TIMER_REPEAT | MG_TIMER_RUN_NOW, timer_fn, NULL);
+  mg_timer_add(&mgr, 1000, MG_TIMER_REPEAT | MG_TIMER_RUN_NOW, timer_fn, NULL);
   mg_http_listen(&mgr, s_listen_on, fn, NULL);
   MG_INFO(("Listening on %s", s_listen_on));
   for (;;) mg_mgr_poll(&mgr, 1000);
-  mg_timer_free(&t1);
   mg_mgr_free(&mgr);
   return 0;
 }

examples/json-rpc-over-websocket/main.c

@@ -67,11 +67,10 @@ static void timer_fn(void *arg) {
 }
 
 int main(void) {
-  struct mg_mgr mgr;   // Event manager
-  struct mg_timer t1;  // Timer
+  struct mg_mgr mgr;  // Event manager
 
   mg_mgr_init(&mgr);  // Init event manager
-  mg_timer_init(&t1, 5000, MG_TIMER_REPEAT, timer_fn, &mgr);  // Init timer
+  mg_timer_add(&mgr, 5000, MG_TIMER_REPEAT, timer_fn, &mgr);  // Init timer
 
   jsonrpc_init(NULL, NULL);         // Init JSON-RPC instance
   jsonrpc_export("sum", sum);       // And export a couple
@@ -80,7 +79,6 @@ int main(void) {
   printf("Starting WS listener on %s/websocket\n", s_listen_on);
   mg_http_listen(&mgr, s_listen_on, fn, NULL);  // Create HTTP listener
   for (;;) mg_mgr_poll(&mgr, 1000);             // Infinite event loop
-  mg_timer_free(&t1);                           // Free timer resources
   mg_mgr_free(&mgr);                            // Deallocate event manager
   return 0;
 }

examples/live-log/main.c

@@ -49,14 +49,12 @@ static void timer_fn(void *arg) {
 
 int main(void) {
   struct mg_mgr mgr;
-  struct mg_timer t1;
 
   mg_mgr_init(&mgr);
   mg_http_listen(&mgr, "http://localhost:8000", cb, NULL);
-  mg_timer_init(&t1, 1000, MG_TIMER_REPEAT, timer_fn, &mgr);
+  mg_timer_add(&mgr, 1000, MG_TIMER_REPEAT, timer_fn, &mgr);
 
   for (;;) mg_mgr_poll(&mgr, 50);
-  mg_timer_free(&t1);
   mg_mgr_free(&mgr);
 
   return 0;

examples/mqtt-client/main.c

@@ -74,17 +74,15 @@ static void timer_fn(void *arg) {
 
 int main(void) {
   struct mg_mgr mgr;
-  struct mg_timer timer;
   int topts = MG_TIMER_REPEAT | MG_TIMER_RUN_NOW;
 
   signal(SIGINT, signal_handler);   // Setup signal handlers - exist event
   signal(SIGTERM, signal_handler);  // manager loop on SIGINT and SIGTERM
 
-  mg_mgr_init(&mgr);                                   // Init event manager
-  mg_timer_init(&timer, 3000, topts, timer_fn, &mgr);  // Init timer
-  while (s_signo == 0) mg_mgr_poll(&mgr, 1000);        // Event loop, 1s timeout
-  mg_mgr_free(&mgr);                                   // Finished, cleanup
-  mg_timer_free(&timer);                               // Free timer resources
+  mg_mgr_init(&mgr);                                // Init event manager
+  mg_timer_add(&mgr, 3000, topts, timer_fn, &mgr);  // Init timer
+  while (s_signo == 0) mg_mgr_poll(&mgr, 1000);     // Event loop, 1s timeout
+  mg_mgr_free(&mgr);                                // Finished, cleanup
 
   return 0;
 }

examples/timers/main.c

@@ -40,13 +40,11 @@ static void timer_fn(void *arg) {
 }
 
 int main(void) {
-  struct mg_mgr mgr;   // Event manager
-  struct mg_timer t1;  // Timer
-  mg_mgr_init(&mgr);   // Initialise event manager
-  mg_timer_init(&t1, 300, MG_TIMER_REPEAT, timer_fn, &mgr);  // Init timer
+  struct mg_mgr mgr;  // Event manager
+  mg_mgr_init(&mgr);  // Initialise event manager
+  mg_timer_add(&mgr, 300, MG_TIMER_REPEAT, timer_fn, &mgr);  // Init timer
   mg_http_listen(&mgr, s_listen_on, fn, NULL);  // Create HTTP listener
   for (;;) mg_mgr_poll(&mgr, 1000);             // Infinite event loop
-  mg_timer_free(&t1);                           // Free timer resources
   mg_mgr_free(&mgr);                            // Free manager resources
   return 0;
 }

examples/udp-ssdp-search/main.c

@@ -36,11 +36,10 @@ static void tfn(void *param) {
 
 int main(void) {
   struct mg_mgr mgr;
-  struct mg_timer timer;
   static struct mg_connection *c;
   mg_mgr_init(&mgr);
   c = mg_connect(&mgr, s_ssdp_url, fn, NULL);
-  mg_timer_init(&timer, 2000, MG_TIMER_REPEAT | MG_TIMER_RUN_NOW, tfn, c);
+  mg_timer_add(&mgr, 2000, MG_TIMER_REPEAT | MG_TIMER_RUN_NOW, tfn, c);
   while (true) mg_mgr_poll(&mgr, 200);
   mg_mgr_free(&mgr);
   return 0;

examples/video-stream/main.c

@@ -54,13 +54,11 @@ static void timer_callback(void *arg) {
 
 int main(void) {
   struct mg_mgr mgr;
-  struct mg_timer t1;
 
   mg_mgr_init(&mgr);
   mg_http_listen(&mgr, "http://localhost:8000", cb, NULL);
-  mg_timer_init(&t1, 500, MG_TIMER_REPEAT, timer_callback, &mgr);
+  mg_timer_add(&mgr, 500, MG_TIMER_REPEAT, timer_callback, &mgr);
   for (;;) mg_mgr_poll(&mgr, 50);
-  mg_timer_free(&t1);
   mg_mgr_free(&mgr);
 
   return 0;

examples/zephyr/http-server/src/main.c

@@ -72,8 +72,7 @@ int main(int argc, char *argv[]) {
   mg_http_listen(&mgr, s_http_addr, wcb, NULL);
   mg_http_listen(&mgr, s_https_addr, wcb, &mgr);
 
-  struct mg_timer t;
-  mg_timer_init(&t, 5000, MG_TIMER_REPEAT | MG_TIMER_RUN_NOW, timer_fn, &mgr);
+  mg_timer_add(&mgr, 5000, MG_TIMER_REPEAT | MG_TIMER_RUN_NOW, timer_fn, &mgr);
 
   // Start infinite event loop
   MG_INFO(("Mongoose version : v%s", MG_VERSION));