Changeset 968:652713ce3596 in freeDiameter for libfdcore

Timestamp:

Mar 12, 2013, 11:47:53 PM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Parents:

967:bbc08d58325a (diff), 940:9b00b868e308 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

merge main

Location:

libfdcore

Files:

• fdd.l (modified) (1 diff)
• peers.c (modified) (1 diff)
• peers.c (modified) (2 diffs)

libfdcore/fdd.l

@@ -52 +52 @@
         yylloc->first_column = yylloc->last_column + 1;                 \
         yylloc->last_column = yylloc->first_column + yyleng - 1;        \
-        TRACE_DEBUG_ERROR(                                              \
+        fd_log_debug(                                                   \
                 "(%d:%d-%d:%d) matched rule %d, length=%d, txt='%s'\n", \
                 yylloc->first_line, yylloc->first_column,               \

libfdcore/peers.c

@@ -91 +91 @@
 
 /* Add a new peer entry */
-int fd_peer_add ( struct peer_info * info, char * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data )
+int fd_peer_add ( struct peer_info * info, const char * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data )
 {
         struct fd_peer *p = NULL;

libfdcore/peers.c

@@ -257 +257 @@
 }
 
+/* Return the value of srlist->cnt */
+int fd_peer_get_load_pending(struct peer_hdr *peer, int * load)
+{
+        struct fd_peer * p = (struct fd_peer *)peer;
+        TRACE_ENTRY("%p %p", peer, load);
+        CHECK_PARAMS(CHECK_PEER(peer) && load);
+        
+        CHECK_POSIX( pthread_mutex_lock(&p->p_sr.mtx) );
+        *load = p->p_sr.cnt;
+        CHECK_POSIX( pthread_mutex_unlock(&p->p_sr.mtx) );
+        
+        return 0;
+}
+
+
 /* Destroy a structure once cleanups have been performed (fd_psm_abord, ...) */
 int fd_peer_free(struct fd_peer ** ptr)
@@ -395 +410 @@
         }
 
-        fd_log_debug(">  %s\t%s", STATE_STR(fd_peer_getstate(peer)), peer->p_hdr.info.pi_diamid);
+        fd_log_debug(">  %s\t%s\t[%dsr]", STATE_STR(fd_peer_getstate(peer)), peer->p_hdr.info.pi_diamid, peer->p_sr.cnt);
         if (details > INFO) {
                 fd_log_debug("\t(rlm:%s)", peer->p_hdr.info.runtime.pir_realm ?: "<unknown>");