Changeset 745 for trunk/server/source4/torture/nbench

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/torture/nbench/nbench.c (modified) (3 diffs)
• source4/torture/nbench/nbio.c (modified) (11 diffs)

trunk/server/source4/torture/nbench/nbench.c

@@ -64 +64 @@
         bool correct = true;
         double target_rate = torture_setting_double(tctx, "targetrate", 0);     
-        int n;
+        int n = 0;
 
         if (target_rate != 0 && client == 0) {
@@ -100 +100 @@
                 }
 
-                all_string_sub(line,"client1", cname, sizeof(line));
+                all_string_sub(line, "client1", cname, sizeof(line));
                 
-                params = params0 = str_list_make_shell(NULL, line, " ");
+                params = params0 = const_str_list(
+                                        str_list_make_shell(NULL, line, " "));
                 i = str_list_length(params);
 
@@ -282 +283 @@
 NTSTATUS torture_nbench_init(void)
 {
-        struct torture_suite *suite = 
-                torture_suite_create(
-                        talloc_autofree_context(),
-                        "BENCH");
-
-        torture_suite_add_simple_test(suite, "NBENCH", torture_nbench);
+        struct torture_suite *suite = torture_suite_create(
+                                                   talloc_autofree_context(), "bench");
+
+        torture_suite_add_simple_test(suite, "nbench", torture_nbench);
 
         suite->description = talloc_strdup(suite, "Benchmarks");

trunk/server/source4/torture/nbench/nbio.c

@@ -28 +28 @@
 #include "../lib/util/dlinklist.h"
 #include "libcli/libcli.h"
-#include "libcli/raw/libcliraw.h"
-#include "torture/torture.h"
-#include "libcli/libcli.h"
 #include "torture/util.h"
 #include "torture/nbench/proto.h"
@@ -50 +47 @@
 struct createx_params {
         char *fname;
-        uint_t create_options;
-        uint_t create_disposition;
+        unsigned int create_options;
+        unsigned int create_disposition;
         int handle;
 };
@@ -76 +73 @@
 static bool nb_do_createx(struct ftable *f,
                           const char *fname,
-                          uint_t create_options,
-                          uint_t create_disposition,
+                          unsigned int create_options,
+                          unsigned int create_disposition,
                           int handle,
                           NTSTATUS status,
@@ -86 +83 @@
 static void nb_set_createx_params(struct ftable *f,
                                   const char *fname,
-                                  uint_t create_options,
-                                  uint_t create_disposition,
+                                  unsigned int create_options,
+                                  unsigned int create_disposition,
                                   int handle)
 {
@@ -196 +193 @@
         tdelay = (children[nbio_id].bytes - last_bytes)/(1.0e6*rate) - timeval_elapsed(&last_time);
         if (tdelay > 0) {
-                msleep(tdelay*1000);
+                smb_msleep(tdelay*1000);
         } else {
                 children[nbio_id].max_latency = MAX(children[nbio_id].max_latency, -tdelay);
@@ -214 +211 @@
         double elapsed = timeval_elapsed(&children[nbio_id].starttime);
         if (targett > elapsed) {
-                msleep(1000*(targett - elapsed));
+                smb_msleep(1000*(targett - elapsed));
         } else if (elapsed - targett > children[nbio_id].max_latency) {
                 children[nbio_id].max_latency = MAX(elapsed - targett, children[nbio_id].max_latency);
@@ -459 +456 @@
 static bool nb_do_createx(struct ftable *f,
                           const char *fname,
-                          uint_t create_options,
-                          uint_t create_disposition,
+                          unsigned int create_options,
+                          unsigned int create_disposition,
                           int handle,
                           NTSTATUS status,
@@ -469 +466 @@
         NTSTATUS ret;
         TALLOC_CTX *mem_ctx;
-        uint_t flags = 0;
+        unsigned int flags = 0;
 
         mem_ctx = talloc_init("raw_open");
@@ -488 +485 @@
         io.ntcreatex.level = RAW_OPEN_NTCREATEX;
         io.ntcreatex.in.flags = flags;
-        io.ntcreatex.in.root_fid = 0;
+        io.ntcreatex.in.root_fid.fnum = 0;
         io.ntcreatex.in.access_mask = desired_access;
         io.ntcreatex.in.file_attr = 0;
@@ -535 +532 @@
 
 bool nb_createx(const char *fname, 
-               uint_t create_options, uint_t create_disposition, int handle,
+               unsigned int create_options, unsigned int create_disposition, int handle,
                NTSTATUS status)
 {
@@ -668 +665 @@
 }
 
-bool nb_unlockx(int handle, uint_t offset, int size, NTSTATUS status)
+bool nb_unlockx(int handle, unsigned int offset, int size, NTSTATUS status)
 {
         union smb_lock io;