mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-04-29 06:46:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

milan-avb: adp: add log_state diagnostic

Browse source
This commit is contained in:
hackerman-kl 2026-04-25 08:03:41 +02:00 • committed by Wim Taymans
parent e7f2fc9ab0
commit 2cc60d6167
2 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/modules/module-avb/adp.c
View file

@ -115,6 +115,14 @@ static int adp_message(void *data, uint64_t now, const void *message, int len)
e = find_entity_by_id(adp, entity_id); e = find_entity_by_id(adp, entity_id);
{
const char *mt = (message_type == AVB_ADP_MESSAGE_TYPE_ENTITY_AVAILABLE) ? "ADP rx ENTITY_AVAILABLE" :
(message_type == AVB_ADP_MESSAGE_TYPE_ENTITY_DEPARTING) ? "ADP rx ENTITY_DEPARTING" :
(message_type == AVB_ADP_MESSAGE_TYPE_ENTITY_DISCOVER) ? "ADP rx ENTITY_DISCOVER" :
"ADP rx ?";
avb_log_state(server, mt);
}
switch (message_type) { switch (message_type) {
case AVB_ADP_MESSAGE_TYPE_ENTITY_AVAILABLE: case AVB_ADP_MESSAGE_TYPE_ENTITY_AVAILABLE:
if (e == NULL) { if (e == NULL) {
@ -145,7 +153,7 @@ static int adp_message(void *data, uint64_t now, const void *message, int len)
struct avb_packet_adp *p_saved = struct avb_packet_adp *p_saved =
SPA_PTROFF(h_saved, sizeof(*h_saved), void); SPA_PTROFF(h_saved, sizeof(*h_saved), void);
if (p_saved->available_index != p->available_index) { if (ntohl(p->available_index) <= ntohl(p_saved->available_index)) {
if (handle_evt_tk_departed(server->acmp, entity_id, now)) { if (handle_evt_tk_departed(server->acmp, entity_id, now)) {
pw_log_info("handling departing event"); pw_log_info("handling departing event");
return -1; return -1;
@ -431,6 +439,36 @@ void adp_stop_discovery_entity(struct server *server, uint64_t entity_id)
pw_log_warn("Could not find entity 0x%"PRIx64, entity_id); pw_log_warn("Could not find entity 0x%"PRIx64, entity_id);
} }
void adp_log_state(struct server *server, const char *label)
{
struct adp *adp = (struct adp *)server->adp;
struct entity *e;
struct timespec ts;
uint64_t now;
char buf[64];
int n = 0;
if (adp == NULL)
return;
clock_gettime(CLOCK_MONOTONIC, &ts);
now = SPA_TIMESPEC_TO_NSEC(&ts);
spa_list_for_each(e, &adp->entities, link)
n++;
pw_log_debug("[%s] ADP: %d entit%s", label, n, n == 1 ? "y" : "ies");
spa_list_for_each(e, &adp->entities, link) {
struct avb_ethernet_header *h = (void *)e->buf;
struct avb_packet_adp *p = SPA_PTROFF(h, sizeof(*h), void);
uint64_t age_ms = (now - e->last_time) / 1000000ULL;
pw_log_debug("[%s] %s last_seen=%" PRIu64 "ms valid=%ds available_index=%u",
label,
avb_utils_format_id(buf, sizeof(buf), e->entity_id),
age_ms, e->valid_time, ntohl(p->available_index));
}
}
struct avb_adp *avb_adp_register(struct server *server) struct avb_adp *avb_adp_register(struct server *server)
{ {
struct adp *adp; struct adp *adp;

2
src/modules/module-avb/adp.h
View file

@ -88,4 +88,6 @@ void adp_stop_discovery_entity(struct server *server, uint64_t entity_id);
struct avb_adp *avb_adp_register(struct server *server); struct avb_adp *avb_adp_register(struct server *server);
void avb_adp_unregister(struct avb_adp *adp); void avb_adp_unregister(struct avb_adp *adp);
void adp_log_state(struct server *server, const char *label);
#endif /* AVB_ADP_H */ #endif /* AVB_ADP_H */