Changeset 968:652713ce3596 in freeDiameter

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

Files:

• include/freeDiameter/libfdcore.h (modified) (3 diffs)
• include/freeDiameter/libfdcore.h (modified) (1 diff)
• libfdcore/fdd.l (modified) (1 diff)
• libfdcore/peers.c (modified) (1 diff)
• libfdcore/peers.c (modified) (2 diffs)

include/freeDiameter/libfdcore.h

@@ -87 +87 @@
 
 /* Parse the freeDiameter.conf configuration file, load the extensions */
-int fd_core_parseconf(char * conffile);
+int fd_core_parseconf(const char * conffile);
 
 /* Start the server & client threads */
@@ -111 +111 @@
         int              cnf_eyec;      /* Eye catcher: EYEC_CONFIG */
         
-        char            *cnf_file;      /* Configuration file to parse, default is DEFAULT_CONF_FILE */
+        const char      *cnf_file;      /* Configuration file to parse, default is DEFAULT_CONF_FILE */
         
         DiamId_t         cnf_diamid;    /* Diameter Identity of the local peer (FQDN -- ASCII) */
@@ -350 +350 @@
  *    ENOMEM    : Memory allocation for the new object element failed.)
  */
-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 );
 
 /*

include/freeDiameter/libfdcore.h

@@ -385 +385 @@
 int fd_peer_get_state(struct peer_hdr *peer);
 
+/* 
+ * FUNCTION:    fd_peer_get_load_pending
+ *
+ * PARAMETERS:
+ *  peer        : The peer which load to read
+ *
+ * DESCRIPTION: 
+ *   Returns the current number of requests sent to this peer
+ *  that have not been answered yet. This is an empirical indication
+ *  of the workload of this peer.
+ *
+ * RETURN VALUE:
+ *  0  : The load parameter has been updated. (it should have a positive value always)
+ * !0  : An error occurred
+ */
+int fd_peer_get_load_pending(struct peer_hdr *peer, int * load);
+
 /*
  * FUNCTION:    fd_peer_validate_register

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>");