Skip to content

Commit 8f233ad

Browse files
sobomaxsobomax
committed
Re-gen.
1 parent 82e2254 commit 8f233ad

File tree

16 files changed

+1459
-265
lines changed

16 files changed

+1459
-265
lines changed

‎autosrc/Makefile.ami‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ rtpp_socket_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_socket_fin.h $(RTPP_AUTOSRC_DIR)
5858
SRCS_AUTOGEN_DEBUG += $(rtpp_socket_AUTOSRCS)
5959
rtpp_refproxy_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_refproxy_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_refproxy_fin.c
6060
SRCS_AUTOGEN_DEBUG += $(rtpp_refproxy_AUTOSRCS)
61+
rtpp_wref_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_wref_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_wref_fin.c
62+
SRCS_AUTOGEN_DEBUG += $(rtpp_wref_AUTOSRCS)
6163
rtpp_command_reply_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_command_reply_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_command_reply_fin.c
6264
SRCS_AUTOGEN_DEBUG += $(rtpp_command_reply_AUTOSRCS)
6365
rtpp_genuid_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_genuid_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_genuid_fin.c

‎autosrc/rtpp_refcnt_fin.c‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ static void refcnt_traceen_fin(void *pub) {
4343
fprintf(stderr, "Method rtpp_refcnt@%p::traceen (refcnt_traceen) is invoked after destruction\x0a", pub);
4444
RTPP_AUTOTRAP();
4545
}
46+
static void refcnt_tryincref_fin(void *pub) {
47+
fprintf(stderr, "Method rtpp_refcnt@%p::tryincref (refcnt_tryincref) is invoked after destruction\x0a", pub);
48+
RTPP_AUTOTRAP();
49+
}
4650
static const struct rtpp_refcnt_smethods rtpp_refcnt_smethods_fin = {
4751
.attach = (refcnt_attach_t)&refcnt_attach_fin,
4852
.attach_nc = (refcnt_attach_nc_t)&refcnt_attach_nc_fin,
@@ -53,6 +57,7 @@ static const struct rtpp_refcnt_smethods rtpp_refcnt_smethods_fin = {
5357
.incref = (refcnt_incref_t)&refcnt_incref_fin,
5458
.peek = (refcnt_peek_t)&refcnt_peek_fin,
5559
.traceen = (refcnt_traceen_t)&refcnt_traceen_fin,
60+
.tryincref = (refcnt_tryincref_t)&refcnt_tryincref_fin,
5661
};
5762
void rtpp_refcnt_fin(struct rtpp_refcnt *pub) {
5863
RTPP_DBG_ASSERT(pub->smethods->attach != (refcnt_attach_t)NULL);
@@ -64,6 +69,7 @@ void rtpp_refcnt_fin(struct rtpp_refcnt *pub) {
6469
RTPP_DBG_ASSERT(pub->smethods->incref != (refcnt_incref_t)NULL);
6570
RTPP_DBG_ASSERT(pub->smethods->peek != (refcnt_peek_t)NULL);
6671
RTPP_DBG_ASSERT(pub->smethods->traceen != (refcnt_traceen_t)NULL);
72+
RTPP_DBG_ASSERT(pub->smethods->tryincref != (refcnt_tryincref_t)NULL);
6773
RTPP_DBG_ASSERT(pub->smethods != &rtpp_refcnt_smethods_fin &&
6874
pub->smethods != NULL);
6975
pub->smethods = &rtpp_refcnt_smethods_fin;
@@ -99,6 +105,7 @@ rtpp_refcnt_fintest()
99105
.incref = (refcnt_incref_t)((void *)0x1),
100106
.peek = (refcnt_peek_t)((void *)0x1),
101107
.traceen = (refcnt_traceen_t)((void *)0x1),
108+
.tryincref = (refcnt_tryincref_t)((void *)0x1),
102109
};
103110
tp->pub.smethods = &dummy;
104111
RTPP_OBJ_DTOR_ATTACH_s(&tp->pub, (rtpp_refcnt_dtor_t)&rtpp_refcnt_fin,
@@ -113,7 +120,8 @@ rtpp_refcnt_fintest()
113120
CALL_TFIN(&tp->pub, incref);
114121
CALL_TFIN(&tp->pub, peek);
115122
CALL_TFIN(&tp->pub, traceen);
116-
assert((_naborts - naborts_s) == 9);
123+
CALL_TFIN(&tp->pub, tryincref);
124+
assert((_naborts - naborts_s) == 10);
117125
}
118126
DATA_SET(rtpp_fintests, rtpp_refcnt_fintest);
119127
#endif /* RTPP_FINTEST */

‎autosrc/rtpp_socket_fin.c‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ static void rtpp_socket_drain_fin(void *pub) {
1515
fprintf(stderr, "Method rtpp_socket@%p::drain (rtpp_socket_drain) is invoked after destruction\x0a", pub);
1616
RTPP_AUTOTRAP();
1717
}
18+
static void rtpp_socket_get_session_link_fin(void *pub) {
19+
fprintf(stderr, "Method rtpp_socket@%p::get_session_link (rtpp_socket_get_session_link) is invoked after destruction\x0a", pub);
20+
RTPP_AUTOTRAP();
21+
}
22+
static void rtpp_socket_get_stream_link_fin(void *pub) {
23+
fprintf(stderr, "Method rtpp_socket@%p::get_stream_link (rtpp_socket_get_stream_link) is invoked after destruction\x0a", pub);
24+
RTPP_AUTOTRAP();
25+
}
1826
static void rtpp_socket_get_stuid_fin(void *pub) {
1927
fprintf(stderr, "Method rtpp_socket@%p::get_stuid (rtpp_socket_get_stuid) is invoked after destruction\x0a", pub);
2028
RTPP_AUTOTRAP();
@@ -23,6 +31,14 @@ static void rtpp_socket_getfd_fin(void *pub) {
2331
fprintf(stderr, "Method rtpp_socket@%p::getfd (rtpp_socket_getfd) is invoked after destruction\x0a", pub);
2432
RTPP_AUTOTRAP();
2533
}
34+
static void rtpp_socket_link_session_fin(void *pub) {
35+
fprintf(stderr, "Method rtpp_socket@%p::link_session (rtpp_socket_link_session) is invoked after destruction\x0a", pub);
36+
RTPP_AUTOTRAP();
37+
}
38+
static void rtpp_socket_link_stream_fin(void *pub) {
39+
fprintf(stderr, "Method rtpp_socket@%p::link_stream (rtpp_socket_link_stream) is invoked after destruction\x0a", pub);
40+
RTPP_AUTOTRAP();
41+
}
2642
static void rtpp_socket_rtp_recv_fin(void *pub) {
2743
fprintf(stderr, "Method rtpp_socket@%p::rtp_recv (rtpp_socket_rtp_recv) is invoked after destruction\x0a", pub);
2844
RTPP_AUTOTRAP();
@@ -54,8 +70,12 @@ static void rtpp_socket_settos_fin(void *pub) {
5470
static const struct rtpp_socket_smethods rtpp_socket_smethods_fin = {
5571
.bind2 = (rtpp_socket_bind_t)&rtpp_socket_bind_fin,
5672
.drain = (rtpp_socket_drain_t)&rtpp_socket_drain_fin,
73+
.get_session_link = (rtpp_socket_get_session_link_t)&rtpp_socket_get_session_link_fin,
74+
.get_stream_link = (rtpp_socket_get_stream_link_t)&rtpp_socket_get_stream_link_fin,
5775
.get_stuid = (rtpp_socket_get_stuid_t)&rtpp_socket_get_stuid_fin,
5876
.getfd = (rtpp_socket_getfd_t)&rtpp_socket_getfd_fin,
77+
.link_session = (rtpp_socket_link_session_t)&rtpp_socket_link_session_fin,
78+
.link_stream = (rtpp_socket_link_stream_t)&rtpp_socket_link_stream_fin,
5979
.rtp_recv = (rtpp_socket_rtp_recv_t)&rtpp_socket_rtp_recv_fin,
6080
.send_pkt_na = (rtpp_socket_send_pkt_na_t)&rtpp_socket_send_pkt_na_fin,
6181
.set_stuid = (rtpp_socket_set_stuid_t)&rtpp_socket_set_stuid_fin,
@@ -67,8 +87,12 @@ static const struct rtpp_socket_smethods rtpp_socket_smethods_fin = {
6787
void rtpp_socket_fin(struct rtpp_socket *pub) {
6888
RTPP_DBG_ASSERT(pub->smethods->bind2 != (rtpp_socket_bind_t)NULL);
6989
RTPP_DBG_ASSERT(pub->smethods->drain != (rtpp_socket_drain_t)NULL);
90+
RTPP_DBG_ASSERT(pub->smethods->get_session_link != (rtpp_socket_get_session_link_t)NULL);
91+
RTPP_DBG_ASSERT(pub->smethods->get_stream_link != (rtpp_socket_get_stream_link_t)NULL);
7092
RTPP_DBG_ASSERT(pub->smethods->get_stuid != (rtpp_socket_get_stuid_t)NULL);
7193
RTPP_DBG_ASSERT(pub->smethods->getfd != (rtpp_socket_getfd_t)NULL);
94+
RTPP_DBG_ASSERT(pub->smethods->link_session != (rtpp_socket_link_session_t)NULL);
95+
RTPP_DBG_ASSERT(pub->smethods->link_stream != (rtpp_socket_link_stream_t)NULL);
7296
RTPP_DBG_ASSERT(pub->smethods->rtp_recv != (rtpp_socket_rtp_recv_t)NULL);
7397
RTPP_DBG_ASSERT(pub->smethods->send_pkt_na != (rtpp_socket_send_pkt_na_t)NULL);
7498
RTPP_DBG_ASSERT(pub->smethods->set_stuid != (rtpp_socket_set_stuid_t)NULL);
@@ -104,8 +128,12 @@ rtpp_socket_fintest()
104128
static const struct rtpp_socket_smethods dummy = {
105129
.bind2 = (rtpp_socket_bind_t)((void *)0x1),
106130
.drain = (rtpp_socket_drain_t)((void *)0x1),
131+
.get_session_link = (rtpp_socket_get_session_link_t)((void *)0x1),
132+
.get_stream_link = (rtpp_socket_get_stream_link_t)((void *)0x1),
107133
.get_stuid = (rtpp_socket_get_stuid_t)((void *)0x1),
108134
.getfd = (rtpp_socket_getfd_t)((void *)0x1),
135+
.link_session = (rtpp_socket_link_session_t)((void *)0x1),
136+
.link_stream = (rtpp_socket_link_stream_t)((void *)0x1),
109137
.rtp_recv = (rtpp_socket_rtp_recv_t)((void *)0x1),
110138
.send_pkt_na = (rtpp_socket_send_pkt_na_t)((void *)0x1),
111139
.set_stuid = (rtpp_socket_set_stuid_t)((void *)0x1),
@@ -120,16 +148,20 @@ rtpp_socket_fintest()
120148
RTPP_OBJ_DECREF(&(tp->pub));
121149
CALL_TFIN(&tp->pub, bind2);
122150
CALL_TFIN(&tp->pub, drain);
151+
CALL_TFIN(&tp->pub, get_session_link);
152+
CALL_TFIN(&tp->pub, get_stream_link);
123153
CALL_TFIN(&tp->pub, get_stuid);
124154
CALL_TFIN(&tp->pub, getfd);
155+
CALL_TFIN(&tp->pub, link_session);
156+
CALL_TFIN(&tp->pub, link_stream);
125157
CALL_TFIN(&tp->pub, rtp_recv);
126158
CALL_TFIN(&tp->pub, send_pkt_na);
127159
CALL_TFIN(&tp->pub, set_stuid);
128160
CALL_TFIN(&tp->pub, setnonblock);
129161
CALL_TFIN(&tp->pub, setrbuf);
130162
CALL_TFIN(&tp->pub, settimestamp);
131163
CALL_TFIN(&tp->pub, settos);
132-
assert((_naborts - naborts_s) == 11);
164+
assert((_naborts - naborts_s) == 15);
133165
}
134166
DATA_SET(rtpp_fintests, rtpp_socket_fintest);
135167
#endif /* RTPP_FINTEST */

‎extractaudio/Makefile.in‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,8 +530,9 @@ SRCS_AUTOGEN_DEBUG = $(rtpp_netaddr_AUTOSRCS) \
530530
$(rtpp_ringbuf_AUTOSRCS) $(rtpp_sessinfo_AUTOSRCS) \
531531
$(rtpp_rw_lock_AUTOSRCS) $(rtpp_proc_servers_AUTOSRCS) \
532532
$(rtpp_proc_wakeup_AUTOSRCS) $(rtpp_socket_AUTOSRCS) \
533-
$(rtpp_refproxy_AUTOSRCS) $(rtpp_command_reply_AUTOSRCS) \
534-
$(rtpp_genuid_AUTOSRCS) $(rtpp_bindaddrs_AUTOSRCS)
533+
$(rtpp_refproxy_AUTOSRCS) $(rtpp_wref_AUTOSRCS) \
534+
$(rtpp_command_reply_AUTOSRCS) $(rtpp_genuid_AUTOSRCS) \
535+
$(rtpp_bindaddrs_AUTOSRCS) $(rtpp_packetport_AUTOSRCS)
535536
rtpp_command_rcache_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_command_rcache_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_command_rcache_fin.c
536537
rtpp_log_obj_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_log_obj_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_log_obj_fin.c
537538
rtpp_port_table_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_port_table_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_port_table_fin.c
@@ -560,9 +561,11 @@ rtpp_proc_servers_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_proc_servers_fin.h $(RTPP_
560561
rtpp_proc_wakeup_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_proc_wakeup_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_proc_wakeup_fin.c
561562
rtpp_socket_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_socket_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_socket_fin.c
562563
rtpp_refproxy_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_refproxy_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_refproxy_fin.c
564+
rtpp_wref_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_wref_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_wref_fin.c
563565
rtpp_command_reply_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_command_reply_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_command_reply_fin.c
564566
rtpp_genuid_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_genuid_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_genuid_fin.c
565567
rtpp_bindaddrs_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_bindaddrs_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_bindaddrs_fin.c
568+
rtpp_packetport_AUTOSRCS = $(RTPP_AUTOSRC_DIR)/rtpp_packetport_fin.h $(RTPP_AUTOSRC_DIR)/rtpp_packetport_fin.c
566569
extractaudio_BASESOURCES = extractaudio.c decoder.c rtpp_loader.c \
567570
$(MAINSRCDIR)/rtp.c $(MAINSRCDIR)/rtp_analyze.c \
568571
$(MAINSRCDIR)/rtpp_util.c $(MAINSRCDIR)/rtpp_time.c decoder.h \

0 commit comments

Comments
 (0)