netloop: speed up NetLoop
PATCH 3/31 netloop: speed up NetLoop
NetLoop polls every cycle with getenv some environment variables. This is horribly slow, especially when the environment is big.
This patch reads only the environment variables in NetLoop, when they were changed.
--- common/cmd_nvedit.c | 6 +++ include/common.h | 1 + net/eth.c | 11 +++++- net/net.c | 88 +++++++++++++++++++++++++++----------------------- 4 files changed, 63 insertions(+), 43 deletions(-)
common/cmd_nvedit.c +6 -0
@@ -75,7 +75,12 @@ DECLARE_GLOBAL_DATA_PTR;static const unsigned long baudrate_table[] =CONFIG_SYS_BAUDRATE_TABLE ;#define N_BAUDRATES (sizeof(baudrate_table) / sizeof(baudrate_table[0])) +static int env_id =1 ; +int get_env_id (void ) +{ +return env_id; +}/************************************************************************ * Command interface: print one or all environment variables */
@@ -168,6 +173,7 @@ int _do_setenv (int flag, int argc, char *argv[])return 1 ; } + env_id++;/* * search if variable with this name already exists */
include/common.h +1 -0
@@ -269,6 +269,7 @@ void forceenv (char *, char *);#ifdef CONFIG_AUTO_COMPLETE int env_complete (char *var,int maxv,char *cmdv[],int maxsz,char *buf);#endif +int get_env_id (void );void pci_init (void );void pci_init_board (void );
net/eth.c +9 -2
@@ -28,7 +28,11 @@#if defined(CONFIG_CMD_NET ) && defined(CONFIG_NET_MULTI ) +static char *act =0 ; +static int env_changed_id =0 ; +/* +* * CPU and board-specific Ethernet initializations. Aliased function * signals caller to move on */
@@ -439,13 +443,16 @@ void eth_try_another(int first_restart)#ifdef CONFIG_NET_MULTI void eth_set_current (void ) { -char *act;struct eth_device * old_current;if (!eth_current)/* XXX no current */ return ; - act =getenv ("ethact" ); +if ((*act ==0 ) || (env_changed_id <get_env_id ())) + { + act =getenv ("ethact" ); + env_changed_id =get_env_id (); + }if (act !=NULL ) { old_current = eth_current; do {
net/net.c +47 -41
116 lines not on this page · raw message
Signature · 5 lines
1.6.0.6 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 3/31 netloop: speed up NetLoop
Dear Heiko Schocher,
Quoted 5 lines · In message <[email protected]> you wrote:
NetLoop polls every cycle with getenv some environment variables. This is horribly slow, especially when the environment is big.
This patch reads only the environment variables in NetLoop, when they were changed.
...
net/eth.c void eth_try_another(int first_restart) · line 455
Quoted 7 lines
net/eth.c +5
-1- act =getenv ("ethact" ); +if ((*act ==0 ) || (env_changed_id <get_env_id ())) + { + act =getenv ("ethact" ); + env_changed_id =get_env_id (); + }
Incorrect brace style.
Note that you are calling get_env_id() twice - in the test and then again. This can be avoided. Also, I recommend to use "!=" instead of "<".
Quoted 2 lines
net/net.c +0
-0
...
net/net.c restart: · line 348
Quoted 13 lines
net/net.c +5
-1+int env_changed_id =0 ; +void ArpRequest (void ) {int i;@@ -341,63 +343,67 @@ restart:* packets and timer events. */ -switch (protocol) { +/* update just, if the environment has changed */ +if (env_changed_id <get_env_id ()) { +switch (protocol) {
Please change the comment into something like "update only when the environment has changed" or so.
Better use "!=" instead of "<".
Quoted 88 lines
net/net.c +41
-31#if defined(CONFIG_CMD_NFS ) -case NFS : +case NFS :#endif #if defined(CONFIG_CMD_PING ) -case PING : +case PING :#endif #if defined(CONFIG_CMD_SNTP ) -case SNTP : +case SNTP :#endif -case NETCONS : -case TFTP : -NetCopyIP (&NetOurIP, &bd->bi_ip_addr); - NetOurGatewayIP =getenv_IPaddr ("gatewayip" ); - NetOurSubnetMask=getenv_IPaddr ("netmask" ); - NetOurVLAN =getenv_VLAN ("vlan" ); - NetOurNativeVLAN =getenv_VLAN ("nvlan" ); +case NETCONS : +case TFTP : +NetCopyIP (&NetOurIP, &bd->bi_ip_addr); + NetOurGatewayIP =getenv_IPaddr ("gatewayip" ); + NetOurSubnetMask=getenv_IPaddr ("netmask" ); + NetOurVLAN =getenv_VLAN ("vlan" ); + NetOurNativeVLAN =getenv_VLAN ("nvlan" ); -switch (protocol) { +switch (protocol) {#if defined(CONFIG_CMD_NFS ) -case NFS : +case NFS :#endif -case NETCONS : -case TFTP : - NetServerIP =getenv_IPaddr ("serverip" ); -break ; +case NETCONS : +case TFTP : + NetServerIP =getenv_IPaddr ("serverip" ); +break ;#if defined(CONFIG_CMD_PING ) -case PING : -/* nothing */ -break ; +case PING : +/* nothing */ +break ;#endif #if defined(CONFIG_CMD_SNTP ) -case SNTP : -/* nothing */ -break ; +case SNTP : +/* nothing */ +break ;#endif +default : +break ; + } + +break ; +case BOOTP : +case RARP : +/* +* initialize our IP addr to 0 in order to accept ANY +* IP addr assigned to us by the BOOTP / RARP server +*/ + NetOurIP =0 ; + NetServerIP =getenv_IPaddr ("serverip" ); + NetOurVLAN =getenv_VLAN ("vlan" );/* VLANs must be read */ + NetOurNativeVLAN =getenv_VLAN ("nvlan" ); +case CDP : + NetOurVLAN =getenv_VLAN ("vlan" );/* VLANs must be read */ + NetOurNativeVLAN =getenv_VLAN ("nvlan" ); +break ;default :break ; } - -break ; -case BOOTP : -case RARP : -/* -* initialize our IP addr to 0 in order to accept ANY -* IP addr assigned to us by the BOOTP / RARP server -*/ - NetOurIP =0 ;
net/net.c restart: · line 406
Quoted 10 lines
net/net.c +1
-9- NetServerIP =getenv_IPaddr ("serverip" ); - NetOurVLAN =getenv_VLAN ("vlan" );/* VLANs must be read */ - NetOurNativeVLAN =getenv_VLAN ("nvlan" ); -case CDP : - NetOurVLAN =getenv_VLAN ("vlan" );/* VLANs must be read */ - NetOurNativeVLAN =getenv_VLAN ("nvlan" ); -break ; -default : -break ; + env_changed_id =get_env_id ();
You are calling get_env_id() twice - avoid that.
Instead of adding yet anothe rlevel of indentation to that switch I recommend to split it in a separate fuinction - it's big enough for that anyway.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Here is an Appalachian version of management's answer to those who are concerned with the fate of the project: "Don't worry about the mule. Just load the wagon." - Mike Dennison's hillbilly uncle
PATCH 3/31 netloop: speed up NetLoop
Hello Wolfgang,
Quoted 7 lines · Wolfgang Denk
Quoted 5 lines · In message <[email protected]> you wrote:
NetLoop polls every cycle with getenv some environment variables. This is horribly slow, especially when the environment is big.
This patch reads only the environment variables in NetLoop, when they were changed.
...
Quoted 8 lines
net/eth.c void eth_try_another(int first_restart) · line 455
Quoted 6 lines
net/eth.c +5
-1- act =getenv ("ethact" ); +if ((*act ==0 ) || (env_changed_id <get_env_id ())) + { + act =getenv ("ethact" ); + env_changed_id =get_env_id (); + }Incorrect brace style.
Argh.
Quoted 3 lines
Note that you are calling
get_env_id()twice - in the test and then again. This can be avoided. Also, I recommend to use "!=" instead of "<".
OK, I change this.
Quoted 20 lines
Quoted 2 lines
net/net.c +0
-0...
net/net.c restart: · line 348
Quoted 13 lines
net/net.c +5
-1+int env_changed_id =0 ; +void ArpRequest (void ) {int i;@@ -341,63 +343,67 @@ restart:* packets and timer events. */ -switch (protocol) { +/* update just, if the environment has changed */ +if (env_changed_id <get_env_id ()) { +switch (protocol) {Please change the comment into something like "update only when the environment has changed" or so.
Quoted 1 line
Better use "!=" instead of "<".
OK.
Quoted 92 lines
Quoted 92 lines
net/net.c +41
-35#if defined(CONFIG_CMD_NFS ) -case NFS : +case NFS :#endif #if defined(CONFIG_CMD_PING ) -case PING : +case PING :#endif #if defined(CONFIG_CMD_SNTP ) -case SNTP : +case SNTP :#endif -case NETCONS : -case TFTP : -NetCopyIP (&NetOurIP, &bd->bi_ip_addr); - NetOurGatewayIP =getenv_IPaddr ("gatewayip" ); - NetOurSubnetMask=getenv_IPaddr ("netmask" ); - NetOurVLAN =getenv_VLAN ("vlan" ); - NetOurNativeVLAN =getenv_VLAN ("nvlan" ); +case NETCONS : +case TFTP : +NetCopyIP (&NetOurIP, &bd->bi_ip_addr); + NetOurGatewayIP =getenv_IPaddr ("gatewayip" ); + NetOurSubnetMask=getenv_IPaddr ("netmask" ); + NetOurVLAN =getenv_VLAN ("vlan" ); + NetOurNativeVLAN =getenv_VLAN ("nvlan" ); -switch (protocol) { +switch (protocol) {#if defined(CONFIG_CMD_NFS ) -case NFS : +case NFS :#endif -case NETCONS : -case TFTP : - NetServerIP =getenv_IPaddr ("serverip" ); -break ; +case NETCONS : +case TFTP : + NetServerIP =getenv_IPaddr ("serverip" ); +break ;#if defined(CONFIG_CMD_PING ) -case PING : -/* nothing */ -break ; +case PING : +/* nothing */ +break ;#endif #if defined(CONFIG_CMD_SNTP ) -case SNTP : -/* nothing */ -break ; +case SNTP : +/* nothing */ +break ;#endif +default : +break ; + } + +break ; +case BOOTP : +case RARP : +/* +* initialize our IP addr to 0 in order to accept ANY +* IP addr assigned to us by the BOOTP / RARP server +*/ + NetOurIP =0 ; + NetServerIP =getenv_IPaddr ("serverip" ); + NetOurVLAN =getenv_VLAN ("vlan" );/* VLANs must be read */ + NetOurNativeVLAN =getenv_VLAN ("nvlan" ); +case CDP : + NetOurVLAN =getenv_VLAN ("vlan" );/* VLANs must be read */ + NetOurNativeVLAN =getenv_VLAN ("nvlan" ); +break ;default :break ; } - -break ; -case BOOTP : -case RARP : -/* -* initialize our IP addr to 0 in order to accept ANY -* IP addr assigned to us by the BOOTP / RARP server -*/ - NetOurIP =0 ; - NetServerIP =getenv_IPaddr ("serverip" ); - NetOurVLAN =getenv_VLAN ("vlan" );/* VLANs must be read */ - NetOurNativeVLAN =getenv_VLAN ("nvlan" ); -case CDP :
Quoted 8 lines
net/net.c restart: · line 406
Quoted 6 lines
net/net.c +1
-5- NetOurVLAN =getenv_VLAN ("vlan" );/* VLANs must be read */ - NetOurNativeVLAN =getenv_VLAN ("nvlan" ); -break ; -default : -break ; + env_changed_id =get_env_id ();You are calling
get_env_id()twice - avoid that.
OK, I try it.
Quoted 3 lines
Instead of adding yet anothe rlevel of indentation to that switch I recommend to split it in a separate fuinction - it's big enough for that anyway.
OK, will change this.
thanks
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH 3/31 netloop: speed up NetLoop
In reply to Heiko Schochercommon/cmd_nvedit.c DECLARE_GLOBAL_DATA_PTR; · line 83
Quoted 11 lines · On Wed, 28 Jan 2009 10:38:42 +0100 Heiko Schocher <[email protected]> wrote:
+++
b/common/cmd_nvedit.ccommon/cmd_nvedit.c +5
-0@@ -75,7 +75,12 @@ DECLARE_GLOBAL_DATA_PTR;static const unsigned long baudrate_table[] =CONFIG_SYS_BAUDRATE_TABLE ;#define N_BAUDRATES (sizeof(baudrate_table) / sizeof(baudrate_table[0])) +static int env_id =1 ; +int get_env_id (void ) +{ +return env_id; +}
does getting env_id really need be a function?
net/eth.c line 35
Quoted 13 lines
net/eth.c +4
-0@@ -28,7 +28,11 @@#if defined(CONFIG_CMD_NET ) && defined(CONFIG_NET_MULTI ) +static char *act =0 ; +static int env_changed_id =0 ; +/* +*
please don't mess with the already good comment coding style.
Quoted 5 lines
net/eth.c +0
-0* CPU and board-specific Ethernet initializations. Aliased function * signals caller to move on */ @@ -439,13 +443,16 @@ void eth_try_another(int first_restart)#ifdef CONFIG_NET_MULTI
net/eth.c void eth_try_another(int first_restart) · line 451
Quoted 10 lines
net/eth.c +1
-2void eth_set_current (void ) { -char *act;struct eth_device * old_current;if (!eth_current)/* XXX no current */ return ; - act =getenv ("ethact" ); +if ((*act ==0 ) || (env_changed_id <get_env_id ()))
If I'm not mistaken, this will unintentionally dereference address 0 the first time this is executed.
net/eth.c void eth_try_another(int first_restart) · line 458
Quoted 7 lines
net/eth.c +4
-0+ { + act =getenv ("ethact" ); + env_changed_id =get_env_id (); + }if (act !=NULL ) { old_current = eth_current; do {
Kim
PATCH 3/31 netloop: speed up NetLoop
Hello Kim,
Kim Phillips:
Quoted 7 lines
Quoted 5 lines · On Wed, 28 Jan 2009 10:38:42 +0100 Heiko Schocher <[email protected]> wrote:
+++
b/common/cmd_nvedit.ccommon/cmd_nvedit.c +0
-0@@ -75,7 +75,12 @@ DECLARE_GLOBAL_DATA_PTR;static const unsigned long baudrate_table[] =CONFIG_SYS_BAUDRATE_TABLE ;#define N_BAUDRATES (sizeof(baudrate_table) / sizeof(baudrate_table[0]))
Quoted 8 lines
common/cmd_nvedit.c DECLARE_GLOBAL_DATA_PTR; · line 83
Quoted 6 lines
common/cmd_nvedit.c +5
-0+static int env_id =1 ; +int get_env_id (void ) +{ +return env_id; +}does getting
env_idreally need be a function?
not absolute, but accesing this var from another file by a function seems better to me.
Quoted 8 lines
Quoted 8 lines
net/eth.c +0
-0@@ -28,7 +28,11 @@#if defined(CONFIG_CMD_NET ) && defined(CONFIG_NET_MULTI )
Quoted 7 lines
net/eth.c line 35
Quoted 5 lines
net/eth.c +4
-0+static char *act =0 ; +static int env_changed_id =0 ; +/* +* please don't mess with the already good comment coding style.
Argh, sorry.
Quoted 10 lines
Quoted 10 lines
net/eth.c +0
-1* CPU and board-specific Ethernet initializations. Aliased function * signals caller to move on */ @@ -439,13 +443,16 @@ void eth_try_another(int first_restart)#ifdef CONFIG_NET_MULTI void eth_set_current (void ) { -char *act;struct eth_device * old_current;
Quoted 8 lines
net/eth.c void eth_try_another(int first_restart) · line 451
Quoted 5 lines
net/eth.c +1
-1if (!eth_current)/* XXX no current */ return ; - act =getenv ("ethact" ); +if ((*act ==0 ) || (env_changed_id <get_env_id ()))If I'm not mistaken, this will unintentionally dereference address 0 the first time this is executed.
Hmm.. must think about it.
thanks
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany