[Cmake-commits] CMake branch, next, updated. v3.1.0-1222-g3f59a44
Brad King
brad.king at kitware.com
Wed Dec 17 15:01:44 EST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3f59a446c7f7f874f8b223a32eb47397fabebef2 (commit)
via 3470704f5a68310a063d928e290a41be5e49620f (commit)
via 6a5ab894fbb1683ed24bfa5d603eff6ff3f40039 (commit)
from 8cff10383e6198df9c1f1d4649049961d7c8f00a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f59a446c7f7f874f8b223a32eb47397fabebef2
commit 3f59a446c7f7f874f8b223a32eb47397fabebef2
Merge: 8cff103 3470704
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 17 15:01:43 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 17 15:01:43 2014 -0500
Merge topic 'update-kwsys' into next
3470704f Merge branch 'upstream-kwsys' into update-kwsys
6a5ab894 KWSys 2014-12-16 (cc4046a8)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3470704f5a68310a063d928e290a41be5e49620f
commit 3470704f5a68310a063d928e290a41be5e49620f
Merge: 9c7c6e4 6a5ab89
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 17 15:00:39 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 17 15:00:39 2014 -0500
Merge branch 'upstream-kwsys' into update-kwsys
diff --cc Source/kwsys/CONTRIBUTING.rst
index 0000000,e097b76..e097b76
mode 000000,100644..100644
--- a/Source/kwsys/CONTRIBUTING.rst
+++ b/Source/kwsys/CONTRIBUTING.rst
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a5ab894fbb1683ed24bfa5d603eff6ff3f40039
commit 6a5ab894fbb1683ed24bfa5d603eff6ff3f40039
Author: KWSys Robot <kwrobot at kitware.com>
AuthorDate: Tue Dec 16 08:48:30 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 17 15:00:15 2014 -0500
KWSys 2014-12-16 (cc4046a8)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ cc4046a8 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' dec9c30b..cc4046a8
Brad King (2):
9c3eacf8 Add CONTRIBUTING.rst file with instructions to contribute
cc4046a8 Directory: Work around PGI problem with Linux Large File Support
Jean-Christophe Fillion-Robin (2):
c38ba638 SystemInformation: Improve Get(Available/Total)VirtualMemory for windows
58308145 SystemInformation: Improve comments in private implementation
Change-Id: Ic033444a9c03a8a8b5195e7dac108af2aec79fa6
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
new file mode 100644
index 0000000..e097b76
--- /dev/null
+++ b/CONTRIBUTING.rst
@@ -0,0 +1,35 @@
+Contributing to KWSys
+*********************
+
+Overview
+========
+
+KWSys is kept in its own Git repository and shared by several projects
+via copies in their source trees. Changes to KWSys should not be made
+directly in a host project, except perhaps in maintenance branches.
+
+Please visit
+
+ http://public.kitware.com/Wiki/KWSys/Git
+
+to contribute changes directly to KWSys upstream. Once changes are
+reviewed, tested, and integrated there then the copies of KWSys within
+dependent projects can be updated to get the changes.
+
+Issues
+======
+
+KWSys has no independent issue tracker. After encountering an issue
+(bug) please try to submit a patch using the above instructions.
+Otherwise please report the issue to the tracker for the project that
+hosts the copy of KWSys in which the problem was found.
+
+License
+=======
+
+We do not require any formal copyright assignment or contributor license
+agreement. Any contributions intentionally sent upstream are presumed
+to be offerred under terms of the OSI-approved BSD 3-clause License.
+See `Copyright.txt`_ for details.
+
+.. _`Copyright.txt`: Copyright.txt
diff --git a/Directory.cxx b/Directory.cxx
index 741bcba..04b2866 100644
--- a/Directory.cxx
+++ b/Directory.cxx
@@ -203,13 +203,18 @@ unsigned long Directory::GetNumberOfFilesInDirectory(const kwsys_stl::string& na
#include <sys/types.h>
#include <dirent.h>
-/* There is a problem with the Portland compiler, large file
-support and glibc/Linux system headers:
-http://www.pgroup.com/userforum/viewtopic.php?
-p=1992&sid=f16167f51964f1a68fe5041b8eb213b6
-*/
-#if defined(__PGI) && defined(__USE_FILE_OFFSET64)
-# define dirent dirent64
+// PGI with glibc has trouble with dirent and large file support:
+// http://www.pgroup.com/userforum/viewtopic.php?
+// p=1992&sid=f16167f51964f1a68fe5041b8eb213b6
+// Work around the problem by mapping dirent the same way as readdir.
+#if defined(__PGI) && defined(__GLIBC__)
+# define kwsys_dirent_readdir dirent
+# define kwsys_dirent_readdir64 dirent64
+# define kwsys_dirent kwsys_dirent_lookup(readdir)
+# define kwsys_dirent_lookup(x) kwsys_dirent_lookup_delay(x)
+# define kwsys_dirent_lookup_delay(x) kwsys_dirent_##x
+#else
+# define kwsys_dirent dirent
#endif
namespace KWSYS_NAMESPACE
@@ -226,7 +231,7 @@ bool Directory::Load(const kwsys_stl::string& name)
return 0;
}
- for (dirent* d = readdir(dir); d; d = readdir(dir) )
+ for (kwsys_dirent* d = readdir(dir); d; d = readdir(dir) )
{
this->Internal->Files.push_back(d->d_name);
}
@@ -240,7 +245,7 @@ unsigned long Directory::GetNumberOfFilesInDirectory(const kwsys_stl::string& na
DIR* dir = opendir(name.c_str());
unsigned long count = 0;
- for (dirent* d = readdir(dir); d; d = readdir(dir) )
+ for (kwsys_dirent* d = readdir(dir); d; d = readdir(dir) )
{
count++;
}
diff --git a/README.txt b/README.txt
index ba03f8d..b8191f7 100644
--- a/README.txt
+++ b/README.txt
@@ -8,3 +8,5 @@ details.
You are probably reading this file in the source tree of a surrounding
project. In that case, see "../README.kwsys" for details of using
KWSys in your project.
+
+See CONTRIBUTING.rst for instructions to contribute KWSys changes.
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 3e1a1ab..3d5e728 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -443,7 +443,7 @@ public:
};
protected:
- // Functions.
+ // For windows
bool RetrieveCPUFeatures();
bool RetrieveCPUIdentity();
bool RetrieveCPUCacheDetails();
@@ -457,6 +457,7 @@ protected:
bool RetrieveClassicalCPUIdentity();
bool RetrieveExtendedCPUIdentity();
+ // Processor information
Manufacturer ChipManufacturer;
CPUFeatures Features;
ID ChipID;
@@ -464,11 +465,11 @@ protected:
unsigned int NumberOfLogicalCPU;
unsigned int NumberOfPhysicalCPU;
- int CPUCount();
+ int CPUCount(); // For windows
unsigned char LogicalCPUPerPhysicalCPU();
- unsigned char GetAPICId();
+ unsigned char GetAPICId(); // For windows
bool IsHyperThreadingSupported();
- static LongLong GetCyclesDifference(DELAY_FUNC, unsigned int);
+ static LongLong GetCyclesDifference(DELAY_FUNC, unsigned int); // For windows
// For Linux and Cygwin, /proc/cpuinfo formats are slightly different
bool RetreiveInformationFromCpuInfoFile();
@@ -3753,9 +3754,9 @@ bool SystemInformationImplementation::QueryWindowsMemory()
}
# define MEM_VAL(value) ull##value
# endif
- tv = ms.MEM_VAL(TotalVirtual);
+ tv = ms.MEM_VAL(TotalPageFile);
tp = ms.MEM_VAL(TotalPhys);
- av = ms.MEM_VAL(AvailVirtual);
+ av = ms.MEM_VAL(AvailPageFile);
ap = ms.MEM_VAL(AvailPhys);
this->TotalVirtualMemory = tv>>10>>10;
this->TotalPhysicalMemory = tp>>10>>10;
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/CONTRIBUTING.rst | 35 +++++++++++++++++++++++++++++++++++
Source/kwsys/Directory.cxx | 23 ++++++++++++++---------
Source/kwsys/README.txt | 2 ++
Source/kwsys/SystemInformation.cxx | 13 +++++++------
4 files changed, 58 insertions(+), 15 deletions(-)
create mode 100644 Source/kwsys/CONTRIBUTING.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list