changeset deb871e1fc27 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=deb871e1fc27
description:
license: Fix license on network model code
This mostly was a matter of changing the license owner to Princeton
which is as it should have been. The code was originally licensed
under the GPL but was relicensed as BSD by Li-Shiuan Peh on July 27,
2009. This relicensing was in an explicit e-mail to Nathan Binkert,
Brad Beckmann, Mark Hill, David Wood, and Steve Reinhardt.
diffstat:
51 files changed, 204 insertions(+), 393 deletions(-)
src/mem/ruby/network/Network.cc | 27
+++++++++
src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh | 30
+++++++++-
src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh | 10 +--
src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc | 11 +--
src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh | 12 +---
src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh | 10 +--
src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh | 12 +---
src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh | 14 ++--
src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh | 10 +--
src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh | 10 +--
src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/Router.cc | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/Router.hh | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/flit.cc | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/flit.hh | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc | 11 +--
src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh | 11 +--
diffs (truncated from 1448 to 300 lines):
diff -r b61018e8d169 -r deb871e1fc27 src/mem/ruby/network/Network.cc
--- a/src/mem/ruby/network/Network.cc Wed Oct 28 11:56:43 2009 -0700
+++ b/src/mem/ruby/network/Network.cc Wed Oct 28 11:56:56 2009 -0700
@@ -1,3 +1,30 @@
+/*
+ * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * 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;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * 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.
+ */
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/network/Network.hh"
diff -r b61018e8d169 -r deb871e1fc27
src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh
--- a/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh Wed Oct
28 11:56:43 2009 -0700
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh Wed Oct
28 11:56:56 2009 -0700
@@ -1,9 +1,33 @@
/*
- * CreditLink_d.hh
+ * Copyright (c) 2008 Princeton University
+ * All rights reserved.
*
- * Niket Agarwal, Princeton University
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met: redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer;
+ * 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;
+ * neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
*
- * */
+ * 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.
+ *
+ * Authors: Niket Agarwal
+ */
+
#ifndef CREDIT_LINK_D_H
#define CREDIT_LINK_D_H
diff -r b61018e8d169 -r deb871e1fc27
src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc
--- a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc Wed Oct
28 11:56:43 2009 -0700
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc Wed Oct
28 11:56:56 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
+ * Copyright (c) 2008 Princeton University
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,15 +24,10 @@
* 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.
+ *
+ * Authors: Niket Agarwal
*/
-/*
- * GarnetNetwork_d.cc
- *
- * Niket Agarwal, Princeton University
- *
- * */
-
#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
#include "mem/protocol/MachineType.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh"
diff -r b61018e8d169 -r deb871e1fc27
src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh
--- a/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh Wed Oct
28 11:56:43 2009 -0700
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh Wed Oct
28 11:56:56 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
+ * Copyright (c) 2008 Princeton University
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,15 +24,10 @@
* 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.
+ *
+ * Authors: Niket Agarwal
*/
-/*
- * GarnetNetwork_d.hh
- *
- * Niket Agarwal, Princeton University
- *
- * */
-
#ifndef GARNETNETWORK_D_H
#define GARNETNETWORK_D_H
diff -r b61018e8d169 -r deb871e1fc27
src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc
--- a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc Wed Oct 28
11:56:43 2009 -0700
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc Wed Oct 28
11:56:56 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
+ * Copyright (c) 2008 Princeton University
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,15 +24,10 @@
* 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.
+ *
+ * Authors: Niket Agarwal
*/
-/*
- * InputUnit_d.C
- *
- * Niket Agarwal, Princeton University
- *
- * */
-
#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
diff -r b61018e8d169 -r deb871e1fc27
src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh
--- a/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh Wed Oct 28
11:56:43 2009 -0700
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh Wed Oct 28
11:56:56 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
+ * Copyright (c) 2008 Princeton University
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,15 +24,10 @@
* 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.
+ *
+ * Authors: Niket Agarwal
*/
-/*
- * InputUnit_d.hh
- *
- * Niket Agarwal, Princeton University
- *
- * */
-
#ifndef INPUT_UNIT_D_H
#define INPUT_UNIT_D_H
diff -r b61018e8d169 -r deb871e1fc27
src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh Wed Oct
28 11:56:43 2009 -0700
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh Wed Oct
28 11:56:56 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
+ * Copyright (c) 2008 Princeton University
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,15 +24,10 @@
* 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.
+ *
+ * Authors: Niket Agarwal
*/
-/*
- * NetworkHeader.hh
- *
- * Niket Agarwal, Princeton University
- *
- * */
-
#ifndef NETWORK_HEADER_H
#define NETWORK_HEADER_H
diff -r b61018e8d169 -r deb871e1fc27
src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc Wed Oct
28 11:56:43 2009 -0700
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc Wed Oct
28 11:56:56 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
+ * Copyright (c) 2008 Princeton University
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,15 +24,10 @@
* 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.
+ *
+ * Authors: Niket Agarwal
*/
-/*
- * NetworkInterface_d.cc
- *
- * Niket Agarwal, Princeton University
- *
- * */
-
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh"
#include "mem/ruby/buffers/MessageBuffer.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
diff -r b61018e8d169 -r deb871e1fc27
src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh Wed Oct
28 11:56:43 2009 -0700
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh Wed Oct
28 11:56:56 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
+ * Copyright (c) 2008 Princeton University
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,15 +24,10 @@
* 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.
+ *
+ * Authors: Niket Agarwal
*/
-/*
- * NetworkInterface_d.hh
- *
- * Niket Agarwal, Princeton University
- *
- * */
-
#ifndef NET_INTERFACE_D_H
#define NET_INTERFACE_D_H
diff -r b61018e8d169 -r deb871e1fc27
src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc Wed Oct
28 11:56:43 2009 -0700
+++ b/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc Wed Oct
28 11:56:56 2009 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood
+ * Copyright (c) 2008 Princeton University
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,15 +24,10 @@
* 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.
+ *
+ * Authors: Niket Agarwal
*/
-/*
- * NetworkLink_d.cc
- *
- * Niket Agarwal, Princeton University
- *
- * */
-
#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
diff -r b61018e8d169 -r deb871e1fc27
src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh
--- a/src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh Wed Oct
28 11:56:43 2009 -0700
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
