msnfs41client: Patches for more precise file timestamps+sys debugging+misc, 2024-10-16
Posted by Anonymous on Wed 16th Oct 2024 11:07
raw | new post

From 1009f0f891cdaa7d6da0d855328ce6364c69215e Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed, 16 Oct 2024 11:21:55 +0200
Subject: [PATCH 1/3] daemon,libtirpc: Switch to
 |GetSystemTimePreciseAsFileTime()| for more precise timestamps

Switch to |GetSystemTimePreciseAsFileTime()| for more precise (file)
timestamps.

Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 daemon/util.c               | 2 +-
 libtirpc/src/gettimeofday.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/util.c b/daemon/util.c
index 3da52f1..fd7ebbd 100644
--- a/daemon/util.c
+++ b/daemon/util.c
@@ -301,7 +301,7 @@ void nfs41_file_info_cpy(
 void get_file_time(
     OUT PLARGE_INTEGER file_time)
 {
-    GetSystemTimeAsFileTime((LPFILETIME)file_time);
+    GetSystemTimePreciseAsFileTime((LPFILETIME)file_time);
 }

 void get_nfs_time(
diff --git a/libtirpc/src/gettimeofday.c b/libtirpc/src/gettimeofday.c
index ff12dda..6dff414 100644
--- a/libtirpc/src/gettimeofday.c
+++ b/libtirpc/src/gettimeofday.c
@@ -16,7 +16,7 @@ int gettimeofday(struct timeval *tv, struct timezone *tz)

   if (NULL != tv)
   {
-    GetSystemTimeAsFileTime(&ft);
+    GetSystemTimePreciseAsFileTime(&ft);

     tmpres |= ft.dwHighDateTime;
     tmpres <<= 32;
--
2.45.1

From 85f9d07bc1c4850d01440871d9f4baa3a1ebffc1 Mon Sep 17 00:00:00 2001
From: Dan Shelton <dan.f.shelton@gmail.com>
Date: Wed, 16 Oct 2024 11:26:09 +0200
Subject: [PATCH 2/3] sys: map_query_acl_error() should use (long), not (long
 long), for %lx

map_query_acl_error() should use (long), not (long long), for %lx

Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 sys/nfs41sys_acl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/nfs41sys_acl.c b/sys/nfs41sys_acl.c
index 1ad4c77..55c5789 100644
--- a/sys/nfs41sys_acl.c
+++ b/sys/nfs41sys_acl.c
@@ -174,7 +174,7 @@ NTSTATUS map_query_acl_error(
         print_error("map_query_acl_error: "
             "failed to map windows ERROR_0x%lx to NTSTATUS; "
             "defaulting to STATUS_INVALID_NETWORK_RESPONSE\n",
-            (long long)error);
+            (long)error);
     case ERROR_BAD_NET_RESP:        return STATUS_INVALID_NETWORK_RESPONSE;
     }
 }
--
2.45.1

From 0379e6c3feff024e8bef4b4275e67b8dd1ae0702 Mon Sep 17 00:00:00 2001
From: Roland Mainz <roland.mainz@nrubsig.org>
Date: Wed, 16 Oct 2024 11:58:28 +0200
Subject: [PATCH 3/3] tests: Increase nfsbuildtest gcc build from -j8 to -j12

Increase nfsbuildtest gcc build from -j8 to -j12 for better
parallel testing.

This should really be calculated based on the number of active
CPUs and available memory, but for now we stick with a fixed
value to be able to compare the perf values&build times across runs.

Signed-off-by: Cedric Blancher <cedric.blancher@gmail.com>
---
 tests/nfsbuildtest/nfsbuildtest.ksh93 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/nfsbuildtest/nfsbuildtest.ksh93 b/tests/nfsbuildtest/nfsbuildtest.ksh93
index 96399b3..e5cb613 100644
--- a/tests/nfsbuildtest/nfsbuildtest.ksh93
+++ b/tests/nfsbuildtest/nfsbuildtest.ksh93
@@ -155,7 +155,7 @@ function gcc_build
        #
        # build gcc
        #
-       time ksh93 -c 'export SHELL=/bin/ksh93 ; (yes | make --load-average 32 -j8 all)'
+       time ksh93 -c 'export SHELL=/bin/ksh93 ; (yes | make --load-average 32 -j12 all)'
        echo $?

        echo "#Done."
--
2.45.1