mirrors/pv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not call pv_state_name_set when adjusting an fd display_name, but instead set the alias state->display.name ourselves. Since the fd display_name we are pointing to is within the info_array, if we extend info_array with realloc we then have to also reset those aliases since display_name may move if realloc rebases the array. (#165)

Browse Source
This commit is contained in:
Andrew Wood
2025-07-27 20:51:00 +01:00
parent a0f2d9c9c7
commit 52634f01f9
1 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pv/watchpid.c
+25 -2
View File
@@ -333,6 +333,7 @@ static bool extend_info_array(int *array_length_ptr, pvwatchfd_t * info_array_pt
int array_length = 0;
struct pvwatchfd_s *info_array = NULL;
struct pvwatchfd_s *new_info_array;
int idx;
array_length = *array_length_ptr;
info_array = *info_array_ptr;
@@ -353,6 +354,19 @@ static bool extend_info_array(int *array_length_ptr, pvwatchfd_t * info_array_pt
return false;
}
debug("%s", "extended info array");
/*
* We now have to re-point all of the display.name pointers to their
* respective display_name buffers, in case realloc moved the
* array's base address.
*/
for (idx = 0; idx < array_length; idx++) {
if (NULL != new_info_array[idx].state) {
new_info_array[idx].state->display.name = new_info_array[idx].display_name;
}
}
*info_array_ptr = new_info_array;
*array_length_ptr = array_length;
return true;
@@ -589,8 +603,7 @@ int pv_watchpid_scanfds(pvstate_t state,
/* Set the info display_name appropriately. */
pv_watchpid_setname(state, &(info_array[use_idx]));
/* Carry the display_name through to the display state, and reparse. */
pv_state_name_set(info_array[use_idx].state, info_array[use_idx].display_name);
/* Reparse. */
info_array[use_idx].state->flags.reparse_display = 1;
pv_elapsedtime_read(&(info_array[use_idx].start_time));
@@ -663,4 +676,14 @@ void pv_watchpid_setname(pvstate_t state, pvwatchfd_t info)
}
debug("%s: %d: [%s]", "set name for fd", info->watch_fd, info->display_name);
/*
* Set the display.name alias so the display_name is used by
* pv_display().
*/
if (NULL != info->state) {
info->state->display.name = info->display_name;
debug("%s: %d: [%s] / %p", "set display.name for fd", info->watch_fd, info->state->display.name,
info->state->display.name);
}
}