Permalink
Browse files

Updated licenses and copyright notices in source files. Fixes #51

  • Loading branch information...
ccurtsinger committed Aug 10, 2016
1 parent 6701430 commit 5cd402164bbda9d4091d5ba5a963f80f5320a7c6
View
@@ -0,0 +1,27 @@
+Original work: _Copyright © 2015, Charlie Curtsinger and Emery Berger, University of Massachusetts Amherst_
+Modified work: _Copyright © 2016, Charlie Curtsinger_
+_All rights reserved._
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The views and conclusions contained in the software and documentation are those
+of the authors and should not be interpreted as representing official policies,
+either expressed or implied, of the FreeBSD Project.
View
@@ -1,24 +0,0 @@
-Copyright (c) 2015 Charlie Curtsinger and Emery Berger
-University of Massachusetts Amherst
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
@@ -67,8 +67,6 @@ Coz currently does not support interpreted or JIT-compiled languages such as Pyt
Interpreted languages will likely not be supported at any point, but support for JIT-compiled languages that produce debug information could be added in the future.
## License
-All source code is licensed under the BSD 2-clause license unless otherwise indicated.
+All source code is licensed under the BSD 2-clause license unless otherwise indicated. See LICENSE.md for.
-Copyright (C) 2015 Charlie Curtsinger and Emery Berger, University of Massachusetts Amherst
-
-Sample applications (in the `benchmarks` directory) include several [PHOENIX](https://github.com/kozyraki/phoenix) programs and [pbzip2](http://compression.ca/pbzip2/), which are licensed separately and included with this release for convenience.
+Sample applications (in the `benchmarks` directory) include several [Phoenix](https://github.com/kozyraki/phoenix) programs and [pbzip2](http://compression.ca/pbzip2/), which are licensed separately and included with this release for convenience.
View
@@ -0,0 +1,48 @@
+# Phoenix applications
+The `histogram`, `kmeans`, `linear_regression`, `matrix_multiply`, `pca`, `string_match`, and `word_count` directories contain code from [Phoenix](https://github.com/kozyraki/phoenix). The source code in these directories is licensed as follows:
+
+ The Phoenix source code is distributed with a BSD license. The copyright is held by Stanford University. Phoenix is provided "as is" without any guarantees of any kind.
+
+# `pbzip2`
+The contents of the `pbzip2` directory are derived from [pbzip2](http://compression.ca/pbzip2/). This code is licensed as follows:
+
+ This program, "pbzip2" is copyright (C) 2003-2011 Jeff Gilchrist.
+ All rights reserved.
+
+ The library "libbzip2" which pbzip2 uses, is copyright
+ (C) 1996-2008 Julian R Seward. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 3. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ Jeff Gilchrist, Ottawa, Canada.
+ pbzip2@compression.ca
+ pbzip2 version 1.1.13 of Dec 18, 2015
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#include <stdio.h>
#include <stdint.h>
#include <stddef.h>
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#include <thread>
volatile size_t x;
View
5 coz
@@ -1,5 +1,10 @@
#!/usr/bin/env python
+# Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+# University of Massachusetts Amherst
+# This file is part of the Coz project. See LICENSE.md file at the top-level
+# directory of this distribution and at http://github.com/plasma-umass/coz.
+
import argparse
import copy
import os
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#if !defined(COZ_H)
#define COZ_H
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#include "inspect.h"
#include <elf.h>
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#if !defined(CAUSAL_RUNTIME_INSPECT_H)
#define CAUSAL_RUNTIME_INSPECT_H
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#include <dlfcn.h>
#include <linux/limits.h>
#include <pthread.h>
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#include "perf.h"
#include <asm/unistd.h>
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#if !defined(CAUSAL_RUNTIME_PERF_H)
#define CAUSAL_RUNTIME_PERF_H
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#include "profiler.h"
#include <asm/unistd.h>
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#if !defined(CAUSAL_RUNTIME_PROFILER_H)
#define CAUSAL_RUNTIME_PROFILER_H
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#if !defined(CAUSAL_RUNTIME_PROGRESS_POINT_H)
#define CAUSAL_RUNTIME_PROGRESS_POINT_H
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#include "real.h"
#include <dlfcn.h>
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#if !defined(CAUSAL_RUNTIME_REAL_H)
#define CAUSAL_RUNTIME_REAL_H
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#if !defined(CAUSAL_RUNTIME_THREAD_STATE_H)
#define CAUSAL_RUNTIME_THREAD_STATE_H
View
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2015, Charlie Curtsinger and Emery Berger,
+ * University of Massachusetts Amherst
+ * This file is part of the Coz project. See LICENSE.md file at the top-level
+ * directory of this distribution and at http://github.com/plasma-umass/coz.
+ */
+
#if !defined(CAUSAL_RUNTIME_UTIL_H)
#define CAUSAL_RUNTIME_UTIL_H

0 comments on commit 5cd4021

Please sign in to comment.