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

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.h (modified) (5 diffs)

extensions/rt_redirect/rt_redir.h

@@ -1 +1 @@
 /*********************************************************************************************************
 * Software License Agreement (BSD License)                                                               *
-* Author: Sebastien Decugis <sdecugis@freediameter.net>                                                  *
-*                                                                                                        *
-* Copyright (c) 2013, WIDE Project and NICT                                                              *
+* Author: Sebastien Decugis <sdecugis@freediameter.net> and                                              *
+* Thomas Klausner <tk@giga.or.at>                                                                        *
+*                                                                                                        *
+* Copyright (c) 2013, 2014, WIDE Project and NICT                                                        *
 * All rights reserved.                                                                                   *
 *                                                                                                        *
@@ -36 +37 @@
 /* Diameter Redirect management */
 #include <freeDiameter/extension.h>
+
+#include "uthash.h"
 
 /* There are 2 locks in this module. The priority is established as follow to avoid deadlocks:
@@ -130 +133 @@
         struct fd_list   target_peers_list; /* The list of Redirect-Hosts for this entry */
 
-        struct timespec  timeout;  /* When does this entry expires? */
+        struct timespec  timeout;  /* When does this entry expire? */
         struct fd_list   exp_list; /* chain in the expire_list list, ordered by expiration date, protected by exp_peer_lock */
 
-        enum redir_h_u type;  /* Type of this entry */
+        enum redir_h_u type;       /* Type of this entry */
         struct fd_list redir_list; /* link in redirects_usages lists. Lists are ordered by the data value. Protected by rw locks */
-        union matchdata data;   /* The strings are duplicated & must be freed in this structure */
+        union matchdata data;      /* The strings are duplicated & must be freed in this structure */
+        UT_hash_handle hh;         /* magic entry for hash table */
 };
 
@@ -145 +149 @@
 };
 extern struct redir_line redirects_usages[];
+/* the hash table where entries are stored for ALL_SESSION and ALL_USER */
+extern struct redir_entry *redirect_hash_table[];
 
 /* Accelerator to the line lock */
@@ -158 +164 @@
 /* Functions on redir_entry */
 int redir_entry_init();
+int redir_entry_fini();
 int redir_entry_new(struct redir_entry ** e, struct fd_list * targets, uint32_t rhu, struct msg * qry, DiamId_t nh, size_t nhlen, os0_t oh, size_t ohlen);
 extern int (*redir_entry_cmp_key[])(union matchdata * , union matchdata *); /* compare functions */