sr-dev

sr-dev@lists.kamailio.org

17 participants
44126 discussions

git:janakj/flatstore: Remove km_Makefile and km_README.

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 0d5350a936bf90e3395d2439815cf57146a162c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d5350a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 16:33:42 2009 +0100 Remove km_Makefile and km_README. --- modules/db_flatstore/km_Makefile | 10 -- modules/db_flatstore/km_README | 168 -------------------------------------- 2 files changed, 0 insertions(+), 178 deletions(-) diff --git a/modules/db_flatstore/km_Makefile b/modules/db_flatstore/km_Makefile deleted file mode 100644 index 6cd413c..0000000 --- a/modules/db_flatstore/km_Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $Id$ -# -# WARNING: do not run this directly, it should be run by the master Makefile - -include ../../Makefile.defs -auto_gen= -NAME=db_flatstore.so -LIBS= - -include ../../Makefile.modules diff --git a/modules/db_flatstore/km_README b/modules/db_flatstore/km_README deleted file mode 100644 index ee2427f..0000000 --- a/modules/db_flatstore/km_README +++ /dev/null @@ -1,168 +0,0 @@ -Flatstore Module - -Jan Janak - - FhG FOKUS - -Edited by - -Jan Janak - - Copyright � 2004, 2005 FhG FOKUS - Revision History - Revision $Revision$ $Date: 2008-08-06 12:08:33 +0200 - (Mi, 06 Aug 2008) $ - __________________________________________________________ - - Table of Contents - - 1. Admin Guide - - 1.1. Overview - - 1.1.1. Rotating Log Files - - 1.2. Dependencies - - 1.2.1. Kamailio Modules - 1.2.2. External Libraries or Applications - - 1.3. Exported Parameters - - 1.3.1. flush (integer) - - 1.4. Exported Functions - 1.5. Exported MI Functions - - 1.5.1. flat_rotate - - 2. Developer Guide - - List of Examples - - 1.1. Set "flush" parameter - -Chapter 1. Admin Guide - -1.1. Overview - - Flatstore is one of so-called Kamailio database modules. It - does not export any functions executable from the configuration - scripts, but it exports a subset of functions from the database - API and thus other module can use it instead of, for example, - mysql module. - - The module does not export all functions of the database API, - it supports only one function, insert. The module is limited - but very fast. It is especially suitable for storing accounting - information on sites with extremely high traffic. If MySQL is - too slow or if you get a huge amount of accounting data then - you can consider using this module. Note that the acc module is - the only module that was tested with flastore. - - The format of the files produced by this module is plain text. - Each line consists of several fields, fields are separated by | - character. New information is always appended at the end of the - file, searching, deleting and updating of existing data is not - supported by the module. - - The acc module can be configured to use flatstore module as - database backend using the db_url_parameter: -modparam("acc", "db_url", "flatstore:/var/log/acc") - - This configuration options tells acc module that it should use - the flatstore module and the flatstore module should create all - files in /var/log/acc directory. The directory must exist and - Kamailio processes must have permissions to create files in - that directory. - - Name of files in that directory will follow the following - pattern: -<table_name>_<process_name>.log - - For example, entries writen by Kamailio process 8 into acc - table would be written in file acc_8.log. For each table there - will be several files, one file for every Kamailio process that - wrote some data into that table. The main reason why there are - several files for each table is that it is much faster to have - one file per process, because it does not require any locking - and thus Kamailio processes will not block each other. To get - the complete data for a table you can simply concatenate the - contents of files with the same table name but different - process id. - -1.1.1. Rotating Log Files - - There is a new Kamailio MI (management interface) command - called flat_rotate. When Kamailio receives the command then it - will close and reopen all files used by flatstore module. The - rotation itself has to be done by another application (such as - logrotate). Follow these steps to rotate files generated by - flatstore module: - * Rename the files that you want to rotate: -cd /var/log/acc -mv acc_1.log acc_1.log.20050605 -mv acc_2.log acc_2.log.20050605 -mv acc_4.log acc_3.log.20050605 -... - - Note that at this point Kamailio will still be writing all - data into the renamed files. - * Send Kamailio the MI command to close and reopen the - renamed files. For example, using FIFO: -kamctl fifo flat_rotate - - This will force Kamailio to close the renamed files and - open new ones with original names, such as acc_1.log. New - files will be open at the point when Kamailio has some data - to write. It is normal that the files will be not created - immediately if there is no traffic on the proxy server. - * Move the renamed files somewhere else and process them. - -1.2. Dependencies - -1.2.1. Kamailio Modules - - The following modules must be loaded before this module: - * No dependencies on other Kamailio modules. - -1.2.2. External Libraries or Applications - - The following libraries or applications must be installed - before running Kamailio with this module loaded: - * None. - -1.3. Exported Parameters - -1.3.1. flush (integer) - - Enable or disable flushing after each write. - - Default value is 1. - - Example 1.1. Set "flush" parameter -... -modparam("db_flatstore", "flush", 0) -... - -1.4. Exported Functions - - There are no function exported to routing script. - -1.5. Exported MI Functions - -1.5.1. flat_rotate - - It changes the name of the files where it is written. - - Name: flat_rotate - - Parameters: none - - MI FIFO Command Format: - :flat_rotate:_reply_fifo_file_ - _empty_line_ - -Chapter 2. Developer Guide - - The module implements the DB API.

15 years, 10 months

git:janakj/flatstore: Align defines protecting header files with filenames.

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: c9658e67196928556779f5031f559b20db2094c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c9658e6… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 16:38:55 2009 +0100 Align defines protecting header files with filenames. --- modules/db_flatstore/km_flat_con.h | 6 +++--- modules/db_flatstore/km_flat_id.h | 6 +++--- modules/db_flatstore/km_flat_mi.h | 6 +++--- modules/db_flatstore/km_flat_pool.h | 6 +++--- modules/db_flatstore/km_flatstore.h | 6 +++--- modules/db_flatstore/km_flatstore_mod.h | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/db_flatstore/km_flat_con.h b/modules/db_flatstore/km_flat_con.h index 7139e2d..ae02a30 100644 --- a/modules/db_flatstore/km_flat_con.h +++ b/modules/db_flatstore/km_flat_con.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _FLAT_CON_H -#define _FLAT_CON_H +#ifndef _KM_FLAT_CON_H +#define _KM_FLAT_CON_H #include <stdio.h> #include <time.h> @@ -62,4 +62,4 @@ void flat_free_connection(struct flat_con* con); int flat_reopen_connection(struct flat_con* con); -#endif /* _FLAT_CON_H */ +#endif /* _KM_FLAT_CON_H */ diff --git a/modules/db_flatstore/km_flat_id.h b/modules/db_flatstore/km_flat_id.h index 44d4c84..fb87e53 100644 --- a/modules/db_flatstore/km_flat_id.h +++ b/modules/db_flatstore/km_flat_id.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _FLAT_ID_H -#define _FLAT_ID_H +#ifndef _KM_FLAT_ID_H +#define _KM_FLAT_ID_H #include "../../str.h" @@ -52,4 +52,4 @@ unsigned char cmp_flat_id(struct flat_id* id1, struct flat_id* id2); void free_flat_id(struct flat_id* id); -#endif /* _FLAT_ID_H */ +#endif /* _KM_FLAT_ID_H */ diff --git a/modules/db_flatstore/km_flat_mi.h b/modules/db_flatstore/km_flat_mi.h index 0ae18e5..5309fad 100644 --- a/modules/db_flatstore/km_flat_mi.h +++ b/modules/db_flatstore/km_flat_mi.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _FLATSTORE_MI_H_ -#define _FLATSTORE_MI_H_ +#ifndef _KM_FLAT_MI_H_ +#define _KM_FLAT_MI_H_ #include "../../mi/mi.h" @@ -31,5 +31,5 @@ struct mi_root* mi_flat_rotate_cmd(struct mi_root* cmd, void* param); -#endif /* _FLATSTORE_MI_H_ */ +#endif /* _KM_FLAT_MI_H_ */ diff --git a/modules/db_flatstore/km_flat_pool.h b/modules/db_flatstore/km_flat_pool.h index 1eaab69..8c103fc 100644 --- a/modules/db_flatstore/km_flat_pool.h +++ b/modules/db_flatstore/km_flat_pool.h @@ -22,8 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef _FLAT_POOL_H -#define _FLAT_POOL_H +#ifndef _KM_FLAT_POOL_H +#define _KM_FLAT_POOL_H #include "flat_con.h" @@ -47,4 +47,4 @@ void flat_release_connection(struct flat_con* con); */ int flat_rotate_logs(void); -#endif /* _FLAT_POOL_H */ +#endif /* _KM_FLAT_POOL_H */ diff --git a/modules/db_flatstore/km_flatstore.h b/modules/db_flatstore/km_flatstore.h index 08dd4b2..fa79a34 100644 --- a/modules/db_flatstore/km_flatstore.h +++ b/modules/db_flatstore/km_flatstore.h @@ -28,8 +28,8 @@ * 2003-03-16 flags export parameter added (janakj) */ -#ifndef _FLATSTORE_H -#define _FLATSTORE_H +#ifndef _KM_FLATSTORE_H +#define _KM_FLATSTORE_H #include "../../db/db_val.h" #include "../../db/db_key.h" @@ -64,4 +64,4 @@ int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, const int n); -#endif /* _FLATSTORE_H */ +#endif /* _KM_FLATSTORE_H */ diff --git a/modules/db_flatstore/km_flatstore_mod.h b/modules/db_flatstore/km_flatstore_mod.h index f07a58e..7a71406 100644 --- a/modules/db_flatstore/km_flatstore_mod.h +++ b/modules/db_flatstore/km_flatstore_mod.h @@ -27,8 +27,8 @@ * 2003-03-16 flags export parameter added (janakj) */ -#ifndef FLATSTORE_MOD_H -#define FLATSTORE_MOD_H +#ifndef KM_FLATSTORE_MOD_H +#define KM_FLATSTORE_MOD_H #include <time.h> @@ -64,4 +64,4 @@ extern time_t* flat_rotate; extern time_t local_timestamp; -#endif /* FLATSTORE_MOD_H */ +#endif /* KM_FLATSTORE_MOD_H */

15 years, 10 months

git:janakj/flatstore: Merge branch 'master' of ssh://janakj@git.sip-router. org/sip-router into flatstore

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: ffb2f540c9c7865cf44308697d623995294933b7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ffb2f54… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 15:01:08 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into flatstore * 'master' of ssh://janakj@git.sip-router.org/sip-router: (119 commits) Integrate functions and parameters from kamailio sources. Ignore emacs backup and lock files. Various changes to get rid of conflicts and make km_ files compile. Fixed matching of db flags names at the beginning of line. Two small fixes in regular expressions. Module renamed to db_postgres. Merged contents of km_Makefile (namely pg_config autodetection). Removed km_Makefile and km_README. Updated filenames of locally includede header files Align defines protecting headers with filenames. Link with both srdb1 and srdb2 SER to sip-router module conversion script. Kamailio to sip-router module conversion script. Remove compiler warning about uninitialized variable. Make the module compile in the sip-router tree. - fix regression during value conversion when input SQL string is NULL, - another error condition fix for a problem that gets introduced by a - add one DBG log to each drivers error condition, that the mem is freed - improve two errors messages, inform the user that the query is aborted - db_postgres_convert_rows needs to free the row_buf on all error conditions ... ---

15 years, 10 months

git:janakj/flatstore: Added prefix km_ to locally included header files.

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 619951f5cf36ee3c826c2ddeb248f1574be086b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=619951f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 16:43:09 2009 +0100 Added prefix km_ to locally included header files. --- modules/db_flatstore/km_flat_con.c | 4 ++-- modules/db_flatstore/km_flat_con.h | 2 +- modules/db_flatstore/km_flat_id.c | 2 +- modules/db_flatstore/km_flat_mi.c | 2 +- modules/db_flatstore/km_flat_pool.c | 4 ++-- modules/db_flatstore/km_flat_pool.h | 2 +- modules/db_flatstore/km_flatstore.c | 8 ++++---- modules/db_flatstore/km_flatstore_mod.c | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/db_flatstore/km_flat_con.c b/modules/db_flatstore/km_flat_con.c index d415ba2..7321b65 100644 --- a/modules/db_flatstore/km_flat_con.c +++ b/modules/db_flatstore/km_flat_con.c @@ -27,8 +27,8 @@ #include "../../mem/mem.h" #include "../../dprint.h" #include "../../ut.h" -#include "flatstore_mod.h" -#include "flat_con.h" +#include "km_flatstore_mod.h" +#include "km_flat_con.h" #define FILE_SUFFIX ".log" #define FILE_SUFFIX_LEN (sizeof(FILE_SUFFIX) - 1) diff --git a/modules/db_flatstore/km_flat_con.h b/modules/db_flatstore/km_flat_con.h index ae02a30..0c21e17 100644 --- a/modules/db_flatstore/km_flat_con.h +++ b/modules/db_flatstore/km_flat_con.h @@ -27,7 +27,7 @@ #include <stdio.h> #include <time.h> -#include "flat_id.h" +#include "km_flat_id.h" struct flat_con { struct flat_id* id; /* Connection identifier */ diff --git a/modules/db_flatstore/km_flat_id.c b/modules/db_flatstore/km_flat_id.c index 708f98f..3294528 100644 --- a/modules/db_flatstore/km_flat_id.c +++ b/modules/db_flatstore/km_flat_id.c @@ -25,7 +25,7 @@ #include <string.h> #include "../../dprint.h" #include "../../mem/mem.h" -#include "flat_id.h" +#include "km_flat_id.h" diff --git a/modules/db_flatstore/km_flat_mi.c b/modules/db_flatstore/km_flat_mi.c index 5cac83d..992e2a4 100644 --- a/modules/db_flatstore/km_flat_mi.c +++ b/modules/db_flatstore/km_flat_mi.c @@ -23,7 +23,7 @@ */ #include "flatstore_mod.h" -#include "flat_mi.h" +#include "km_flat_mi.h" struct mi_root* mi_flat_rotate_cmd(struct mi_root* cmd_tree, void* param) diff --git a/modules/db_flatstore/km_flat_pool.c b/modules/db_flatstore/km_flat_pool.c index eca5884..72d5c85 100644 --- a/modules/db_flatstore/km_flat_pool.c +++ b/modules/db_flatstore/km_flat_pool.c @@ -24,8 +24,8 @@ #include <unistd.h> #include "../../dprint.h" -#include "flat_pool.h" -#include "flat_id.h" +#include "km_flat_pool.h" +#include "km_flat_id.h" /* The head of the pool */ diff --git a/modules/db_flatstore/km_flat_pool.h b/modules/db_flatstore/km_flat_pool.h index 8c103fc..616e63a 100644 --- a/modules/db_flatstore/km_flat_pool.h +++ b/modules/db_flatstore/km_flat_pool.h @@ -25,7 +25,7 @@ #ifndef _KM_FLAT_POOL_H #define _KM_FLAT_POOL_H -#include "flat_con.h" +#include "km_flat_con.h" /* * Get a connection from the pool, reuse existing diff --git a/modules/db_flatstore/km_flatstore.c b/modules/db_flatstore/km_flatstore.c index e6e96b9..1f85482 100644 --- a/modules/db_flatstore/km_flatstore.c +++ b/modules/db_flatstore/km_flatstore.c @@ -31,10 +31,10 @@ #include <ctype.h> #include "../../mem/mem.h" #include "../../dprint.h" -#include "flat_pool.h" -#include "flat_con.h" -#include "flatstore_mod.h" -#include "flatstore.h" +#include "km_flat_pool.h" +#include "km_flat_con.h" +#include "km_flatstore_mod.h" +#include "km_flatstore.h" static int parse_flat_url(const str* url, str* path) diff --git a/modules/db_flatstore/km_flatstore_mod.c b/modules/db_flatstore/km_flatstore_mod.c index 443ad9a..c24343a 100644 --- a/modules/db_flatstore/km_flatstore_mod.c +++ b/modules/db_flatstore/km_flatstore_mod.c @@ -30,9 +30,9 @@ #include "../../sr_module.h" #include "../../mem/shm_mem.h" #include "../../db/db.h" -#include "flatstore.h" -#include "flat_mi.h" -#include "flatstore_mod.h" +#include "km_flatstore.h" +#include "km_flat_mi.h" +#include "km_flatstore_mod.h" MODULE_VERSION

15 years, 10 months

git:janakj/flatstore: Merge branch kamailio/trunk/ db_flatstore into sip-router/janakj/db_flatstore.

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 2400cb07e16f3e2b237130b83b2a6e6fb76fe370 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2400cb0… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 16:17:48 2009 +0100 Merge branch kamailio/trunk/db_flatstore into sip-router/janakj/db_flatstore. * kamailio/trunk/db_flatstore: (23 commits) - disable big integer (DB_BIGINT) support for non SQL DB modules for now - don't link with unnecessary libs, related to bug #1855859 - fix link entity names, patch from Carsten Gross - rebuilt default READMEs - renaming: changed entities in documentation - renaming scripts part 1 - fix some FAQ entries, change missing entity, regenerate READMEs - change name in copyright headers - fixed bug in keeping the dir path for the flatstore files - as the path is a substring of the DB URL, we need to explicitly allocate a str structure for it; otherwise we will randomly write in memory :D - titles for admin, devel and faq chapters are defined via entities for coherence and easier management - updated old entity names - content of faq removed (mistakenly added by me after Henning did the cleanup for modules' docs; rev 3839) - entity &user; replaced with &admin; to obey naming structure (entities to be replaced by xinclude); updated obsolete address tags - re-sync READMEs after last updates - step 2 for the rest of modules to re-link history from sgml to xml files - step 1 for the rest of modules to re-link history from sgml to xml files - modules documentation migrated from sgml to xml docbook format - migrated to db_bind_api() - change module docs FAQ link to a common one in the doc dir - first round of cleanups for documentation ... ---

15 years, 10 months

git:janakj/flatstore: Make km_sources compile, part two.

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 46b6981987a2ce15a2327f6da09741d860f25cb8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=46b6981… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 23:43:12 2009 +0100 Make km_sources compile, part two. List of changes: * Call km_mod_init, km_child_init, km_mod_destroy from the real init functions in flatstore_mod.c and make the km_ functions non-static so that they are callable from other object files. * Renamed non-static global variables in km_flatstore_mod.c to avoid conflicts with variables with the same name in flatstore_mod.c (local_timestamp->km_local_timestamp, flat_rotate->km_flat_rotate) --- modules/db_flatstore/flatstore_mod.c | 15 ++++++++++++- modules/db_flatstore/km_flat_mi.c | 3 +- modules/db_flatstore/km_flatstore.c | 4 +- modules/db_flatstore/km_flatstore_mod.c | 32 ++++++++++++------------------ modules/db_flatstore/km_flatstore_mod.h | 10 +++++++- 5 files changed, 38 insertions(+), 26 deletions(-) diff --git a/modules/db_flatstore/flatstore_mod.c b/modules/db_flatstore/flatstore_mod.c index 78c29e8..0f7b5b5 100644 --- a/modules/db_flatstore/flatstore_mod.c +++ b/modules/db_flatstore/flatstore_mod.c @@ -29,8 +29,8 @@ /** \file * Flatstore module interface. */ - #include "flatstore_mod.h" +#include "km_flatstore_mod.h" #include "flat_con.h" #include "flat_cmd.h" #include "flat_rpc.h" @@ -166,22 +166,33 @@ static int mod_init(void) *flat_rotate = time(0); flat_local_timestamp = *flat_rotate; - return 0; + + return km_mod_init(); } static void mod_destroy(void) { + km_mod_destroy(); if (flat_pid.s) free(flat_pid.s); if (flat_rotate) shm_free(flat_rotate); } +/* + * FIXME: We should check whether just calling km_child_init would really work + * here. This function comes from kamailio and since the core of sip-router is + * based on SER 2.0, the way how child_init is called and values of the rank + * variable could be incompatible with km_child_init function. A solution here + * would be to rewrite km_child_init with ser 2.0 init stuff in mind. + */ static int child_init(int rank) { char* tmp; unsigned int v; + km_child_init(rank); + if (rank <= 0) { v = -rank; } else { diff --git a/modules/db_flatstore/km_flat_mi.c b/modules/db_flatstore/km_flat_mi.c index 992e2a4..2200148 100644 --- a/modules/db_flatstore/km_flat_mi.c +++ b/modules/db_flatstore/km_flat_mi.c @@ -23,6 +23,7 @@ */ #include "flatstore_mod.h" +#include "km_flatstore_mod.h" #include "km_flat_mi.h" @@ -34,7 +35,7 @@ struct mi_root* mi_flat_rotate_cmd(struct mi_root* cmd_tree, void* param) if(rpl_tree == NULL) return rpl_tree; - *flat_rotate = time(0); + *km_flat_rotate = time(0); return rpl_tree; } diff --git a/modules/db_flatstore/km_flatstore.c b/modules/db_flatstore/km_flatstore.c index 499a98e..7a2fbaf 100644 --- a/modules/db_flatstore/km_flatstore.c +++ b/modules/db_flatstore/km_flatstore.c @@ -158,9 +158,9 @@ int flat_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, int l; char *s, *p; - if (local_timestamp < *flat_rotate) { + if (km_local_timestamp < *km_flat_rotate) { flat_rotate_logs(); - local_timestamp = *flat_rotate; + km_local_timestamp = *km_flat_rotate; } f = CON_FILE(h); diff --git a/modules/db_flatstore/km_flatstore_mod.c b/modules/db_flatstore/km_flatstore_mod.c index d968594..ebb5304 100644 --- a/modules/db_flatstore/km_flatstore_mod.c +++ b/modules/db_flatstore/km_flatstore_mod.c @@ -37,12 +37,6 @@ /*MODULE_VERSION*/ -static int child_init(int rank); - -static int mod_init(void); - -static void mod_destroy(void); - int db_flat_bind_api(db_func_t *dbb); /* @@ -61,9 +55,9 @@ char* km_flat_delimiter = "|"; * Timestamp of the last log rotation request from * the FIFO interface */ -time_t* flat_rotate; +time_t* km_flat_rotate; -time_t local_timestamp; +time_t km_local_timestamp; /* * Flatstore database module interface @@ -98,40 +92,40 @@ struct kam_module_exports km_exports = { mi_cmds, /* exported MI functions */ 0, /* exported pseudo-variables */ 0, /* extra processes */ - mod_init, /* module initialization function */ + km_mod_init, /* module initialization function */ 0, /* response function*/ - mod_destroy, /* destroy function */ - child_init /* per-child init function */ + km_mod_destroy, /* destroy function */ + km_child_init /* per-child init function */ }; -static int mod_init(void) +int km_mod_init(void) { if (strlen(km_flat_delimiter) != 1) { LM_ERR("delimiter has to be exactly one character\n"); return -1; } - flat_rotate = (time_t*)shm_malloc(sizeof(time_t)); - if (!flat_rotate) { + km_flat_rotate = (time_t*)shm_malloc(sizeof(time_t)); + if (!km_flat_rotate) { LM_ERR("no shared memory left\n"); return -1; } - *flat_rotate = time(0); - local_timestamp = *flat_rotate; + *km_flat_rotate = time(0); + km_local_timestamp = *km_flat_rotate; return 0; } -static void mod_destroy(void) +void km_mod_destroy(void) { - if (flat_rotate) shm_free(flat_rotate); + if (km_flat_rotate) shm_free(km_flat_rotate); } -static int child_init(int rank) +int km_child_init(int rank) { if (rank <= 0) { km_flat_pid = - rank; diff --git a/modules/db_flatstore/km_flatstore_mod.h b/modules/db_flatstore/km_flatstore_mod.h index b605c11..3ca8c50 100644 --- a/modules/db_flatstore/km_flatstore_mod.h +++ b/modules/db_flatstore/km_flatstore_mod.h @@ -48,14 +48,20 @@ extern char* km_flat_delimiter; * The timestamp of log rotation request from * the FIFO interface */ -extern time_t* flat_rotate; +extern time_t* km_flat_rotate; /* * Local timestamp marking the time of the * last log rotation in the process */ -extern time_t local_timestamp; +extern time_t km_local_timestamp; + +int km_mod_init(void); + +void km_mod_destroy(void); + +int km_child_init(int rank); #endif /* KM_FLATSTORE_MOD_H */

15 years, 10 months

git:janakj/flatstore: Link with libkmi, sources from kamailio use the management interface.

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 45fe67d7cf94fd205511373bb9090a422a21af12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45fe67d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 23:38:13 2009 +0100 Link with libkmi, sources from kamailio use the management interface. --- modules/db_flatstore/Makefile | 2 +- modules/db_flatstore/km_flat_mi.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_flatstore/Makefile b/modules/db_flatstore/Makefile index 6b008b2..5b063bc 100644 --- a/modules/db_flatstore/Makefile +++ b/modules/db_flatstore/Makefile @@ -10,6 +10,6 @@ LIBS= DEFS += -DSER_MOD_INTERFACE SERLIBPATH=../../lib -SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 +SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 $(SERLIBPATH)/kmi/kmi include ../../Makefile.modules diff --git a/modules/db_flatstore/km_flat_mi.h b/modules/db_flatstore/km_flat_mi.h index 5309fad..6dbfc33 100644 --- a/modules/db_flatstore/km_flat_mi.h +++ b/modules/db_flatstore/km_flat_mi.h @@ -25,7 +25,7 @@ #ifndef _KM_FLAT_MI_H_ #define _KM_FLAT_MI_H_ -#include "../../mi/mi.h" +#include "../../lib/kmi/mi.h" #define MI_FLAT_ROTATE "flat_rotate"

15 years, 10 months

git:janakj/flatstore: Make km_ sources compile:

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: a35e28152a68a49490029ed37150f05f881fb654 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a35e281… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Feb 18 23:10:33 2009 +0100 Make km_ sources compile: List of changes: * Rename flat_pid variable to km_flat_pid to avoid conflict with sources originating from ser * Rename db_con_t to db1_con_t * Rename db type names DB_* to DB1_* * Rename flat_delimiter variable to km_flat_delimiter * Fix paths to headers in lib/srdb1 * Rename cmd_export_t to kam_cmd_export_t * Rename module_exports to kam_module_exports * Rename exports structure to kam_exports --- modules/db_flatstore/km_flat_con.c | 2 +- modules/db_flatstore/km_flatstore.c | 35 ++++++++++++++++--------------- modules/db_flatstore/km_flatstore.h | 14 ++++++------ modules/db_flatstore/km_flatstore_mod.c | 25 ++++++++------------- modules/db_flatstore/km_flatstore_mod.h | 10 +------- 5 files changed, 38 insertions(+), 48 deletions(-) diff --git a/modules/db_flatstore/km_flat_con.c b/modules/db_flatstore/km_flat_con.c index 7321b65..c4f38bb 100644 --- a/modules/db_flatstore/km_flat_con.c +++ b/modules/db_flatstore/km_flat_con.c @@ -72,7 +72,7 @@ static char* get_name(struct flat_id* id) *ptr++ = '_'; - num = int2str(flat_pid, &num_len); + num = int2str(km_flat_pid, &num_len); if (buf_len<(total_len+num_len)){ LM_ERR("the path is too long (%d and PATHMAX is" " %d)\n", total_len+num_len, buf_len); diff --git a/modules/db_flatstore/km_flatstore.c b/modules/db_flatstore/km_flatstore.c index 1f85482..499a98e 100644 --- a/modules/db_flatstore/km_flatstore.c +++ b/modules/db_flatstore/km_flatstore.c @@ -35,6 +35,7 @@ #include "km_flat_con.h" #include "km_flatstore_mod.h" #include "km_flatstore.h" +#include "flatstore_mod.h" static int parse_flat_url(const str* url, str* path) @@ -54,9 +55,9 @@ static int parse_flat_url(const str* url, str* path) * Initialize database module * No function should be called before this */ -db_con_t* flat_db_init(const str* url) +db1_con_t* flat_db_init(const str* url) { - db_con_t* res; + db1_con_t* res; str* path; if (!url || !url->s) { @@ -72,13 +73,13 @@ db_con_t* flat_db_init(const str* url) /* as the table (path) is a substring of the received str, we need to * allocate a separate str struct for it -bogdan */ - res = pkg_malloc(sizeof(db_con_t)+sizeof(struct flat_con*)+sizeof(str)); + res = pkg_malloc(sizeof(db1_con_t)+sizeof(struct flat_con*)+sizeof(str)); if (!res) { LM_ERR("no pkg memory left\n"); return 0; } - memset(res, 0, sizeof(db_con_t) + sizeof(struct flat_con*) + sizeof(str)); - path = (str*)(((char*)res) + sizeof(db_con_t) + sizeof(struct flat_con*)); + memset(res, 0, sizeof(db1_con_t) + sizeof(struct flat_con*) + sizeof(str)); + path = (str*)(((char*)res) + sizeof(db1_con_t) + sizeof(struct flat_con*)); if (parse_flat_url(url, path) < 0) { pkg_free(res); @@ -94,7 +95,7 @@ db_con_t* flat_db_init(const str* url) * Store name of table that will be used by * subsequent database functions */ -int flat_use_table(db_con_t* h, const str* t) +int flat_use_table(db1_con_t* h, const str* t) { struct flat_con* con; @@ -124,7 +125,7 @@ int flat_use_table(db_con_t* h, const str* t) } -void flat_db_close(db_con_t* h) +void flat_db_close(db1_con_t* h) { struct flat_con* con; @@ -149,7 +150,7 @@ void flat_db_close(db_con_t* h) * v: values of the keys * n: number of key=value pairs */ -int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, +int flat_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, const int n) { FILE* f; @@ -170,31 +171,31 @@ int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, for(i = 0; i < n; i++) { switch(VAL_TYPE(v + i)) { - case DB_INT: + case DB1_INT: fprintf(f, "%d", VAL_INT(v + i)); break; - case DB_BIGINT: + case DB1_BIGINT: LM_ERR("BIGINT not supported"); return -1; - case DB_DOUBLE: + case DB1_DOUBLE: fprintf(f, "%f", VAL_DOUBLE(v + i)); break; - case DB_STRING: + case DB1_STRING: fprintf(f, "%s", VAL_STRING(v + i)); break; - case DB_STR: + case DB1_STR: fprintf(f, "%.*s", VAL_STR(v + i).len, VAL_STR(v + i).s); break; - case DB_DATETIME: + case DB1_DATETIME: fprintf(f, "%u", (unsigned int)VAL_TIME(v + i)); break; - case DB_BLOB: + case DB1_BLOB: l = VAL_BLOB(v+i).len; s = p = VAL_BLOB(v+i).s; while (l--) { @@ -208,13 +209,13 @@ int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, fprintf(f,"%.*s",(int)(s-p),p); break; - case DB_BITMAP: + case DB1_BITMAP: fprintf(f, "%u", VAL_BITMAP(v + i)); break; } if (i < (n - 1)) { - fprintf(f, "%c", *flat_delimiter); + fprintf(f, "%c", *km_flat_delimiter); } } diff --git a/modules/db_flatstore/km_flatstore.h b/modules/db_flatstore/km_flatstore.h index fa79a34..c6e82f9 100644 --- a/modules/db_flatstore/km_flatstore.h +++ b/modules/db_flatstore/km_flatstore.h @@ -31,26 +31,26 @@ #ifndef _KM_FLATSTORE_H #define _KM_FLATSTORE_H -#include "../../db/db_val.h" -#include "../../db/db_key.h" -#include "../../db/db_con.h" +#include "../../lib/srdb1/db_val.h" +#include "../../lib/srdb1/db_key.h" +#include "../../lib/srdb1/db_con.h" /* * Initialize database module * No function should be called before this */ -db_con_t* flat_db_init(const str* _url); +db1_con_t* flat_db_init(const str* _url); /* * Store name of table that will be used by * subsequent database functions */ -int flat_use_table(db_con_t* h, const str* t); +int flat_use_table(db1_con_t* h, const str* t); -void flat_db_close(db_con_t* h); +void flat_db_close(db1_con_t* h); /* @@ -60,7 +60,7 @@ void flat_db_close(db_con_t* h); * v: values of the keys * n: number of key=value pairs */ -int flat_db_insert(const db_con_t* h, const db_key_t* k, const db_val_t* v, +int flat_db_insert(const db1_con_t* h, const db_key_t* k, const db_val_t* v, const int n); diff --git a/modules/db_flatstore/km_flatstore_mod.c b/modules/db_flatstore/km_flatstore_mod.c index c24343a..d968594 100644 --- a/modules/db_flatstore/km_flatstore_mod.c +++ b/modules/db_flatstore/km_flatstore_mod.c @@ -29,12 +29,13 @@ #include "../../sr_module.h" #include "../../mem/shm_mem.h" -#include "../../db/db.h" +#include "../../lib/srdb1/db.h" #include "km_flatstore.h" #include "km_flat_mi.h" #include "km_flatstore_mod.h" +#include "flatstore_mod.h" -MODULE_VERSION +/*MODULE_VERSION*/ static int child_init(int rank); @@ -47,18 +48,13 @@ int db_flat_bind_api(db_func_t *dbb); /* * Process number used in filenames */ -int flat_pid; - -/* - * Should we flush after each write to the database ? - */ -int flat_flush = 1; +int km_flat_pid; /* * Delimiter delimiting columns */ -char* flat_delimiter = "|"; +char* km_flat_delimiter = "|"; /* @@ -72,7 +68,7 @@ time_t local_timestamp; /* * Flatstore database module interface */ -static cmd_export_t cmds[] = { +static kam_cmd_export_t cmds[] = { {"db_bind_api", (cmd_function)db_flat_bind_api, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -81,7 +77,6 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"flush", INT_PARAM, &flat_flush}, {0, 0, 0} }; @@ -94,7 +89,7 @@ static mi_export_t mi_cmds[] = { { 0, 0, 0, 0, 0} }; -struct module_exports exports = { +struct kam_module_exports km_exports = { "db_flatstore", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, @@ -112,7 +107,7 @@ struct module_exports exports = { static int mod_init(void) { - if (strlen(flat_delimiter) != 1) { + if (strlen(km_flat_delimiter) != 1) { LM_ERR("delimiter has to be exactly one character\n"); return -1; } @@ -139,9 +134,9 @@ static void mod_destroy(void) static int child_init(int rank) { if (rank <= 0) { - flat_pid = - rank; + km_flat_pid = - rank; } else { - flat_pid = rank - PROC_TCP_MAIN; + km_flat_pid = rank - PROC_TCP_MAIN; } return 0; } diff --git a/modules/db_flatstore/km_flatstore_mod.h b/modules/db_flatstore/km_flatstore_mod.h index 7a71406..b605c11 100644 --- a/modules/db_flatstore/km_flatstore_mod.h +++ b/modules/db_flatstore/km_flatstore_mod.h @@ -35,19 +35,13 @@ /* * Process number used in filenames */ -extern int flat_pid; - - -/* - * Should we flush after each write to the database ? - */ -extern int flat_flush; +extern int km_flat_pid; /* * Delmiter delimiting columns */ -extern char* flat_delimiter; +extern char* km_flat_delimiter; /*

15 years, 10 months

git:janakj/flatstore: - rename database modules to use the 'db_' prefix

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 4a4cc74c10604a67fc9637a81edf308961d1d901 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a4cc74… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 13:10:03 2008 +0000 - rename database modules to use the 'db_' prefix git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3638 689a6050-402a-0410-94f2-e92a70836424 ---

15 years, 10 months

git:janakj/flatstore: further changes after the db name change

by Jan Janak

Module: sip-router Branch: janakj/flatstore Commit: 553cc2471208ec6e4e396eab1822ccd5c27543f7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=553cc24… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 15:46:09 2008 +0000 further changes after the db name change - update INSTALL file - fix Makefile skip modules variable - fix module Makefile, lib name - change db_bind_mod to add the db prefix in the function - change db url defines in db_berkeley and db_text - change database modules names in module struct - fix debian packaging - fix tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3642 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_flatstore/km_Makefile | 2 +- modules/db_flatstore/km_flatstore_mod.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_flatstore/km_Makefile b/modules/db_flatstore/km_Makefile index 0953806..6b53fdb 100644 --- a/modules/db_flatstore/km_Makefile +++ b/modules/db_flatstore/km_Makefile @@ -4,6 +4,6 @@ include ../../Makefile.defs auto_gen= -NAME=flatstore.so +NAME=db_flatstore.so include ../../Makefile.modules diff --git a/modules/db_flatstore/km_flatstore_mod.c b/modules/db_flatstore/km_flatstore_mod.c index 66db6f6..68d8d20 100644 --- a/modules/db_flatstore/km_flatstore_mod.c +++ b/modules/db_flatstore/km_flatstore_mod.c @@ -97,7 +97,7 @@ static mi_export_t mi_cmds[] = { }; struct module_exports exports = { - "flatstore", + "db_flatstore", DEFAULT_DLFLAGS, /* dlopen flags */ cmds, params, /* module parameters */

15 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev