Changeset 228 for branches/samba-3.2.x/source/torture

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

Location:

branches/samba-3.2.x/source/torture

Files:

• locktest.c (modified) (2 diffs)
• masktest.c (modified) (2 diffs)
• torture.c (modified) (3 diffs)

branches/samba-3.2.x/source/torture/locktest.c

@@ -177 +177 @@
         server_n = server;
 
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
 
         slprintf(myname,sizeof(myname), "lock-%lu-%u", (unsigned long)getpid(), count++);
@@ -185 +185 @@
 
  again:
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
 
         /* have to open a new connection */

branches/samba-3.2.x/source/torture/masktest.c

@@ -179 +179 @@
         server_n = server;
 
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
 
         make_nmb_name(&calling, "masktest", 0x0);
@@ -185 +185 @@
 
  again:
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
 
         /* have to open a new connection */

branches/samba-3.2.x/source/torture/torture.c

@@ -159 +159 @@
         make_nmb_name(&called , host, 0x20);
 
-        zero_addr(&ss);
+        zero_sockaddr(&ss);
 
         if (!(c = cli_initialise())) {
@@ -5193 +5193 @@
         DATA_BLOB v1, v2, v3;
 
+        TALLOC_CTX *mem_ctx;
+        char *str1, *str2;
+        size_t size1, size2;
+        bool ret = false;
+
         cache = memcache_init(NULL, 100);
 
@@ -5244 +5249 @@
 
         TALLOC_FREE(cache);
-        return true;
+
+        cache = memcache_init(NULL, 0);
+
+        mem_ctx = talloc_init("foo");
+
+        str1 = talloc_strdup(mem_ctx, "string1");
+        str2 = talloc_strdup(mem_ctx, "string2");
+
+        memcache_add_talloc(cache, SINGLETON_CACHE_TALLOC,
+                            data_blob_string_const("torture"), &str1);
+        size1 = talloc_total_size(cache);
+
+        memcache_add_talloc(cache, SINGLETON_CACHE_TALLOC,
+                            data_blob_string_const("torture"), &str2);
+        size2 = talloc_total_size(cache);
+
+        printf("size1=%d, size2=%d\n", (int)size1, (int)size2);
+
+        if (size2 > size1) {
+                printf("memcache leaks memory!\n");
+                goto fail;
+        }
+
+        ret = true;
+ fail:
+        TALLOC_FREE(cache);
+        return ret;
 }