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

Merge branch 'master' of git.omp.am:/home/omp/git/conky

Browse Source
This commit is contained in:
Brenden Matthews 2009-05-24 13:48:10 -06:00
commit 19ca4c071a
3 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common.c
View File

@ -338,6 +338,9 @@ void update_stuff(void)
/* clear speeds and up status in case device was removed and doesn't get
* updated */
#ifdef HAVE_OPENMP
#pragma omp parallel for
#endif /* HAVE_OPENMP */
for (i = 0; i < 16; i++) {
if (netstats[i].dev) {
netstats[i].up = 0;

21
src/conky.c
View File

@ -3907,9 +3907,15 @@ static void generate_text_internal(char *p, int p_max_size,
#endif
if(!obj->a) obj->a = DEFAULT_BAR_WIDTH_NO_X;
barnum = round_to_int( ( barnum * obj->a ) / 100);
#ifdef HAVE_OPENMP
#pragma omp parallel for
#endif /* HAVE_OPENMP */
for(i=0; i<barnum; i++) {
*(p+i)='#';
}
#ifdef HAVE_OPENMP
#pragma omp parallel for
#endif /* HAVE_OPENMP */
for(; i < obj->a; i++) {
*(p+i)='_';
}
@ -5301,13 +5307,22 @@ static void generate_text_internal(char *p, int p_max_size,
struct text_object * objsub = obj->sub;
p[0]=0;
#ifdef HAVE_OPENMP
#pragma omp parallel for
#endif /* HAVE_OPENMP */
for(i=0; i<2; i++) {
nr_rows[i] = 1;
nextstart = 0;
ll_rows[i] = malloc(sizeof(struct llrows));
current[i] = ll_rows[i];
#ifdef HAVE_OPENMP
#pragma omp parallel for
#endif /* HAVE_OPENMP */
for(j=0; j<i; j++) objsub = objsub->sub;
generate_text_internal(buf[i], max_user_text, *objsub, cur);
#ifdef HAVE_OPENMP
#pragma omp parallel for reduction (+:nr_rows[i])
#endif /* HAVE_OPENMP */
for(j=0; buf[i][j] != 0; j++) {
if(buf[i][j] == '\t') buf[i][j] = ' ';
if(buf[i][j] == '\n') {
@ -5339,8 +5354,14 @@ static void generate_text_internal(char *p, int p_max_size,
strcat(p, current[1]->row);
}
strcat(p, "\n");
#ifdef HAVE_OPENMP
#pragma omp parallel for
#endif /* HAVE_OPENMP */
for(i=0; i<2; i++) if(current[i]) current[i]=current[i]->next;
}
#ifdef HAVE_OPENMP
#pragma omp parallel for
#endif /* HAVE_OPENMP */
for(i=0; i<2; i++) {
while(ll_rows[i] != NULL) {
current[i]=ll_rows[i];

3
src/temphelper.c
View File

@ -53,6 +53,9 @@ set_temp_output_unit(const char *name)
return 1;
buf = strdup(name);
#ifdef HAVE_OPENMP
#pragma omp parallel for
#endif /* HAVE_OPENMP */
for (i = 0; i < strlen(name); i++)
buf[i] = tolower(name[i]);