[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  5700158 lib: Use replace.h properly in pthreadpool
       via  499bfce ctdb-pmda: Use 1s timeout for fetching statistics
      from  e001dce ldb: Fix some signed/unsigned hickups

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 57001580bb354be086548720b3b0d3c8b6e05642
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jul 31 07:42:21 2016 +0200

    lib: Use replace.h properly in pthreadpool
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Fri Aug 12 04:26:09 CEST 2016 on sn-devel-144

commit 499bfce3e9138e01216170a25b12b404d7430a74
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Tue Aug 2 19:06:10 2016 +1000

    ctdb-pmda: Use 1s timeout for fetching statistics
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12138
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/utils/pmda/pmda_ctdb.c           |  3 +--
 source3/lib/pthreadpool/pthreadpool.c | 14 +++-----------
 2 files changed, 4 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c
index 6131be9..a77f26c 100644
--- a/ctdb/utils/pmda/pmda_ctdb.c
+++ b/ctdb/utils/pmda/pmda_ctdb.c
@@ -441,7 +441,6 @@ static int
 pmda_ctdb_fetch(int numpmid, pmID pmidlist[], pmResult **resp, pmdaExt *pmda)
 {
 	int ret;
-	struct timeval ctdb_timeout;
 
 	if (client == NULL) {
 		fprintf(stderr, "attempting reconnect to ctdbd\n");
@@ -453,7 +452,7 @@ pmda_ctdb_fetch(int numpmid, pmID pmidlist[], pmResult **resp, pmdaExt *pmda)
 	}
 
 	ret = ctdb_ctrl_statistics(client, ev, client, CTDB_CURRENT_NODE,
-				   ctdb_timeout, &stats);
+				   tevent_timeval_current_ofs(1,0), &stats);
 	if (ret != 0) {
 		fprintf(stderr, "ctdb control for statistics failed, reconnecting\n");
 		pmda_ctdb_daemon_disconnect();
diff --git a/source3/lib/pthreadpool/pthreadpool.c b/source3/lib/pthreadpool/pthreadpool.c
index 4b745e4..917bafa 100644
--- a/source3/lib/pthreadpool/pthreadpool.c
+++ b/source3/lib/pthreadpool/pthreadpool.c
@@ -17,21 +17,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <pthread.h>
-#include <signal.h>
-#include <assert.h>
-#include <fcntl.h>
+#include "replace.h"
 #include "system/time.h"
 #include "system/filesys.h"
-#include "replace.h"
-
 #include "pthreadpool.h"
 #include "lib/util/dlinklist.h"
+#include "system/threads.h"
+#include <assert.h>
 
 struct pthreadpool_job {
 	int id;


-- 
Samba Shared Repository