Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-27 04:32:55 +00:00
Code Issues Releases Activity

put same stuff from print_texeci and print_texecpi in a separate function

Browse Source
This commit is contained in:
Nikolas Garofil 2010-02-08 16:12:46 +01:00
parent 223eefcdd7
commit a5ed45fc7b
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/exec.cc
View File

@ -345,12 +345,11 @@ void print_execpi(struct text_object *obj, char *p, int p_max_size)
free_text_objects(&subroot);
}
void print_texeci(struct text_object *obj, char *p, int p_max_size)
{
char* threaded_exec_caller(struct text_object *obj) {
struct execi_data *ed = (struct execi_data *)obj->data.opaque;
if (!ed)
return;
return NULL;
if (!ed->p_timed_thread) {
/*
@ -361,32 +360,27 @@ void print_texeci(struct text_object *obj, char *p, int p_max_size)
if (!ed->p_timed_thread) {
NORM_ERR("Error creating texeci timed thread");
}
return NULL;
} else {
std::lock_guard<std::mutex> lock(ed->p_timed_thread->mutex());
snprintf(p, p_max_size, "%s", ed->buffer);
return ed->buffer;
}
}
void print_texeci(struct text_object *obj, char *p, int p_max_size)
{
char* buffer = threaded_exec_caller(obj);
if(buffer != NULL) snprintf(p, p_max_size, "%s", buffer);
}
void print_texecpi(struct text_object *obj, char *p, int p_max_size)
{
struct execi_data *ed = (struct execi_data *)obj->data.opaque;
char* buffer = threaded_exec_caller(obj);
struct text_object subroot;
if (!ed)
return;
if (!ed->p_timed_thread) {
/*
* note that we don't register this thread with the
* timed_thread list, because we destroy it manually
*/
ed->p_timed_thread = timed_thread::create(std::bind(threaded_exec, std::placeholders::_1, obj), ed->interval * 1000000, false);
if (!ed->p_timed_thread) {
NORM_ERR("Error creating texecpi timed thread");
}
} else {
std::lock_guard<std::mutex> lock(ed->p_timed_thread->mutex());
parse_conky_vars(&subroot, ed->buffer, p, p_max_size);
if(buffer != NULL) {
parse_conky_vars(&subroot, buffer, p, p_max_size);
free_text_objects(&subroot);
}
}