Changeset 706:4ffbc9f1e922 in freeDiameter for tests/testostr.c

Timestamp:

Feb 9, 2011, 3:26:58 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Large UNTESTED commit with the following changes:

• Improved DiameterIdentity? handling (esp. interationalization issues), and improve efficiency of some string operations in peers, sessions, and dictionary modules (closes #7)
• Cleanup in the session module to free only unreferenced sessions (#16)
• Removed fd_cpu_flush_cache(), replaced by more robust alternatives.
• Improved peer state machine algorithm to counter SCTP multistream race condition.

File:

• tests/testostr.c (moved) (moved from tests/testlist.c) (2 diffs)

tests/testostr.c

@@ -36 +36 @@
 #include "tests.h"
 
-#define TEST_STR "This is my test string (with extra unused data)"
-#define TEST_STRLEN 22
+#define TEST_STR (os0_t)"This is my test string (with extra unused data)"
 
 /* Main test routine */
@@ -47 +46 @@
         /* Check the hash function */
         {
-                char buf[30];
+                uint8_t buf[30];
                 
-                uint32_t hash = fd_hash(TEST_STR, TEST_STRLEN); /* reference value */
+                uint32_t hash = fd_os_hash(TEST_STR, CONSTSTRLEN(TEST_STR)); /* reference value */
                 
                 /* Check that a hash of a substring / surstring is different */
-                CHECK( 1, hash != fd_hash(TEST_STR, TEST_STRLEN - 1) ? 1 : 0 );
-                CHECK( 1, hash != fd_hash(TEST_STR, TEST_STRLEN + 1) ? 1 : 0 );
+                CHECK( 1, hash != fd_os_hash(TEST_STR, CONSTSTRLEN(TEST_STR) - 1) ? 1 : 0 );
+                CHECK( 1, hash != fd_os_hash(TEST_STR, CONSTSTRLEN(TEST_STR) + 1) ? 1 : 0 );
                 
                 /* Check alignment of the string is not important */
-                memcpy(buf + 4, TEST_STR, TEST_STRLEN);
-                CHECK( hash, fd_hash(buf + 4, TEST_STRLEN) );
+                memcpy(buf + 4, TEST_STR, CONSTSTRLEN(TEST_STR));
+                CHECK( hash, fd_os_hash(buf + 4, CONSTSTRLEN(TEST_STR)) );
                 
-                memcpy(buf + 3, TEST_STR, TEST_STRLEN);
-                CHECK( hash, fd_hash(buf + 3, TEST_STRLEN) );
+                memcpy(buf + 3, TEST_STR, CONSTSTRLEN(TEST_STR));
+                CHECK( hash, fd_os_hash(buf + 3, CONSTSTRLEN(TEST_STR)) );
                 
-                memcpy(buf + 2, TEST_STR, TEST_STRLEN);
-                CHECK( hash, fd_hash(buf + 2, TEST_STRLEN) );
+                memcpy(buf + 2, TEST_STR, CONSTSTRLEN(TEST_STR));
+                CHECK( hash, fd_os_hash(buf + 2, CONSTSTRLEN(TEST_STR)) );
                 
-                memcpy(buf + 1, TEST_STR, TEST_STRLEN);
-                CHECK( hash, fd_hash(buf + 1, TEST_STRLEN) );
+                memcpy(buf + 1, TEST_STR, CONSTSTRLEN(TEST_STR));
+                CHECK( hash, fd_os_hash(buf + 1, CONSTSTRLEN(TEST_STR)) );
         }