Changeset 1260:4f6f61e67599 in freeDiameter for extensions/rt_redirect/rt_redir.c

Timestamp:

Mar 24, 2014, 9:21:41 PM (10 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Store redirect information for ALL_SESSION and ALL_USER in a hash.

This is a speedup if many of these exist (compared to checking a
linked list for matches as before).

Refactor a bit while here.

Use the uthash code from Troy D. Hanson,
​http://troydhanson.github.com/uthash/

File:

• extensions/rt_redirect/rt_redir.c (modified) (3 diffs)

extensions/rt_redirect/rt_redir.c

@@ -1 +1 @@
 /*********************************************************************************************************
 * Software License Agreement (BSD License)                                                               *
-* Author: Sebastien Decugis <sdecugis@freediameter.net>                                                  *
+* Authors: Sebastien Decugis <sdecugis@freediameter.net>                                                 *
+* and Thomas Klausner <tk@giga.or.at>                                                                    *
 *                                                                                                        *
-* Copyright (c) 2011, WIDE Project and NICT                                                              *
+* Copyright (c) 2011, 2014, WIDE Project and NICT                                                        *
 * All rights reserved.                                                                                   *
 *                                                                                                        *
@@ -72 +73 @@
 void fd_ext_fini(void)
 {
-        int i;
-
         /* Unregister the callbacks */
         if (fwd_hdl) {
@@ -86 +85 @@
 
         /* Empty all entries */
-        CHECK_POSIX_DO( pthread_mutex_lock(&redir_exp_peer_lock),   );
-        for (i = 0; i <= H_U_MAX; i++) {
-                CHECK_POSIX_DO( pthread_rwlock_wrlock( &redirects_usages[i].lock), );
-                while (!FD_IS_LIST_EMPTY(&redirects_usages[i].sentinel)) {
-                        struct redir_entry * e = redirects_usages[i].sentinel.next->o;
-                        fd_list_unlink(&e->redir_list);
-                        CHECK_FCT_DO( redir_entry_destroy(e), );
-                }
-                CHECK_POSIX_DO( pthread_rwlock_unlock( &redirects_usages[i].lock), );
-                CHECK_POSIX_DO( pthread_rwlock_destroy( &redirects_usages[i].lock), );
-        }
-        CHECK_POSIX_DO( pthread_mutex_unlock(&redir_exp_peer_lock),   );
+        redir_entry_fini();
 
         return;