[Sumover-dev] [svn commit] r4219 - in vic/branches/cc: rtp

[sumover-dev at cs.ucl.ac.uk]

Author: soohyunc
Date: Wed Jul 23 18:43:55 2008
New Revision: 4219

Added:
   vic/branches/cc/cc/
   vic/branches/cc/cc/cc.cpp   (contents, props changed)
   vic/branches/cc/cc/cc.h   (contents, props changed)
Modified:
   vic/branches/cc/rtp/transmitter.cpp
   vic/branches/cc/rtp/transmitter.h

Log:
o  currently empty CC files - just for compilation test purpose
o  a sample function in CC is added to transmitter.cpp 
   (again, compilation test purpose)



Added: vic/branches/cc/cc/cc.cpp
==============================================================================
--- (empty file)
+++ vic/branches/cc/cc/cc.cpp	Wed Jul 23 18:43:55 2008
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2008 University College London
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the MASH Research
+ *  Group at the University of California Berkeley.
+ * 4. Neither the name of the University nor of the Research Group may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ * $Id$
+ */
+
+#include "cc.h"
+
+CcManager::CcManager() {
+}
+
+void CcManager::cc_parse_buf(pktbuf* pb) {
+	printf("cc_parse_buf called\n");
+	// currently do nothing
+}

Added: vic/branches/cc/cc/cc.h
==============================================================================
--- (empty file)
+++ vic/branches/cc/cc/cc.h	Wed Jul 23 18:43:55 2008
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2008 University College London
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *  This product includes software developed by the MASH Research
+ *  Group at the University of California Berkeley.
+ * 4. Neither the name of the University nor of the Research Group may be
+ *    used to endorse or promote products derived from this software without
+ *    specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ * $Id$
+ */
+
+#ifndef vic_cc_h
+#define vic_cc_h
+
+#include "config.h"
+#include "timer.h"
+#include "rtp.h"
+#include "inet.h"
+#include "vic_tcl.h"
+#include "module.h"
+#include "transmitter.h"
+#include "pktbuf-rtp.h"
+
+class CcManager {
+public:
+	CcManager();
+	void cc_parse_buf(pktbuf*);
+
+protected:
+	CcManager* ccman_;
+};
+
+#endif

Modified: vic/branches/cc/rtp/transmitter.cpp
==============================================================================
--- vic/branches/cc/rtp/transmitter.cpp	(original)
+++ vic/branches/cc/rtp/transmitter.cpp	Wed Jul 23 18:43:55 2008
@@ -209,6 +209,7 @@
 
 void Transmitter::send(pktbuf* pb)
 {
+	ccman_->cc_parse_buf(pb);
 	if (!busy_) {
 		double delay = txtime(pb);
 		nextpkttime_ = gettimeofday_secs() + delay;

Modified: vic/branches/cc/rtp/transmitter.h
==============================================================================
--- vic/branches/cc/rtp/transmitter.h	(original)
+++ vic/branches/cc/rtp/transmitter.h	Wed Jul 23 18:43:55 2008
@@ -48,6 +48,7 @@
 #include "rtp.h"
 #include "inet.h"
 #include "pktbuf-rtp.h"
+#include "cc/cc.h"
 
 /*
  * The base object for performing the outbound path of