Merge branch 'sh/plugin_interval'

Conflicts:
	src/amqp.c
	src/exec.c
	src/memcached.c
	src/unixsock.c

diff --cc src/amqp.c
index c9e46c4,db65791..9c8c6e5
--- 1/src/amqp.c
--- 2/src/amqp.c
+++ b/src/amqp.c
@@@ -607,25 -552,21 +609,25 @@@ static void *camqp_subscribe_thread (vo
          status = camqp_connect (conf);
          if (status != 0)
          {
 +            struct timespec ts_interval;
              ERROR ("amqp plugin: camqp_connect failed. "
                      "Will sleep for %.3f seconds.",
-                     CDTIME_T_TO_DOUBLE (interval_g));
-             CDTIME_T_TO_TIMESPEC (interval_g, &ts_interval);
+                     CDTIME_T_TO_DOUBLE (interval));
 -            sleep (interval);
++            CDTIME_T_TO_TIMESPEC (interval, &ts_interval);
 +            nanosleep (&ts_interval, /* remaining = */ NULL);
              continue;
          }
  
          status = amqp_simple_wait_frame (conf->connection, &frame);
          if (status < 0)
          {
 +            struct timespec ts_interval;
              ERROR ("amqp plugin: amqp_simple_wait_frame failed. "
                      "Will sleep for %.3f seconds.",
-                     CDTIME_T_TO_DOUBLE (interval_g));
+                     CDTIME_T_TO_DOUBLE (interval));
              camqp_close_connection (conf);
-             CDTIME_T_TO_TIMESPEC (interval_g, &ts_interval);
 -            sleep (interval);
++            CDTIME_T_TO_TIMESPEC (interval, &ts_interval);
 +            nanosleep (&ts_interval, /* remaining = */ NULL);
              continue;
          }
  

diff --cc src/collectd.c
Simple merge

diff --cc src/collectd.conf.pod
Simple merge

diff --cc src/configfile.c
Simple merge

diff --cc src/configfile.h
Simple merge

diff --cc src/disk.c
index 375583c,fde0dcd..3728d55
--- 1/src/disk.c
--- 2/src/disk.c
+++ b/src/disk.c
@@@ -248,16 -235,6 +248,17 @@@ static void disk_submit (const char *pl
        plugin_dispatch_values (&vl);
  } /* void disk_submit */
  
-       double avg_time_incr = CDTIME_T_TO_DOUBLE (interval_g) * avg_time;
 +#if KERNEL_LINUX
 +static counter_t disk_calc_time_incr (counter_t delta_time, counter_t delta_ops)
 +{
++      double interval = CDTIME_T_TO_DOUBLE (plugin_get_interval ());
 +      double avg_time = ((double) delta_time) / ((double) delta_ops);
++      double avg_time_incr = interval * avg_time;
 +
 +      return ((counter_t) (avg_time_incr + .5));
 +}
 +#endif
 +
  #if HAVE_IOKIT_IOKITLIB_H
  static signed long long dict_get_value (CFDictionaryRef dict, const char *key)
  {

diff --cc src/email.c
Simple merge

diff --cc src/exec.c
index 0e807c7,da6e367..14d288f
--- 1/src/exec.c
--- 2/src/exec.c
+++ b/src/exec.c
@@@ -826,8 -814,7 +827,8 @@@ static int exec_read (void) /* {{{ *
  
      pthread_attr_init (&attr);
      pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
-     pthread_create (&t, &attr, exec_read_one, (void *) pl);
+     plugin_thread_create (&t, &attr, exec_read_one, (void *) pl);
 +    pthread_attr_destroy (&attr);
    } /* for (pl) */
  
    return (0);
@@@ -870,8 -857,7 +871,8 @@@ static int exec_notification (const not
  
      pthread_attr_init (&attr);
      pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
-     pthread_create (&t, &attr, exec_notification_one, (void *) pln);
+     plugin_thread_create (&t, &attr, exec_notification_one, (void *) pln);
 +    pthread_attr_destroy (&attr);
    } /* for (pl) */
  
    return (0);

diff --cc src/network.c
Simple merge

diff --cc src/perl.c
Simple merge

diff --cc src/pinba.c
Simple merge

diff --cc src/ping.c
Simple merge

diff --cc src/plugin.c
Simple merge

diff --cc src/plugin.h
Simple merge

diff --cc src/postgresql.c
index 675505b,953bcd8..a72109a
--- 1/src/postgresql.c
--- 2/src/postgresql.c
+++ b/src/postgresql.c
@@@ -345,12 -337,10 +345,13 @@@ static PGresult *c_psql_exec_query_para
                        case C_PSQL_PARAM_INTERVAL:
                                ssnprintf (interval, sizeof (interval), "%.3f",
                                                (db->interval > 0)
-                                               ? CDTIME_T_TO_DOUBLE (db->interval) : interval_g);
+                                               ? CDTIME_T_TO_DOUBLE (db->interval)
+                                               : plugin_get_interval ());
                                params[i] = interval;
                                break;
 +                      case C_PSQL_PARAM_INSTANCE:
 +                              params[i] = db->instance;
 +                              break;
                        default:
                                assert (0);
                }

diff --cc src/python.c
Simple merge

diff --cc src/rrdtool.c
Simple merge

diff --cc src/snmp.c
Simple merge

diff --cc src/unixsock.c
index 0dc7d65,337978d..2c1665f
--- 1/src/unixsock.c
--- 2/src/unixsock.c
+++ b/src/unixsock.c
@@@ -363,7 -352,11 +363,8 @@@ static void *us_server_thread (void __a
  
                DEBUG ("Spawning child to handle connection on fd #%i", *remote_fd);
  
-               status = pthread_create (&th, &th_attr, us_handle_client, (void *) remote_fd);
 -              pthread_attr_init (&th_attr);
 -              pthread_attr_setdetachstate (&th_attr, PTHREAD_CREATE_DETACHED);
 -
+               status = plugin_thread_create (&th, &th_attr,
+                               us_handle_client, (void *) remote_fd);
                if (status != 0)
                {
                        char errbuf[1024];