b707fdb119
Support multiple domain numbers for each uds socket used in HA phc2sys. The ha_domainNumber option is an interface setting to configure the domain number for an uds socket. It ranges from 0 to 127. If the ha_domainNumber is not configured for a given interface, the global domainNumber setting is used. Test plan: PASS: Verify use of ha_domainNumber configuration in manual configuration. Failure path: domain number match PASS: Verify that phc2sys fails to start if domain number doesn't match ptp4l instance parameter. Regression: PASS: Verify use of global domain number in manual configuration. PASS: Verify auto configuration uses global domain number. Story: 2010723 Task: 48656 Change-Id: If71775f6ce02586573f005c3b3e805b5351a5a86 Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
From d5421e4d4d86907648a59810ab9c27e739591971 Mon Sep 17 00:00:00 2001
|
|
From: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
Date: Mon, 12 Jun 2023 15:35:23 -0300
|
|
Subject: [PATCH 24/48] pmc_agent: Perform time comparison using positive
|
|
logic.
|
|
|
|
In the update_pmc_node() method, reduce the expression
|
|
!(x < y) to (x >= y).
|
|
|
|
While we're at it, clean the coding style as well.
|
|
|
|
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
|
|
[commit fb92fec7cef9ee3345950c2633a7781b8bd3ca08 upstream]
|
|
Signed-off-by: Andre Mauricio Zelak <andre.zelak@windriver.com>
|
|
---
|
|
pmc_agent.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/pmc_agent.c b/pmc_agent.c
|
|
index df3a562..ea6b3b7 100644
|
|
--- a/pmc_agent.c
|
|
+++ b/pmc_agent.c
|
|
@@ -351,12 +351,13 @@ int update_pmc_node(struct pmc_agent *node)
|
|
}
|
|
ts = tp.tv_sec * NS_PER_SEC + tp.tv_nsec;
|
|
|
|
- if (!(ts - node->pmc_last_update < PMC_UPDATE_INTERVAL)) {
|
|
+ if (ts - node->pmc_last_update >= PMC_UPDATE_INTERVAL) {
|
|
if (node->stay_subscribed) {
|
|
renew_subscription(node, 0);
|
|
}
|
|
- if (run_pmc_get_utc_offset(node, 0) > 0)
|
|
+ if (run_pmc_get_utc_offset(node, 0) > 0) {
|
|
node->pmc_last_update = ts;
|
|
+ }
|
|
}
|
|
|
|
return 0;
|
|
--
|
|
2.25.1
|
|
|