Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 6 Apr 2020 23:08:07 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r359675 - head/tests/sys/kqueue/libkqueue
Message-ID:  <202004062308.036N87Si003615@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kevans
Date: Mon Apr  6 23:08:07 2020
New Revision: 359675
URL: https://svnweb.freebsd.org/changeset/base/359675

Log:
  kqueue tests: fix -fno-common build
  
  vnode_fd and kqfd are both shared among multiple CU; define them exactly
  once.
  
  In the case of vnode_fd, it was simply the declaration that needed
  correction.
  
  -fno-common will become the default in GCC10/LLVM11.
  
  MFC after:	3 days

Modified:
  head/tests/sys/kqueue/libkqueue/common.h
  head/tests/sys/kqueue/libkqueue/proc.c
  head/tests/sys/kqueue/libkqueue/read.c
  head/tests/sys/kqueue/libkqueue/signal.c
  head/tests/sys/kqueue/libkqueue/timer.c
  head/tests/sys/kqueue/libkqueue/user.c
  head/tests/sys/kqueue/libkqueue/vnode.c

Modified: head/tests/sys/kqueue/libkqueue/common.h
==============================================================================
--- head/tests/sys/kqueue/libkqueue/common.h	Mon Apr  6 23:07:56 2020	(r359674)
+++ head/tests/sys/kqueue/libkqueue/common.h	Mon Apr  6 23:08:07 2020	(r359675)
@@ -41,7 +41,8 @@
 #include <sys/event.h>
 
 extern char *cur_test_id;
-int vnode_fd;
+extern int vnode_fd;
+extern int kqfd;
 
 extern char * kevent_to_str(struct kevent *);
 struct kevent * kevent_get(int);

Modified: head/tests/sys/kqueue/libkqueue/proc.c
==============================================================================
--- head/tests/sys/kqueue/libkqueue/proc.c	Mon Apr  6 23:07:56 2020	(r359674)
+++ head/tests/sys/kqueue/libkqueue/proc.c	Mon Apr  6 23:08:07 2020	(r359675)
@@ -25,7 +25,6 @@
 
 static int sigusr1_caught = 0;
 
-int kqfd;
 
 static void
 sig_handler(int signum)

Modified: head/tests/sys/kqueue/libkqueue/read.c
==============================================================================
--- head/tests/sys/kqueue/libkqueue/read.c	Mon Apr  6 23:07:56 2020	(r359674)
+++ head/tests/sys/kqueue/libkqueue/read.c	Mon Apr  6 23:08:07 2020	(r359675)
@@ -18,7 +18,6 @@
 
 #include "common.h"
 
-int kqfd;
 int sockfd[2];
 
 static void

Modified: head/tests/sys/kqueue/libkqueue/signal.c
==============================================================================
--- head/tests/sys/kqueue/libkqueue/signal.c	Mon Apr  6 23:07:56 2020	(r359674)
+++ head/tests/sys/kqueue/libkqueue/signal.c	Mon Apr  6 23:08:07 2020	(r359675)
@@ -18,7 +18,6 @@
 
 #include "common.h"
 
-int kqfd;
 
 void
 test_kevent_signal_add(void)

Modified: head/tests/sys/kqueue/libkqueue/timer.c
==============================================================================
--- head/tests/sys/kqueue/libkqueue/timer.c	Mon Apr  6 23:07:56 2020	(r359674)
+++ head/tests/sys/kqueue/libkqueue/timer.c	Mon Apr  6 23:08:07 2020	(r359675)
@@ -26,7 +26,6 @@
 #define	MS_TO_US(t)  ((t) * THOUSAND)	/* Convert milliseconds to microseconds. */
 #define	US_TO_NS(t)  ((t) * THOUSAND)	/* Convert microseconds to nanoseconds. */
 
-int kqfd;
 
 /* Get the current time with microsecond precision. Used for
  * sub-second timing to make some timer tests run faster.

Modified: head/tests/sys/kqueue/libkqueue/user.c
==============================================================================
--- head/tests/sys/kqueue/libkqueue/user.c	Mon Apr  6 23:07:56 2020	(r359674)
+++ head/tests/sys/kqueue/libkqueue/user.c	Mon Apr  6 23:08:07 2020	(r359675)
@@ -18,7 +18,6 @@
 
 #include "common.h"
 
-int kqfd;
 
 static void
 add_and_delete(void)

Modified: head/tests/sys/kqueue/libkqueue/vnode.c
==============================================================================
--- head/tests/sys/kqueue/libkqueue/vnode.c	Mon Apr  6 23:07:56 2020	(r359674)
+++ head/tests/sys/kqueue/libkqueue/vnode.c	Mon Apr  6 23:08:07 2020	(r359675)
@@ -18,7 +18,6 @@
 
 #include "common.h"
 
-int kqfd;
 int vnode_fd;
 
 void

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004062308.036N87Si003615>