D45574.diff
No OneTemporary
Actions

Size

1012 B

Referenced Files

None

Subscribers

None

D45574.diff
View Options

	diff --git a/usr.bin/time/time.c b/usr.bin/time/time.c
	--- a/usr.bin/time/time.c
	+++ b/usr.bin/time/time.c
	@@ -40,6 +40,8 @@
	#include <errno.h>
	#include <locale.h>
	#include <signal.h>
	+#include <stdatomic.h>
	+#include <stdbool.h>
	#include <stdio.h>
	#include <stdlib.h>
	#include <stdint.h>
	@@ -54,7 +56,7 @@
	static void siginfo(int);
	static void usage(void) __dead2;

	-static volatile sig_atomic_t siginfo_recvd;
	+static sig_atomic_t siginfo_recvd;
	static char decimal_point;
	static struct timespec before_ts;
	static int hflag, pflag;
	@@ -125,7 +127,10 @@
	(void)signal(SIGINFO, siginfo);
	(void)siginterrupt(SIGINFO, 1);
	while (wait4(pid, &status, 0, &ru) != pid) {
	- if (siginfo_recvd) {
	+ bool do_siginfo = siginfo_recvd != 0;
	+
	+ atomic_signal_fence(memory_order_acquire);
	+ if (do_siginfo) {
	siginfo_recvd = 0;
	if (clock_gettime(CLOCK_MONOTONIC, &after))
	err(1, "clock_gettime");
	@@ -296,4 +301,5 @@
	{

	siginfo_recvd = 1;
	+ atomic_signal_fence(memory_order_release);
	}