Changeset 745 for trunk/server/source3/torture/nbio.c

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)
• source3/torture/nbio.c (modified) (13 diffs)

trunk/server/source3/torture/nbio.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include "torture/proto.h"
+#include "../libcli/security/security.h"
+#include "libsmb/libsmb.h"
+#include "libsmb/clirap.h"
 
 #define MAX_FILES 1000
@@ -28 +32 @@
 extern int nbio_id;
 static int nprocs;
+static struct timeval nb_start;
 
 static struct {
@@ -61 +66 @@
         }
 
-        printf("%4d  %8d  %.2f MB/sec\r", num_clients, lines/nprocs, 1.0e-6 * nbio_total() / end_timer());
+        printf("%4d  %8d  %.2f MB/sec\r",
+               num_clients, lines/nprocs,
+               1.0e-6 * nbio_total() / timeval_elapsed(&nb_start));
 
         signal(SIGALRM, nb_alarm);
@@ -122 +129 @@
         signal(SIGSEGV, sigsegv);
         c = cli;
-        start_timer();
+        nb_start = timeval_current();
         children[nbio_id].done = 0;
 }
@@ -129 +136 @@
 void nb_unlink(const char *fname)
 {
-        if (!NT_STATUS_IS_OK(cli_unlink(c, fname, aSYSTEM | aHIDDEN))) {
+        if (!NT_STATUS_IS_OK(cli_unlink(c, fname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN))) {
 #if NBDEBUG
                 printf("(%d) unlink %s failed (%s)\n", 
@@ -184 +191 @@
 {
         int i;
+        NTSTATUS status;
 
         if (buf[0] == 0) memset(buf, 1, sizeof(buf));
 
         i = find_handle(handle);
-        if (cli_write(c, ftable[i].fd, 0, buf, offset, size) != ret_size) {
-                printf("(%d) ERROR: write failed on handle %d, fd %d \
-errno %d (%s)\n", line_count, handle, ftable[i].fd, errno, strerror(errno));
+        status = cli_writeall(c, ftable[i].fd, 0, (uint8_t *)buf, offset, size,
+                              NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                printf("(%d) ERROR: write failed on handle %d, fd %d "
+                       "error %s\n", line_count, handle, ftable[i].fd,
+                       nt_errstr(status));
                 exit(1);
         }
@@ -242 +253 @@
 void nb_qpathinfo(const char *fname)
 {
-        cli_qpathinfo(c, fname, NULL, NULL, NULL, NULL, NULL);
+        cli_qpathinfo1(c, fname, NULL, NULL, NULL, NULL, NULL);
 }
 
@@ -249 +260 @@
         int i;
         i = find_handle(fnum);
-        cli_qfileinfo(c, ftable[i].fd, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+        cli_qfileinfo_basic(c, ftable[i].fd, NULL, NULL, NULL, NULL, NULL,
+                            NULL, NULL);
 }
 
@@ -259 +271 @@
 }
 
-static void find_fn(const char *mnt, file_info *finfo, const char *name, void *state)
+static NTSTATUS find_fn(const char *mnt, struct file_info *finfo, const char *name,
+                    void *state)
 {
         /* noop */
+        return NT_STATUS_OK;
 }
 
@@ -278 +292 @@
 static int total_deleted;
 
-static void delete_fn(const char *mnt, file_info *finfo, const char *name, void *state)
-{
+static NTSTATUS delete_fn(const char *mnt, struct file_info *finfo,
+                      const char *name, void *state)
+{
+        NTSTATUS status;
         char *s, *n;
-        if (finfo->name[0] == '.') return;
+        if (finfo->name[0] == '.') {
+                return NT_STATUS_OK;
+        }
 
         n = SMB_STRDUP(name);
@@ -287 +305 @@
         if (asprintf(&s, "%s%s", n, finfo->name) == -1) {
                 printf("asprintf failed\n");
-                return;
-        }
-        if (finfo->mode & aDIR) {
+                return NT_STATUS_NO_MEMORY;
+        }
+        if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) {
                 char *s2;
                 if (asprintf(&s2, "%s\\*", s) == -1) {
                         printf("asprintf failed\n");
-                        return;
+                        return NT_STATUS_NO_MEMORY;
                 }
-                cli_list(c, s2, aDIR, delete_fn, NULL);
+                status = cli_list(c, s2, FILE_ATTRIBUTE_DIRECTORY, delete_fn, NULL);
+                if (!NT_STATUS_IS_OK(status)) {
+                        free(n);
+                        free(s2);
+                        return status;
+                }
                 nb_rmdir(s);
         } else {
@@ -303 +326 @@
         free(s);
         free(n);
+        return NT_STATUS_OK;
 }
 
@@ -314 +338 @@
 
         total_deleted = 0;
-        cli_list(c, mask, aDIR, delete_fn, NULL);
+        cli_list(c, mask, FILE_ATTRIBUTE_DIRECTORY, delete_fn, NULL);
         free(mask);
         cli_rmdir(c, dname);