refactor: move netdev stats into netdev struct

sakumisu · sakumisu · commit e6421b8005c2 · 2025-12-30T22:46:42.000+08:00
Signed-off-by: sakumisu &lt;1203593632@qq.com&gt;
diff --git a/include/ec_datagram.h b/include/ec_datagram.h
@@ -45,7 +45,7 @@ typedef struct {
     ec_dlist_t queue;
     ec_dlist_t ext_queue;
     ec_dlist_t sent;
-    ec_netdev_index_t netdev_idx;     /**< Netdev via which the datagram shall be / was sent. */
+    uint8_t netdev_idx;               /**< Netdev via which the datagram shall be / was sent. */
     ec_datagram_type_t type;          /**< Datagram type (APRD, BWR, etc.). */
     bool static_alloc;                /**< True, if \a data is statically allocated. */
     uint8_t address[EC_ADDR_LEN];     /**< Recipient address. */
diff --git a/include/ec_def.h b/include/ec_def.h
@@ -127,6 +127,13 @@ typedef enum {
     /**< Acknowledge/Error bit (no actual state) */
 } ec_slave_state_t;
 
+typedef enum {
+    EC_PORT_NOT_IMPLEMENTED, /**< Port is not implemented. */
+    EC_PORT_NOT_CONFIGURED,  /**< Port is not configured. */
+    EC_PORT_EBUS,            /**< Port is an E-Bus. */
+    EC_PORT_MII              /**< Port is a MII. */
+} ec_slave_port_desc_t;
+
 /** Slave information interface CANopen over EtherCAT details flags.
  */
 typedef struct {
diff --git a/include/ec_master.h b/include/ec_master.h
@@ -32,37 +32,14 @@
 #include "ec_eoe.h"
 #include "ec_cmd.h"
 
-/** Netdev statistics.
- */
-typedef struct {
-    uint64_t tx_count;                     /**< Number of frames sent. */
-    uint64_t last_tx_count;                /**< Number of frames sent of last statistics cycle. */
-    uint64_t rx_count;                     /**< Number of frames received. */
-    uint64_t last_rx_count;                /**< Number of frames received of last statistics cycle. */
-    uint64_t tx_bytes;                     /**< Number of bytes sent. */
-    uint64_t last_tx_bytes;                /**< Number of bytes sent of last statistics cycle. */
-    uint64_t rx_bytes;                     /**< Number of bytes received. */
-    uint64_t last_rx_bytes;                /**< Number of bytes received of last statistics cycle. */
-    uint64_t last_loss;                    /**< Tx/Rx difference of last statistics cycle. */
-    int32_t tx_frame_rates[EC_RATE_COUNT]; /**< Transmit rates in frames/s for different statistics cycle periods.*/
-    int32_t rx_frame_rates[EC_RATE_COUNT]; /**< Receive rates in frames/s for different statistics cycle periods.*/
-    int32_t tx_byte_rates[EC_RATE_COUNT];  /**< Transmit rates in byte/s for different statistics cycle periods. */
-    int32_t rx_byte_rates[EC_RATE_COUNT];  /**< Receive rates in byte/s for different statistics cycle periods. */
-    int32_t loss_rates[EC_RATE_COUNT];     /**< Frame loss rates for different statistics cycle periods. */
-    uint64_t last_jiffies;                 /**< Jiffies of last statistic cycle. */
-} ec_netdev_stats_t;
-
-/** Cyclic statistics.
- */
 typedef struct {
-    unsigned int timeouts;        /**< datagram timeouts */
-    unsigned int corrupted;       /**< corrupted frames */
-    unsigned int unmatched;       /**< unmatched datagrams (received, but not queued any longer) */
-    unsigned long output_jiffies; /**< time of last output */
-} ec_stats_t;
+    unsigned int timeouts;
+    unsigned int corrupted;
+    unsigned int unmatched;
+} ec_master_stats_t;
 
 typedef enum {
-    EC_ORPHANED, /**< Orphaned phase. The master has no Ethernet device attached. */
+    EC_UNKNOWN,  /**< Unknown phase. No Ethernet device is attached. */
     EC_IDLE,     /**< Idle phase. An Ethernet device is attached, but the master is not in use, yet. */
     EC_OPERATION /**< Operation phase. The master was requested by a realtime application. */
 } ec_master_phase_t;
@@ -81,32 +58,32 @@ typedef struct ec_master {
     uint8_t index;
     ec_netdev_t *netdev[CONFIG_EC_MAX_NETDEVS];
     bool link_state[CONFIG_EC_MAX_NETDEVS];
-    uint32_t slaves_responding[CONFIG_EC_MAX_NETDEVS];
+    uint32_t slaves_working_counter[CONFIG_EC_MAX_NETDEVS];
     ec_slave_state_t slaves_state[CONFIG_EC_MAX_NETDEVS];
-    ec_netdev_stats_t netdev_stats;
-    ec_stats_t stats;
-    ec_master_phase_t phase;
-    bool active;         /**< Master is started. */
+
+    bool started;        /**< Master is started. */
     bool scan_done;      /**< Slave scan is done. */
     bool rescan_request; /**< Rescan requested. */
+    ec_master_stats_t stats;
+    ec_master_phase_t phase;
 
     ec_datagram_t main_datagram; /**< Main datagram for slave scan & state change & config & sii */
 
     ec_dlist_t datagram_queue;     /**< Queue of pending datagrams*/
     ec_dlist_t pdo_datagram_queue; /**< Queue of pdo datagrams*/
     uint8_t datagram_index;
 
-    ec_slave_t *dc_ref_clock;                /**< DC reference clock slave. */
-    ec_datagram_t dc_ref_sync_datagram;      /**< Datagram used for synchronizing the reference clock to the master clock. */
-    ec_datagram_t dc_all_sync_datagram;      /**< Datagram used for synchronizing all slaves to the dc ref clock. */
-    ec_datagram_t systime_diff_mon_datagram; /**< Datagram used for reading the system time difference between master and reference clock. */
+    ec_slave_t *dc_ref_clock;           /**< DC reference clock slave. */
+    ec_datagram_t dc_ref_sync_datagram; /**< Datagram used for synchronizing the reference clock to the master clock. */
+    ec_datagram_t dc_all_sync_datagram; /**< Datagram used for synchronizing all slaves to the dc ref clock. */
 
+    ec_datagram_t systime_diff_mon_datagram; /**< Datagram used for reading the system time difference between master and reference clock. */
+    bool systime_diff_enable;
     uint32_t min_systime_diff;
     uint32_t max_systime_diff;
     uint32_t curr_systime_diff;
     uint32_t systime_diff_count;
     uint64_t total_systime_diff;
-    bool systime_diff_enable;
 
     bool dc_sync_with_dc_ref_enable; /**< true: Sync the reference clock by dc ref clock, false: by master */
     uint32_t cycle_time;             /**< Cycle time [ns]. */
@@ -139,9 +116,9 @@ typedef struct ec_master {
     bool nonperiod_suspend;
 
     uint8_t pdo_buffer[CONFIG_EC_MAX_NETDEVS][CONFIG_EC_MAX_PDO_BUFSIZE];
-    uint32_t actual_pdo_size;
-    uint32_t expected_working_counter;
-    uint32_t actual_working_counter;
+    uint32_t actual_pdo_size;          /**< Actual PDO size for current setting. */
+    uint32_t expected_working_counter; /**< Expected working counter for PDO datagrams. */
+    uint32_t actual_working_counter;   /**< Actual working counter for PDO datagrams. */
 } ec_master_t;
 
 int ec_master_init(ec_master_t *master, uint8_t master_index);
diff --git a/include/ec_netdev.h b/include/ec_netdev.h
@@ -10,34 +10,39 @@
 
 typedef struct ec_master ec_master_t;
 
-typedef struct ec_netdev {
-    ec_master_t *master;
-    struct chry_phy_device phydev;
-    ec_netdev_index_t index;
-    char name[24];
-    uint8_t mac_addr[6];
-    bool link_state;
-    uint8_t tx_frame_index;
-    unsigned long jiffies_poll;
-
-    // Frame statistics
+/** Netdev statistics.
+ */
+typedef struct {
     uint64_t tx_count;                     /**< Number of frames sent. */
-    uint64_t last_tx_count;                /**< Number of frames sent of last statistics cycle.*/
+    uint64_t last_tx_count;                /**< Number of frames sent of last statistics cycle. */
     uint64_t rx_count;                     /**< Number of frames received. */
-    uint64_t last_rx_count;                /**< Number of frames received of last statistics cycle.*/
+    uint64_t last_rx_count;                /**< Number of frames received of last statistics cycle. */
     uint64_t tx_bytes;                     /**< Number of bytes sent. */
-    uint64_t last_tx_bytes;                /**< Number of bytes sent of last statistics cycle.*/
+    uint64_t last_tx_bytes;                /**< Number of bytes sent of last statistics cycle. */
     uint64_t rx_bytes;                     /**< Number of bytes received. */
-    uint64_t last_rx_bytes;                /**< Number of bytes received of last statistics cycle.*/
+    uint64_t last_rx_bytes;                /**< Number of bytes received of last statistics cycle. */
     uint64_t tx_errors;                    /**< Number of transmit errors. */
+    uint64_t loss_count;                   /**< Number of lost frames. */
     int32_t tx_frame_rates[EC_RATE_COUNT]; /**< Transmit rates in frames/s for different statistics cycle periods.*/
     int32_t rx_frame_rates[EC_RATE_COUNT]; /**< Receive rates in frames/s for different statistics cycle periods.*/
-    int32_t tx_byte_rates[EC_RATE_COUNT];  /**< Transmit rates in byte/s for different statistics cycle periods.*/
-    int32_t rx_byte_rates[EC_RATE_COUNT];  /**< Receive rates in byte/s for different statistics cycle periods.*/
+    int32_t tx_byte_rates[EC_RATE_COUNT];  /**< Transmit rates in byte/s for different statistics cycle periods. */
+    int32_t rx_byte_rates[EC_RATE_COUNT];  /**< Receive rates in byte/s for different statistics cycle periods. */
+    int32_t loss_rates[EC_RATE_COUNT];     /**< Frame loss rates for different statistics cycle periods. */
+    uint64_t last_jiffies;                 /**< Jiffies of last statistic cycle. */
+} ec_netdev_stats_t;
+
+typedef struct ec_netdev {
+    ec_master_t *master;
+    struct chry_phy_device phydev;
+    uint8_t index;
+    char name[24];
+    uint8_t mac_addr[6];
+    bool link_state;
+    uint8_t tx_frame_index;
 
+    ec_netdev_stats_t stats;
 } ec_netdev_t;
 
-void ec_netdev_clear_stats(ec_netdev_t *netdev);
 void ec_netdev_update_stats(ec_netdev_t *netdev);
 
 ec_netdev_t *ec_netdev_init(uint8_t netdev_index);
diff --git a/include/ec_slave.h b/include/ec_slave.h
@@ -37,15 +37,6 @@ typedef struct {
     ec_sync_signal_t dc_sync[EC_SYNC_SIGNAL_COUNT]; /**< DC sync signals. */
 } ec_slave_config_t;
 
-/** EtherCAT slave port descriptor.
- */
-typedef enum {
-    EC_PORT_NOT_IMPLEMENTED, /**< Port is not implemented. */
-    EC_PORT_NOT_CONFIGURED,  /**< Port is not configured. */
-    EC_PORT_EBUS,            /**< Port is an E-Bus. */
-    EC_PORT_MII              /**< Port is a MII. */
-} ec_slave_port_desc_t;
-
 /** EtherCAT slave port information.
  */
 typedef struct {
@@ -63,13 +54,13 @@ typedef struct {
 } ec_slave_port_t;
 
 typedef struct ec_slave {
-    uint32_t index;               /**< Index of the slave in the master slave array. */
-    ec_master_t *master;          /**< Master owning the slave. */
-    ec_netdev_index_t netdev_idx; /**< Index of device the slave responds on. */
+    uint32_t index;      /**< Index of the slave in the master slave array. */
+    ec_master_t *master; /**< Master owning the slave. */
+    uint8_t netdev_idx;  /**< Index of device the slave responds on. */
 
     uint16_t autoinc_address; /**< Auto-increment address. */
     uint16_t station_address; /**< Configured station address. */
-    uint16_t effective_alias; /**< Effective alias address. */
+    uint16_t alias_address;   /**< alias address. */
 
     ec_slave_port_t ports[EC_MAX_PORTS]; /**< Port information. */
 
diff --git a/src/ec_cmd.c b/src/ec_cmd.c
@@ -85,26 +85,27 @@ void ec_master_cmd_master(ec_master_t *master)
 {
     unsigned int dev_idx, j;
     uint64_t lost;
-    double perc;
     int colwidth = 8;
+    ec_netdev_stats_t netdev_stats;
+    uintptr_t flags;
 
     EC_LOG_RAW("Master%d\n", master->index);
     EC_LOG_RAW("  Phase: ");
     switch (master->phase) {
         case 0:
-            EC_LOG_RAW("Waiting for device(s)...");
+            EC_LOG_RAW("Waiting for device attached...\n");
             break;
         case 1:
-            EC_LOG_RAW("Idle");
+            EC_LOG_RAW("Idle\n");
             break;
         case 2:
-            EC_LOG_RAW("Operation");
+            EC_LOG_RAW("Operation\n");
             break;
         default:
-            EC_LOG_RAW("???");
+            EC_LOG_RAW("Unknown\n");
+            break;
     }
 
-    EC_LOG_RAW("\n");
     EC_LOG_RAW("  Slaves: %u\n", master->slave_count);
     EC_LOG_RAW("  Ethernet net devices:\n");
 
@@ -118,89 +119,56 @@ void ec_master_cmd_master(ec_master_t *master)
                    master->netdev[dev_idx]->mac_addr[4],
                    master->netdev[dev_idx]->mac_addr[5]);
         EC_LOG_RAW("      Link: %s\n", master->netdev[dev_idx]->link_state ? "UP" : "DOWN");
-        EC_LOG_RAW("      Tx frames:   %llu\n", master->netdev[dev_idx]->tx_count);
-        EC_LOG_RAW("      Tx bytes:    %llu\n", master->netdev[dev_idx]->tx_bytes);
-        EC_LOG_RAW("      Rx frames:   %llu\n", master->netdev[dev_idx]->rx_count);
-        EC_LOG_RAW("      Rx bytes:    %llu\n", master->netdev[dev_idx]->rx_bytes);
-        EC_LOG_RAW("      Tx errors:   %llu\n", master->netdev[dev_idx]->tx_errors);
+
+        flags = ec_osal_enter_critical_section();
+        memcpy(&netdev_stats, &master->netdev[dev_idx]->stats, sizeof(ec_netdev_stats_t));
+        ec_osal_leave_critical_section(flags);
+
+        EC_LOG_RAW("      Tx frames:   %llu\n", netdev_stats.tx_count);
+        EC_LOG_RAW("      Tx bytes:    %llu\n", netdev_stats.tx_bytes);
+        EC_LOG_RAW("      Rx frames:   %llu\n", netdev_stats.rx_count);
+        EC_LOG_RAW("      Rx bytes:    %llu\n", netdev_stats.rx_bytes);
+        EC_LOG_RAW("      Tx errors:   %llu\n", netdev_stats.tx_errors);
+
+        lost = netdev_stats.loss_count;
+        if (lost == 1)
+            lost = 0;
+        EC_LOG_RAW("      Lost frames: %llu\n", lost);
 
         EC_LOG_RAW("      Tx frame rate [1/s]: ");
         for (j = 0; j < EC_RATE_COUNT; j++) {
-            EC_LOG_RAW("%*.*f", colwidth, 0, master->netdev[dev_idx]->tx_frame_rates[j] / 1000.0);
+            EC_LOG_RAW("%*.*f", colwidth, 0, netdev_stats.tx_frame_rates[j] / 1000.0);
             if (j < EC_RATE_COUNT - 1)
                 EC_LOG_RAW(" ");
         }
         EC_LOG_RAW("\n      Tx rate [KByte/s]:   ");
         for (j = 0; j < EC_RATE_COUNT; j++) {
-            EC_LOG_RAW("%*.*f", colwidth, 1, master->netdev[dev_idx]->tx_byte_rates[j] / 1024.0);
+            EC_LOG_RAW("%*.*f", colwidth, 1, netdev_stats.tx_byte_rates[j] / 1024.0);
             if (j < EC_RATE_COUNT - 1)
                 EC_LOG_RAW(" ");
         }
         EC_LOG_RAW("\n      Rx frame rate [1/s]: ");
         for (j = 0; j < EC_RATE_COUNT; j++) {
-            EC_LOG_RAW("%*.*f", colwidth, 0, master->netdev[dev_idx]->rx_frame_rates[j] / 1000.0);
+            EC_LOG_RAW("%*.*f", colwidth, 0, netdev_stats.rx_frame_rates[j] / 1000.0);
             if (j < EC_RATE_COUNT - 1)
                 EC_LOG_RAW(" ");
         }
         EC_LOG_RAW("\n      Rx rate [KByte/s]:   ");
         for (j = 0; j < EC_RATE_COUNT; j++) {
-            EC_LOG_RAW("%*.*f", colwidth, 1, master->netdev[dev_idx]->rx_byte_rates[j] / 1024.0);
+            EC_LOG_RAW("%*.*f", colwidth, 1, netdev_stats.rx_byte_rates[j] / 1024.0);
             if (j < EC_RATE_COUNT - 1)
                 EC_LOG_RAW(" ");
         }
-        EC_LOG_RAW("\n");
-    }
 
-    lost = master->netdev_stats.tx_count - master->netdev_stats.rx_count;
-    if (lost == 1)
-        lost = 0;
-    EC_LOG_RAW("    Common:\n");
-    EC_LOG_RAW("      Tx frames:   %llu\n", master->netdev_stats.tx_count);
-    EC_LOG_RAW("      Tx bytes:    %llu\n", master->netdev_stats.tx_bytes);
-    EC_LOG_RAW("      Rx frames:   %llu\n", master->netdev_stats.rx_count);
-    EC_LOG_RAW("      Rx bytes:    %llu\n", master->netdev_stats.rx_bytes);
-    EC_LOG_RAW("      Lost frames: %llu\n", lost);
-
-    EC_LOG_RAW("      Tx frame rate [1/s]: ");
-    for (j = 0; j < EC_RATE_COUNT; j++) {
-        EC_LOG_RAW("%*.*f", colwidth, 0, master->netdev_stats.tx_frame_rates[j] / 1000.0);
-        if (j < EC_RATE_COUNT - 1)
-            EC_LOG_RAW(" ");
-    }
-    EC_LOG_RAW("\n      Tx rate [KByte/s]:   ");
-    for (j = 0; j < EC_RATE_COUNT; j++) {
-        EC_LOG_RAW("%*.*f", colwidth, 1, master->netdev_stats.tx_byte_rates[j] / 1024.0);
-        if (j < EC_RATE_COUNT - 1)
-            EC_LOG_RAW(" ");
-    }
-    EC_LOG_RAW("\n      Rx frame rate [1/s]: ");
-    for (j = 0; j < EC_RATE_COUNT; j++) {
-        EC_LOG_RAW("%*.*f", colwidth, 0, master->netdev_stats.rx_frame_rates[j] / 1000.0);
-        if (j < EC_RATE_COUNT - 1)
-            EC_LOG_RAW(" ");
-    }
-    EC_LOG_RAW("\n      Rx rate [KByte/s]:   ");
-    for (j = 0; j < EC_RATE_COUNT; j++) {
-        EC_LOG_RAW("%*.*f", colwidth, 1, master->netdev_stats.rx_byte_rates[j] / 1024.0);
-        if (j < EC_RATE_COUNT - 1)
-            EC_LOG_RAW(" ");
-    }
-    EC_LOG_RAW("\n      Loss rate [1/s]:     ");
-    for (j = 0; j < EC_RATE_COUNT; j++) {
-        EC_LOG_RAW("%*.*f", colwidth, 0, master->netdev_stats.loss_rates[j] / 1000.0);
-        if (j < EC_RATE_COUNT - 1)
-            EC_LOG_RAW(" ");
-    }
-    EC_LOG_RAW("\n      Frame loss [%%]:      ");
-    for (j = 0; j < EC_RATE_COUNT; j++) {
-        perc = 0.0;
-        if (master->netdev_stats.tx_frame_rates[j])
-            perc = 100.0 * master->netdev_stats.loss_rates[j] / master->netdev_stats.tx_frame_rates[j];
-        EC_LOG_RAW("%*.*f", colwidth, 1, perc);
-        if (j < EC_RATE_COUNT - 1)
-            EC_LOG_RAW(" ");
+        EC_LOG_RAW("\n      Loss rate [1/s]:     ");
+        for (j = 0; j < EC_RATE_COUNT; j++) {
+            EC_LOG_RAW("%*.*f", colwidth, 0, netdev_stats.loss_rates[j] / 1000.0);
+            if (j < EC_RATE_COUNT - 1)
+                EC_LOG_RAW(" ");
+        }
+
+        EC_LOG_RAW("\n");
     }
-    EC_LOG_RAW("\n");
 }
 
 static void ec_cmd_show_slave_detail(ec_master_t *master, uint32_t slave_idx)
@@ -222,8 +190,8 @@ static void ec_cmd_show_slave_detail(ec_master_t *master, uint32_t slave_idx)
 
     EC_LOG_RAW("=== Master %d, Slave %d ===\n", master->index, slave_idx);
 
-    if (slave_data.effective_alias != 0) {
-        EC_LOG_RAW("Alias: 0x%04x\n", slave_data.effective_alias);
+    if (slave_data.alias_address != 0) {
+        EC_LOG_RAW("Alias: 0x%04x\n", slave_data.alias_address);
     }
 
     EC_LOG_RAW("Device: %s\n", master->netdev[slave->netdev_idx]->name);
diff --git a/src/ec_master.c b/src/ec_master.c
diff --git a/src/ec_netdev.c b/src/ec_netdev.c
diff --git a/src/ec_slave.c b/src/ec_slave.c
