Skip to content
This repository was archived by the owner on Feb 16, 2023. It is now read-only.

Commit ce97604

Browse files
slabasanslabasan
committed
Update license and source file notice.
Signed-off-by: Stephanie Brink <[email protected]>
1 parent b604d4e commit ce97604

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1286
-957
lines changed

‎LICENSE

+371-164
Large diffs are not rendered by default.

‎README

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ version 0.3.1
1212

1313
Last Update
1414
-----------
15-
21 May 2019
15+
2 August 2019
1616

1717

1818
Webpages
@@ -108,7 +108,7 @@ developers to have your name added to the list.
108108
Release
109109
-------
110110

111-
libmsr is released under the GPLv3 license. For more details, see the
111+
libmsr is released under the GPLv2.1 license. For more details, see the
112112
[LICENSE](https://github.com/LLNL/libmsr/blob/master/LICENSE) file.
113113

114114
LLNL-CODE-645430

‎autoconf.c

+17-20
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
1-
/* autoconf.c
1+
/*
2+
* Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
23
*
3-
* Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
4-
* LLNL-CODE-645430
4+
* Produced at the Lawrence Livermore National Laboratory. Written by:
5+
* Barry Rountree <[email protected]>,
6+
* Scott Walker <[email protected]>, and
7+
* Kathleen Shoga <[email protected]>.
58
*
6-
* Produced at Lawrence Livermore National Laboratory
7-
* Written by Barry Rountree, [email protected]
8-
* Scott Walker, [email protected]
9-
* Kathleen Shoga, [email protected]
9+
* LLNL-CODE-645430
1010
*
1111
* All rights reserved.
1212
*
13-
* This file is part of libmsr.
13+
* This file is part of libmsr. For details, see https://github.com/LLNL/libmsr.git.
14+
*
15+
* Please also read libmsr/LICENSE for our notice and the LGPL.
1416
*
1517
* libmsr is free software: you can redistribute it and/or modify it under the
16-
* terms of the GNU Lesser General Public License as published by the Free
17-
* Software Foundation, either version 3 of the License, or (at your option)
18-
* any later version.
18+
* terms of the GNU Lesser General Public License (as published by the Free
19+
* Software Foundation) version 2.1 dated February 1999.
1920
*
2021
* libmsr is distributed in the hope that it will be useful, but WITHOUT ANY
21-
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
22-
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
23-
* more details.
22+
* WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or FITNESS
23+
* FOR A PARTICULAR PURPOSE. See the terms and conditions of the GNU Lesser
24+
* General Public License for more details.
2425
*
2526
* You should have received a copy of the GNU Lesser General Public License
26-
* along with libmsr. If not, see <http://www.gnu.org/licenses/>.
27-
*
28-
* This material is based upon work supported by the U.S. Department of
29-
* Energy's Lawrence Livermore National Laboratory. Office of Science, under
30-
* Award number DE-AC52-07NA27344.
31-
*
27+
* along with libmsr; if not, write to the Free Software Foundation, Inc., 59
28+
* Temple Place, Suite 330, Boston, MA 02111-1307 USA.
3229
*/
3330

3431
// This code will generate the correct header files for the target

‎demoapps/powmon/common.c

+18-21
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,32 @@
1-
/* common.c
1+
/*
2+
* Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
23
*
3-
* Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
4-
* LLNL-CODE-645430
4+
* Produced at the Lawrence Livermore National Laboratory. Written by:
5+
* Barry Rountree <[email protected]>,
6+
* Daniel Ellsworth <[email protected]>,
7+
* Scott Walker <[email protected]>, and
8+
* Kathleen Shoga <[email protected]>.
59
*
6-
* Produced at Lawrence Livermore National Laboratory
7-
* Written by Barry Rountree, [email protected]
8-
* Daniel Ellsworth, [email protected]
9-
* Scott Walker, [email protected]
10-
* Kathleen Shoga, [email protected]
10+
* LLNL-CODE-645430
1111
*
1212
* All rights reserved.
1313
*
14-
* This file is part of libmsr.
14+
* This file is part of libmsr. For details, see https://github.com/LLNL/libmsr.git.
15+
*
16+
* Please also read libmsr/LICENSE for our notice and the LGPL.
1517
*
1618
* libmsr is free software: you can redistribute it and/or modify it under the
17-
* terms of the GNU Lesser General Public License as published by the Free
18-
* Software Foundation, either version 3 of the License, or (at your option)
19-
* any later version.
19+
* terms of the GNU Lesser General Public License (as published by the Free
20+
* Software Foundation) version 2.1 dated February 1999.
2021
*
2122
* libmsr is distributed in the hope that it will be useful, but WITHOUT ANY
22-
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
23-
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
24-
* details.
23+
* WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or FITNESS
24+
* FOR A PARTICULAR PURPOSE. See the terms and conditions of the GNU Lesser
25+
* General Public License for more details.
2526
*
2627
* You should have received a copy of the GNU Lesser General Public License
27-
* along with libmsr. If not, see <http://www.gnu.org/licenses/>.
28-
*
29-
* This material is based upon work supported by the U.S. Department of
30-
* Energy's Lawrence Livermore National Laboratory. Office of Science, under
31-
* Award number DE-AC52-07NA27344.
32-
*
28+
* along with libmsr; if not, write to the Free Software Foundation, Inc., 59
29+
* Temple Place, Suite 330, Boston, MA 02111-1307 USA.
3330
*/
3431

3532
#include <stdint.h>

‎demoapps/powmon/ghighres.c

+20-24
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,36 @@
1-
/* ghighres.c
1+
/*
2+
* Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
23
*
3-
* Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
4-
* LLNL-CODE-645430
4+
* Produced at the Lawrence Livermore National Laboratory. Written by:
5+
* Barry Rountree <[email protected]>,
6+
* Daniel Ellsworth <[email protected]>,
7+
* Scott Walker <[email protected]>, and
8+
* Kathleen Shoga <[email protected]>.
59
*
6-
* Produced at Lawrence Livermore National Laboratory
7-
* Written by Barry Rountree, [email protected]
8-
* Daniel Ellsworth, [email protected]
9-
* Scott Walker, [email protected]
10-
* Kathleen Shoga, [email protected]
10+
* LLNL-CODE-645430
1111
*
1212
* All rights reserved.
1313
*
14-
* This file is part of libmsr.
14+
* This file is part of libmsr. For details, see https://github.com/LLNL/libmsr.git.
15+
*
16+
* Please also read libmsr/LICENSE for our notice and the LGPL.
1517
*
1618
* libmsr is free software: you can redistribute it and/or modify it under the
17-
* terms of the GNU Lesser General Public License as published by the Free
18-
* Software Foundation, either version 3 of the License, or (at your option)
19-
* any later version.
19+
* terms of the GNU Lesser General Public License (as published by the Free
20+
* Software Foundation) version 2.1 dated February 1999.
2021
*
2122
* libmsr is distributed in the hope that it will be useful, but WITHOUT ANY
22-
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
23-
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
24-
* details.
23+
* WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or FITNESS
24+
* FOR A PARTICULAR PURPOSE. See the terms and conditions of the GNU Lesser
25+
* General Public License for more details.
2526
*
2627
* You should have received a copy of the GNU Lesser General Public License
27-
* along with libmsr. If not, see <http://www.gnu.org/licenses/>.
28-
*
29-
* This material is based upon work supported by the U.S. Department of
30-
* Energy's Lawrence Livermore National Laboratory. Office of Science, under
31-
* Award number DE-AC52-07NA27344.
32-
*
33-
*/
34-
/*! \file ghighres.c
35-
* \brief high resolution sleep function
28+
* along with libmsr; if not, write to the Free Software Foundation, Inc., 59
29+
* Temple Place, Suite 330, Boston, MA 02111-1307 USA.
3630
*/
3731

32+
/// high resolution sleep function
33+
3834
#include <sys/select.h>
3935
#include <time.h>
4036

‎demoapps/powmon/highlander.c

+19-22
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,32 @@
1-
/* highlander.c
1+
/*
2+
* Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
23
*
3-
* Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
4-
* LLNL-CODE-645430
4+
* Produced at the Lawrence Livermore National Laboratory. Written by:
5+
* Barry Rountree <[email protected]>,
6+
* Daniel Ellsworth <[email protected]>,
7+
* Scott Walker <[email protected]>, and
8+
* Kathleen Shoga <[email protected]>.
59
*
6-
* Produced at Lawrence Livermore National Laboratory
7-
* Written by Barry Rountree, [email protected]
8-
* Daniel Ellsworth, [email protected]
9-
* Scott Walker, [email protected]
10-
* Kathleen Shoga, [email protected]
10+
* LLNL-CODE-645430
1111
*
1212
* All rights reserved.
1313
*
14-
* This file is part of libmsr.
14+
* This file is part of libmsr. For details, see https://github.com/LLNL/libmsr.git.
15+
*
16+
* Please also read libmsr/LICENSE for our notice and the LGPL.
1517
*
1618
* libmsr is free software: you can redistribute it and/or modify it under the
17-
* terms of the GNU Lesser General Public License as published by the Free
18-
* Software Foundation, either version 3 of the License, or (at your option) any
19-
* later version.
19+
* terms of the GNU Lesser General Public License (as published by the Free
20+
* Software Foundation) version 2.1 dated February 1999.
2021
*
2122
* libmsr is distributed in the hope that it will be useful, but WITHOUT ANY
22-
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
23-
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
24-
* details.
25-
*
26-
* You should have received a copy of the GNU Lesser General Public License along
27-
* with libmsr. If not, see <http://www.gnu.org/licenses/>.
28-
*
29-
* This material is based upon work supported by the U.S. Department
30-
* of Energy's Lawrence Livermore National Laboratory. Office of
31-
* Science, under Award number DE-AC52-07NA27344.
23+
* WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or FITNESS
24+
* FOR A PARTICULAR PURPOSE. See the terms and conditions of the GNU Lesser
25+
* General Public License for more details.
3226
*
27+
* You should have received a copy of the GNU Lesser General Public License
28+
* along with libmsr; if not, write to the Free Software Foundation, Inc., 59
29+
* Temple Place, Suite 330, Boston, MA 02111-1307 USA.
3330
*/
3431

3532
/// Highlander... because there can be only one.

‎demoapps/powmon/power_wrapper_dynamic.c

+18-21
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,32 @@
1-
/* power_wrapper_dynamic.c
1+
/*
2+
* Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
23
*
3-
* Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
4-
* LLNL-CODE-645430
4+
* Produced at the Lawrence Livermore National Laboratory. Written by:
5+
* Barry Rountree <[email protected]>,
6+
* Daniel Ellsworth <[email protected]>,
7+
* Scott Walker <[email protected]>, and
8+
* Kathleen Shoga <[email protected]>.
59
*
6-
* Produced at Lawrence Livermore National Laboratory
7-
* Written by Barry Rountree, [email protected]
8-
* Daniel Ellsworth, [email protected]
9-
* Scott Walker, [email protected]
10-
* Kathleen Shoga, [email protected]
10+
* LLNL-CODE-645430
1111
*
1212
* All rights reserved.
1313
*
14-
* This file is part of libmsr.
14+
* This file is part of libmsr. For details, see https://github.com/LLNL/libmsr.git.
15+
*
16+
* Please also read libmsr/LICENSE for our notice and the LGPL.
1517
*
1618
* libmsr is free software: you can redistribute it and/or modify it under the
17-
* terms of the GNU Lesser General Public License as published by the Free
18-
* Software Foundation, either version 3 of the License, or (at your option)
19-
* any later version.
19+
* terms of the GNU Lesser General Public License (as published by the Free
20+
* Software Foundation) version 2.1 dated February 1999.
2021
*
2122
* libmsr is distributed in the hope that it will be useful, but WITHOUT ANY
22-
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
23-
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
24-
* details.
23+
* WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or FITNESS
24+
* FOR A PARTICULAR PURPOSE. See the terms and conditions of the GNU Lesser
25+
* General Public License for more details.
2526
*
2627
* You should have received a copy of the GNU Lesser General Public License
27-
* along with libmsr. If not, see <http://www.gnu.org/licenses/>.
28-
*
29-
* This material is based upon work supported by the U.S. Department of
30-
* Energy's Lawrence Livermore National Laboratory. Office of Science, under
31-
* Award number DE-AC52-07NA27344.
32-
*
28+
* along with libmsr; if not, write to the Free Software Foundation, Inc., 59
29+
* Temple Place, Suite 330, Boston, MA 02111-1307 USA.
3330
*/
3431

3532
#define _GNU_SOURCE

‎demoapps/powmon/power_wrapper_static.c

+18-21
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,32 @@
1-
/* power_wrapper_static.c
1+
/*
2+
* Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
23
*
3-
* Copyright (c) 2011-2016, Lawrence Livermore National Security, LLC.
4-
* LLNL-CODE-645430
4+
* Produced at the Lawrence Livermore National Laboratory. Written by:
5+
* Barry Rountree <[email protected]>,
6+
* Daniel Ellsworth <[email protected]>,
7+
* Scott Walker <[email protected]>, and
8+
* Kathleen Shoga <[email protected]>.
59
*
6-
* Produced at Lawrence Livermore National Laboratory
7-
* Written by Barry Rountree, [email protected]
8-
* Daniel Ellsworth, [email protected]
9-
* Scott Walker, [email protected]
10-
* Kathleen Shoga, [email protected]
10+
* LLNL-CODE-645430
1111
*
1212
* All rights reserved.
1313
*
14-
* This file is part of libmsr.
14+
* This file is part of libmsr. For details, see https://github.com/LLNL/libmsr.git.
15+
*
16+
* Please also read libmsr/LICENSE for our notice and the LGPL.
1517
*
1618
* libmsr is free software: you can redistribute it and/or modify it under the
17-
* terms of the GNU Lesser General Public License as published by the Free
18-
* Software Foundation, either version 3 of the License, or (at your option)
19-
* any later version.
19+
* terms of the GNU Lesser General Public License (as published by the Free
20+
* Software Foundation) version 2.1 dated February 1999.
2021
*
2122
* libmsr is distributed in the hope that it will be useful, but WITHOUT ANY
22-
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
23-
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
24-
* details.
23+
* WARRANTY; without even the IMPLIED WARRANTY OF MERCHANTABILITY or FITNESS
24+
* FOR A PARTICULAR PURPOSE. See the terms and conditions of the GNU Lesser
25+
* General Public License for more details.
2526
*
2627
* You should have received a copy of the GNU Lesser General Public License
27-
* along with libmsr. If not, see <http://www.gnu.org/licenses/>.
28-
*
29-
* This material is based upon work supported by the U.S. Department of
30-
* Energy's Lawrence Livermore National Laboratory. Office of Science, under
31-
* Award number DE-AC52-07NA27344.
32-
*
28+
* along with libmsr; if not, write to the Free Software Foundation, Inc., 59
29+
* Temple Place, Suite 330, Boston, MA 02111-1307 USA.
3330
*/
3431

3532
#define _GNU_SOURCE

0 commit comments

Comments
 (0)