sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dhcpd:Optimize the data area memory and reduce it by about 1k bytes

Browse Source 
If a daemon app(e.ot_client) starts dhcpd by calling dhcpd_start and needs to shut it down after use,
then the global static variables ds_inpacket and ds_outpacket will always occupy the data area,
causing unnecessary waste.

Signed-off-by: wangyingdong <wangyingdong@xiaomi.com>
This commit is contained in:
wangyingdong 2023-08-29 15:56:57 +08:00 committed by Xiang Xiao
parent 8f58d34e06
commit 2e5139eba4
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
netutils/dhcpd/dhcpd.c
View File

@ -188,6 +188,8 @@
# define HAVE_LEASE_TIME 1 # define HAVE_LEASE_TIME 1
#endif #endif
#define g_state (*g_dhcpd_daemon.ds_data)
/**************************************************************************** /****************************************************************************
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
@ -271,10 +273,11 @@ struct dhcpd_state_s
struct dhcpd_daemon_s struct dhcpd_daemon_s
{ {
uint8_t ds_state; /* See enum dhcpd_daemon_e */ uint8_t ds_state; /* See enum dhcpd_daemon_e */
sem_t ds_lock; /* Used to protect the whole structure */ sem_t ds_lock; /* Used to protect the whole structure */
sem_t ds_sync; /* Used to synchronize start and stop events */ sem_t ds_sync; /* Used to synchronize start and stop events */
pid_t ds_pid; /* Task ID of the DHCPD daemon */ pid_t ds_pid; /* Task ID of the DHCPD daemon */
FAR struct dhcpd_state_s *ds_data; /* DHCPD daemon data */
}; };
struct dhcpd_config_s struct dhcpd_config_s
@ -301,8 +304,6 @@ static const uint8_t g_magiccookie[4] =
99, 130, 83, 99 99, 130, 83, 99
}; };
static struct dhcpd_state_s g_state;
/* This type describes the state of the DHCPD client daemon. Only one /* This type describes the state of the DHCPD client daemon. Only one
* instance of the DHCPD daemon is permitted in this implementation. This * instance of the DHCPD daemon is permitted in this implementation. This
* limitation is due only to this global data structure. * limitation is due only to this global data structure.
@ -313,7 +314,8 @@ static struct dhcpd_daemon_s g_dhcpd_daemon =
DHCPD_NOT_RUNNING, DHCPD_NOT_RUNNING,
SEM_INITIALIZER(1), SEM_INITIALIZER(1),
SEM_INITIALIZER(0), SEM_INITIALIZER(0),
-1 -1,
NULL
}; };
static struct dhcpd_config_s g_dhcpd_config = static struct dhcpd_config_s g_dhcpd_config =
@ -1520,6 +1522,16 @@ int dhcpd_run(FAR const char *interface)
return OK; return OK;
} }
/* Initialize everything to zero */
g_dhcpd_daemon.ds_data = malloc(sizeof(struct dhcpd_state_s));
if (g_dhcpd_daemon.ds_data == NULL)
{
return -ENOMEM;
}
memset(g_dhcpd_daemon.ds_data, 0, sizeof(struct dhcpd_state_s));
/* Update the pid if running in daemon mode */ /* Update the pid if running in daemon mode */
g_dhcpd_daemon.ds_pid = getpid(); g_dhcpd_daemon.ds_pid = getpid();
@ -1530,10 +1542,6 @@ int dhcpd_run(FAR const char *interface)
sem_post(&g_dhcpd_daemon.ds_sync); sem_post(&g_dhcpd_daemon.ds_sync);
/* Initialize everything to zero */
memset(&g_state, 0, sizeof(struct dhcpd_state_s));
/* Now loop indefinitely, reading packets from the DHCP server socket */ /* Now loop indefinitely, reading packets from the DHCP server socket */
sockfd = -1; sockfd = -1;
@ -1617,6 +1625,8 @@ int dhcpd_run(FAR const char *interface)
} }
} }
free(g_dhcpd_daemon.ds_data);
g_dhcpd_daemon.ds_data = NULL;
g_dhcpd_daemon.ds_pid = -1; g_dhcpd_daemon.ds_pid = -1;
g_dhcpd_daemon.ds_state = DHCPD_STOPPED; g_dhcpd_daemon.ds_state = DHCPD_STOPPED;
sem_post(&g_dhcpd_daemon.ds_sync); sem_post(&g_dhcpd_daemon.ds_sync);