markow
/
ckpool
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Set to read only various constants in ckpool.c

master
ckolivas 10 years ago
parent
4585f634b8
commit
8959cac620
2 changed files with 35 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 56
      src/ckpool.c
  2. 14
      src/ckpool.h

56
src/ckpool.c
Unescape View File

@ -150,7 +150,7 @@ ckmsgq_t *create_ckmsgq(ckpool_t *ckp, const char *name, const void *func)
return ckmsgq; return ckmsgq;
} }
ckmsgq_t *create_ckmsgqs(ckpool_t *ckp, const char *name, const void *func, int count) ckmsgq_t *create_ckmsgqs(ckpool_t *ckp, const char *name, const void *func, const int count)
{ {
ckmsgq_t *ckmsgq = ckzalloc(sizeof(ckmsgq_t) * count); ckmsgq_t *ckmsgq = ckzalloc(sizeof(ckmsgq_t) * count);
pthread_mutex_t *lock; pthread_mutex_t *lock;
@ -215,14 +215,14 @@ static void broadcast_proc(ckpool_t *ckp, const char *buf)
/* Put a sanity check on kill calls to make sure we are not sending them to /* Put a sanity check on kill calls to make sure we are not sending them to
* pid 0. */ * pid 0. */
static int kill_pid(int pid, int sig) static int kill_pid(const int pid, const int sig)
{ {
if (pid < 1) if (pid < 1)
return -1; return -1;
return kill(pid, sig); return kill(pid, sig);
} }
static int pid_wait(pid_t pid, int ms) static int pid_wait(const pid_t pid, const int ms)
{ {
tv_t start, now; tv_t start, now;
int ret; int ret;
@ -237,7 +237,7 @@ static int pid_wait(pid_t pid, int ms)
return ret; return ret;
} }
static int send_procmsg(proc_instance_t *pi, const char *buf) static int send_procmsg(const proc_instance_t *pi, const char *buf)
{ {
char *path = pi->us.path; char *path = pi->us.path;
int ret = -1; int ret = -1;
@ -391,7 +391,7 @@ void empty_buffer(connsock_t *cs)
/* Read from a socket into cs->buf till we get an '\n', converting it to '\0' /* Read from a socket into cs->buf till we get an '\n', converting it to '\0'
* and storing how much extra data we've received, to be moved to the beginning * and storing how much extra data we've received, to be moved to the beginning
* of the buffer for use on the next receive. */ * of the buffer for use on the next receive. */
int read_socket_line(connsock_t *cs, int timeout) int read_socket_line(connsock_t *cs, const int timeout)
{ {
int fd = cs->fd, ret = -1; int fd = cs->fd, ret = -1;
char *eom = NULL; char *eom = NULL;
@ -467,9 +467,9 @@ out:
return ret; return ret;
} }
static void childsighandler(int sig); static void childsighandler(const int sig);
static int get_proc_pid(proc_instance_t *pi) static int get_proc_pid(const proc_instance_t *pi)
{ {
int ret, pid = 0; int ret, pid = 0;
char path[256]; char path[256];
@ -596,7 +596,7 @@ out:
} }
/* Send a json msg to ckdb and return the response */ /* Send a json msg to ckdb and return the response */
char *_ckdb_msg_call(const ckpool_t *ckp, char *msg, const char *file, const char *func, char *_ckdb_msg_call(const ckpool_t *ckp, const char *msg, const char *file, const char *func,
const int line) const int line)
{ {
char *buf = NULL; char *buf = NULL;
@ -693,7 +693,7 @@ out:
/* Open the file in path, check if there is a pid in there that still exists /* Open the file in path, check if there is a pid in there that still exists
* and if not, write the pid into that file. */ * and if not, write the pid into that file. */
static bool write_pid(ckpool_t *ckp, const char *path, pid_t pid) static bool write_pid(ckpool_t *ckp, const char *path, const pid_t pid)
{ {
struct stat statbuf; struct stat statbuf;
FILE *fp; FILE *fp;
@ -751,13 +751,13 @@ out:
return true; return true;
} }
static void name_process_sockname(unixsock_t *us, proc_instance_t *pi) static void name_process_sockname(unixsock_t *us, const proc_instance_t *pi)
{ {
us->path = strdup(pi->ckp->socket_dir); us->path = strdup(pi->ckp->socket_dir);
realloc_strcat(&us->path, pi->sockname); realloc_strcat(&us->path, pi->sockname);
} }
static void open_process_sock(ckpool_t *ckp, proc_instance_t *pi, unixsock_t *us) static void open_process_sock(ckpool_t *ckp, const proc_instance_t *pi, unixsock_t *us)
{ {
LOGDEBUG("Opening %s", us->path); LOGDEBUG("Opening %s", us->path);
us->sockd = open_unix_server(us->path); us->sockd = open_unix_server(us->path);
@ -786,7 +786,7 @@ static void write_namepid(proc_instance_t *pi)
quit(1, "Failed to write %s pid %d", pi->processname, pi->pid); quit(1, "Failed to write %s pid %d", pi->processname, pi->pid);
} }
static void rm_namepid(proc_instance_t *pi) static void rm_namepid(const proc_instance_t *pi)
{ {
char s[256]; char s[256];
@ -796,7 +796,7 @@ static void rm_namepid(proc_instance_t *pi)
/* Disable signal handlers for child processes, but simply pass them onto the /* Disable signal handlers for child processes, but simply pass them onto the
* parent process to shut down cleanly. */ * parent process to shut down cleanly. */
static void childsighandler(int sig) static void childsighandler(const int sig)
{ {
signal(sig, SIG_IGN); signal(sig, SIG_IGN);
signal(SIGTERM, SIG_IGN); signal(SIGTERM, SIG_IGN);
@ -808,7 +808,7 @@ static void childsighandler(int sig)
exit(0); exit(0);
} }
static void launch_logger(proc_instance_t *pi) static void launch_logger(const proc_instance_t *pi)
{ {
ckpool_t *ckp = pi->ckp; ckpool_t *ckp = pi->ckp;
char loggername[16]; char loggername[16];
@ -850,7 +850,7 @@ static void launch_process(proc_instance_t *pi)
pi->pid = pid; pi->pid = pid;
} }
static void launch_processes(ckpool_t *ckp) static void launch_processes(const ckpool_t *ckp)
{ {
int i; int i;
@ -858,7 +858,7 @@ static void launch_processes(ckpool_t *ckp)
launch_process(ckp->children[i]); launch_process(ckp->children[i]);
} }
int process_exit(ckpool_t *ckp, proc_instance_t *pi, int ret) int process_exit(ckpool_t *ckp, const proc_instance_t *pi, int ret)
{ {
if (ret) { if (ret) {
/* Abnormal termination, kill entire process */ /* Abnormal termination, kill entire process */
@ -902,7 +902,7 @@ static void cancel_pthread(pthread_t *pth)
pth = NULL; pth = NULL;
} }
static void wait_child(pid_t *pid) static void wait_child(const pid_t *pid)
{ {
int ret; int ret;
@ -939,7 +939,7 @@ static void shutdown_children(ckpool_t *ckp)
__shutdown_children(ckp); __shutdown_children(ckp);
} }
static void sighandler(int sig) static void sighandler(const int sig)
{ {
ckpool_t *ckp = global_ckp; ckpool_t *ckp = global_ckp;
@ -954,7 +954,7 @@ static void sighandler(int sig)
exit(0); exit(0);
} }
static bool _json_get_string(char **store, json_t *entry, const char *res) static bool _json_get_string(char **store, const json_t *entry, const char *res)
{ {
bool ret = false; bool ret = false;
const char *buf; const char *buf;
@ -976,12 +976,12 @@ out:
return ret; return ret;
} }
bool json_get_string(char **store, json_t *val, const char *res) bool json_get_string(char **store, const json_t *val, const char *res)
{ {
return _json_get_string(store, json_object_get(val, res), res); return _json_get_string(store, json_object_get(val, res), res);
} }
static void json_get_int64(int64_t *store, json_t *val, const char *res) static void json_get_int64(int64_t *store, const json_t *val, const char *res)
{ {
json_t *entry = json_object_get(val, res); json_t *entry = json_object_get(val, res);
@ -997,7 +997,7 @@ static void json_get_int64(int64_t *store, json_t *val, const char *res)
LOGDEBUG("Json found entry %s: %ld", res, *store); LOGDEBUG("Json found entry %s: %ld", res, *store);
} }
bool json_get_int(int *store, json_t *val, const char *res) bool json_get_int(int *store, const json_t *val, const char *res)
{ {
json_t *entry = json_object_get(val, res); json_t *entry = json_object_get(val, res);
bool ret = false; bool ret = false;
@ -1017,7 +1017,7 @@ out:
return ret; return ret;
} }
bool json_get_double(double *store, json_t *val, const char *res) bool json_get_double(double *store, const json_t *val, const char *res)
{ {
json_t *entry = json_object_get(val, res); json_t *entry = json_object_get(val, res);
bool ret = false; bool ret = false;
@ -1037,7 +1037,7 @@ out:
return ret; return ret;
} }
static bool json_get_bool(bool *store, json_t *val, const char *res) static bool json_get_bool(bool *store, const json_t *val, const char *res)
{ {
json_t *entry = json_object_get(val, res); json_t *entry = json_object_get(val, res);
bool ret = false; bool ret = false;
@ -1057,7 +1057,7 @@ out:
return ret; return ret;
} }
static void parse_btcds(ckpool_t *ckp, json_t *arr_val, int arr_size) static void parse_btcds(ckpool_t *ckp, const json_t *arr_val, const int arr_size)
{ {
json_t *val; json_t *val;
int i; int i;
@ -1076,7 +1076,7 @@ static void parse_btcds(ckpool_t *ckp, json_t *arr_val, int arr_size)
} }
} }
static void parse_proxies(ckpool_t *ckp, json_t *arr_val, int arr_size) static void parse_proxies(ckpool_t *ckp, const json_t *arr_val, const int arr_size)
{ {
json_t *val; json_t *val;
int i; int i;
@ -1093,7 +1093,7 @@ static void parse_proxies(ckpool_t *ckp, json_t *arr_val, int arr_size)
} }
} }
static bool parse_serverurls(ckpool_t *ckp, json_t *arr_val) static bool parse_serverurls(ckpool_t *ckp, const json_t *arr_val)
{ {
bool ret = false; bool ret = false;
int arr_size, i; int arr_size, i;
@ -1188,7 +1188,7 @@ static proc_instance_t *prepare_child(ckpool_t *ckp, int (*process)(), char *nam
return pi; return pi;
} }
static proc_instance_t *child_by_pid(ckpool_t *ckp, pid_t pid) static proc_instance_t *child_by_pid(const ckpool_t *ckp, const pid_t pid)
{ {
proc_instance_t *pi = NULL; proc_instance_t *pi = NULL;
int i; int i;

14
src/ckpool.h
Unescape View File

@ -193,7 +193,7 @@ struct ckpool_instance {
#define SAFE_HASH_OVERHEAD(HASHLIST) (HASHLIST ? HASH_OVERHEAD(hh, HASHLIST) : 0) #define SAFE_HASH_OVERHEAD(HASHLIST) (HASHLIST ? HASH_OVERHEAD(hh, HASHLIST) : 0)
ckmsgq_t *create_ckmsgq(ckpool_t *ckp, const char *name, const void *func); ckmsgq_t *create_ckmsgq(ckpool_t *ckp, const char *name, const void *func);
ckmsgq_t *create_ckmsgqs(ckpool_t *ckp, const char *name, const void *func, int count); ckmsgq_t *create_ckmsgqs(ckpool_t *ckp, const char *name, const void *func, const int count);
void ckmsgq_add(ckmsgq_t *ckmsgq, void *data); void ckmsgq_add(ckmsgq_t *ckmsgq, void *data);
bool ckmsgq_empty(ckmsgq_t *ckmsgq); bool ckmsgq_empty(ckmsgq_t *ckmsgq);
@ -201,22 +201,22 @@ ckpool_t *global_ckp;
bool ping_main(ckpool_t *ckp); bool ping_main(ckpool_t *ckp);
void empty_buffer(connsock_t *cs); void empty_buffer(connsock_t *cs);
int read_socket_line(connsock_t *cs, int timeout); int read_socket_line(connsock_t *cs, const int timeout);
bool _send_proc(proc_instance_t *pi, const char *msg, const char *file, const char *func, const int line); bool _send_proc(proc_instance_t *pi, const char *msg, const char *file, const char *func, const int line);
#define send_proc(pi, msg) _send_proc(pi, msg, __FILE__, __func__, __LINE__) #define send_proc(pi, msg) _send_proc(pi, msg, __FILE__, __func__, __LINE__)
char *_send_recv_proc(proc_instance_t *pi, const char *msg, const char *file, const char *func, const int line); char *_send_recv_proc(proc_instance_t *pi, const char *msg, const char *file, const char *func, const int line);
#define send_recv_proc(pi, msg) _send_recv_proc(pi, msg, __FILE__, __func__, __LINE__) #define send_recv_proc(pi, msg) _send_recv_proc(pi, msg, __FILE__, __func__, __LINE__)
char *_send_recv_ckdb(const ckpool_t *ckp, const char *msg, const char *file, const char *func, const int line); char *_send_recv_ckdb(const ckpool_t *ckp, const char *msg, const char *file, const char *func, const int line);
#define send_recv_ckdb(ckp, msg) _send_recv_ckdb(ckp, msg, __FILE__, __func__, __LINE__) #define send_recv_ckdb(ckp, msg) _send_recv_ckdb(ckp, msg, __FILE__, __func__, __LINE__)
char *_ckdb_msg_call(const ckpool_t *ckp, char *msg, const char *file, const char *func, char *_ckdb_msg_call(const ckpool_t *ckp, const char *msg, const char *file, const char *func,
const int line); const int line);
#define ckdb_msg_call(ckp, msg) _ckdb_msg_call(ckp, msg, __FILE__, __func__, __LINE__) #define ckdb_msg_call(ckp, msg) _ckdb_msg_call(ckp, msg, __FILE__, __func__, __LINE__)
json_t *json_rpc_call(connsock_t *cs, const char *rpc_req); json_t *json_rpc_call(connsock_t *cs, const char *rpc_req);
int process_exit(ckpool_t *ckp, proc_instance_t *pi, int ret); int process_exit(ckpool_t *ckp, const proc_instance_t *pi, int ret);
bool json_get_string(char **store, json_t *val, const char *res); bool json_get_string(char **store, const json_t *val, const char *res);
bool json_get_int(int *store, json_t *val, const char *res); bool json_get_int(int *store, const json_t *val, const char *res);
bool json_get_double(double *store, json_t *val, const char *res); bool json_get_double(double *store, const json_t *val, const char *res);
#endif /* CKPOOL_H */ #endif /* CKPOOL_H */

Write Preview
Loading…
Cancel
Save