lib/util: consolidate module loading into common code

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

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index bd27cf1081abe2e4df8c64296e5a8052d9136fab..b066d3e1ac612b302de21326c2c5d09966026388 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -6,7 +6,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,
@@ -15,85 +15,42 @@
    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 "system/time.h"
-#include "torture/torture.h"
-#include "build.h"
-#include "dlinklist.h"
+#include "param/param.h"
+#include "lib/cmdline/popt_common.h"
+#include "torture/smbtorture.h"
+#include "lib/util/samba_modules.h"
 
-_PUBLIC_ int torture_nprocs=4;
 _PUBLIC_ int torture_numops=10;
 _PUBLIC_ int torture_entries=1000;
 _PUBLIC_ int torture_failures=1;
 _PUBLIC_ int torture_seed=0;
 _PUBLIC_ int torture_numasync=100;
-_PUBLIC_ BOOL use_oplocks;
-_PUBLIC_ BOOL use_level_II_oplocks;
-_PUBLIC_ BOOL torture_showall = False;
 
-struct torture_suite_list *torture_suites = NULL;
+struct torture_suite *torture_root = NULL;
 
-NTSTATUS torture_register_suite(struct torture_suite *suite)
+bool torture_register_suite(struct torture_suite *suite)
 {
-       struct torture_suite_list *p, *n;
+       if (!suite)
+               return true;
 
-       if (!suite) {
-               return NT_STATUS_OK;
-       }
+       if (torture_root == NULL)
+               torture_root = talloc_zero(talloc_autofree_context(), struct torture_suite);
 
-       n = talloc(talloc_autofree_context(), struct torture_suite_list);
-       n->suite = suite;
-
-       for (p = torture_suites; p; p = p->next) {
-               if (strcmp(p->suite->name, suite->name) == 0) {
-                       /* Check for duplicates */
-                       DEBUG(0,("There already is a suite registered with the name %s!\n", suite->name));
-                       return NT_STATUS_OBJECT_NAME_COLLISION;
-               }
-
-               if (strcmp(p->suite->name, suite->name) < 0 && 
-                       (!p->next || strcmp(p->next->suite->name, suite->name) > 0)) {
-                       DLIST_ADD_AFTER(torture_suites, n, p);
-                       return NT_STATUS_OK;
-               }
-       }
-
-       DLIST_ADD(torture_suites, n);
-
-       return NT_STATUS_OK;
-}
-
-static BOOL wrap_old_torture_fn(struct torture_context *torture,
-                                                               const void *_fn)
-{
-       BOOL (*fn)(struct torture_context *) = _fn;
-       return fn(torture);
+       return torture_suite_add_suite(torture_root, suite);
 }
 
-
-/* Backwards compatibility wrapper */
-_PUBLIC_ NTSTATUS register_torture_op(const char *name, BOOL (*fn)(struct torture_context *))
+_PUBLIC_ int torture_init(void)
 {
-       struct torture_suite *suite;
-       suite = torture_suite_create(talloc_autofree_context(), name);
-
-       torture_suite_add_simple_tcase(suite, name, 
-                                                                  wrap_old_torture_fn,
-                                                                  fn);
-       torture_register_suite(suite);
+#define _MODULE_PROTO(init) extern NTSTATUS init(void);
+       STATIC_smbtorture_MODULES_PROTO;
+       init_module_fn static_init[] = { STATIC_smbtorture_MODULES };
+       init_module_fn *shared_init = load_samba_modules(NULL, "smbtorture");
 
-       return NT_STATUS_OK;
-}
-
-int torture_init(void)
-{
-       init_module_fn static_init[] = STATIC_torture_MODULES;
-       init_module_fn *shared_init = load_samba_modules(NULL, "torture");
-       
        run_init_functions(static_init);
        run_init_functions(shared_init);