Changeset 745 for trunk/server/source4/torture/gentest.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)
• source4/torture/gentest.c (modified) (19 diffs)

trunk/server/source4/torture/gentest.c

@@ -49 +49 @@
         int analyze_always;
         int analyze_continuous;
-        uint_t max_open_handles;
-        uint_t seed;
-        uint_t numops;
+        unsigned int max_open_handles;
+        unsigned int seed;
+        unsigned int numops;
         int use_oplocks;
         char **ignore_patterns;
@@ -68 +68 @@
 static struct {
         bool active;
-        uint_t instance;
+        unsigned int instance;
         struct smb2_handle smb2_handle[NSERVERS]; /* SMB2 */
         uint16_t smb_handle[NSERVERS];            /* SMB */
         const char *name;
 } *open_handles;
-static uint_t num_open_handles;
+static unsigned int num_open_handles;
 
 /* state information for the servers. We open NINSTANCES connections to
@@ -87 +87 @@
 /* the seeds and flags for each operation */
 static struct {
-        uint_t seed;
+        unsigned int seed;
         bool disabled;
 } *op_parms;
@@ -112 +112 @@
 static struct {
         const char *name;
-        uint_t seed;
+        unsigned int seed;
         NTSTATUS status;
-        uint_t opnum;
+        unsigned int opnum;
         TALLOC_CTX *mem_ctx;
         const char *mismatch;
@@ -216 +216 @@
                         struct smbcli_options smb_options;
                         struct smbcli_session_options smb_session_options;
-                        lp_smbcli_options(lp_ctx, &smb_options);
-                        lp_smbcli_session_options(lp_ctx, &smb_session_options);
+                        lpcfg_smbcli_options(lp_ctx, &smb_options);
+                        lpcfg_smbcli_session_options(lp_ctx, &smb_session_options);
 
                         printf("Connecting to \\\\%s\\%s as %s - instance %d\n",
@@ -228 +228 @@
                         if (options.smb2) {
                                 status = smb2_connect(NULL, servers[i].server_name, 
-                                                                          lp_smb_ports(lp_ctx),
+                                                                          lpcfg_smb_ports(lp_ctx),
                                                       servers[i].share_name,
-                                                      lp_resolve_context(lp_ctx),
+                                                      lpcfg_resolve_context(lp_ctx),
                                                       servers[i].credentials,
                                                       &servers[i].smb2_tree[j],
                                                       ev, &smb_options,
-                                                          lp_socket_options(lp_ctx),
-                                                          lp_gensec_settings(lp_ctx, lp_ctx)
+                                                          lpcfg_socket_options(lp_ctx),
+                                                          lpcfg_gensec_settings(lp_ctx, lp_ctx)
                                                           );
                         } else {
@@ -241 +241 @@
                                                                      &servers[i].smb_tree[j], 
                                                                      servers[i].server_name, 
-                                                                     lp_smb_ports(lp_ctx),
+                                                                     lpcfg_smb_ports(lp_ctx),
                                                                      servers[i].share_name, "A:",
-                                                                         lp_socket_options(lp_ctx),
+                                                                         lpcfg_socket_options(lp_ctx),
                                                                      servers[i].credentials,
-                                                                     lp_resolve_context(lp_ctx), ev,
+                                                                     lpcfg_resolve_context(lp_ctx), ev,
                                                                      &smb_options,
                                                                      &smb_session_options,
-                                                                         lp_iconv_convenience(lp_ctx),
-                                                                         lp_gensec_settings(lp_ctx, lp_ctx));
+                                                                         lpcfg_gensec_settings(lp_ctx, lp_ctx));
                         }
                         if (!NT_STATUS_IS_OK(status)) {
@@ -278 +277 @@
   work out the time skew between the servers - be conservative
 */
-static uint_t time_skew(void)
-{
-        uint_t ret;
+static unsigned int time_skew(void)
+{
+        unsigned int ret;
         if (options.smb2) {
                 ret = labs(servers[0].smb2_tree[0]->session->transport->negotiate.system_time -
@@ -300 +299 @@
   turn a server handle into a local handle
 */
-static uint_t fnum_to_handle_smb2(int server, int instance, struct smb2_handle server_handle)
-{
-        uint_t i;
+static unsigned int fnum_to_handle_smb2(int server, int instance, struct smb2_handle server_handle)
+{
+        unsigned int i;
         for (i=0;i<options.max_open_handles;i++) {
                 if (!open_handles[i].active ||
@@ -318 +317 @@
   turn a server handle into a local handle
 */
-static uint_t fnum_to_handle_smb(int server, int instance, uint16_t server_handle)
-{
-        uint_t i;
+static unsigned int fnum_to_handle_smb(int server, int instance, uint16_t server_handle)
+{
+        unsigned int i;
         for (i=0;i<options.max_open_handles;i++) {
                 if (!open_handles[i].active ||
@@ -451 +450 @@
   return true with 'chance' probability as a percentage
 */
-static bool gen_chance(uint_t chance)
+static bool gen_chance(unsigned int chance)
 {
         return ((random() % 100) <= chance);
@@ -512 +511 @@
 static int gen_int_range(uint64_t min, uint64_t max)
 {
-        uint_t r = random();
+        unsigned int r = random();
         return min + (r % (1+max-min));
 }
@@ -641 +640 @@
   generate a bitmask
 */
-static uint32_t gen_bits_mask(uint_t mask)
-{
-        uint_t ret = random();
+static uint32_t gen_bits_mask(unsigned int mask)
+{
+        unsigned int ret = random();
         return ret & mask;
 }
@@ -870 +869 @@
   generate a file allocation size
 */
-static uint_t gen_alloc_size(void)
-{
-        uint_t ret;
+static unsigned int gen_alloc_size(void)
+{
+        unsigned int ret;
 
         if (gen_chance(30)) return 0;
@@ -1213 +1212 @@
         int i, j;
 
-        msleep(20);
+        smb_msleep(20);
 
         for (j=0;j<NINSTANCES;j++) {
@@ -1820 +1819 @@
         parm[0].ntcreatex.level = RAW_OPEN_NTCREATEX;
         parm[0].ntcreatex.in.flags = gen_ntcreatex_flags();
-        parm[0].ntcreatex.in.root_fid = gen_root_fid(instance);
+        parm[0].ntcreatex.in.root_fid.fnum = gen_root_fid(instance);
         parm[0].ntcreatex.in.access_mask = gen_access_mask();
         parm[0].ntcreatex.in.alloc_size = gen_alloc_size();
@@ -1838 +1837 @@
         
         GEN_COPY_PARM;
-        if (parm[0].ntcreatex.in.root_fid != 0) {
-                GEN_SET_FNUM_SMB(ntcreatex.in.root_fid);
+        if (parm[0].ntcreatex.in.root_fid.fnum != 0) {
+                GEN_SET_FNUM_SMB(ntcreatex.in.root_fid.fnum);
         }
         GEN_CALL_SMB(smb_raw_open(tree, current_op.mem_ctx, &parm[i]));
@@ -2662 +2661 @@
         parm[0].in.file.handle.data[0] = gen_fnum(instance);
         parm[0].in.lock_count = gen_lock_count();
-        parm[0].in.reserved = gen_reserved32();
+        parm[0].in.lock_sequence = gen_reserved32();
         
         parm[0].in.locks = talloc_array(current_op.mem_ctx,
@@ -3187 +3186 @@
                 switch (opt) {
                 case OPT_UNCLIST:
-                        lp_set_cmdline(cmdline_lp_ctx, "torture:unclist", poptGetOptArg(pc));
+                        lpcfg_set_cmdline(cmdline_lp_ctx, "torture:unclist", poptGetOptArg(pc));
                         break;
                 case 'U':