Small clean-up.

- Updating libmsr version - Cleared Cab patch from TODO list. - Updating copyright year. - Updating README. Signed-off-by: Stephanie Labasan <labasan1@llnl.gov>
LLNL · Aug 26, 2016 · 56c27ff · 56c27ff
1 parent 177cb76
commit 56c27ff
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 36 deletions.
diff --git a/README b/README
@@ -1,16 +1,22 @@
 LIBMSR
 ======
 
-Welcome to libmsr, a friendly (well, friendlier) interface to many of the
+Welcome to Libmsr, a friendly (well, friendlier) interface to many of the
 model-specific registers in Intel processors. Now with PCI configuration
 register support for some Intel hardware.
 
-version 0.2.0
+version 0.3.0
 
 
 Last Update
 -----------
-18 August 2016
+24 August 2016
+
+
+Webpages
+--------
+http://software.llnl.gov/libmsr <br>
+https://github.com/llnl/libmsr
 
 
 Overview
@@ -24,7 +30,7 @@ controlling various CPU features.
 Installation
 ------------
 
-Installation is simple. You will need [cmake](http://www.cmake.org) version 2.8
+Installation is simple. You will need [CMAKE](http://www.cmake.org) version 2.8
 or higher and GCC. The old installation method is deprecated, you MUST use the
 script. In most cases, the installation is as follows:
 
@@ -84,6 +90,9 @@ Our most up-to-date documentation for Libmsr use is generated as part of the
 install script using Doxygen. There are also some useful PDF files in the
 documentation/ directory.
 
+If you wish to use Libmsr on LLNL's Cab system, you will need to apply a patch
+to gain MSR access. At this time, the patch will need to be requested as it is
+not on Github.
 
 Contributing
 ------------
@@ -96,12 +105,11 @@ Code formatting can be automated using astyle with the following parameters:
 Contact
 -------
 
-Stephanie Labasan, Developer <labasan1@llnl.gov>
-Scott Walker, Developer, <walker91@llnl.gov>
-Kathleen Shoga, Developer, <shoga1@llnl.gov>
-Lauren Morita, Developer, <morita4@llnl.gov>
-Barry Rountree, Project Lead <rountree@llnl.gov>
+Barry Rountree, Project Lead, <rountree@llnl.gov> <br>
+Kathleen Shoga, Developer, <shoga1@llnl.gov> <br>
+Scott Walker, Developer, <walker91@llnl.gov> <br>
+Lauren Morita, Developer, <morita4@llnl.gov> <br>
+Stephanie Labasan, Developer, <labasan1@llnl.gov>
 
-We are in the process of migrating our bug tracking to Github. For now, please
-feel free to contact the authors with questions, problems, bugs, and feature
+Please feel free to contact the developers with any questions or feature
 requests.
diff --git a/README.md b/README.md
@@ -1,16 +1,22 @@
 LIBMSR {#mainpage}
 ==================
 
-Welcome to libmsr, a friendly (well, friendlier) interface to many of the
+Welcome to Libmsr, a friendly (well, friendlier) interface to many of the
 model-specific registers in Intel processors. Now with PCI configuration
 register support for some Intel hardware.
 
-version 0.2.0
+version 0.3.0
 
 
 Last Update
 -----------
-18 August 2016
+24 August 2016
+
+
+Webpages
+--------
+http://software.llnl.gov/libmsr <br>
+https://github.com/llnl/libmsr
 
 
 Overview
@@ -24,7 +30,7 @@ controlling various CPU features.
 Installation
 ------------
 
-Installation is simple. You will need [cmake](http://www.cmake.org) version 2.8
+Installation is simple. You will need [CMAKE](http://www.cmake.org) version 2.8
 or higher and GCC. The old installation method is deprecated, you MUST use the
 script. In most cases, the installation is as follows:
 
@@ -84,6 +90,9 @@ Our most up-to-date documentation for Libmsr use is generated as part of the
 install script using Doxygen. There are also some useful PDF files in the
 documentation/ directory.
 
+If you wish to use Libmsr on LLNL's Cab system, you will need to apply a patch
+to gain MSR access. At this time, the patch will need to be requested as it is
+not on Github.
 
 Contributing
 ------------
@@ -96,12 +105,11 @@ Code formatting can be automated using astyle with the following parameters:
 Contact
 -------
 
-Stephanie Labasan, Developer <labasan1@llnl.gov> <br>
-Scott Walker, Developer, <walker91@llnl.gov> <br>
+Barry Rountree, Project Lead, <rountree@llnl.gov> <br>
 Kathleen Shoga, Developer, <shoga1@llnl.gov> <br>
+Scott Walker, Developer, <walker91@llnl.gov> <br>
 Lauren Morita, Developer, <morita4@llnl.gov> <br>
-Barry Rountree, Project Lead <rountree@llnl.gov>
+Stephanie Labasan, Developer, <labasan1@llnl.gov>
 
-We are in the process of migrating our bug tracking to Github. For now, please
-feel free to contact the authors with questions, problems, bugs, and feature
+Please feel free to contact the developers with any questions or feature
 requests.
diff --git a/TODO b/TODO
@@ -9,8 +9,6 @@ src/msr_rapl.c  Currently unused, but if it ever is used, we need a fix for
 Ongoing
 -------
 
-- [2016-08-08] Create patch for libmsr on Cab, which uses the msr-safeB kernel.
-
 - [2016-08-08] Finish tagging PCI configuration (CSR) files with Doxygen tags.
 
 - [2016-08-11] Check functionality of signalCombined.c once batch operation is

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.1
+0.3.0
diff --git a/demoapps/powmon/src/common.c b/demoapps/powmon/src/common.c
@@ -1,6 +1,6 @@
 /* common.c
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430
  *
  * Produced at Lawrence Livermore National Laboratory

diff --git a/demoapps/powmon/src/ghighres.c b/demoapps/powmon/src/ghighres.c
@@ -1,6 +1,6 @@
 /* ghighres.c
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430
  *
  * Produced at Lawrence Livermore National Laboratory

diff --git a/demoapps/powmon/src/highlander.c b/demoapps/powmon/src/highlander.c
@@ -1,6 +1,8 @@
 /* highlander.c
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC. LLNL-CODE-645430
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
+ * LLNL-CODE-645430
+ *
  * Produced at Lawrence Livermore National Laboratory
  * Written by  Barry Rountree,   rountree@llnl.gov
  *             Daniel Ellsworth, ellsworth8@llnl.gov

diff --git a/demoapps/powmon/src/highlander.h b/demoapps/powmon/src/highlander.h
@@ -1,6 +1,6 @@
 /* highlander.h
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430
  *
  * Produced at Lawrence Livermore National Laboratory

diff --git a/demoapps/powmon/src/power_wrapper_dynamic.c b/demoapps/powmon/src/power_wrapper_dynamic.c
@@ -1,6 +1,6 @@
 /* power_wrapper_dynamic.c
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430
  *
  * Produced at Lawrence Livermore National Laboratory

diff --git a/demoapps/powmon/src/power_wrapper_static.c b/demoapps/powmon/src/power_wrapper_static.c
@@ -1,6 +1,6 @@
 /* power_wrapper_static.c
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430
  *
  * Produced at Lawrence Livermore National Laboratory

diff --git a/demoapps/powmon/src/powmon.c b/demoapps/powmon/src/powmon.c
@@ -1,6 +1,6 @@
 /* powmon.c
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430
  *
  * Produced at Lawrence Livermore National Laboratory

diff --git a/demoapps/powmon/src/rapl.h b/demoapps/powmon/src/rapl.h
@@ -1,6 +1,6 @@
 /* rapl.h
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430
  *
  * Produced at Lawrence Livermore National Laboratory 

diff --git a/demoapps/powmon/src/rapl1.c b/demoapps/powmon/src/rapl1.c
@@ -1,6 +1,6 @@
 /* rapl1.c
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430
  *
  * Produced at Lawrence Livermore National Laboratory

diff --git a/demoapps/powmon/src/rapl2.c b/demoapps/powmon/src/rapl2.c
@@ -1,6 +1,6 @@
 /* rapl2.c
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430
  *
  * Produced at Lawrence Livermore National Laboratory

diff --git a/dox/Doxyfile b/dox/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "libmsr"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.2.1
+PROJECT_NUMBER         = 0.3.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/msrmod/msrmod.c b/msrmod/msrmod.c
@@ -1,6 +1,6 @@
 /* msrmod.c
  *
- * Copyright (c) 2011-2015, Lawrence Livermore National Security, LLC.
+ * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430
  *
  * Produced at Lawrence Livermore National Laboratory

diff --git a/src/signalCombined.c b/src/signalCombined.c
@@ -1,4 +1,4 @@
-/*
+/* signalCombined.c
  *
  * Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
  * LLNL-CODE-645430