diff options
author | Sean Bright <sean@malleable.com> | 2012-10-01 20:36:25 +0000 |
---|---|---|
committer | Sean Bright <sean@malleable.com> | 2012-10-01 20:36:25 +0000 |
commit | b9eeff1521cb1c0d479761dfa17cf88d19cd7bf7 (patch) | |
tree | a554bc0a54a608da5a41a4763e7aec082304e724 /main | |
parent | b3c739a8424720bc63e15faebc8e6ffe15944294 (diff) |
app_queue: Support persisting and loading of long member lists.
Greenlight in #asterisk brought up that he was receiving an error message "Could
not create persistent member string, out of space" when running app_queue in
Asterisk 10. dump_queue_members() made an assumption that 8K would be enough to
store the generated string, but with queues that have large member lists this is
not always the case. This patch removes the limitation and uses ast_str instead
of a fixed sized buffer.
The complicating factor comes from the fact that ast_db_get requires a buffer
and buffer size argument, which doesn't let us pull back more than what we pass
in, so I introduced a new ast_db_get_allocated() which returns an ast_strdup()'d
copy of the value from astdb.
As an aside, I did some testing on the maximum size of data that we can store in
the BDB library we distribute and was able to store a 10MB string and retrieve
it with no problems, so I feel this is a safe patch.
Review: https://reviewboard.asterisk.org/r/2136/
........
Merged revisions 374108 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 374135 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 374150 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@374151 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/db.c | 41 |
1 files changed, 39 insertions, 2 deletions
@@ -307,7 +307,21 @@ int ast_db_put(const char *family, const char *key, const char *value) return res; } -int ast_db_get(const char *family, const char *key, char *value, int valuelen) +/*! + * \internal + * \brief Get key value specified by family/key. + * + * Gets the value associated with the specified \a family and \a key, and + * stores it, either into the fixed sized buffer specified by \a buffer + * and \a bufferlen, or as a heap allocated string if \a bufferlen is -1. + * + * \note If \a bufferlen is -1, \a buffer points to heap allocated memory + * and must be freed by calling ast_free(). + * + * \retval -1 An error occurred + * \retval 0 Success + */ +static int db_get_common(const char *family, const char *key, char **buffer, int bufferlen) { const unsigned char *result; char fullkey[MAX_DB_FIELD]; @@ -332,7 +346,13 @@ int ast_db_get(const char *family, const char *key, char *value, int valuelen) ast_log(LOG_WARNING, "Couldn't get value\n"); res = -1; } else { - ast_copy_string(value, (const char *) result, valuelen); + const char *value = (const char *) result; + + if (bufferlen == -1) { + *buffer = ast_strdup(value); + } else { + ast_copy_string(*buffer, value, bufferlen); + } } sqlite3_reset(get_stmt); ast_mutex_unlock(&dblock); @@ -340,6 +360,23 @@ int ast_db_get(const char *family, const char *key, char *value, int valuelen) return res; } +int ast_db_get(const char *family, const char *key, char *value, int valuelen) +{ + ast_assert(value != NULL); + + /* Make sure we initialize */ + value[0] = 0; + + return db_get_common(family, key, &value, valuelen); +} + +int ast_db_get_allocated(const char *family, const char *key, char **out) +{ + *out = NULL; + + return db_get_common(family, key, out, -1); +} + int ast_db_del(const char *family, const char *key) { char fullkey[MAX_DB_FIELD]; |