hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean skygw_utils.

Browse Source 
Not finished yet. There are e.g. a number of functions that are only used
by the log manager. They could just as well be moved as private functions
to log_manager.cc.
This commit is contained in:
Johan Wikman
2016-02-09 17:43:55 +02:00
parent 38db155fef
commit e1273a2e5f
2 changed files with 96 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
utils/skygw_utils.cc
View File

@ -42,7 +42,6 @@ static void simple_mutex_free_memory(simple_mutex_t* sm);
static void thread_free_memory(skygw_thread_t* th, char* name); static void thread_free_memory(skygw_thread_t* th, char* name);
/** End of static function declarations */ /** End of static function declarations */
/** mutexed list */
int skygw_rwlock_rdlock(skygw_rwlock_t* rwlock) int skygw_rwlock_rdlock(skygw_rwlock_t* rwlock)
{ {
@ -990,10 +989,10 @@ return_succp:
/** /**
* Write data to a file. * Write data to a file.
* *
* @param file write target * @param file write target
* @param data pointer to contiguous memory buffer * @param data pointer to contiguous memory buffer
* @param nbytes amount of bytes to be written * @param nbytes amount of bytes to be written
* @param flush ensure that write is permanent * @param flush ensure that write is permanent
* *
* @return 0 if succeed, errno if failed. * @return 0 if succeed, errno if failed.
*/ */
@ -1157,7 +1156,7 @@ void skygw_file_close(skygw_file_t* file, bool shutdown)
#define BUFFER_GROWTH_RATE 1.2 #define BUFFER_GROWTH_RATE 1.2
static pcre2_code* remove_comments_re = NULL; static pcre2_code* remove_comments_re = NULL;
static const PCRE2_SPTR remove_comments_pattern = (PCRE2_SPTR) static const PCRE2_SPTR remove_comments_pattern = (PCRE2_SPTR)
"(?:`[^`]*`\\K)|(\\/[*](?!(M?!)).*?[*]\\/)|(?:#.*|--[[:space:]].*)"; "(?:`[^`]*`\\K)|(\\/[*](?!(M?!)).*?[*]\\/)|(?:#.*|--[[:space:]].*)";
/** /**
* Remove SQL comments from the end of a string * Remove SQL comments from the end of a string
@ -1226,7 +1225,7 @@ char* remove_mysql_comments(const char** src, const size_t* srcsize, char** dest
static pcre2_code* replace_values_re = NULL; static pcre2_code* replace_values_re = NULL;
static const PCRE2_SPTR replace_values_pattern = (PCRE2_SPTR) "(?i)([-=,+*/([:space:]]|\\b|[@])" static const PCRE2_SPTR replace_values_pattern = (PCRE2_SPTR) "(?i)([-=,+*/([:space:]]|\\b|[@])"
"(?:[0-9.-]+|(?<=[@])[a-z_0-9]+)([-=,+*/)[:space:];]|$)"; "(?:[0-9.-]+|(?<=[@])[a-z_0-9]+)([-=,+*/)[:space:];]|$)";
/** /**
* Replace literal numbers and user variables with a question mark. * Replace literal numbers and user variables with a question mark.
@ -1378,7 +1377,7 @@ retblock:
static pcre2_code* replace_quoted_re = NULL; static pcre2_code* replace_quoted_re = NULL;
static const PCRE2_SPTR replace_quoted_pattern = (PCRE2_SPTR) static const PCRE2_SPTR replace_quoted_pattern = (PCRE2_SPTR)
"(?>[^'\"]*)(?|(?:\"\\K(?:(?:(?<=\\\\)\")|[^\"])*(\"))|(?:'\\K(?:(?:(?<=\\\\)')|[^'])*(')))"; "(?>[^'\"]*)(?|(?:\"\\K(?:(?:(?<=\\\\)\")|[^\"])*(\"))|(?:'\\K(?:(?:(?<=\\\\)')|[^'])*(')))";
/** /**
* Replace contents of single or double quoted strings with question marks. * Replace contents of single or double quoted strings with question marks.
@ -1449,14 +1448,14 @@ char* replace_quoted(const char** src, const size_t* srcsize, char** dest, size_
/** /**
* Calculate the number of decimal numbers from a size_t value. * Calculate the number of decimal numbers from a size_t value.
* *
* @param value value * @param value value
* *
* @return number of decimal numbers of which the value consists of * @return number of decimal numbers of which the value consists of
* value==123 returns 3, for example. * value==123 returns 3, for example.
* @note Does the same as UINTLEN macro * @note Does the same as UINTLEN macro
*/ */
size_t get_decimal_len( size_t get_decimal_len(
size_t value) size_t value)
{ {
return value > 0 ? (size_t) log10((double) value) + 1 : 1; return value > 0 ? (size_t) log10((double) value) + 1 : 1;
} }

161
utils/skygw_utils.h
View File

@ -1,5 +1,22 @@
#if !defined(SKYGW_UTILS_H) #ifndef _SKYGW_UTILS_H
#define SKYGW_UTILS_H #define _SKYGW_UTILS_H
/*
* This file is distributed as part of the MariaDB Corporation MaxScale. It is free
* software: you can redistribute it and/or modify it under the terms of the
* GNU General Public License as published by the Free Software Foundation,
* version 2.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
* You should have received a copy of the GNU General Public License along with
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright MariaDB Corporation Ab 2016
*/
/* /*
* We need a common.h file that is included by every component. * We need a common.h file that is included by every component.
@ -25,22 +42,24 @@ typedef struct skygw_file_st skygw_file_t;
typedef struct skygw_thread_st skygw_thread_t; typedef struct skygw_thread_st skygw_thread_t;
typedef struct skygw_message_st skygw_message_t; typedef struct skygw_message_st skygw_message_t;
typedef struct simple_mutex_st { typedef struct simple_mutex_st
skygw_chk_t sm_chk_top; {
pthread_mutex_t sm_mutex; skygw_chk_t sm_chk_top;
pthread_t sm_lock_thr; pthread_mutex_t sm_mutex;
bool sm_locked; pthread_t sm_lock_thr;
int sm_enabled; /**< defined as in to minimize mutexing */ bool sm_locked;
bool sm_flat; int sm_enabled; /**< defined as in to minimize mutexing */
char* sm_name; bool sm_flat;
skygw_chk_t sm_chk_tail; char* sm_name;
skygw_chk_t sm_chk_tail;
} simple_mutex_t; } simple_mutex_t;
typedef struct skygw_rwlock_st { typedef struct skygw_rwlock_st
skygw_chk_t srw_chk_top; {
pthread_rwlock_t* srw_rwlock; skygw_chk_t srw_chk_top;
pthread_t srw_rwlock_thr; pthread_rwlock_t* srw_rwlock;
skygw_chk_t srw_chk_tail; pthread_t srw_rwlock_thr;
skygw_chk_t srw_chk_tail;
} skygw_rwlock_t; } skygw_rwlock_t;
@ -48,45 +67,47 @@ typedef enum { THR_INIT, THR_RUNNING, THR_STOPPED, THR_DONE } skygw_thr_state_t;
typedef enum { MES_RC_FAIL, MES_RC_SUCCESS, MES_RC_TIMEOUT } skygw_mes_rc_t; typedef enum { MES_RC_FAIL, MES_RC_SUCCESS, MES_RC_TIMEOUT } skygw_mes_rc_t;
static const char* timestamp_formatstr = "%04d-%02d-%02d %02d:%02d:%02d "; static const char* timestamp_formatstr = "%04d-%02d-%02d %02d:%02d:%02d ";
/** One for terminating '\0' */ /** One for terminating '\0' */
static const size_t timestamp_len = (4+1 +2+1 +2+1 +2+1 +2+1 +2+3 +1) * sizeof(char); static const size_t timestamp_len = (4+1 +2+1 +2+1 +2+1 +2+1 +2+3 +1) * sizeof(char);
static const char* timestamp_formatstr_hp = "%04d-%02d-%02d %02d:%02d:%02d.%03d ";
static const char* timestamp_formatstr_hp = "%04d-%02d-%02d %02d:%02d:%02d.%03d ";
/** One for terminating '\0' */ /** One for terminating '\0' */
static const size_t timestamp_len_hp = (4+1 +2+1 +2+1 +2+1 +2+1 +2+1+3+3 +1) * sizeof(char); static const size_t timestamp_len_hp = (4+1 +2+1 +2+1 +2+1 +2+1 +2+1+3+3 +1) * sizeof(char);
struct skygw_thread_st { struct skygw_thread_st
skygw_chk_t sth_chk_top; {
bool sth_must_exit; skygw_chk_t sth_chk_top;
simple_mutex_t* sth_mutex; bool sth_must_exit;
pthread_t sth_parent; simple_mutex_t* sth_mutex;
pthread_t sth_thr; pthread_t sth_parent;
int sth_errno; pthread_t sth_thr;
int sth_errno;
#if defined(SS_DEBUG) #if defined(SS_DEBUG)
skygw_thr_state_t sth_state; skygw_thr_state_t sth_state;
#endif #endif
char* sth_name; char* sth_name;
void* (*sth_thrfun)(void* data); void* (*sth_thrfun)(void* data);
void* sth_data; void* sth_data;
skygw_chk_t sth_chk_tail; skygw_chk_t sth_chk_tail;
}; };
struct skygw_message_st { struct skygw_message_st
skygw_chk_t mes_chk_top; {
bool mes_sent; skygw_chk_t mes_chk_top;
pthread_mutex_t mes_mutex; bool mes_sent;
pthread_cond_t mes_cond; pthread_mutex_t mes_mutex;
skygw_chk_t mes_chk_tail; pthread_cond_t mes_cond;
skygw_chk_t mes_chk_tail;
}; };
struct skygw_file_st { struct skygw_file_st
skygw_chk_t sf_chk_top; {
char* sf_fname; skygw_chk_t sf_chk_top;
FILE* sf_file; char* sf_fname;
int sf_fd; FILE* sf_file;
skygw_chk_t sf_chk_tail; int sf_fd;
skygw_chk_t sf_chk_tail;
}; };
EXTERN_C_BLOCK_BEGIN EXTERN_C_BLOCK_BEGIN
@ -97,10 +118,9 @@ void utils_end();
EXTERN_C_BLOCK_END EXTERN_C_BLOCK_END
/** Skygw thread routines */ /** Skygw thread routines */
skygw_thread_t* skygw_thread_init( skygw_thread_t* skygw_thread_init(const char* name,
const char* name, void* (*sth_thrfun)(void* data),
void* (*sth_thrfun)(void* data), void* data);
void* data);
void skygw_thread_done(skygw_thread_t* th); void skygw_thread_done(skygw_thread_t* th);
int skygw_thread_start(skygw_thread_t* thr); int skygw_thread_start(skygw_thread_t* thr);
skygw_thr_state_t skygw_thread_get_state(skygw_thread_t* thr); skygw_thr_state_t skygw_thread_get_state(skygw_thread_t* thr);
@ -113,15 +133,13 @@ size_t snprint_timestamp_hp(char* p_ts, size_t tslen);
EXTERN_C_BLOCK_BEGIN EXTERN_C_BLOCK_BEGIN
void skygw_thread_set_state( void skygw_thread_set_state(skygw_thread_t* thr,
skygw_thread_t* thr, skygw_thr_state_t state);
skygw_thr_state_t state);
void* skygw_thread_get_data(skygw_thread_t* thr); void* skygw_thread_get_data(skygw_thread_t* thr);
bool skygw_thread_must_exit(skygw_thread_t* thr); bool skygw_thread_must_exit(skygw_thread_t* thr);
bool skygw_thread_set_exitflag( bool skygw_thread_set_exitflag(skygw_thread_t* thr,
skygw_thread_t* thr, skygw_message_t* sendmes,
skygw_message_t* sendmes, skygw_message_t* recmes);
skygw_message_t* recmes);
EXTERN_C_BLOCK_END EXTERN_C_BLOCK_END
@ -132,11 +150,10 @@ skygw_file_t* skygw_file_alloc(char* fname);
void skygw_file_free(skygw_file_t* file); void skygw_file_free(skygw_file_t* file);
skygw_file_t* skygw_file_init(char* fname, char* symlinkname); skygw_file_t* skygw_file_init(char* fname, char* symlinkname);
void skygw_file_close(skygw_file_t* file, bool shutdown); void skygw_file_close(skygw_file_t* file, bool shutdown);
int skygw_file_write( int skygw_file_write(skygw_file_t* file,
skygw_file_t* file, void* data,
void* data, size_t nbytes,
size_t nbytes, bool flush);
bool flush);
/** Skygw file routines */ /** Skygw file routines */
EXTERN_C_BLOCK_BEGIN EXTERN_C_BLOCK_BEGIN
@ -151,21 +168,12 @@ int simple_mutex_unlock(simple_mutex_t* sm);
/** Skygw message routines */ /** Skygw message routines */
skygw_message_t* skygw_message_init(void); skygw_message_t* skygw_message_init(void);
void skygw_message_done(skygw_message_t* mes);
skygw_mes_rc_t skygw_message_send(skygw_message_t* mes);
void skygw_message_wait(skygw_message_t* mes);
skygw_mes_rc_t skygw_message_request(skygw_message_t* mes);
void skygw_message_reset(skygw_message_t* mes);
void skygw_message_done(
skygw_message_t* mes);
skygw_mes_rc_t skygw_message_send(
skygw_message_t* mes);
void skygw_message_wait(
skygw_message_t* mes);
skygw_mes_rc_t skygw_message_request(
skygw_message_t* mes);
void skygw_message_reset(
skygw_message_t* mes);
/** Skygw message routines */ /** Skygw message routines */
EXTERN_C_BLOCK_END EXTERN_C_BLOCK_END
@ -186,8 +194,7 @@ char* replace_values(const char** src, const size_t* srcsize, char** dest,
char* replace_literal(char* haystack, char* replace_literal(char* haystack,
const char* needle, const char* needle,
const char* replacement); const char* replacement);
char* replace_quoted(const char** src, const size_t* srcsize, char** dest, char* replace_quoted(const char** src, const size_t* srcsize, char** dest, size_t* destsize);
size_t* destsize);
bool is_valid_posix_path(char* path); bool is_valid_posix_path(char* path);
bool strip_escape_chars(char*); bool strip_escape_chars(char*);
int simple_str_hash(char* key); int simple_str_hash(char* key);