Osmocom Open Build Service

libosmocore.spec Changed

commit_05903100666afaf721b7cb1209032c2f832d09d0.txt Added

commit_2b29660d537242a872aeb1578a63c3d07ea4b902.txt Deleted

libosmocore_1.12.0.69.2b29.dsc -> libosmocore_1.12.0.72.0590.dsc Changed

@@ -2,7 +2,7 @@
 Source: libosmocore
 Binary: libosmocore, libosmocodec4, libosmocodec-doc, libosmocoding0, libosmocoding-doc, libosmocore22, libosmocore-doc, libosmogb14, libosmogb-doc, libosmogsm20, libosmogsm-doc, libosmoisdn0, libosmoisdn-doc, libosmovty13, libosmovty-doc, libosmoctrl0, libosmoctrl-doc, libosmosim2, libosmosim-doc, libosmousb0, libosmousb-doc, libosmocore-dev, libosmocore-utils, libosmocore-dbg
 Architecture: any all
-Version: 1.12.0.69.2b29
+Version: 1.12.0.72.0590
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/libosmocore
 Standards-Version: 3.9.8
@@ -35,8 +35,8 @@
  libosmovty-doc deb doc optional arch=all
  libosmovty13 deb libs optional arch=any
 Checksums-Sha1:
- 36fb7b5f4ccef338df93661570c42354ad7f68d8 1141068 libosmocore_1.12.0.69.2b29.tar.xz
+ 442a49e50f4cc29672ed3a31e32e854e68f7f575 1141476 libosmocore_1.12.0.72.0590.tar.xz
 Checksums-Sha256:
- 056eb688b563955c8b94f5afde0e97e60017690f6df1bf16c45274706920af3f 1141068 libosmocore_1.12.0.69.2b29.tar.xz
+ 5a3c86160e18975106e39b158a70e66da78ee550e0ea242ad24d6d9df91a3ee9 1141476 libosmocore_1.12.0.72.0590.tar.xz
 Files:
- cff2c06116219ec6f11970f369e8fda8 1141068 libosmocore_1.12.0.69.2b29.tar.xz
+ aa2a3cf4aefe2fb058b8f3f8f010d431 1141476 libosmocore_1.12.0.72.0590.tar.xz

libosmocore_1.12.0.69.2b29.tar.xz/.tarball-version -> libosmocore_1.12.0.72.0590.tar.xz/.tarball-version Changed

libosmocore_1.12.0.69.2b29.tar.xz/debian/changelog -> libosmocore_1.12.0.72.0590.tar.xz/debian/changelog Changed

libosmocore_1.12.0.69.2b29.tar.xz/src/core/osmo_io.c -> libosmocore_1.12.0.72.0590.tar.xz/src/core/osmo_io.c Changed

@@ -69,13 +69,14 @@
 /* Used by some tests, can't be static */
 struct iofd_backend_ops osmo_iofd_ops;
 
-#if defined(HAVE_URING)
-void osmo_iofd_uring_init(void);
-#endif
+static __thread bool g_thread_initialized = false;
 
 /*! initialize osmo_io for the current thread */
 void osmo_iofd_init(void)
 {
+	if (g_thread_initialized)
+		return;
+
 	switch (g_io_backend) {
 	case OSMO_IO_BACKEND_POLL:
 		break;
@@ -88,6 +89,7 @@
 		OSMO_ASSERT(0);
 		break;
 	}
+	g_thread_initialized = true;
 }
 
 /* ensure main thread always has pre-initialized osmo_io
@@ -105,6 +107,7 @@
 	} else if (!strcmp("IO_URING", backend)) {
 		g_io_backend = OSMO_IO_BACKEND_IO_URING;
 		osmo_iofd_ops = iofd_uring_ops;
+		osmo_iofd_uring_constructor();
 #endif
 	} else {
 		fprintf(stderr, "Invalid osmo_io backend requested: \"%s\"\nCheck the environment variable %s\n", backend, OSMO_IO_BACKEND_ENV);
@@ -836,6 +839,7 @@
 		  const struct osmo_io_ops *ioops, void *data)
 {
 	struct osmo_io_fd *iofd;
+	osmo_iofd_init();
 
 	/* reject unsupported/unknown modes */
 	switch (mode) {

libosmocore_1.12.0.69.2b29.tar.xz/src/core/osmo_io_internal.h -> libosmocore_1.12.0.72.0590.tar.xz/src/core/osmo_io_internal.h Changed

libosmocore_1.12.0.69.2b29.tar.xz/src/core/osmo_io_uring.c -> libosmocore_1.12.0.72.0590.tar.xz/src/core/osmo_io_uring.c Changed

@@ -107,15 +107,15 @@
 }
 
 /*! initialize the uring and tie it into our event loop */
-void osmo_iofd_uring_init(void)
+void osmo_iofd_uring_constructor(void)
 {
 	const char *env;
-	int rc, evfd;
+	int rc;
 
 	if ((env = getenv(OSMO_IO_URING_BATCH)))
 		g_io_uring_batch = true;
 
-	if (!g_ring && (env = getenv(OSMO_IO_URING_INITIAL_SIZE))) {
+	if ((env = getenv(OSMO_IO_URING_INITIAL_SIZE))) {
 		int env_value;
 		rc = osmo_str_to_int(&env_value, env, 10, 1, IOFD_URING_MAXIMUM_SIZE);
 		if (rc < 0) {
@@ -130,13 +130,6 @@
 		g_io_uring_size = env_value;
 	}
 
-	g_ring = talloc_zero(OTC_GLOBAL, struct osmo_io_uring);
-	INIT_LLIST_HEAD(&g_ring->cancel_queue);
-
-	rc = io_uring_queue_init(g_io_uring_size, &g_ring->ring, 0);
-	if (rc < 0)
-		osmo_panic("failure during io_uring_queue_init(): %s\n", strerror(-rc));
-
 	if ((env = getenv(OSMO_IO_URING_READ_SQE))) {
 		g_io_uring_read_sqes = atoi(env);
 		if (g_io_uring_read_sqes < 1 || g_io_uring_read_sqes > IOFD_MSGHDR_MAX_READ_SQES) {
@@ -145,6 +138,20 @@
 			exit(1);
 		}
 	}
+}
+
+/*! Per-thread: initialize the uring and tie it into our event loop */
+void osmo_iofd_uring_init(void)
+{
+	int rc, evfd;
+
+	g_ring = talloc_zero(OTC_GLOBAL, struct osmo_io_uring);
+	OSMO_ASSERT(g_ring);
+	INIT_LLIST_HEAD(&g_ring->cancel_queue);
+
+	rc = io_uring_queue_init(g_io_uring_size, &g_ring->ring, 0);
+	if (rc < 0)
+		osmo_panic("failure during io_uring_queue_init(): %s\n", strerror(-rc));
 
 	rc = eventfd(0, 0);
 	if (rc < 0) {

Changes of Revision 472