Remove unused include param/param.h.

[samba.git] / source4 / torture / rpc / bench.c

diff --git a/source4/torture/rpc/bench.c b/source4/torture/rpc/bench.c
index a5aaaeeb29960a79bf496db6187abcf9adee865e..cacc1d3baa9927841e4ed0019603394011bb1c7b 100644 (file)
--- a/source4/torture/rpc/bench.c
+++ b/source4/torture/rpc/bench.c
@@ -7,7 +7,7 @@
    
    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; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -16,27 +16,25 @@
    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 to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "torture/rpc/rpc.h"
 
 /**************************/
 /* srvsvc_NetShare        */
 /**************************/
-static BOOL test_NetShareEnumAll(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+static bool test_NetShareEnumAll(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        NTSTATUS status;
        struct srvsvc_NetShareEnumAll r;
        struct srvsvc_NetShareCtr0 c0;
        uint32_t levels[] = {0, 1, 2, 501, 502};
        int i;
-       BOOL ret = True;
+       bool ret = true;
        uint32_t resume_handle;
 
        ZERO_STRUCT(c0);
@@ -54,7 +52,7 @@ static BOOL test_NetShareEnumAll(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                status = dcerpc_srvsvc_NetShareEnumAll(p, mem_ctx, &r);
                if (!NT_STATUS_IS_OK(status)) {
                        printf("NetShareEnumAll level %u failed - %s\n", r.in.level, nt_errstr(status));
-                       ret = False;
+                       ret = false;
                        continue;
                }
                if (!W_ERROR_IS_OK(r.out.result)) {
@@ -69,11 +67,11 @@ static BOOL test_NetShareEnumAll(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 /*
   benchmark srvsvc netshareenumall queries
 */
-static BOOL bench_NetShareEnumAll(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+static bool bench_NetShareEnumAll(struct torture_context *tctx, struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 {
        struct timeval tv = timeval_current();
-       BOOL ret = True;
-       int timelimit = lp_parm_int(-1, "torture", "timelimit", 10);
+       bool ret = true;
+       int timelimit = torture_setting_int(tctx, "timelimit", 10);
        int count=0;
 
        printf("Running for %d seconds\n", timelimit);
@@ -83,8 +81,10 @@ static BOOL bench_NetShareEnumAll(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                talloc_free(tmp_ctx);
                count++;
                if (count % 50 == 0) {
-                       printf("%.1f queries per second  \r", 
-                              count / timeval_elapsed(&tv));
+                       if (torture_setting_bool(tctx, "progress", true)) {
+                               printf("%.1f queries per second  \r", 
+                                      count / timeval_elapsed(&tv));
+                       }
                }
        }
 
@@ -94,25 +94,25 @@ static BOOL bench_NetShareEnumAll(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 }
 
 
-BOOL torture_bench_rpc(void)
+bool torture_bench_rpc(struct torture_context *torture)
 {
         NTSTATUS status;
         struct dcerpc_pipe *p;
        TALLOC_CTX *mem_ctx;
-       BOOL ret = True;
+       bool ret = true;
 
        mem_ctx = talloc_init("torture_rpc_srvsvc");
 
-       status = torture_rpc_connection(mem_ctx, 
+       status = torture_rpc_connection(torture, 
                                        &p,
-                                       &dcerpc_table_srvsvc);
+                                       &ndr_table_srvsvc);
        if (!NT_STATUS_IS_OK(status)) {
                talloc_free(mem_ctx);
-               return False;
+               return false;
        }
 
-       if (!bench_NetShareEnumAll(p, mem_ctx)) {
-               ret = False;
+       if (!bench_NetShareEnumAll(torture, p, mem_ctx)) {
+               ret = false;
        }
 
        talloc_free(mem_ctx);