Skip to content

common.{c,h}: generalize elapsed_since_timeval() originally from modbus drivers #3321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 1 commit into from
Feb 13, 2026
+35 −62
Merged

common.{c,h}: generalize elapsed_since_timeval() originally from modbus drivers #3321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions NEWS.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ https://github.com/networkupstools/nut/milestone/12
reality agrees with a status reported by device/protocol (if any).
This is also a step in direction of eventually providing a common
`runtimecal` style fallback to all drivers. [issue #3146, PR #3156]
* Generalize `elapsed_since_timeval()` code, originally repeated in
several modbus drivers. [issue #1938, PR #3321]
* Introduced `NOTIFY_STATE_EXTEND_TIMEOUT` option and relevant variables
for `upsnotify()` method, so we can tell systemd to not kill the service
unit if its shutdown takes long (see also the `SHUTDOWNEXIT` option in
Expand Down
25 changes: 25 additions & 0 deletions common/common.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2734,6 +2734,31 @@ double difftimespec(struct timespec x, struct timespec y)
}
#endif /* HAVE_CLOCK_GETTIME && HAVE_CLOCK_MONOTONIC */

/* returns the time elapsed since start in milliseconds */
long elapsed_since_timeval(struct timeval *start)
{
long rval;
struct timeval end;

rval = gettimeofday(&end, NULL);
if (rval < 0) {
upslog_with_errno(LOG_ERR, "elapsed_since_timeval");
}
if (start->tv_usec < end.tv_usec) {
suseconds_t nsec = (end.tv_usec - start->tv_usec) / 1000000 + 1;
end.tv_usec -= 1000000 * nsec;
end.tv_sec += nsec;
}
if (start->tv_usec - end.tv_usec > 1000000) {
suseconds_t nsec = (start->tv_usec - end.tv_usec) / 1000000;
end.tv_usec += 1000000 * nsec;
end.tv_sec -= nsec;
}
rval = (end.tv_sec - start->tv_sec) * 1000 + (end.tv_usec - start->tv_usec) / 1000;

return rval;
}

/* Help avoid cryptic "upsnotify: notify about state 4 with libsystemd:"
* (with only numeric codes) below */
const char *str_upsnotify_state(upsnotify_state_t state) {
Expand Down
33 changes: 2 additions & 31 deletions drivers/adelsystem_cbi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#endif

#define DRIVER_NAME "NUT ADELSYSTEM DC-UPS CB/CBI driver (libmodbus link type: " NUT_MODBUS_LINKTYPE_STR ")"
#define DRIVER_VERSION "0.07"
#define DRIVER_VERSION "0.08"

/* variables */
static modbus_t *mbctx = NULL; /* modbus memory context */
Expand Down Expand Up @@ -83,10 +83,6 @@ int register_write(modbus_t *mb, int addr, regtype_t type, void *data);
/* instant command triggered by upsd */
int upscmd(const char *cmdname, const char *extra);

/* count the time elapsed since start */
long time_elapsed(struct timeval *start);


/* driver description structure */
upsdrv_info_t upsdrv_info = {
DRIVER_NAME,
Expand Down Expand Up @@ -790,31 +786,6 @@ int register_write(modbus_t *mb, int addr, regtype_t type, void *data)
return rval;
}

/* returns the time elapsed since start in milliseconds */
long time_elapsed(struct timeval *start)
{
long rval;
struct timeval end;

rval = gettimeofday(&end, NULL);
if (rval < 0) {
upslog_with_errno(LOG_ERR, "time_elapsed");
}
if (start->tv_usec < end.tv_usec) {
suseconds_t nsec = (end.tv_usec - start->tv_usec) / 1000000 + 1;
end.tv_usec -= 1000000 * nsec;
end.tv_sec += nsec;
}
if (start->tv_usec - end.tv_usec > 1000000) {
suseconds_t nsec = (start->tv_usec - end.tv_usec) / 1000000;
end.tv_usec += 1000000 * nsec;
end.tv_sec -= nsec;
}
rval = (end.tv_sec - start->tv_sec) * 1000 + (end.tv_usec - start->tv_usec) / 1000;

return rval;
}

/* instant command triggered by upsd */
int upscmd(const char *cmdname, const char *extra)
{
Expand Down Expand Up @@ -861,7 +832,7 @@ int upscmd(const char *cmdname, const char *extra)
}

/* wait for an increasing time interval before sending shutdown command */
while ((etime = time_elapsed(&start)) < ( FSD_REPEAT_INTRV / cnt));
while ((etime = elapsed_since_timeval(&start)) < ( FSD_REPEAT_INTRV / cnt));
upsdebugx(2, "ERROR: load.off failed, wait for %lims, retries left: %d", etime, cnt - 1);
cnt--;
}
Expand Down
34 changes: 3 additions & 31 deletions drivers/generic_modbus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#endif

#define DRIVER_NAME "NUT Generic Modbus driver (libmodbus link type: " NUT_MODBUS_LINKTYPE_STR ")"
#define DRIVER_VERSION "0.09"
#define DRIVER_VERSION "0.10"

/* variables */
static modbus_t *mbctx = NULL; /* modbus memory context */
Expand Down Expand Up @@ -69,9 +69,6 @@ int upscmd(const char *cmd, const char *arg);
/* read signal status */
int get_signal_state(devstate_t state);

/* count the time elapsed since start */
long time_elapsed(struct timeval *start);

int register_write(modbus_t *mb, int addr, regtype_t type, void *data);

/* driver description structure */
Expand Down Expand Up @@ -543,31 +540,6 @@ int register_write(modbus_t *mb, int addr, regtype_t type, void *data)
return rval;
}

/* returns the time elapsed since start in milliseconds */
long time_elapsed(struct timeval *start)
{
long rval;
struct timeval end;

rval = gettimeofday(&end, NULL);
if (rval < 0) {
upslog_with_errno(LOG_ERR, "time_elapsed");
}
if (start->tv_usec < end.tv_usec) {
suseconds_t nsec = (end.tv_usec - start->tv_usec) / 1000000 + 1;
end.tv_usec -= 1000000 * nsec;
end.tv_sec += nsec;
}
if (start->tv_usec - end.tv_usec > 1000000) {
suseconds_t nsec = (start->tv_usec - end.tv_usec) / 1000000;
end.tv_usec += 1000000 * nsec;
end.tv_sec -= nsec;
}
rval = (end.tv_sec - start->tv_sec) * 1000 + (end.tv_usec - start->tv_usec) / 1000;

return rval;
}

/* instant command triggered by upsd */
int upscmd(const char *cmd, const char *arg)
{
Expand Down Expand Up @@ -611,7 +583,7 @@ int upscmd(const char *cmd, const char *arg)
}

/* wait for FSD_pulse_duration ms */
while ((etime = time_elapsed(&start)) < FSD_pulse_duration);
while ((etime = elapsed_since_timeval(&start)) < FSD_pulse_duration);

data = 0 ^ sigar[FSD_T].noro;
rval = register_write(mbctx, sigar[FSD_T].addr, sigar[FSD_T].type, &data);
Expand Down Expand Up @@ -654,7 +626,7 @@ int upscmd(const char *cmd, const char *arg)
}

/* wait for an increasing time interval before sending shutdown command */
while ((etime = time_elapsed(&start)) < ( FSD_REPEAT_INTRV / cnt));
while ((etime = elapsed_since_timeval(&start)) < ( FSD_REPEAT_INTRV / cnt));
upsdebugx(2,"ERROR: load.off failed, wait for %lims, retries left: %d\n", etime, cnt - 1);
cnt--;
}
Expand Down
3 changes: 3 additions & 0 deletions include/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,9 @@ double difftimeval(struct timeval x, struct timeval y);
double difftimespec(struct timespec x, struct timespec y);
#endif

/* count the time elapsed since start in milliseconds */
long elapsed_since_timeval(struct timeval *start);

#ifndef HAVE_USLEEP
/* int __cdecl usleep(unsigned int useconds); */
/* Note: if we'd need to define an useconds_t for obscure systems,
Expand Down
Loading