[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Thu Jul 14 03:45:03 UTC 2016
The branch, master has been updated
via 7c9505e ldb:dlinklist: avoid -Wtautological-compare errors with gcc6
via 2991f77 tevent: avoid -Wtautological-compare errors with gcc6
via 5d85fd8 lib:dlinklist: avoid -Wtautological-compare errors with gcc6
via f6d4380 selftest: Add tunable for smb2.maxfid limit
from 84992e3 rpc_server: add mssing '#pragma GCC diagnostic push'
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 7c9505e651287c5d4747b222af1fda970c562a00
Author: Ira Cooper <ira at samba.org>
Date: Wed Jul 13 12:37:19 2016 +0200
ldb:dlinklist: avoid -Wtautological-compare errors with gcc6
We expect these macros to generate tautological compares
intentionally, so disabling the warning is just fine.
This lets --pick-developer work with gcc6 and newer.
Pair-Programmed-With: Michael Adam <obnox at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Thu Jul 14 05:44:21 CEST 2016 on sn-devel-144
commit 2991f7709973fdcc2c0b83bbe15dda3f1ceae9b3
Author: Michael Adam <obnox at samba.org>
Date: Wed Jul 13 12:36:21 2016 +0200
tevent: avoid -Wtautological-compare errors with gcc6
We expect these macros to generate tautological compares
intentionally, so disabling the warning is just fine.
This lets --picky-developer work with gcc6 and newer.
Pair-Programmed-With: Ira Cooper <ira at samba.org>
Signed-off-by: Ira Cooper <ira at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit 5d85fd85467eb1f8941641d5f71d75e7d5c7234c
Author: Ira Cooper <ira at samba.org>
Date: Wed Jul 13 12:35:13 2016 +0200
lib:dlinklist: avoid -Wtautological-compare errors with gcc6
We expect these macros to generate tautological compares
intentionally, so disabling the warning is just fine.
This lets --picky-developer work with gcc6 and newer.
Pair-Programmed-With: Michael Adam <obnox at samba.org>
Signed-off-by: Michael Adam <obnox at samba.org>
Signed-off-by: Ira Cooper <ira at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit f6d4380a9d1e6e7323fb943d809893ce9b9dbbb2
Author: Christof Schmitt <cs at samba.org>
Date: Wed Jul 13 13:09:48 2016 -0700
selftest: Add tunable for smb2.maxfid limit
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/include/dlinklist.h | 8 ++++++++
lib/tevent/tevent_util.h | 8 ++++++++
lib/util/dlinklist.h | 8 ++++++++
source4/torture/smb2/maxfid.c | 10 ++++++++--
4 files changed, 32 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/include/dlinklist.h b/lib/ldb/include/dlinklist.h
index ef01aec..ca76794 100644
--- a/lib/ldb/include/dlinklist.h
+++ b/lib/ldb/include/dlinklist.h
@@ -83,6 +83,9 @@ do { \
*/
#define DLIST_REMOVE(list, p) \
do { \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wpragmas\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wtautological-compare\"") \
if ((p) == (list)) { \
if ((p)->next) (p)->next->prev = (p)->prev; \
(list) = (p)->next; \
@@ -94,6 +97,7 @@ do { \
if ((p)->next) (p)->next->prev = (p)->prev; \
} \
if ((p) != (list)) (p)->next = (p)->prev = NULL; \
+ _Pragma ("GCC diagnostic pop") \
} while (0)
/*
@@ -124,7 +128,11 @@ do { \
(p)->next = (el)->next; \
(el)->next = (p); \
if ((p)->next) (p)->next->prev = (p); \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wpragmas\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wtautological-compare\"") \
if ((list)->prev == (el)) (list)->prev = (p); \
+ _Pragma ("GCC diagnostic pop") \
}\
} while (0)
diff --git a/lib/tevent/tevent_util.h b/lib/tevent/tevent_util.h
index e2cdbb8..eb7586f 100644
--- a/lib/tevent/tevent_util.h
+++ b/lib/tevent/tevent_util.h
@@ -79,6 +79,9 @@ do { \
*/
#define DLIST_REMOVE(list, p) \
do { \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wpragmas\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wtautological-compare\"") \
if ((p) == (list)) { \
if ((p)->next) (p)->next->prev = (p)->prev; \
(list) = (p)->next; \
@@ -90,6 +93,7 @@ do { \
if ((p)->next) (p)->next->prev = (p)->prev; \
} \
if ((p) != (list)) (p)->next = (p)->prev = NULL; \
+ _Pragma ("GCC diagnostic pop") \
} while (0)
/*
@@ -120,7 +124,11 @@ do { \
(p)->next = (el)->next; \
(el)->next = (p); \
if ((p)->next) (p)->next->prev = (p); \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wpragmas\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wtautological-compare\"") \
if ((list)->prev == (el)) (list)->prev = (p); \
+ _Pragma ("GCC diagnostic pop") \
}\
} while (0)
diff --git a/lib/util/dlinklist.h b/lib/util/dlinklist.h
index 8a1b84d..bdd4f9c 100644
--- a/lib/util/dlinklist.h
+++ b/lib/util/dlinklist.h
@@ -79,6 +79,9 @@ do { \
*/
#define DLIST_REMOVE(list, p) \
do { \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wpragmas\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wtautological-compare\"") \
if ((p) == (list)) { \
if ((p)->next) (p)->next->prev = (p)->prev; \
(list) = (p)->next; \
@@ -90,6 +93,7 @@ do { \
if ((p)->next) (p)->next->prev = (p)->prev; \
} \
if ((p) != (list)) (p)->next = (p)->prev = NULL; \
+ _Pragma ("GCC diagnostic pop") \
} while (0)
/*
@@ -120,7 +124,11 @@ do { \
(p)->next = (el)->next; \
(el)->next = (p); \
if ((p)->next) (p)->next->prev = (p); \
+ _Pragma ("GCC diagnostic push") \
+ _Pragma ("GCC diagnostic ignored \"-Wpragmas\"") \
+ _Pragma ("GCC diagnostic ignored \"-Wtautological-compare\"") \
if ((list)->prev == (el)) (list)->prev = (p); \
+ _Pragma ("GCC diagnostic pop") \
}\
} while (0)
diff --git a/source4/torture/smb2/maxfid.c b/source4/torture/smb2/maxfid.c
index 3de76ab..cfdf7c1 100644
--- a/source4/torture/smb2/maxfid.c
+++ b/source4/torture/smb2/maxfid.c
@@ -34,7 +34,9 @@ bool torture_smb2_maxfid(struct torture_context *tctx)
const char *dname = "smb2_maxfid";
int i, maxfid;
struct smb2_handle *handles, dir_handle = { };
- const size_t max_handles = 0x41000; /* Windows 8.1 allowed 0x40000 */
+ size_t max_handles;
+
+ max_handles = torture_setting_int(tctx, "maxopenfiles", 0x11000);
if (!torture_smb2_connection(tctx, &tree)) {
return false;
@@ -117,7 +119,11 @@ bool torture_smb2_maxfid(struct torture_context *tctx)
}
maxfid = i;
- torture_comment(tctx, "Maximum number of open files: %d\n", maxfid);
+ if (maxfid == max_handles) {
+ torture_comment(tctx, "Reached test limit of %d open files. "
+ "Adjust to higher test with "
+ "--option=torture:maxopenfiles=NNN\n", maxfid);
+ }
torture_comment(tctx, "Cleanup open files\n");
--
Samba Shared Repository
More information about the samba-cvs
mailing list