Changeset 974:2091bf698fb1 in freeDiameter for libfdproto
- Timestamp:
- Mar 15, 2013, 2:14:35 AM (11 years ago)
- Branch:
- default
- Phase:
- public
- Location:
- libfdproto
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
libfdproto/dictionary.c
r972 r974 315 315 { 316 316 if (obj) { 317 TRACE_DEBUG(FULL, "Invalid object : %p \n"317 TRACE_DEBUG(FULL, "Invalid object : %p" 318 318 " obj->objeyec : %x / %x\n" 319 319 " obj->type : %d\n" … … 1282 1282 for (i=0; i<NB_LISTS_PER_OBJ; i++) { 1283 1283 if ((obj->list[i].o == NULL) && (obj->list[i].next != &obj->list[i])) { 1284 fd_log_debug("%*s>%p: list[%d]: \n", indent, "", obj, i);1284 fd_log_debug("%*s>%p: list[%d]:", indent, "", obj, i); 1285 1285 dump_list(&obj->list[i], parents, depth - 1, indent + 2); 1286 1286 } … … 1291 1291 void fd_dict_dump_object(struct dict_object * obj) 1292 1292 { 1293 fd_log_debug("Dictionary object %p dump: \n", obj);1293 fd_log_debug("Dictionary object %p dump:", obj); 1294 1294 dump_object( obj, 1, 2, 2 ); 1295 1295 } … … 1304 1304 CHECK_POSIX_DO( pthread_rwlock_rdlock( &dict->dict_lock ), /* ignore */ ); 1305 1305 1306 fd_log_debug("###################################################### \n");1307 fd_log_debug("###### Dumping vendors, AVPs and related rules ####### \n");1306 fd_log_debug("######################################################"); 1307 fd_log_debug("###### Dumping vendors, AVPs and related rules #######"); 1308 1308 1309 1309 dump_object( &dict->dict_vendors, 0, 3, 0 ); … … 1311 1311 dump_object( li->o, 0, 3, 0 ); 1312 1312 1313 fd_log_debug("###### Dumping applications ####### \n");1313 fd_log_debug("###### Dumping applications #######"); 1314 1314 1315 1315 dump_object( &dict->dict_applications, 0, 1, 0 ); … … 1317 1317 dump_object( li->o, 0, 1, 0 ); 1318 1318 1319 fd_log_debug("###### Dumping types ####### \n");1319 fd_log_debug("###### Dumping types #######"); 1320 1320 1321 1321 dump_list( &dict->dict_types, 0, 2, 0 ); 1322 1322 1323 fd_log_debug("###### Dumping commands per name ####### \n");1323 fd_log_debug("###### Dumping commands per name #######"); 1324 1324 1325 1325 dump_list( &dict->dict_cmd_name, 0, 2, 0 ); 1326 1326 1327 fd_log_debug("###### Dumping commands per code and flags ####### \n");1327 fd_log_debug("###### Dumping commands per code and flags #######"); 1328 1328 1329 1329 dump_list( &dict->dict_cmd_code, 0, 0, 0 ); 1330 1330 1331 fd_log_debug("###### Statistics ####### \n");1331 fd_log_debug("###### Statistics #######"); 1332 1332 1333 1333 for (i=1; i<=DICT_TYPE_MAX; i++) 1334 fd_log_debug(" %5d objects of type %s \n", dict->dict_count[i], dict_obj_info[i].name);1335 1336 fd_log_debug("###################################################### \n");1334 fd_log_debug(" %5d objects of type %s", dict->dict_count[i], dict_obj_info[i].name); 1335 1336 fd_log_debug("######################################################"); 1337 1337 1338 1338 /* Free the rwlock */ … … 1867 1867 TRACE_DEBUG(INFO, "An existing object with different non-key data was found: EEXIST"); 1868 1868 if (TRACE_BOOL(INFO)) { 1869 fd_log_debug("New object to insert: \n");1869 fd_log_debug("New object to insert:"); 1870 1870 dump_object(new, 0, 0, 3); 1871 fd_log_debug("Object already in dictionary: \n");1871 fd_log_debug("Object already in dictionary:"); 1872 1872 dump_object(locref, 0, 0 , 3); 1873 1873 } -
libfdproto/fifo.c
r767 r974 115 115 return; 116 116 117 fd_log_debug("Dumping queue '%s' (%p): \n", name ?: "?", queue);117 fd_log_debug("Dumping queue '%s' (%p):", name ?: "?", queue); 118 118 if (!CHECK_FIFO( queue )) { 119 fd_log_debug(" Queue invalid! \n");119 fd_log_debug(" Queue invalid!"); 120 120 if (queue) 121 fd_log_debug(" (%x != %x) \n", queue->eyec, FIFO_EYEC);121 fd_log_debug(" (%x != %x)", queue->eyec, FIFO_EYEC); 122 122 return; 123 123 } 124 124 125 125 CHECK_POSIX_DO( pthread_mutex_lock( &queue->mtx ), /* continue */ ); 126 fd_log_debug(" %d elements in queue / %d threads waiting \n", queue->count, queue->thrs);127 fd_log_debug(" %d elements max / %d threads waiting to push \n", queue->max, queue->thrs_push);128 fd_log_debug(" thresholds: %d / %d (h:%d), cb: %p,%p (%p), highest: %d \n",126 fd_log_debug(" %d elements in queue / %d threads waiting", queue->count, queue->thrs); 127 fd_log_debug(" %d elements max / %d threads waiting to push", queue->max, queue->thrs_push); 128 fd_log_debug(" thresholds: %d / %d (h:%d), cb: %p,%p (%p), highest: %d", 129 129 queue->high, queue->low, queue->highest, 130 130 queue->h_cb, queue->l_cb, queue->data, … … 135 135 int i = 0; 136 136 for (li = queue->list.next; li != &queue->list; li = li->next) { 137 fd_log_debug(" [%i] item %p in fifo %p: \n", i++, li->o, queue);137 fd_log_debug(" [%i] item %p in fifo %p:", i++, li->o, queue); 138 138 (*dump_item)(level, li->o); 139 139 } -
libfdproto/init.c
r740 r974 40 40 if (TRACE_BOOL(ANNOYING)) { 41 41 if (str) { 42 fd_log_debug("(Thread '%s' terminating) \n", (char *)str);42 fd_log_debug("(Thread '%s' terminating)", (char *)str); 43 43 } 44 44 } -
libfdproto/log.c
r966 r974 166 166 if (TRACE_BOOL(ANNOYING)) { 167 167 if (val) { 168 fd_log_debug("(Thread '%s' renamed to '%s') \n", (char *)val, name?:"(nil)");168 fd_log_debug("(Thread '%s' renamed to '%s')", (char *)val, name?:"(nil)"); 169 169 } else { 170 fd_log_debug("(Thread %p named '%s') \n", pthread_self(), name?:"(nil)");170 fd_log_debug("(Thread %p named '%s')", pthread_self(), name?:"(nil)"); 171 171 } 172 172 } -
libfdproto/messages.c
r961 r974 829 829 char *outstr; 830 830 size_t offset, outlen; 831 CHECK_FCT_DO( dump_init_str(&outstr, &offset, &outlen), { fd_log_debug_fstr(fstr, "Error initializing string for dumping %p \n", msg); return; } );831 CHECK_FCT_DO( dump_init_str(&outstr, &offset, &outlen), { fd_log_debug_fstr(fstr, "Error initializing string for dumping %p", msg); return; } ); 832 832 do { 833 833 CHECK_FCT_DO( msg_dump_intern ( NONE, ref, indent, &outstr, &offset, &outlen ), 834 fd_log_debug_fstr(fstr, "Error while dumping %p \n", ref) );834 fd_log_debug_fstr(fstr, "Error while dumping %p", ref) ); 835 835 836 836 /* Now find the next object */ … … 841 841 842 842 /* now really output this in one shot, so it is not interrupted */ 843 fd_log_debug_fstr(fstr, "%s \n", outstr);843 fd_log_debug_fstr(fstr, "%s", outstr); 844 844 845 845 free(outstr); … … 849 849 char *outstr; 850 850 size_t offset, outlen; 851 CHECK_FCT_DO( dump_init_str(&outstr, &offset, &outlen), { fd_log_debug_fstr(fstr, "Error initializing string for dumping %p \n", msg); return; } );851 CHECK_FCT_DO( dump_init_str(&outstr, &offset, &outlen), { fd_log_debug_fstr(fstr, "Error initializing string for dumping %p", msg); return; } ); 852 852 CHECK_FCT_DO( msg_dump_intern ( NONE, msg, 2, &outstr, &offset, &outlen ), 853 fd_log_debug_fstr(fstr, "Error while dumping %p \n", msg) );853 fd_log_debug_fstr(fstr, "Error while dumping %p", msg) ); 854 854 /* now really output this in one shot, so it is not interrupted */ 855 fd_log_debug_fstr(fstr, "%s \n", outstr);855 fd_log_debug_fstr(fstr, "%s", outstr); 856 856 857 857 free(outstr); … … 866 866 size_t offset, outlen; 867 867 CHECK_FCT_DO( dump_init_str(&outstr, &offset, &outlen), 868 { fd_log_debug_fstr(fd_g_debug_fstr, "Error initializing string for dumping %p \n", obj); return; } );868 { fd_log_debug_fstr(fd_g_debug_fstr, "Error initializing string for dumping %p", obj); return; } ); 869 869 870 870 do { 871 871 CHECK_FCT_DO( msg_dump_intern ( level, ref, indent, &outstr, &offset, &outlen ), 872 fd_log_debug_fstr(fd_g_debug_fstr, "Error while dumping %p \n", ref) );872 fd_log_debug_fstr(fd_g_debug_fstr, "Error while dumping %p", ref) ); 873 873 874 874 /* Now find the next object */ … … 892 892 size_t offset, outlen; 893 893 CHECK_FCT_DO( dump_init_str(&outstr, &offset, &outlen), 894 { fd_log_debug_fstr(fd_g_debug_fstr, "Error initializing string for dumping %p \n", obj); return; } );894 { fd_log_debug_fstr(fd_g_debug_fstr, "Error initializing string for dumping %p", obj); return; } ); 895 895 CHECK_FCT_DO( msg_dump_intern ( level, obj, 1, &outstr, &offset, &outlen ), 896 fd_log_debug_fstr(fd_g_debug_fstr, "Error while dumping %p \n", obj) );896 fd_log_debug_fstr(fd_g_debug_fstr, "Error while dumping %p", obj) ); 897 897 TRACE_DEBUG(level, "------ Dumping object %p (s)-------", obj); 898 898 TRACE_DEBUG(level, "%s", outstr); -
libfdproto/msg_log.c
r928 r974 181 181 (void)pthread_mutex_unlock(&fd_log_lock); 182 182 183 fd_log_debug_fstr(fstr, " \n Logged: %s\n", buftime);183 fd_log_debug_fstr(fstr, " Logged: %s", buftime); 184 184 185 185 /* And now the message itself */ -
libfdproto/sessions.c
r928 r974 882 882 return; 883 883 884 fd_log_debug("\t %*s -- Session @%p -- \n", level, "", session);884 fd_log_debug("\t %*s -- Session @%p --", level, "", session); 885 885 if (!VALIDATE_SI(session)) { 886 fd_log_debug("\t %*s Invalid session object \n", level, "");886 fd_log_debug("\t %*s Invalid session object", level, ""); 887 887 } else { 888 888 889 fd_log_debug("\t %*s sid '%s'(%zd), hash %x, msg %d, destroyed %d \n", level, "", session->sid, session->sidlen, session->hash, session->msg_cnt, session->is_destroyed);889 fd_log_debug("\t %*s sid '%s'(%zd), hash %x, msg %d, destroyed %d", level, "", session->sid, session->sidlen, session->hash, session->msg_cnt, session->is_destroyed); 890 890 891 891 strftime(buf, sizeof(buf), "%D,%T", localtime_r( &session->timeout.tv_sec , &tm )); 892 fd_log_debug("\t %*s timeout %s.%09ld \n", level, "", buf, session->timeout.tv_nsec);892 fd_log_debug("\t %*s timeout %s.%09ld", level, "", buf, session->timeout.tv_nsec); 893 893 894 894 CHECK_POSIX_DO( pthread_mutex_lock(&session->stlock), /* ignore */ ); … … 896 896 for (li = session->states.next; li != &session->states; li = li->next) { 897 897 struct state * st = (struct state *)(li->o); 898 fd_log_debug("\t %*s handler %d registered data %p \n", level, "", st->hdl->id, st->state);898 fd_log_debug("\t %*s handler %d registered data %p", level, "", st->hdl->id, st->state); 899 899 } 900 900 pthread_cleanup_pop(0); 901 901 CHECK_POSIX_DO( pthread_mutex_unlock(&session->stlock), /* ignore */ ); 902 902 } 903 fd_log_debug("\t %*s -- end of session @%p -- \n", level, "", session);903 fd_log_debug("\t %*s -- end of session @%p --", level, "", session); 904 904 } 905 905 … … 909 909 return; 910 910 911 fd_log_debug("\t %*s -- Handler @%p -- \n", level, "", handler);911 fd_log_debug("\t %*s -- Handler @%p --", level, "", handler); 912 912 if (!VALIDATE_SH(handler)) { 913 fd_log_debug("\t %*s Invalid session handler object \n", level, "");913 fd_log_debug("\t %*s Invalid session handler object", level, ""); 914 914 } else { 915 fd_log_debug("\t %*s id %d, cleanup %p, opaque %p \n", level, "", handler->id, handler->cleanup, handler->opaque);916 } 917 fd_log_debug("\t %*s -- end of handler @%p -- \n", level, "", handler);915 fd_log_debug("\t %*s id %d, cleanup %p, opaque %p", level, "", handler->id, handler->cleanup, handler->opaque); 916 } 917 fd_log_debug("\t %*s -- end of handler @%p --", level, "", handler); 918 918 } 919 919
Note: See TracChangeset
for help on using the changeset viewer.