# HG changeset patch # User Sebastien Decugis # Date 1292894986 -32400 # Node ID 69d3579f6c6cd3b16daeedc60ca94ca6056a3748 # Parent 237cf633954651f1cb83827220bc07c07fa2c7ba First version of dbg_interactive is complete diff -r 237cf6339546 -r 69d3579f6c6c contrib/debian/changelog --- a/contrib/debian/changelog Mon Dec 20 19:36:40 2010 +0900 +++ b/contrib/debian/changelog Tue Dec 21 10:29:46 2010 +0900 @@ -1,12 +1,12 @@ freediameter (1.0.3) UNRELEASED; urgency=low - * Added parameters to fd_disp_register and fd_sess_handler_create, - Bumped API version number accordingly. * Fixed a couple of issues for portability (#21, #22, #23) * Fixed issue with ListenOn bit ordering (#20) * Added dictionary support for MIPv6 application objects. * Added dictionary support for legacy XML files. - * Added new debug extension based on python (experimental). + * Added python interface dbg_interactive (experimental). + * Added parameters to fd_disp_register() and fd_sess_handler_create(), + Bumped API version number accordingly. -- Sebastien Decugis Tue, 14 Dec 2010 11:39:29 +0900 diff -r 237cf6339546 -r 69d3579f6c6c doc/dbg_interactive.py.sample --- a/doc/dbg_interactive.py.sample Mon Dec 20 19:36:40 2010 +0900 +++ b/doc/dbg_interactive.py.sample Tue Dec 21 10:29:46 2010 +0900 @@ -647,8 +647,10 @@ ############# PEERS ############ # Get the list of peers defined in the system -# (well, we are supposed actually to readlock fd_g_peers_rw before doing this, but it should be fine most of the time) +# (we are supposed to readlock fd_g_peers_rw before accessing this list) +cvar.fd_g_peers_rw.rdlock() peers = cvar.fd_g_peers.enum_as("struct peer_hdr *") +cvar.fd_g_peers_rw.unlock() for p in peers: print "Peer:", p.info.pi_diamid @@ -726,3 +728,23 @@ fd_ep_dump(0, np.pi_endpoints) + +############# POSIX functions wrappers ############ + +# The interface also provides wrappers around base POSIX +# synchronization functions: + +m = pthread_mutex_t() +m.lock() +m.unlock() + +c = pthread_cond_t() +c.signal() +c.broadcast() +c.wait(m) +c.timedwait(m, 5) # it takes a relative time + +r = pthread_rwlock_t() +r.rdlock() +r.unlock() +r.wrlock() diff -r 237cf6339546 -r 69d3579f6c6c extensions/dbg_interactive/CMakeLists.txt --- a/extensions/dbg_interactive/CMakeLists.txt Mon Dec 20 19:36:40 2010 +0900 +++ b/extensions/dbg_interactive/CMakeLists.txt Tue Dec 21 10:29:46 2010 +0900 @@ -27,6 +27,7 @@ peers.i events.i endpoints.i + posix.i ) SET_SOURCE_FILES_PROPERTIES(dbg_interactive.i PROPERTIES SWIG_MODULE_NAME fDpy) diff -r 237cf6339546 -r 69d3579f6c6c extensions/dbg_interactive/dbg_interactive.i --- a/extensions/dbg_interactive/dbg_interactive.i Mon Dec 20 19:36:40 2010 +0900 +++ b/extensions/dbg_interactive/dbg_interactive.i Tue Dec 21 10:29:46 2010 +0900 @@ -177,3 +177,5 @@ %include "peers.i" %include "events.i" %include "endpoints.i" + +%include "posix.i" diff -r 237cf6339546 -r 69d3579f6c6c extensions/dbg_interactive/posix.i --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/extensions/dbg_interactive/posix.i Tue Dec 21 10:29:46 2010 +0900 @@ -0,0 +1,194 @@ +/********************************************************************************************************* +* Software License Agreement (BSD License) * +* Author: Sebastien Decugis * +* * +* Copyright (c) 2010, WIDE Project and NICT * +* All rights reserved. * +* * +* Redistribution and use of this software in source and binary forms, with or without modification, are * +* permitted provided that the following conditions are met: * +* * +* * Redistributions of source code must retain the above * +* copyright notice, this list of conditions and the * +* following disclaimer. * +* * +* * Redistributions in binary form must reproduce the above * +* copyright notice, this list of conditions and the * +* following disclaimer in the documentation and/or other * +* materials provided with the distribution. * +* * +* * Neither the name of the WIDE Project or NICT nor the * +* names of its contributors may be used to endorse or * +* promote products derived from this software without * +* specific prior written permission of WIDE Project and * +* NICT. * +* * +* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED * +* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A * +* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR * +* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * +* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * +* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR * +* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * +* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * +*********************************************************************************************************/ + +/* Do not include this directly, use dbg_interactive.i instead */ + +/****** POSIX wrappers around useful functions for fD *********/ + +/**** MUTEX ****/ +typedef struct pthread_mutex_swig { +} pthread_mutex_t; + +%extend pthread_mutex_t { + pthread_mutex_t() { + int ret = 0; + pthread_mutex_t * r = calloc(1, sizeof(pthread_mutex_t)); + if (!r) { + DI_ERROR_MALLOC; + return NULL; + } + ret = pthread_mutex_init(r, NULL); + if (ret) { + DI_ERROR(ret, NULL, NULL); + free(r); + return NULL; + } + return r; + } + ~pthread_mutex_t() { + int ret = 0; + ret = pthread_mutex_destroy($self); + if (ret) { + DI_ERROR(ret, NULL, NULL); + return; + } + free($self); + return; + } + void lock() { + int ret = pthread_mutex_lock($self); + if (ret) { + DI_ERROR(ret, NULL, NULL); + } + } + void unlock() { + int ret = pthread_mutex_unlock($self); + if (ret) { + DI_ERROR(ret, NULL, NULL); + } + } +} + +/**** CONDVAR ****/ +typedef struct pthread_cond_swig { +} pthread_cond_t; + +%extend pthread_cond_t { + pthread_cond_t() { + int ret = 0; + pthread_cond_t * r = calloc(1, sizeof(pthread_cond_t)); + if (!r) { + DI_ERROR_MALLOC; + return NULL; + } + ret = pthread_cond_init(r, NULL); + if (ret) { + DI_ERROR(ret, NULL, NULL); + free(r); + return NULL; + } + return r; + } + ~pthread_cond_t() { + int ret = 0; + ret = pthread_cond_destroy($self); + if (ret) { + DI_ERROR(ret, NULL, NULL); + return; + } + free($self); + return; + } + void signal() { + int ret = pthread_cond_signal($self); + if (ret) { + DI_ERROR(ret, NULL, NULL); + } + } + void broadcast() { + int ret = pthread_cond_broadcast($self); + if (ret) { + DI_ERROR(ret, NULL, NULL); + } + } + void wait(pthread_mutex_t * mutex) { + int ret = pthread_cond_wait($self, mutex); + if (ret) { + DI_ERROR(ret, NULL, NULL); + } + } + void timedwait(pthread_mutex_t * mutex, long seconds) { + struct timespec ts; + int ret; + + clock_gettime(CLOCK_REALTIME, &ts); + ts.tv_sec += seconds; + + ret = pthread_cond_timedwait($self, mutex, &ts); + if (ret && (ret != ETIMEDOUT)) { + DI_ERROR(ret, NULL, NULL); + } + } +} + +/**** RWLOCK ****/ +typedef struct pthread_rwlock_swig { +} pthread_rwlock_t; + +%extend pthread_rwlock_t { + pthread_rwlock_t() { + int ret = 0; + pthread_rwlock_t * r = calloc(1, sizeof(pthread_rwlock_t)); + if (!r) { + DI_ERROR_MALLOC; + return NULL; + } + ret = pthread_rwlock_init(r, NULL); + if (ret) { + DI_ERROR(ret, NULL, NULL); + free(r); + return NULL; + } + return r; + } + ~pthread_rwlock_t() { + int ret = 0; + ret = pthread_rwlock_destroy($self); + if (ret) { + DI_ERROR(ret, NULL, NULL); + return; + } + free($self); + return; + } + void rdlock() { + int ret = pthread_rwlock_rdlock($self); + if (ret) { + DI_ERROR(ret, NULL, NULL); + } + } + void wrlock() { + int ret = pthread_rwlock_wrlock($self); + if (ret) { + DI_ERROR(ret, NULL, NULL); + } + } + void unlock() { + int ret = pthread_rwlock_unlock($self); + if (ret) { + DI_ERROR(ret, NULL, NULL); + } + } +}