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

refclock: avoid reallocation of refclock instances

Browse source 
Change the array with refclock instances to store just pointers and
avoid reallocation of the instances. This fixes a bug with the SOCK
refclock, which uses the pointer to the instance in a file handler and
which was invalid when the instance was reallocated (after adding
another refclock).

The bug is from commit d92583ed33.
This commit is contained in:
Miroslav Lichvar 2016-05-11 16:31:51 +02:00
parent 71b7e689c0
commit d1f4e5876b
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
refclock.c
View file

@ -87,7 +87,7 @@ struct RCL_Instance_Record {
SRC_Instance source; SRC_Instance source;
}; };
/* Array of RCL_Instance_Record */ /* Array of pointers to RCL_Instance_Record */
static ARR_Instance refclocks; static ARR_Instance refclocks;
static LOG_FileID logfileid; static LOG_FileID logfileid;
@ -114,13 +114,13 @@ static void filter_add_dispersion(struct MedianFilter *filter, double dispersion
static RCL_Instance static RCL_Instance
get_refclock(unsigned int index) get_refclock(unsigned int index)
{ {
return (RCL_Instance)ARR_GetElement(refclocks, index); return *(RCL_Instance *)ARR_GetElement(refclocks, index);
} }
void void
RCL_Initialise(void) RCL_Initialise(void)
{ {
refclocks = ARR_CreateInstance(sizeof (struct RCL_Instance_Record)); refclocks = ARR_CreateInstance(sizeof (RCL_Instance));
CNF_AddRefclocks(); CNF_AddRefclocks();
@ -148,6 +148,7 @@ RCL_Finalise(void)
filter_fini(&inst->filter); filter_fini(&inst->filter);
Free(inst->driver_parameter); Free(inst->driver_parameter);
SRC_DestroyInstance(inst->source); SRC_DestroyInstance(inst->source);
Free(inst);
} }
if (ARR_GetSize(refclocks) > 0) { if (ARR_GetSize(refclocks) > 0) {
@ -162,8 +163,10 @@ int
RCL_AddRefclock(RefclockParameters *params) RCL_AddRefclock(RefclockParameters *params)
{ {
int pps_source = 0; int pps_source = 0;
RCL_Instance inst;
RCL_Instance inst = ARR_GetNewElement(refclocks); inst = MallocNew(struct RCL_Instance_Record);
*(RCL_Instance *)ARR_GetNewElement(refclocks) = inst;
if (strcmp(params->driver_name, "SHM") == 0) { if (strcmp(params->driver_name, "SHM") == 0) {
inst->driver = &RCL_SHM_driver; inst->driver = &RCL_SHM_driver;