svn commit: r301637 - user/pho/stress2/misc
Peter Holm
pho at FreeBSD.org
Wed Jun 8 16:03:05 UTC 2016
Author: pho
Date: Wed Jun 8 16:03:04 2016
New Revision: 301637
URL: https://svnweb.freebsd.org/changeset/base/301637
Log:
Fixed issues flagged by gcc.
Sponsored by: EMC / Isilon Storage Division
Modified:
user/pho/stress2/misc/context2.sh
user/pho/stress2/misc/nfs15.sh
user/pho/stress2/misc/nfs16.sh
Modified: user/pho/stress2/misc/context2.sh
==============================================================================
--- user/pho/stress2/misc/context2.sh Wed Jun 8 15:41:39 2016 (r301636)
+++ user/pho/stress2/misc/context2.sh Wed Jun 8 16:03:04 2016 (r301637)
@@ -78,7 +78,7 @@ thr_routine(void *arg)
int i;
int token;
- i = (int)arg;
+ i = (long)arg;
for (;;) {
if (read(fds[i][0], &token, sizeof(token)) != sizeof(token))
err(1, "read pipe 2");
@@ -94,6 +94,7 @@ main(void)
{
pthread_t threads[NTHREADS];
time_t start;
+ long arg;
int i, r, token;
for (i = 0; i < NTHREADS + 1; i++) {
@@ -101,10 +102,12 @@ main(void)
err(1, "pipe");
}
- for (i = 0; i < NTHREADS; i++)
+ for (i = 0; i < NTHREADS; i++) {
+ arg = i;
if ((r = pthread_create(&threads[i], NULL, thr_routine,
- (void *)i)) != 0)
+ (void *)arg)) != 0)
errc(1, r, "pthread_create(): %s\n", strerror(r));
+ }
start = time(NULL);
Modified: user/pho/stress2/misc/nfs15.sh
==============================================================================
--- user/pho/stress2/misc/nfs15.sh Wed Jun 8 15:41:39 2016 (r301636)
+++ user/pho/stress2/misc/nfs15.sh Wed Jun 8 16:03:04 2016 (r301637)
@@ -118,7 +118,7 @@ t2(void *data __unused)
err(1, "open(%s)", file);
do {
r = lockf(fd, F_LOCK, 0);
- } while (r == -1 & errno == EDEADLK);
+ } while (r == -1 && errno == EDEADLK);
if (r == -1)
err(1, "lockf(%s, F_LOCK)", file);
write(fd, "x", 1);
Modified: user/pho/stress2/misc/nfs16.sh
==============================================================================
--- user/pho/stress2/misc/nfs16.sh Wed Jun 8 15:41:39 2016 (r301636)
+++ user/pho/stress2/misc/nfs16.sh Wed Jun 8 16:03:04 2016 (r301637)
@@ -112,7 +112,7 @@ t2(void *data __unused)
err(1, "open(%s)", file);
do {
r = lockf(fd, F_LOCK, 0);
- } while (r == -1 & errno == EDEADLK);
+ } while (r == -1 && errno == EDEADLK);
if (r == -1)
err(1, "lockf(%s, F_LOCK)", file);
write(fd, "x", 1);
More information about the svn-src-user
mailing list