faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce size of NTP sources hash table

Browse source 
IPv6 addressing significantly increased size of the table,
keep only pointers to get it back.
This commit is contained in:
Miroslav Lichvar 2009-10-13 17:16:41 +02:00
parent 1570f97ee2
commit 48b6c2aa6b
3 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ntp_core.c
View file

@ -1912,3 +1912,11 @@ NCR_IncrementActivityCounters(NCR_Instance inst, int *online, int *offline,
} }
/* ================================================== */ /* ================================================== */
NTP_Remote_Address *
NCR_GetRemoteAddress(NCR_Instance inst)
{
return &inst->remote_addr;
}
/* ================================================== */

2
ntp_core.h
View file

@ -102,4 +102,6 @@ extern void NCR_CycleLogFile(void);
extern void NCR_IncrementActivityCounters(NCR_Instance inst, int *online, int *offline, extern void NCR_IncrementActivityCounters(NCR_Instance inst, int *online, int *offline,
int *burst_online, int *burst_offline); int *burst_online, int *burst_offline);
extern NTP_Remote_Address *NCR_GetRemoteAddress(NCR_Instance instance);
#endif /* GOT_NTP_CORE_H */ #endif /* GOT_NTP_CORE_H */

40
ntp_sources.c
View file

@ -43,8 +43,8 @@
/* Record type private to this file, used to store information about /* Record type private to this file, used to store information about
particular sources */ particular sources */
typedef struct { typedef struct {
NTP_Remote_Address remote_addr; /* The address of this source */ NTP_Remote_Address *remote_addr; /* The address of this source, non-NULL
int in_use; /* Whether this slot in the table is in use */ means this slot in table is in use */
NCR_Instance data; /* Data for the protocol engine for this source */ NCR_Instance data; /* Data for the protocol engine for this source */
} SourceRecord; } SourceRecord;
@ -83,7 +83,7 @@ NSR_Initialise(void)
{ {
int i; int i;
for (i=0; i<N_RECORDS; i++) { for (i=0; i<N_RECORDS; i++) {
records[i].in_use = 0; records[i].remote_addr = NULL;
} }
n_sources = 0; n_sources = 0;
initialised = 1; initialised = 1;
@ -147,15 +147,15 @@ find_slot(NTP_Remote_Address *remote_addr, int *slot, int *found)
hash = ip ^ (ip >> 16); hash = ip ^ (ip >> 16);
hash = (hash ^ (hash >> 8)) & 0xff; hash = (hash ^ (hash >> 8)) & 0xff;
while ((records[hash].in_use) && while (records[hash].remote_addr &&
UTI_CompareIPs(&records[hash].remote_addr.ip_addr, UTI_CompareIPs(&records[hash].remote_addr->ip_addr,
&remote_addr->ip_addr, NULL)) { &remote_addr->ip_addr, NULL)) {
hash++; hash++;
if (hash == 256) hash = 0; if (hash == 256) hash = 0;
} }
if (records[hash].in_use) { if (records[hash].remote_addr) {
if (records[hash].remote_addr.port == port) { if (records[hash].remote_addr->port == port) {
*found = 2; *found = 2;
} else { } else {
*found = 1; *found = 1;
@ -196,9 +196,8 @@ NSR_AddServer(NTP_Remote_Address *remote_addr, SourceParameters *params)
return NSR_InvalidAF; return NSR_InvalidAF;
} else { } else {
n_sources++; n_sources++;
records[slot].remote_addr = *remote_addr;
records[slot].in_use = 1;
records[slot].data = NCR_GetServerInstance(remote_addr, params); /* Will need params passing through */ records[slot].data = NCR_GetServerInstance(remote_addr, params); /* Will need params passing through */
records[slot].remote_addr = NCR_GetRemoteAddress(records[slot].data);
return NSR_Success; return NSR_Success;
} }
} }
@ -230,9 +229,8 @@ NSR_AddPeer(NTP_Remote_Address *remote_addr, SourceParameters *params)
return NSR_InvalidAF; return NSR_InvalidAF;
} else { } else {
n_sources++; n_sources++;
records[slot].remote_addr = *remote_addr;
records[slot].in_use = 1;
records[slot].data = NCR_GetPeerInstance(remote_addr, params); /* Will need params passing through */ records[slot].data = NCR_GetPeerInstance(remote_addr, params); /* Will need params passing through */
records[slot].remote_addr = NCR_GetRemoteAddress(records[slot].data);
return NSR_Success; return NSR_Success;
} }
} }
@ -256,7 +254,7 @@ NSR_RemoveSource(NTP_Remote_Address *remote_addr)
return NSR_NoSuchSource; return NSR_NoSuchSource;
} else { } else {
n_sources--; n_sources--;
records[slot].in_use = 0; records[slot].remote_addr = NULL;
NCR_DestroyInstance(records[slot].data); NCR_DestroyInstance(records[slot].data);
return NSR_Success; return NSR_Success;
} }
@ -318,10 +316,10 @@ slew_sources(struct timeval *raw,
int i; int i;
for (i=0; i<N_RECORDS; i++) { for (i=0; i<N_RECORDS; i++) {
if (records[i].in_use) { if (records[i].remote_addr) {
#if 0 #if 0
LOG(LOGS_INFO, LOGF_Sources, "IP=%s dfreq=%f doff=%f", LOG(LOGS_INFO, LOGF_Sources, "IP=%s dfreq=%f doff=%f",
UTI_IPToString(&records[i].remote_addr.ip_addr), dfreq, doffset); UTI_IPToString(&records[i].remote_addr->ip_addr), dfreq, doffset);
#endif #endif
NCR_SlewTimes(records[i].data, cooked, dfreq, doffset); NCR_SlewTimes(records[i].data, cooked, dfreq, doffset);
@ -340,9 +338,9 @@ NSR_TakeSourcesOnline(IPAddr *mask, IPAddr *address)
any = 0; any = 0;
for (i=0; i<N_RECORDS; i++) { for (i=0; i<N_RECORDS; i++) {
if (records[i].in_use) { if (records[i].remote_addr) {
if (address->family == IPADDR_UNSPEC || if (address->family == IPADDR_UNSPEC ||
!UTI_CompareIPs(&records[i].remote_addr.ip_addr, address, mask)) { !UTI_CompareIPs(&records[i].remote_addr->ip_addr, address, mask)) {
any = 1; any = 1;
NCR_TakeSourceOnline(records[i].data); NCR_TakeSourceOnline(records[i].data);
} }
@ -362,9 +360,9 @@ NSR_TakeSourcesOffline(IPAddr *mask, IPAddr *address)
any = 0; any = 0;
for (i=0; i<N_RECORDS; i++) { for (i=0; i<N_RECORDS; i++) {
if (records[i].in_use) { if (records[i].remote_addr) {
if (address->family == IPADDR_UNSPEC || if (address->family == IPADDR_UNSPEC ||
!UTI_CompareIPs(&records[i].remote_addr.ip_addr, address, mask)) { !UTI_CompareIPs(&records[i].remote_addr->ip_addr, address, mask)) {
any = 1; any = 1;
NCR_TakeSourceOffline(records[i].data); NCR_TakeSourceOffline(records[i].data);
} }
@ -461,9 +459,9 @@ NSR_InitiateSampleBurst(int n_good_samples, int n_total_samples,
any = 0; any = 0;
for (i=0; i<N_RECORDS; i++) { for (i=0; i<N_RECORDS; i++) {
if (records[i].in_use) { if (records[i].remote_addr) {
if (address->family == IPADDR_UNSPEC || if (address->family == IPADDR_UNSPEC ||
!UTI_CompareIPs(&records[i].remote_addr.ip_addr, address, mask)) { !UTI_CompareIPs(&records[i].remote_addr->ip_addr, address, mask)) {
any = 1; any = 1;
NCR_InitiateSampleBurst(records[i].data, n_good_samples, n_total_samples); NCR_InitiateSampleBurst(records[i].data, n_good_samples, n_total_samples);
} }
@ -508,7 +506,7 @@ NSR_GetActivityReport(RPT_ActivityReport *report)
report->burst_offline = 0; report->burst_offline = 0;
for (i=0; i<N_RECORDS; i++) { for (i=0; i<N_RECORDS; i++) {
if (records[i].in_use) { if (records[i].remote_addr) {
NCR_IncrementActivityCounters(records[i].data, &report->online, &report->offline, NCR_IncrementActivityCounters(records[i].data, &report->online, &report->offline,
&report->burst_online, &report->burst_offline); &report->burst_online, &report->burst_offline);
} }