fixes #1729 remove nni_timer

nanomsg · Dec 17, 2023 · ca63231 · ca63231
1 parent dc49988
commit ca63231
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 218 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -68,8 +68,6 @@ nng_sources(
         tcp.h
         thread.c
         thread.h
-        timer.c
-        timer.h
         url.c
         url.h
 )

diff --git a/src/core/init.c b/src/core/init.c
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Staysail Systems, Inc. <[email protected]>
+// Copyright 2023 Staysail Systems, Inc. <[email protected]>
 // Copyright 2018 Capitar IT Group BV <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -34,7 +34,6 @@ nni_init_helper(void)
 
 	if (((rv = nni_taskq_sys_init()) != 0) ||
 	    ((rv = nni_reap_sys_init()) != 0) ||
-	    ((rv = nni_timer_sys_init()) != 0) ||
 	    ((rv = nni_aio_sys_init()) != 0) ||
 	    ((rv = nni_tls_sys_init()) != 0)) {
 		nni_fini();
@@ -65,7 +64,6 @@ nni_fini(void)
 	nni_tls_sys_fini();
 	nni_reap_drain();
 	nni_aio_sys_fini();
-	nni_timer_sys_fini();
 	nni_taskq_sys_fini();
 	nni_reap_sys_fini(); // must be before timer and aio (expire)
 	nni_id_map_sys_fini();

diff --git a/src/core/nng_impl.h b/src/core/nng_impl.h
@@ -1,5 +1,5 @@
 //
-// Copyright 2021 Garrett D'Amore <[email protected]>
+// Copyright 2023 Staysail Systems, Inc. <[email protected]>
 // Copyright 2017 Capitar IT Group BV <[email protected]>
 //
 // This software is supplied under the terms of the MIT License, a
@@ -45,7 +45,6 @@
 #include "core/strs.h"
 #include "core/taskq.h"
 #include "core/thread.h"
-#include "core/timer.h"
 #include "core/url.h"
 
 // transport needs to come after url

diff --git a/src/core/timer.c b/src/core/timer.c
diff --git a/src/core/timer.h b/src/core/timer.h