daniel has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/34526?usp=email )
Change subject: meas_feed: Use osmo_io instead of write queue
......................................................................
meas_feed: Use osmo_io instead of write queue
Related: OS#6170
Change-Id: Ib0570a3242e2846062e24c93cbbbbd31137acdee
---
M include/osmocom/bsc/meas_feed.h
M src/osmo-bsc/bsc_vty.c
M src/osmo-bsc/meas_feed.c
M src/osmo-bsc/osmo_bsc_main.c
4 files changed, 54 insertions(+), 54 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/include/osmocom/bsc/meas_feed.h b/include/osmocom/bsc/meas_feed.h
index f2bd4ba..447eab8 100644
--- a/include/osmocom/bsc/meas_feed.h
+++ b/include/osmocom/bsc/meas_feed.h
@@ -35,12 +35,12 @@
};
#define MEAS_FEED_VERSION 1
-#define MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT 100
+#define MEAS_FEED_TXQUEUE_MAX_LEN_DEFAULT 100
int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port);
void meas_feed_scenario_set(const char *name);
-void meas_feed_wqueue_max_length_set(unsigned int max_length);
+void meas_feed_txqueue_max_length_set(unsigned int max_length);
void meas_feed_cfg_get(char **host, uint16_t *port);
const char *meas_feed_scenario_get(void);
-unsigned int meas_feed_wqueue_max_length_get(void);
+unsigned int meas_feed_txqueue_max_length_get(void);
diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c
index d758832..bdc18b6 100644
--- a/src/osmo-bsc/bsc_vty.c
+++ b/src/osmo-bsc/bsc_vty.c
@@ -385,7 +385,7 @@
uint16_t meas_port;
char *meas_host;
const char *meas_scenario;
- unsigned int max_len = meas_feed_wqueue_max_length_get();
+ unsigned int max_len = meas_feed_txqueue_max_length_get();
meas_feed_cfg_get(&meas_host, &meas_port);
meas_scenario = meas_feed_scenario_get();
@@ -396,7 +396,7 @@
if (strlen(meas_scenario) > 0)
vty_out(vty, " meas-feed scenario %s%s",
meas_scenario, VTY_NEWLINE);
- if (max_len != MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT)
+ if (max_len != MEAS_FEED_TXQUEUE_MAX_LEN_DEFAULT)
vty_out(vty, " meas-feed write-queue-max-length %u%s",
max_len, VTY_NEWLINE);
}
@@ -2424,7 +2424,7 @@
"Maximum number of messages to be queued waiting for transmission\n",
CMD_ATTR_IMMEDIATE)
{
- meas_feed_wqueue_max_length_set(atoi(argv[0]));
+ meas_feed_txqueue_max_length_set(atoi(argv[0]));
return CMD_SUCCESS;
}
diff --git a/src/osmo-bsc/meas_feed.c b/src/osmo-bsc/meas_feed.c
index 23b7d04..b18478f 100644
--- a/src/osmo-bsc/meas_feed.c
+++ b/src/osmo-bsc/meas_feed.c
@@ -6,7 +6,7 @@
#include <osmocom/core/msgb.h>
#include <osmocom/core/socket.h>
-#include <osmocom/core/write_queue.h>
+#include <osmocom/core/osmo_io.h>
#include <osmocom/core/talloc.h>
#include <osmocom/core/utils.h>
@@ -23,17 +23,14 @@
#include <osmocom/bsc/lchan.h>
struct meas_feed_state {
- struct osmo_wqueue wqueue;
- unsigned int wqueue_max_len;
+ struct osmo_io_fd *io_fd;
char scenario[31+1];
char *dst_host;
uint16_t dst_port;
+ size_t txqueue_max;
};
-static struct meas_feed_state g_mfs = {
- .wqueue.bfd.fd = -1,
- .wqueue_max_len = MEAS_FEED_WQUEUE_MAX_LEN_DEFAULT,
-};
+static struct meas_feed_state g_mfs = { .txqueue_max =
MEAS_FEED_TXQUEUE_MAX_LEN_DEFAULT };
static int process_meas_rep(struct gsm_meas_rep *mr)
{
@@ -41,7 +38,7 @@
struct meas_feed_meas *mfm;
struct bsc_subscr *bsub;
- OSMO_ASSERT(g_mfs.wqueue.bfd.fd != -1);
+ OSMO_ASSERT(g_mfs.io_fd != NULL);
/* ignore measurements as long as we don't know who it is */
if (!mr->lchan) {
@@ -90,7 +87,7 @@
mfm->ss_nr = mr->lchan->nr;
/* and send it to the socket */
- if (osmo_wqueue_enqueue(&g_mfs.wqueue, msg) != 0) {
+ if (osmo_iofd_write_msgb(g_mfs.io_fd, msg)) {
LOGP(DMEAS, LOGL_ERROR, "meas_feed %s: sending measurement
report failed\n",
gsm_lchan_name(mr->lchan));
msgb_free(msg);
@@ -115,63 +112,54 @@
return 0;
}
-static int feed_write_cb(struct osmo_fd *ofd, struct msgb *msg)
-{
- return write(ofd->fd, msgb_data(msg), msgb_length(msg));
-}
-
-static int feed_read_cb(struct osmo_fd *ofd)
-{
- int rc;
- char buf[256];
-
- rc = read(ofd->fd, buf, sizeof(buf));
- osmo_fd_read_disable(ofd);
-
- return rc;
-}
-
static void meas_feed_close(void)
{
- if (g_mfs.wqueue.bfd.fd == -1)
+ if (g_mfs.io_fd == NULL)
return;
osmo_signal_unregister_handler(SS_LCHAN, meas_feed_sig_cb, NULL);
- osmo_wqueue_clear(&g_mfs.wqueue);
- osmo_fd_unregister(&g_mfs.wqueue.bfd);
- close(g_mfs.wqueue.bfd.fd);
- g_mfs.wqueue.bfd.fd = -1;
+ osmo_iofd_close(g_mfs.io_fd);
+ osmo_iofd_free(g_mfs.io_fd);
+ g_mfs.io_fd = NULL;
+}
+
+static void meas_feed_noop_cb(struct osmo_io_fd *iofd, int res, struct msgb
*msg)
+{
}
int meas_feed_cfg_set(const char *dst_host, uint16_t dst_port)
{
int rc;
-
+ /* osmo_io code throws an error if 'write_cb' is NULL, so we set a
no-op */
+ struct osmo_io_ops meas_feed_oio = {
+ .read_cb = NULL,
+ .write_cb = meas_feed_noop_cb,
+ .segmentation_cb = NULL
+ };
/* Already initialized */
- if (g_mfs.wqueue.bfd.fd > 0) {
+ if (g_mfs.io_fd != NULL) {
/* No change needed, do nothing */
if (!strcmp(dst_host, g_mfs.dst_host) && dst_port ==
g_mfs.dst_port)
return 0;
meas_feed_close();
}
- osmo_wqueue_init(&g_mfs.wqueue, g_mfs.wqueue_max_len);
- g_mfs.wqueue.write_cb = feed_write_cb;
- g_mfs.wqueue.read_cb = feed_read_cb;
-
- rc = osmo_sock_init_ofd(&g_mfs.wqueue.bfd, AF_UNSPEC, SOCK_DGRAM,
- IPPROTO_UDP, dst_host, dst_port,
- OSMO_SOCK_F_CONNECT);
+ rc = osmo_sock_init(AF_UNSPEC, SOCK_DGRAM, IPPROTO_UDP, dst_host,
dst_port, OSMO_SOCK_F_CONNECT);
if (rc < 0) {
- g_mfs.wqueue.bfd.fd = -1;
+ osmo_signal_unregister_handler(SS_LCHAN, meas_feed_sig_cb,
NULL);
return rc;
}
+ g_mfs.io_fd = osmo_iofd_setup(NULL, rc, "meas_iofd",
OSMO_IO_FD_MODE_READ_WRITE, &meas_feed_oio, NULL);
+ if (!g_mfs.io_fd)
+ return -1;
+ osmo_iofd_set_txqueue_max_length(g_mfs.io_fd, g_mfs.txqueue_max);
+ if ((rc = osmo_iofd_register(g_mfs.io_fd, rc)))
+ return rc;
- osmo_fd_read_disable(&g_mfs.wqueue.bfd);
osmo_talloc_replace_string(NULL, &g_mfs.dst_host, dst_host);
g_mfs.dst_port = dst_port;
osmo_signal_register_handler(SS_LCHAN, meas_feed_sig_cb, NULL);
LOGP(DMEAS, LOGL_DEBUG, "meas_feed: started %s\n",
- osmo_sock_get_name2(g_mfs.wqueue.bfd.fd));
+ osmo_sock_get_name2(osmo_iofd_get_fd(g_mfs.io_fd)));
return 0;
}
@@ -181,16 +169,16 @@
*host = g_mfs.dst_host;
}
-void meas_feed_wqueue_max_length_set(unsigned int max_length)
+void meas_feed_txqueue_max_length_set(unsigned int max_length)
{
- g_mfs.wqueue_max_len = max_length;
- if (g_mfs.wqueue.bfd.fd)
- g_mfs.wqueue.max_length = max_length;
+ g_mfs.txqueue_max = max_length;
+ if (g_mfs.io_fd)
+ osmo_iofd_set_txqueue_max_length(g_mfs.io_fd, max_length);
}
-unsigned int meas_feed_wqueue_max_length_get(void)
+unsigned int meas_feed_txqueue_max_length_get(void)
{
- return g_mfs.wqueue_max_len;
+ return g_mfs.txqueue_max;
}
void meas_feed_scenario_set(const char *name)
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 71d6d41..8da3199 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -39,6 +39,7 @@
#include <osmocom/bsc/handover_fsm.h>
#include <osmocom/bsc/smscb.h>
#include <osmocom/bsc/lb.h>
+#include <osmocom/bsc/meas_feed.h>
#include <osmocom/ctrl/control_cmd.h>
#include <osmocom/ctrl/control_if.h>
@@ -971,6 +972,7 @@
acc_ramp_global_init();
paging_global_init();
smscb_global_init();
+ meas_feed_txqueue_max_length_set(MEAS_FEED_TXQUEUE_MAX_LEN_DEFAULT);
/* Read the config */
rc = bsc_network_configure(config_file);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34526?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ib0570a3242e2846062e24c93cbbbbd31137acdee
Gerrit-Change-Number: 34526
Gerrit-PatchSet: 8
Gerrit-Owner: arehbein <arehb...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillm...@sysmocom.de>
Gerrit-Reviewer: fixeria <vyanits...@sysmocom.de>
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
