Changeset 1088:1d1a20a0779d in freeDiameter for tests/testsess.c
- Timestamp:
- May 5, 2013, 4:25:27 AM (11 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tests/testsess.c
r888 r1088 43 43 44 44 #define TEST_EYEC 0x7e57e1ec 45 struct mystate {45 struct sess_state { 46 46 int eyec; /* TEST_EYEC */ 47 47 os0_t sid; /* the session with which the data was registered */ … … 50 50 }; 51 51 52 static void mycleanup( struct mystate * data, os0_t sid, void * opaque )52 static void mycleanup( struct sess_state * data, os0_t sid, void * opaque ) 53 53 { 54 54 /* sanity */ … … 67 67 } 68 68 69 static __inline__ struct mystate * new_state(os0_t sid, int *freed)69 static __inline__ struct sess_state * new_state(os0_t sid, int *freed) 70 70 { 71 struct mystate *new;72 new = malloc(sizeof(struct mystate));71 struct sess_state *new; 72 new = malloc(sizeof(struct sess_state)); 73 73 CHECK( 1, new ? 1 : 0 ); 74 memset(new, 0, sizeof(struct mystate));74 memset(new, 0, sizeof(struct sess_state)); 75 75 new->eyec = TEST_EYEC; 76 76 new->sid = os0dup(sid, strlen((char *)sid)); … … 106 106 { 107 107 void * testptr = NULL; 108 CHECK( 0, fd_sess_handler_create ( &hdl1, mycleanup, NULL ) );109 CHECK( 0, fd_sess_handler_create ( &hdl2, mycleanup, NULL ) );108 CHECK( 0, fd_sess_handler_create ( &hdl1, mycleanup, NULL, NULL ) ); 109 CHECK( 0, fd_sess_handler_create ( &hdl2, mycleanup, NULL, NULL ) ); 110 110 CHECK( 0, fd_sess_handler_destroy( &hdl2, &testptr ) ); 111 111 CHECK( 1, testptr == NULL ? 1 : 0 ); 112 CHECK( 0, fd_sess_handler_create ( &hdl2, mycleanup, g_opaque ) );113 #if 0 114 fd_ sess_dump_hdl(0, hdl1);115 fd_ sess_dump_hdl(0, hdl2);112 CHECK( 0, fd_sess_handler_create ( &hdl2, mycleanup, NULL, g_opaque ) ); 113 #if 0 114 fd_log_debug("%s\n", fd_sess_dump_hdl(FD_DUMP_TEST_PARAMS, hdl1)); 115 fd_log_debug("%s\n", fd_sess_dump_hdl(FD_DUMP_TEST_PARAMS, hdl2)); 116 116 #endif 117 117 } … … 123 123 CHECK( 0, fd_sess_new( &sess2, TEST_DIAM_ID, CONSTSTRLEN(TEST_DIAM_ID), NULL, 0 ) ); 124 124 #if 0 125 fd_ sess_dump(0, sess1);126 fd_ sess_dump(0, sess2);125 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); 126 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); 127 127 #endif 128 128 … … 141 141 CHECK( 0, fd_sess_new( &sess2, TEST_DIAM_ID, CONSTSTRLEN(TEST_DIAM_ID), TEST_OPT, CONSTSTRLEN(TEST_OPT_IN) - 1 ) ); 142 142 #if 0 143 fd_ sess_dump(0, sess1);144 fd_ sess_dump(0, sess2);143 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); 144 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); 145 145 #endif 146 146 … … 165 165 CHECK( 0, fd_sess_new( &sess2, NULL, 0, TEST_SID, CONSTSTRLEN(TEST_SID_IN) - 1 ) ); 166 166 #if 0 167 fd_ sess_dump(0, sess1);168 fd_ sess_dump(0, sess2);167 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); 168 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); 169 169 #endif 170 170 CHECK( 0, fd_sess_getsid(sess1, &str1, &str1len) ); … … 211 211 /* Test fd_sess_reclaim */ 212 212 { 213 struct mystate *tms;213 struct sess_state *tms; 214 214 215 215 CHECK( 0, fd_sess_fromsid( TEST_SID, CONSTSTRLEN(TEST_SID_IN), &sess1, &new ) ); … … 271 271 /* Test states operations */ 272 272 { 273 struct mystate * ms[6], *tms;273 struct sess_state * ms[6], *tms; 274 274 int freed[6]; 275 275 struct timespec timeout; … … 295 295 296 296 #if 0 297 fd_ sess_dump(0, sess1);297 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); 298 298 #endif 299 299 … … 332 332 333 333 #if 0 334 fd_ sess_dump(0, sess1);335 fd_ sess_dump(0, sess2);336 fd_ sess_dump(0, sess3);334 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); 335 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); 336 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess3, 1)); 337 337 #endif 338 338 … … 357 357 358 358 #if 1 359 fd_ sess_dump(0, sess1);360 fd_ sess_dump(0, sess2);359 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); 360 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); 361 361 #endif 362 362 … … 373 373 CHECK( 0, fd_sess_settimeout( sess2, &timeout) ); 374 374 #if 1 375 fd_ sess_dump(0, sess1);376 fd_ sess_dump(0, sess2);375 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess1, 1)); 376 fd_log_debug("%s\n", fd_sess_dump(FD_DUMP_TEST_PARAMS, sess2, 1)); 377 377 #endif 378 378 timeout.tv_sec = 0;
Note: See TracChangeset
for help on using the changeset viewer.