[Sumover-dev] [svn commit] r4794 - vic/branches/cc/cc

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

Author: soohyunc
Date: Thu May  6 14:20:44 2010
New Revision: 4794

Added:
   vic/branches/cc/cc/cc_common.h   (contents, props changed)
Modified:
   vic/branches/cc/cc/tfwc_sndr.h

Log:
added a header file for the common variable definition



Added: vic/branches/cc/cc/cc_common.h
==============================================================================
--- (empty file)
+++ vic/branches/cc/cc/cc_common.h	Thu May  6 14:20:44 2010
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2010 University College London
+ * All rights reserved.
+ * 
+ * AUTHOR: Soo-Hyun Choi <s.choi at cs.ucl.ac.uk>
+ *
+ * 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. Neither the name of the University nor of the Laboratory 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_common_h
+#define vic_cc_common_h
+
+#define DUPACKS 3   // simulating TCP's 3 dupacks
+#define TSZ 1000    // tsvec_ size
+#define SSZ 1000    // seqvec_ size
+#define RSZ 1000    // refvec_ size
+#define PSR 10000   // packet size record
+
+#define SHORT_HISTORY       // history size = 8
+#ifdef  SHORT_HISTORY
+#define HSZ 8   // history size for avg loss history
+#else
+#define HSZ 16  // history size for avg loss history
+#endif
+
+#define T_RTTVAR_BITS   2
+#define T_SRTT_BITS     3
+
+#define BITLEN  16
+
+#endif /* vic_cc_common_h */

Modified: vic/branches/cc/cc/tfwc_sndr.h
==============================================================================
--- vic/branches/cc/cc/tfwc_sndr.h	(original)
+++ vic/branches/cc/cc/tfwc_sndr.h	Thu May  6 14:20:44 2010
@@ -35,26 +35,9 @@
 #define vic_tfwc_sndr_h
 
 #include "bitmap.h"	// bitmap operations
+#include "cc_common.h"
 #include "cc_timer.h"
 
-#define DUPACKS 3   // simulating TCP's 3 dupacks
-#define TSZ	1000	// tsvec_ size
-#define SSZ 1000	// seqvec_ size
-#define RSZ 1000	// refvec_ size
-#define PSR 10000	// packet size record
-
-#define SHORT_HISTORY		// history size = 8
-#ifdef  SHORT_HISTORY
-#define HSZ 8   // history size for avg loss history
-#else
-#define HSZ 16  // history size for avg loss history
-#endif
-
-#define T_RTTVAR_BITS	2
-#define T_SRTT_BITS		3
-
-#define BITLEN	16
-
 // timer related
 #define TFWC_TIMER_RTX		0
 #define TFWC_TIMER_RESET	1