Merge branch 'master' into imlib2

.gitignore

@@ -34,5 +34,4 @@ conky-*.tar.*
 doc/*.html
 doc/*.mxml
 patches/
-README
 doc/conky.1

ChangeLog

@@ -1,3 +1,6 @@
+2009-05-05
+	* Added some completely pointless OpenMP optimizations(?)
+
 2009-05-03
 	* Added Sony VAIO fanspeed info (thanks Yeon-Hyeong)
 

README.git-version

@@ -1,37 +0,0 @@
-QUICK & EASY:
-	$ sh autogen.sh
-	$ ./configure
-	$ make
-	$ ./src/conky # to run Conky
-	# make install
-
-First, read the README. This contains instructions specific to building conky
-fresh from the git repo:
-
-* Conky requires three "auto-tools", with at least the specific version numbers.
-	Make sure these are installed:
-
-	aclocal-1.9
-	automake-1.9
-	autoconf-2.59
-
-* In the directory where you cloned conky from git,
-	run "aclocal", "automake", and then "autoconf".
-	Make sure you run those commands with the latest versions...
-	it is very possible that older versions are installed, and
-	plain "automake" really means automake-1.4, not what we want,
-	but "automake-1.9" instead.
-	Use the "--version" option to check the program version, i.e.
-	"autoconf --version".
-
-	You can also try using the autogen.sh script, like so:
-
-	$ sh autogen.sh
-
-* After that, it's the familiar
-
-	$ ./configure
-	$ make
-	# make install
-
-	You might have to do the last step as root.

configure.ac.in

@@ -612,6 +612,15 @@ AC_CHECK_HEADER(zlib.h,
 		[AC_MSG_ERROR([zlib is missing; please install the headers first])])
 
 
+dnl
+dnl Check for OpenMP support
+dnl
+
+AX_OPENMP([
+  AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])
+  CFLAGS="$CFLAGS $OPENMP_CFLAGS"
+])
+
 dnl
 dnl Check doc stuff
 dnl
@@ -625,7 +634,6 @@ else
   AM_CONDITIONAL(HAVE_DOCSTUFF, true)
 fi
 
-
 dnl
 dnl kstat in Solaris
 dnl

m4/ax_openmp.m4

@@ -0,0 +1,98 @@
+# ===========================================================================
+#            http://www.nongnu.org/autoconf-archive/ax_openmp.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_OPENMP([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro tries to find out how to compile programs that use OpenMP a
+#   standard API and set of compiler directives for parallel programming
+#   (see http://www-unix.mcs/)
+#
+#   On success, it sets the OPENMP_CFLAGS/OPENMP_CXXFLAGS/OPENMP_F77FLAGS
+#   output variable to the flag (e.g. -omp) used both to compile *and* link
+#   OpenMP programs in the current language.
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also link it with them as well.
+#
+#   If you want to compile everything with OpenMP, you should set:
+#
+#       CFLAGS="$CFLAGS $OPENMP_CFLAGS"
+#       #OR#  CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
+#       #OR#  FFLAGS="$FFLAGS $OPENMP_FFLAGS"
+#
+#   (depending on the selected language).
+#
+#   The user can override the default choice by setting the corresponding
+#   environment variable (e.g. OPENMP_CFLAGS).
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if an OpenMP flag is
+#   found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is
+#   not found. If ACTION-IF-FOUND is not specified, the default action will
+#   define HAVE_OPENMP.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#
+#   This program 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, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   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, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+AC_DEFUN([AX_OPENMP], [
+AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
+
+AC_CACHE_CHECK([for OpenMP flag of _AC_LANG compiler], ax_cv_[]_AC_LANG_ABBREV[]_openmp, [save[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
+ax_cv_[]_AC_LANG_ABBREV[]_openmp=unknown
+# Flags to try:  -fopenmp (gcc), -openmp (icc), -mp (SGI & PGI),
+#                -xopenmp (Sun), -omp (Tru64), -qsmp=omp (AIX), none
+ax_openmp_flags="-fopenmp -openmp -mp -xopenmp -omp -qsmp=omp none"
+if test "x$OPENMP_[]_AC_LANG_PREFIX[]FLAGS" != x; then
+  ax_openmp_flags="$OPENMP_[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flags"
+fi
+for ax_openmp_flag in $ax_openmp_flags; do
+  case $ax_openmp_flag in
+    none) []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[] ;;
+    *) []_AC_LANG_PREFIX[]FLAGS="$save[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flag" ;;
+  esac
+  AC_TRY_LINK_FUNC(omp_set_num_threads,
+	[ax_cv_[]_AC_LANG_ABBREV[]_openmp=$ax_openmp_flag; break])
+done
+[]_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS
+])
+if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then
+  m4_default([$2],:)
+else
+  if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
+    OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
+  fi
+  m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])
+fi
+])dnl AX_OPENMP
+

src/conky.c

@@ -5085,7 +5085,7 @@ static inline int get_string_width_special(char *s)
 	char *p, *final;
 	int idx = 1;
 	int width = 0;
-	unsigned int i;
+	long i;
 
 	if ((output_methods & TO_X) == 0) {
 #endif
@@ -5104,7 +5104,7 @@ static inline int get_string_width_special(char *s)
 		if (*p == SPECIAL_CHAR) {
 			/* shift everything over by 1 so that the special char
 			 * doesn't mess up the size calculation */
-			for (i = 0; i < strlen(p); i++) {
+			for (i = 0; i < (long)strlen(p); i++) {
 				*(p + i) = *(p + i + 1);
 			}
 			if (specials[special_index + idx].type == GRAPH

src/conky.h

@@ -228,11 +228,11 @@ struct information {
 	float *cpu_usage;
 	/* struct cpu_stat cpu_summed; what the hell is this? */
 	unsigned int cpu_count;
-	unsigned int cpu_avg_samples;
+	int cpu_avg_samples;
 
-	unsigned int net_avg_samples;
+	int net_avg_samples;
 
-	unsigned int diskio_avg_samples;
+	int diskio_avg_samples;
 
 	float loadavg[3];
 

src/linux.c

@@ -405,9 +405,12 @@ void update_net_stats(void)
 		curtmp1 = 0;
 		curtmp2 = 0;
 		// get an average
-		for (i = 0; (unsigned) i < info.net_avg_samples; i++) {
+#ifdef HAVE_OPENMP
-			curtmp1 += ns->net_rec[i];
+#pragma omp parallel for
-			curtmp2 += ns->net_trans[i];
+#endif /* HAVE_OPENMP */
+		for (i = 0; i < info.net_avg_samples; i++) {
+			curtmp1 = curtmp1 + ns->net_rec[i];
+			curtmp2 = curtmp2 + ns->net_trans[i];
 		}
 		if (curtmp1 == 0) {
 			curtmp1 = 1;
@@ -418,6 +421,9 @@ void update_net_stats(void)
 		ns->recv_speed = curtmp1 / (double) info.net_avg_samples;
 		ns->trans_speed = curtmp2 / (double) info.net_avg_samples;
 		if (info.net_avg_samples > 1) {
+#ifdef HAVE_OPENMP
+#pragma omp parallel for
+#endif /* HAVE_OPENMP */
 			for (i = info.net_avg_samples; i > 1; i--) {
 				ns->net_rec[i - 1] = ns->net_rec[i - 2];
 				ns->net_trans[i - 1] = ns->net_trans[i - 2];
@@ -592,7 +598,7 @@ inline static void update_stat(void)
 	static int rep = 0;
 	static struct cpu_info *cpu = NULL;
 	char buf[256];
-	unsigned int i;
+	int i;
 	unsigned int idx;
 	double curtmp;
 	const char *stat_template = NULL;
@@ -664,8 +670,11 @@ inline static void update_stat(void)
 				cpu[idx].cpu_last_active_total) /
 				(float) (cpu[idx].cpu_total - cpu[idx].cpu_last_total);
 			curtmp = 0;
+#ifdef HAVE_OPENMP
+#pragma omp parallel for reduction(+:curtmp)
+#endif /* HAVE_OPENMP */
 			for (i = 0; i < info.cpu_avg_samples; i++) {
-				curtmp += cpu[idx].cpu_val[i];
+				curtmp = curtmp + cpu[idx].cpu_val[i];
 			}
 			/* TESTING -- I've removed this, because I don't think it is right.
 			 * You shouldn't divide by the cpu count here ...
@@ -681,6 +690,9 @@ inline static void update_stat(void)
 
 			cpu[idx].cpu_last_total = cpu[idx].cpu_total;
 			cpu[idx].cpu_last_active_total = cpu[idx].cpu_active_total;
+#ifdef HAVE_OPENMP
+#pragma omp parallel for
+#endif /* HAVE_OPENMP */
 			for (i = info.cpu_avg_samples - 1; i > 0; i--) {
 				cpu[idx].cpu_val[i] = cpu[idx].cpu_val[i - 1];
 			}
@@ -794,6 +806,9 @@ static int get_first_file_in_a_directory(const char *dir, char *s, int *rep)
 		strncpy(s, namelist[0]->d_name, 255);
 		s[255] = '\0';
 
+#ifdef HAVE_OPENMP
+#pragma omp parallel for
+#endif /* HAVE_OPENMP */
 		for (i = 0; i < n; i++) {
 			free(namelist[i]);
 		}
@@ -1454,6 +1469,9 @@ void init_batteries(void)
 	if (batteries_initialized) {
 		return;
 	}
+#ifdef HAVE_OPENMP
+#pragma omp parallel for
+#endif /* HAVE_OPENMP */
 	for (idx = 0; idx < MAX_BATTERY_COUNT; idx++) {
 		batteries[idx][0] = '\0';
 	}