src/locktest: Update test header comment

[xfstests-dev.git] / src / locktest.c

diff --git a/src/locktest.c b/src/locktest.c
index adf8ce05ccc5e7f28746e1cd5a75b60596a19a4a..6030c7a8a909217f771996f0ad17faab165e1d74 100644 (file)
--- a/src/locktest.c
+++ b/src/locktest.c
@@ -1,19 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (c) 2000-2003 Silicon Graphics, Inc.
  * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it would be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 /*
@@ -73,8 +61,7 @@ extern int h_errno;
        
 #define HANDLE              int
 #define INVALID_HANDLE      -1
-#define OPEN(N,F)           (open(N, F|O_CREAT|O_BINARY| \
-                            (D_flag ? O_DIRECT : 0), 0644))
+#define OPEN(N,F)           (open(N, F|O_CREAT|O_BINARY, 0644))
 #define SEEK(H, O)          (lseek(H, O, SEEK_SET))
 #define READ(H, B, L)       (read(H, B, L))
 #define WRITE(H, B, L)      (write(H, B, L))
@@ -95,7 +82,7 @@ static char   *filename = 0;
 static int     debug = 0;
 static int     server = 1;
 static int     maxio = 8192;
-static int     port = 7890;
+static int     port = 0;
 static int     testnumber = -1;
 static int     saved_errno = 0;
 
@@ -103,7 +90,6 @@ static SOCKET        s_fd = -1;              /* listen socket    */
 static SOCKET  c_fd = -1;              /* IPC socket       */
 static HANDLE  f_fd = INVALID_HANDLE;  /* shared file      */
 static char    *buf;                   /* I/O buffer       */
-static int     D_flag = 0;
 
 #define        WRLOCK  0
 #define        RDLOCK  1
@@ -189,7 +175,7 @@ char *descriptions[] = {
 };
 
 static int64_t tests[][6] =
-       /*      test #  Action  offset          length          expected        server/client */
+       /*      test #  Action  [offset|flags]  length          expected        server/client */
        {       
        /* Various simple tests exercising the list */
 
@@ -591,12 +577,7 @@ initialize(HANDLE fd)
     int        offset = 0;
     int        togo = FILE_SIZE;
 
-    if (D_flag) {
-        ibuf = (char *)ALLOC_ALIGNED(INIT_BUFSZ);
-    }
-    else {
-        ibuf = (char*)malloc(INIT_BUFSZ);
-    }
+    ibuf = (char*)malloc(INIT_BUFSZ);
     memset(ibuf, ':', INIT_BUFSZ);
 
     SEEK(fd, 0L);
@@ -626,15 +607,6 @@ int do_open(int flag)
        /*NOTREACHED*/
     }
 
-#ifdef __sun
-    if (D_flag) {
-        directio(f_fd, DIRECTIO_ON);
-    }
-#elif defined(__APPLE__)
-    if (D_flag) {
-       fcntl(f_fd, F_NOCACHE, 1);
-    }
-#endif
     return PASS;
 }
 
@@ -838,18 +810,10 @@ main(int argc, char *argv[])
      * +10 is slop for the iteration number if do_write() ... never
      * needed unless maxio is very small
      */
-    if (D_flag) {
-        if ((buf = (char *)ALLOC_ALIGNED(maxio + 10)) == NULL) {
-           perror("aligned alloc buf");
-           exit(1);
-           /*NOTREACHED*/
-        }
-    } else {
-        if ((buf = (char *)malloc(maxio + 10)) == NULL) {
-           perror("malloc buf");
-           exit(1);
-           /*NOTREACHED*/
-        }
+    if ((buf = (char *)malloc(maxio + 10)) == NULL) {
+        perror("malloc buf");
+        exit(1);
+        /*NOTREACHED*/
     }
 
     setbuf(stderr, NULL);
@@ -899,6 +863,20 @@ main(int argc, char *argv[])
            /*NOTREACHED*/
        }
 
+       if (port == 0) {
+               socklen_t addr_len = sizeof(myAddr);
+
+               if (getsockname(s_fd, &myAddr, &addr_len)) {
+                   perror("getsockname");
+                   exit(1);
+               }
+
+               port = ntohs(myAddr.sin_port);
+       }
+
+       printf("server port: %d\n", port);
+       fflush(stdout);
+
        c_fd = accept(s_fd, NULL, NULL);
        if (c_fd == INVALID_SOCKET) {
            perror("accept");
@@ -1157,10 +1135,7 @@ main(int argc, char *argv[])
        printf("%d tests run, %d failed\n", test_count, fail_count);
 }   
     if (buf) {
-        if (D_flag)
-            FREE_ALIGNED(buf);
-        else
-            free(buf);
+        free(buf);
     }