Get rid of the rtpp_genuid_singlet, convert rtpp_genuid to a

newstyle object and use it instead to avoid using static
variables.

Author: sobomax

scripts/fuzz/fuzz_rtp_parser.c

@@ -13,7 +13,6 @@
 #include "rtpp_endian.h"
 #include "rtpp_time.h"
 #include "rtpp_ssrc.h"
-#include "rtpp_genuid_singlet.h"
 #include "rtp_info.h"
 #include "rtp.h"
 #include "rtp_packet.h"
@@ -33,7 +32,6 @@ LLVMFuzzerTestOneInput(const char *data, size_t size)
         return (0);
 
     if (log == NULL) {
-        assert(rtpp_gen_uid_init() == 0);
         log = rtpp_log_ctor("rtpproxy", NULL, LF_REOPEN);
         assert(log != NULL);
         rap = rtpp_analyzer_ctor(log);

src/Makefile.am

@@ -28,7 +28,7 @@ RTPP_AUTOSRC_SOURCES_S = rtpp_netaddr.h rtpp_pearson_perfect.h rtpp_refcnt.h \
   rtpp_record.h rtpp_hash_table.h rtpp_weakref.h rtpp_analyzer.h \
   rtpp_pcnt_strm.h rtpp_ttl.h rtpp_pipe.h rtpp_ringbuf.h rtpp_sessinfo.h \
   rtpp_rw_lock.h rtpp_proc_servers.h rtpp_proc_wakeup.h rtpp_socket.h \
-  rtpp_refproxy.h rtpp_command_reply.h
+  rtpp_refproxy.h rtpp_command_reply.h rtpp_genuid.h
 
 CMDSRCDIR=$(MAINSRCDIR)/commands
 BASE_SOURCES=main.c rtp.h rtpp_server.c \
@@ -53,7 +53,7 @@ BASE_SOURCES=main.c rtp.h rtpp_server.c \
   rtp_packet.c rtpp_time.c rtpp_time.h rtpp_pcnts_strm.h rtpp_runcreds.h \
   rtpp_sessinfo.c rtpp_weakref.c rtpp_rw_lock.c \
   rtpp_proc_servers.c rtpp_stream.c rtpp_proc_wakeup.c \
-  rtpp_genuid.h rtpp_genuid.c rtpp_genuid_singlet.h rtpp_genuid_singlet.c \
+  rtpp_genuid.c \
   rtpp_log_obj.c rtpp_socket.c rtpp_wi_apis.c rtpp_wi_apis.h \
   rtpp_ttl.c rtpp_proc_ttl.h rtpp_proc_ttl.c \
   rtpp_pipe.c rtpp_pcount.c rtpp_debug.h rtpp_wi_sgnl.c rtpp_wi_sgnl.h \

src/commands/rpcpv1_play.c

@@ -34,6 +34,7 @@
 #include "config.h"
 
 #include "rtpp_types.h"
+#include "rtpp_cfg.h"
 #include "rtpp_log.h"
 #include "rtpp_log_obj.h"
 #include "rtpp_command.h"
@@ -93,7 +94,8 @@ rtpp_command_play_opts_free(struct play_opts *plop)
 }
 
 void
-rtpp_command_play_handle(struct rtpp_stream *rsp, struct rtpp_command *cmd)
+rtpp_command_play_handle(struct rtpp_stream *rsp, struct rtpp_command *cmd,
+  const struct rtpp_cfg *cfsp)
 {
     const char *codecs;
     int ptime;
@@ -112,8 +114,15 @@ rtpp_command_play_handle(struct rtpp_stream *rsp, struct rtpp_command *cmd)
         codecs = plop->codecs->s;
         ptime = -1;
     }
-    if (plop->count != 0 && CALL_SMETHOD(rsp, handle_play, codecs,
-      plop->pname->s, plop->count, cmd, ptime) != 0) {
+    const struct r_stream_h_play_args pa = {
+        .codecs = codecs,
+        .pname = plop->pname->s,
+        .playcount = plop->count,
+        .cmd = cmd,
+        .ptime = ptime,
+        .guid = cfsp->guid,
+    };
+    if (plop->count != 0 && CALL_SMETHOD(rsp, handle_play, &pa) != 0) {
         CALL_SMETHOD(cmd->reply, deliver_error, ECODE_PLRFAIL);
         goto freeplop;
     }

src/commands/rpcpv1_play.h

@@ -33,9 +33,11 @@ struct rtpp_log;
 struct play_opts;
 struct rtpp_command;
 struct rtpp_stream;
+struct rtpp_cfg;
 
 struct play_opts *rtpp_command_play_opts_parse(struct rtpp_command *);
-void rtpp_command_play_handle(struct rtpp_stream *, struct rtpp_command *);
+void rtpp_command_play_handle(struct rtpp_stream *, struct rtpp_command *,
+  const struct rtpp_cfg *);
 void rtpp_command_play_opts_free(struct play_opts *);
 
 #endif

src/main.c

@@ -83,7 +83,7 @@
 #include "rtpp_defines.h"
 #include "rtpp_command.h"
 #include "rtpp_controlfd.h"
-#include "rtpp_genuid_singlet.h"
+#include "rtpp_genuid.h"
 #include "rtpp_hash_table.h"
 #include "commands/rpcpv1_ver.h"
 #include "rtpp_command_async.h"
@@ -319,7 +319,7 @@ init_config_bail(struct rtpp_cfg *cfsp, int rval, const char *msg, int memdeb)
     assert(cfsp->_pad == (void *)0x12345678);
     cfsp->_pad = (void *)((uintptr_t)cfsp->_pad ^ 0x87654321);
 #endif
-    rtpp_gen_uid_free();
+    RTPP_OBJ_DECREF(cfsp->guid);
 #if !defined(LIBRTPPROXY)
     rtpp_exit(memdeb, rval);
 #else
@@ -930,7 +930,7 @@ rtpp_shutdown(struct rtpp_cfg *cfsp)
     }
     free(cfsp->ctrl_socks);
     cfsp->ctrl_socks = NULL;
-    rtpp_gen_uid_free();
+    RTPP_OBJ_DECREF(cfsp->guid);
 #if defined(LIBRTPPROXY)
     RTPP_OBJ_DECREF(cfsp->glog);
 #endif
@@ -1025,8 +1025,9 @@ _rtpp_main(int argc, const char * const *argv)
     }
 
     seedrandom();
-    if (rtpp_gen_uid_init() != 0) {
-        MAIN_ERR(1, "rtpp_gen_uid_init() failed");
+    cfsp->guid = rtpp_genuid_ctor();
+    if (cfsp->guid == NULL) {
+        MAIN_ERR(1, "rtpp_genuid_ctor() failed");
         /* NOTREACHED */
     }
 

src/rtpp_cfg.h

@@ -152,6 +152,7 @@ struct rtpp_cfg {
     int no_redirect;
 
     struct rtpp_proc_servers *proc_servers;
+    struct rtpp_genuid *guid;
 #if ENABLE_MODULE_IF
     struct rtpp_modman *modules_cf;
 #else

src/rtpp_command.c

@@ -669,7 +669,7 @@ handle_command(const struct rtpp_cfg *cfsp, struct rtpp_command *cmd)
         break;
 
     case PLAY:
-        rtpp_command_play_handle(spa->rtp->stream[i], cmd);
+        rtpp_command_play_handle(spa->rtp->stream[i], cmd, cfsp);
         break;
 
     case COPY:

src/rtpp_genuid.c

@@ -32,52 +32,50 @@
 #include <stdlib.h>
 
 #include "rtpp_types.h"
+#include "rtpp_refcnt.h"
 #include "rtpp_genuid.h"
+#include "rtpp_genuid_fin.h"
 #include "rtpp_mallocs.h"
 
 struct rtpp_genuid_priv {
-    struct rtpp_genuid_obj pub;
+    struct rtpp_genuid pub;
     _Atomic(uint64_t) lastuid;
 };
 
-static void rtpp_genuid_gen(struct rtpp_genuid_obj *, uint64_t *vp);
-static void rtpp_genuid_dtor(struct rtpp_genuid_obj *);
+static uint64_t rtpp_genuid_gen(struct rtpp_genuid *);
 
-struct rtpp_genuid_obj *
+DEFINE_SMETHODS(rtpp_genuid,
+    .gen = &rtpp_genuid_gen,
+);
+
+struct rtpp_genuid *
 rtpp_genuid_ctor(void)
 {
     struct rtpp_genuid_priv *pvt;
 
-    pvt = rtpp_zmalloc(sizeof(struct rtpp_genuid_priv));
+    pvt = rtpp_rzmalloc(sizeof(struct rtpp_genuid_priv), PVT_RCOFFS(pvt));
     if (pvt == NULL) {
         goto e0;
     }
     atomic_init(&pvt->lastuid, 0);
-    pvt->pub.dtor = &rtpp_genuid_dtor;
-    pvt->pub.gen = &rtpp_genuid_gen;
+#if defined(RTPP_DEBUG)
+    pvt->pub.smethods = GET_SMETHODS(&pvt->pub);
+    RTPP_OBJ_DTOR_ATTACH(&pvt->pub, (rtpp_refcnt_dtor_t)&rtpp_genuid_fin,
+      &(pvt->pub));
+#endif
     return (&pvt->pub);
 
 e0:
     return (NULL);
 }
 
-static void
-rtpp_genuid_dtor(struct rtpp_genuid_obj *pub)
-{
-    struct rtpp_genuid_priv *pvt;
-
-    PUB2PVT(pub, pvt);
-
-    free(pvt);
-}
-
-static void
-rtpp_genuid_gen(struct rtpp_genuid_obj *pub, uint64_t *vp)
+static uint64_t
+rtpp_genuid_gen(struct rtpp_genuid *pub)
 {
     struct rtpp_genuid_priv *pvt;
 
     PUB2PVT(pub, pvt);
 
-    *vp = atomic_fetch_add_explicit(&(pvt->lastuid), 1,
+    return atomic_fetch_add_explicit(&(pvt->lastuid), 1,
       memory_order_relaxed);
 }

src/rtpp_genuid.h

@@ -26,14 +26,13 @@
  *
  */
 
-struct rtpp_genuid_obj;
+DECLARE_CLASS(rtpp_genuid, void);
 
-DEFINE_METHOD(rtpp_genuid_obj, rtpp_genuid_gen, void, uint64_t *);
-DEFINE_METHOD(rtpp_genuid_obj, rtpp_genuid_dtor, void);
+DECLARE_METHOD(rtpp_genuid, rtpp_genuid_gen, uint64_t);
 
-struct rtpp_genuid_obj {
-    rtpp_genuid_gen_t gen;
-    rtpp_genuid_dtor_t dtor;
+DECLARE_SMETHODS(rtpp_genuid)
+{
+    METHOD_ENTRY(rtpp_genuid_gen, gen);
 };
 
-struct rtpp_genuid_obj *rtpp_genuid_ctor(void);
+DECLARE_CLASS_PUBTYPE(rtpp_genuid, {});