Menu
▾
▴
grapevine-cvs-commits — Notifications of CVS commits
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(126) |
Nov
(168) |
Dec
(142) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(118) |
Feb
(90) |
Mar
(49) |
Apr
(108) |
May
(47) |
Jun
(45) |
Jul
(48) |
Aug
(9) |
Sep
(45) |
Oct
(58) |
Nov
(64) |
Dec
(47) |
| 2003 |
Jan
(16) |
Feb
(48) |
Mar
(80) |
Apr
(35) |
May
(31) |
Jun
(37) |
Jul
(18) |
Aug
(26) |
Sep
|
Oct
|
Nov
(24) |
Dec
(9) |
| 2004 |
Jan
(5) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: blackh <gra...@li...> - 2004-01-20 21:22:19
|
blackh Tue Jan 20 13:22:18 2004 EDT
Modified files:
/grapevine grapevine-config.xml
Log:
Bring up to date.
Index: grapevine/grapevine-config.xml
diff -u grapevine/grapevine-config.xml:1.5 grapevine/grapevine-config.xml:1.6
--- grapevine/grapevine-config.xml:1.5 Wed Mar 26 23:30:22 2003
+++ grapevine/grapevine-config.xml Tue Jan 20 13:22:18 2004
@@ -68,7 +68,8 @@
<!--
Specify the list of IP addresses of hosts which are allowed to access the
- Grapevine network using clients or web browser on http://localhost:7588/ -->
+ Grapevine network using clients or web browser on the client port
+ specified above -->
<!-- <allow address="192.168.137.4"/> -->
<!-- <allow address="192.168.137.5"/> -->
|
|
From: blackh <gra...@li...> - 2004-01-20 09:09:13
|
blackh Tue Jan 20 01:09:12 2004 EDT
Modified files:
/grapevine/cpp Engine.cpp
/grapevine/raisen Makefile.in
/grapevine/raisen/grapevine grapevine.dtd interface-control.xml
join-interface.xml join.xml
negotiate-key.xml neighbour.xml
transmit.xml
validate-prospective-neighbour.xml
vector.dtd vector.xml version.xml
/grapevine/raisen/test all.xml
Log:
Improve 'noOfMatches'
Index: grapevine/raisen/test/all.xml
diff -u grapevine/raisen/test/all.xml:1.48 grapevine/raisen/test/all.xml:1.49
--- grapevine/raisen/test/all.xml:1.48 Sat Jun 14 17:00:26 2003
+++ grapevine/raisen/test/all.xml Tue Jan 20 01:09:12 2004
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: all.xml,v 1.48 2003/06/15 00:00:26 rossta Exp $ -->
+<!-- $Id: all.xml,v 1.49 2004/01/20 09:09:12 blackh Exp $ -->
<grapevine>
<domain name="test.all">
@@ -81,16 +81,17 @@
remember new <test.condemn4.init/>,
remember new <test.condemn4a.init/>,
remember new <test.eitheror.init/>,
+ remember new <test.failedToRemoveNullState.init/>,
+ remember new <test.failedToRemoveNullState2.init/>,
remember new <test.listenBug.init/>,
remember new <test.match1.init/>,
remember new <test.multipleFactChanges.init/>,
remember new <test.multipleFactChanges2.init/>,
remember new <test.multipleFactChanges3.init/>,
+ remember new <test.noOfMatches.init/>,
remember new <test.onretract.init/>,
remember new <test.retractPropagateBug.init/>,
remember new <test.samePatternBug.init/>,
- remember new <test.failedToRemoveNullState.init/>,
- remember new <test.failedToRemoveNullState2.init/>,
remember new <test.sort.init/>,
<!-- Unit tests of grapevine functionality -->
|
|
From: blackh <gra...@li...> - 2004-01-20 06:21:58
|
blackh Mon Jan 19 22:21:58 2004 EDT
Added files:
/grapevine/raisen/test noOfMatches.xml
Modified files:
/grapevine configure.ac configure
/grapevine/cpp Engine.cpp Engine.h Makefile.in Operation.cpp
Operation.h RuleSAXHandler.cpp
/grapevine/cpp/lib Makefile.in
Log:
New 'noOfMatches' function that provides a straight-forward way to count
the number of matches of a particular pattern match that exist.
Index: grapevine/cpp/lib/Makefile.in
diff -u grapevine/cpp/lib/Makefile.in:1.38 grapevine/cpp/lib/Makefile.in:1.39
--- grapevine/cpp/lib/Makefile.in:1.38 Sun Nov 30 02:31:17 2003
+++ grapevine/cpp/lib/Makefile.in Mon Jan 19 22:21:57 2004
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,7 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# $Id: Makefile.in,v 1.38 2003/11/30 10:31:17 blackh Exp $
+# $Id: Makefile.in,v 1.39 2004/01/20 06:21:57 blackh Exp $
SHELL = @SHELL@
@@ -76,8 +76,11 @@
EXPATINCLUDE = @EXPATINCLUDE@
EXPATLIB = @EXPATLIB@
EXPATLIBNAME = @EXPATLIBNAME@
+HAVE_LIB = @HAVE_LIB@
HOST = @HOST@
+LIB = @LIB@
LN_S = @LN_S@
+LTLIB = @LTLIB@
MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -204,7 +207,7 @@
dot_seen=no; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \
- test "$$subdir" = "." && dot_seen=yes; \
+ test "$$subdir" != "." || dot_seen=yes; \
done; \
test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
@@ -246,7 +249,7 @@
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
+ || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
mostlyclean-tags:
Index: grapevine/raisen/test/noOfMatches.xml
+++ grapevine/raisen/test/noOfMatches.xml
<?xml version="1.0"?>
<!-- $Id: noOfMatches.xml,v 1.1 2004/01/20 06:21:57 blackh Exp $ -->
<grapevine>
<domain name="test.noOfMatches">
<facts>
<cat name="jasper" colour="orange"/>
<cat name="xenopus" colour="black"/>
<cat name="ee-eye" colour="orange"/>
<cat name="smoochi" colour="orange"/>
<cat name="syndrome" colour="purple"/>
<cat name="bert" colour="purple"/>
</facts>
<rules>
init:
i=<init state=""/>,
print("noOfMatches(): "),
i#state = "one";
init_one:
i=<init state="one"/>,
{
print("1 "),
result = noOfMatches(<cat/>),
result == 6,
print("2 "),
result = noOfMatches(<cat colour="orange"/>),
result == 3,
i#state = "two"
} || println("failed: result=" ## result);
init_two:
i=<init state="two"/>,
remember new <cat name="pebbles" colour="black"/>,
{
print("3 "),
result = noOfMatches(<cat colour="black"/>),
result == 1,
i#state = "three"
} || println("failed: result=" ## result);
init_three:
i=<init state="three"/>,
{
print("4 "),
result = noOfMatches(<cat colour="black"/>),
result == 2,
i#count = 0,
i#state = "four"
} || println("failed: result=" ## result);
<!-- Check that the rule can track changes in the number of cats -->
init_four:
i=<init state="four"/>,
{
expected = i#count,
result = noOfMatches(<cat colour="blue"/>),
print((i#count+5) ## " "),
{
i#count < 5,
i#count = i#count + 1,
remember new <cat name="alfred" colour="blue"/>
} || {
i#state = "five",
}
} || println("failed: result=" ## result ## " expected=" ## expected);
init_five-0:
i=<init state="five"/>,
print("11 "),
retract <cat name="syndrome"/> || true;
init_five-5:
i=<init state="five"/>,
retract <cat name="bert"/> || true;
<!-- Track the numbers of cats -->
track_purple_cats-0:
i=<init state="five"/>,
no = noOfMatches(<cat colour="purple"/>),
{
no == 0,
i#zero = "true"
} || true,
{
no == 1,
i#one = "true"
} || true;
check_five-10:
i=<init state="five"/>,
{
i#zero == "true",
i#one == "true",
i#state = "six"
} || println("failed: i#zero=" ## i#zero ## " i#one=" ## i#one);
check_six:
<init state="six"/>,
println("ok");
</rules>
</domain>
</grapevine>
|
|
From: rossta <gra...@li...> - 2004-01-15 07:35:56
|
rossta Wed Jan 14 23:35:56 2004 EDT
Modified files:
/grapevine/cpp Allocator.h
Log:
MSVC version runs now, but it leaks memory like crazy. Needs research
Index: grapevine/cpp/Allocator.h
diff -u grapevine/cpp/Allocator.h:1.13 grapevine/cpp/Allocator.h:1.14
--- grapevine/cpp/Allocator.h:1.13 Tue Jan 13 22:19:26 2004
+++ grapevine/cpp/Allocator.h Wed Jan 14 23:35:55 2004
@@ -1,4 +1,4 @@
-// $Id: Allocator.h,v 1.13 2004/01/14 06:19:26 rossta Exp $
+// $Id: Allocator.h,v 1.14 2004/01/15 07:35:55 rossta Exp $
#ifndef _ALLOCATOR_H_
#define _ALLOCATOR_H_
@@ -75,9 +75,9 @@
assert(idx < GRAPEVINE_BLOCKSIZES);
void*& freeList = grapevineFreeLists[idx];
- if (p != NULL) {
+// if (p != NULL) {
*((void**)p) = freeList;
- }
+// }
freeList = p;
}
@@ -113,7 +113,7 @@
free(p);
}
-#ifndef _MSC_VER
+// #ifndef _MSC_VER
template <class T>
class grapevine_allocator
@@ -136,7 +136,11 @@
void deallocate(void* p, size_type n)
{
- assert(p != 0);
+#ifdef _MSC_VER
+ if (p == 0)
+ return;
+#endif
+ assert(p != 0);
grapevineFreeBig(p, n * sizeof(T));
}
@@ -174,17 +178,28 @@
{
typedef grapevine_allocator<U> other;
};
+
+#ifndef _MSC_VER
template <class U> grapevine_allocator(const grapevine_allocator<U>&) {}
- template <class U> grapevine_allocator& operator=(const grapevine_allocator<U>&)
- {
- return *this;
- }
+ template <class U> grapevine_allocator& operator=(const grapevine_allocator<U>&) { return *this; }
+
+#else
+ typedef _PDFT difference_type;
+
+ char _FARQ *_Charalloc(size_type _N)
+ {
+ return reinterpret_cast<char _FARQ *>(grapevineAllocateBig((difference_type)_N * sizeof(T)));
+ }
+
+#endif
};
+
+#if 0
-#else // _MSC_VER
+// #else // _MSC_VER
/*
@@ -300,7 +315,9 @@
void deallocate(void _FARQ *_P, size_type _N)
{
-// assert(_P != 0);
+ if (_P == NULL)
+ return;
+ assert(_P != 0);
grapevineFreeBig(_P, _N * sizeof(_Ty));
}
|
|
From: rossta <gra...@li...> - 2004-01-14 06:19:28
|
rossta Tue Jan 13 22:19:26 2004 EDT
Modified files:
/grapevine COPYING Makefile.in
/grapevine/build/win32 grapevine.nsi
/grapevine/cpp Allocator.h Engine.cpp IOLoop.cpp Operation.cpp
RuleBase.cpp grapevine.cpp
/grapevine/cpp/win32 config.h
Log:
MSVC compile fixes. Updated copyright date to 2004
Index: grapevine/cpp/win32/config.h
diff -u grapevine/cpp/win32/config.h:1.17 grapevine/cpp/win32/config.h:1.18
--- grapevine/cpp/win32/config.h:1.17 Fri Jun 13 11:55:22 2003
+++ grapevine/cpp/win32/config.h Tue Jan 13 22:19:26 2004
@@ -1,4 +1,4 @@
-/* $Id: config.h,v 1.17 2003/06/13 18:55:22 rossta Exp $ */
+/* $Id: config.h,v 1.18 2004/01/14 06:19:26 rossta Exp $ */
/*!
config.h for Win32 compilers
@@ -119,6 +119,10 @@
#define CONFIG_FILE "grapevine-config.xml"
#endif
+#ifndef DATADIR
+ #define DATADIR "."
+#endif
+
/* Version of Raisen language */
#ifndef LANGUAGE_VERSION
#define LANGUAGE_VERSION "1.0"
@@ -136,7 +140,7 @@
/* Define to the full name and version of this package. */
#ifndef PACKAGE_STRING
- #define PACKAGE_STRING "GrapevineC++Engine 1.0.5"
+ #define PACKAGE_STRING "GrapevineC++Engine 1.0.6"
#endif
/* Define to the one symbol short name of this package. */
@@ -146,12 +150,12 @@
/* Define to the version of this package. */
#ifndef PACKAGE_VERSION
- #define PACKAGE_VERSION "1.0.5"
+ #define PACKAGE_VERSION "1.0.6"
#endif
/* Version number of package */
#ifndef VERSION
- #define VERSION "1.0.5"
+ #define VERSION "1.0.6"
#endif
// System dependent defines
|
|
From: blackh <gra...@li...> - 2003-12-02 03:25:17
|
blackh Mon Dec 1 18:57:43 2003 EDT
Modified files:
/grapevine/raisen/grapevine vector.xml
Log:
Bug fix.
Index: grapevine/raisen/grapevine/vector.xml
diff -u grapevine/raisen/grapevine/vector.xml:1.19 grapevine/raisen/grapevine/vector.xml:1.20
--- grapevine/raisen/grapevine/vector.xml:1.19 Sun Nov 30 21:32:18 2003
+++ grapevine/raisen/grapevine/vector.xml Mon Dec 1 18:57:43 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: vector.xml,v 1.19 2003/12/01 05:32:18 blackh Exp $ -->
+<!-- $Id: vector.xml,v 1.20 2003/12/02 02:57:43 blackh Exp $ -->
<!DOCTYPE grapevine SYSTEM "../raisen.dtd" [
@@ -57,7 +57,7 @@
dist != "",
-->
<grapevine>
- <domain name="grapevine.vector" author1="Stephen Blackheath" rev="$Revision: 1.19 $">
+ <domain name="grapevine.vector" author1="Stephen Blackheath" rev="$Revision: 1.20 $">
<facts>
<!-- Space is 6-dimensional -->
@@ -122,7 +122,7 @@
sum_squares-10:
d=<distance a="[a]" b="[b]" dist="" id="[id]"/>,
- c1=<co-ord which="a" no="[no]" value="[v1]" id="[id]" size="[zie]"/>,
+ c1=<co-ord which="a" no="[no]" value="[v1]" id="[id]"/>,
c2=<co-ord which="b" no="[no]" value="[v2]" id="[id]"/>,
retract c1,
retract c2,
|
|
From: blackh <gra...@li...> - 2003-12-02 03:20:17
|
blackh Mon Dec 1 18:56:50 2003 EDT
Modified files:
/grapevine/raisen/grapevine interface-control.xml version.xml
Log:
Bug fix.
Index: grapevine/raisen/grapevine/version.xml
diff -u grapevine/raisen/grapevine/version.xml:1.26 grapevine/raisen/grapevine/version.xml:1.27
--- grapevine/raisen/grapevine/version.xml:1.26 Sun Nov 30 22:27:09 2003
+++ grapevine/raisen/grapevine/version.xml Mon Dec 1 18:56:50 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: version.xml,v 1.26 2003/12/01 06:27:09 blackh Exp $ -->
+<!-- $Id: version.xml,v 1.27 2003/12/02 02:56:50 blackh Exp $ -->
<!-- The version of the firmware. -->
@@ -9,10 +9,10 @@
]>
<grapevine>
- <domain name="grapevine.version" author1="Stephen Blackheath" rev="$Revision: 1.26 $">
+ <domain name="grapevine.version" author1="Stephen Blackheath" rev="$Revision: 1.27 $">
<facts>
- <grapevine.version.version grapevine="0.3.10"/>
+ <grapevine.version.version grapevine="0.3.11"/>
</facts>
<rules>
|
|
From: blackh <gra...@li...> - 2003-12-01 09:15:31
|
blackh Mon Dec 1 01:15:30 2003 EDT
Modified files:
/website left.inc
Log:
Index: website/left.inc
diff -u website/left.inc:1.35 website/left.inc:1.36
--- website/left.inc:1.35 Mon Dec 1 01:14:43 2003
+++ website/left.inc Mon Dec 1 01:15:29 2003
@@ -1,4 +1,4 @@
- <!-- $Id: left.inc,v 1.35 2003/12/01 09:14:43 blackh Exp $ -->
+ <!-- $Id: left.inc,v 1.36 2003/12/01 09:15:29 blackh Exp $ -->
<div align="right"><img src="/grapevine-logo.png" alt="The Grapevine Project" width="150" height="178" /></div>
<table cellspacing="0" cellpadding="0" border="1" width="90%" align="center">
<tr>
@@ -26,8 +26,6 @@
<a target="_top" href="http://sourceforge.net/tracker/?group_id=32439&atid=405158">Bugs</a><br />
<a target="_top" href="http://sourceforge.net/mailarchive/forum.php?forum_id=256">Dev list archive</a><br />
<a href="/people.php">People</a><br />
- <a target="_top" href="http://netebb.com:18080/grapevine/">Doxygen</a><br />
-<!-- <a target="_top" href="/cgi-bin/twiki/view">Wiki</a><br /> -->
<a href="/links.php">Links</a><br />
</font>
<br />
@@ -39,4 +37,4 @@
src="http://sourceforge.net/sflogo.php?group_id=32439"
alt="SourceForge Logo" /></a>
<br />
- <!-- EOF: $Id: left.inc,v 1.35 2003/12/01 09:14:43 blackh Exp $ -->
+ <!-- EOF: $Id: left.inc,v 1.36 2003/12/01 09:15:29 blackh Exp $ -->
|
|
From: blackh <gra...@li...> - 2003-12-01 09:14:44
|
blackh Mon Dec 1 01:14:43 2003 EDT
Removed files:
/website plan.php
Modified files:
/website left.inc
Log:
Index: website/left.inc
diff -u website/left.inc:1.34 website/left.inc:1.35
--- website/left.inc:1.34 Sun Nov 30 19:38:07 2003
+++ website/left.inc Mon Dec 1 01:14:43 2003
@@ -1,4 +1,4 @@
- <!-- $Id: left.inc,v 1.34 2003/12/01 03:38:07 blackh Exp $ -->
+ <!-- $Id: left.inc,v 1.35 2003/12/01 09:14:43 blackh Exp $ -->
<div align="right"><img src="/grapevine-logo.png" alt="The Grapevine Project" width="150" height="178" /></div>
<table cellspacing="0" cellpadding="0" border="1" width="90%" align="center">
<tr>
@@ -18,7 +18,6 @@
<a href="/tech-overview.php">Tech. overview</a> (en)<br />
<a href="/tech-overview-cn.php"><img border="0" src="/tech-overview-cn.png" width="57" height="17" align="middle"></a> (cn)<br />
<a target="_top" href="http://sourceforge.net/projects/grapevine/">Project Page</a><br />
- <a href="/plan.php">Plan</a><br />
<a href="/plots.php">Network plots</a><br />
<a href="/designnotes.php">Design notes</a><br />
<a href="/doc/">Documents</a><br />
@@ -40,4 +39,4 @@
src="http://sourceforge.net/sflogo.php?group_id=32439"
alt="SourceForge Logo" /></a>
<br />
- <!-- EOF: $Id: left.inc,v 1.34 2003/12/01 03:38:07 blackh Exp $ -->
+ <!-- EOF: $Id: left.inc,v 1.35 2003/12/01 09:14:43 blackh Exp $ -->
|
|
From: blackh <gra...@li...> - 2003-12-01 08:56:58
|
blackh Mon Dec 1 00:56:46 2003 EDT
Modified files:
/website art.php links.php poetry.php
Log:
Website tweaks.
Index: website/poetry.php
diff -u website/poetry.php:1.5 website/poetry.php:1.6
--- website/poetry.php:1.5 Sat Mar 15 03:43:21 2003
+++ website/poetry.php Mon Dec 1 00:56:46 2003
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- $Id: poetry.php,v 1.5 2003/03/15 11:43:21 blackh Exp $ -->
+<!-- $Id: poetry.php,v 1.6 2003/12/01 08:56:46 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="generator" content=
@@ -29,7 +29,7 @@
<p><i>The following text is released in the public domain without copyright.</i></p>
-<p>---</p>
+<hr/>
<h3>Kubla Khan</h3>
|
|
From: blackh <gra...@li...> - 2003-12-01 08:35:11
|
blackh Mon Dec 1 00:35:10 2003 EDT
Added files:
/website plot-sim2.png
Modified files:
/website plots.php
Log:
Index: website/plots.php
diff -u website/plots.php:1.5 website/plots.php:1.6
--- website/plots.php:1.5 Sun Nov 30 03:57:48 2003
+++ website/plots.php Mon Dec 1 00:35:07 2003
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- $Id: plots.php,v 1.5 2003/11/30 11:57:48 blackh Exp $ -->
+<!-- $Id: plots.php,v 1.6 2003/12/01 08:35:07 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -25,12 +25,21 @@
<h1>Network plots</h1>
- <h3>Test networks</h3>
+ <h3>Test network - 30 nodes</h3>
+
<p>Test network with 30 nodes, of which 23 are working properly.
Note that the network has failed to wrap from top to bottom and left to right.
(There should be lines wrapping off one side and back onto the opposite side.)
This is hampering the routing of messages, and I'll have to solve it.</p>
<p><img src="plot-sim1.png" width="717" height="575"/></p>
+
+ <h3>Test network - 50 nodes</h3>
+
+ <p>Test network with 50 nodes - above problem fixed. The big gap with 'Snft'
+ in the middle of it is problematic. I'll have to find a way to make such
+ gaps get bridged.</p>
+
+ <p><img src="plot-sim2.png" width="657" height="553"/></p>
</div>
<?php include("footer.inc"); ?>
|
|
From: blackh <gra...@li...> - 2003-12-01 06:27:11
|
blackh Sun Nov 30 22:27:10 2003 EDT
Modified files:
/grapevine/raisen/grapevine version.xml
/grapevine/test-client Universe.java
Log:
Index: grapevine/test-client/Universe.java
diff -u grapevine/test-client/Universe.java:1.3 grapevine/test-client/Universe.java:1.4
--- grapevine/test-client/Universe.java:1.3 Mon Nov 4 02:51:53 2002
+++ grapevine/test-client/Universe.java Sun Nov 30 22:27:10 2003
@@ -39,6 +39,9 @@
listeners.remove(listener);
}
+ private static final int maxThreads = 6;
+ private int noOfThreads;
+
public void run()
{
try {
@@ -53,10 +56,17 @@
toVisit.wait();
for (int i = 0; i < toVisit.size(); i++) {
final Node node = (Node) toVisit.elementAt(i);
+ // Hold off if there are too many threads running at once.
+ while (noOfThreads > maxThreads)
+ toVisit.wait();
new Thread() {
public void run()
{
try {
+ synchronized (toVisit) {
+ noOfThreads++;
+ }
+
// Retrieve the neighbours from the network
System.out.println("Retrieving neighbours for " + node);
List neighbours = node.getNeighbours();
@@ -75,6 +85,12 @@
}
catch (IOException e) {
System.err.println(e.toString());
+ }
+ finally {
+ synchronized (toVisit) {
+ noOfThreads--;
+ toVisit.notify();
+ }
}
}
}.start();
|
|
From: blackh <gra...@li...> - 2003-12-01 05:32:19
|
blackh Sun Nov 30 21:32:18 2003 EDT
Modified files:
/grapevine/raisen/grapevine vector.xml
/grapevine/raisen/test vectorDistance.xml
Log:
Fix bug in vector distance.
Index: grapevine/raisen/test/vectorDistance.xml
diff -u grapevine/raisen/test/vectorDistance.xml:1.2 grapevine/raisen/test/vectorDistance.xml:1.3
--- grapevine/raisen/test/vectorDistance.xml:1.2 Thu Jun 5 04:45:11 2003
+++ grapevine/raisen/test/vectorDistance.xml Sun Nov 30 21:32:18 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: vectorDistance.xml,v 1.2 2003/06/05 11:45:11 blackh Exp $ -->
+<!-- $Id: vectorDistance.xml,v 1.3 2003/12/01 05:32:18 blackh Exp $ -->
<grapevine>
<domain name="test.vectorDistance">
@@ -18,7 +18,7 @@
d=<grapevine.vector.distance dist="[dist]" id="one"/>,
dist != "",
retract d,
- sb = "1880968199739491722232881102655154557417608216894.",
+ sb = "970152211369123362099817110334138290539996796072.",
{
toString(dist) == sb,
@@ -37,7 +37,7 @@
d=<grapevine.vector.distance dist="[dist]" id="two"/>,
dist != "",
retract d,
- sb = "1963055737500009225804951781994299725075452504566.",
+ sb = "1386487415256311264762177500765305634429201689616.",
{
toString(dist) == sb,
@@ -56,7 +56,7 @@
d=<grapevine.vector.distance dist="[dist]" id="three"/>,
dist != "",
retract d,
- sb = "1713525756080774528026391424820528456902091276171.",
+ sb = "1146224345583326862278473657965661828039547012890.",
{
toString(dist) == sb,
@@ -75,7 +75,7 @@
d=<grapevine.vector.distance dist="[dist]" id="four"/>,
dist != "",
retract d,
- sb = "1594687990756653932303237428022323909539603932993.",
+ sb = "1037647689398290558378227115782396773285320522121.",
{
toString(dist) == sb,
|
|
From: blackh <gra...@li...> - 2003-12-01 03:38:08
|
blackh Sun Nov 30 19:38:07 2003 EDT
Modified files:
/website index.php left.inc
Log:
Announce new release.
Index: website/left.inc
diff -u website/left.inc:1.33 website/left.inc:1.34
--- website/left.inc:1.33 Sat Aug 16 00:51:37 2003
+++ website/left.inc Sun Nov 30 19:38:07 2003
@@ -1,11 +1,11 @@
- <!-- $Id: left.inc,v 1.33 2003/08/16 07:51:37 blackh Exp $ -->
+ <!-- $Id: left.inc,v 1.34 2003/12/01 03:38:07 blackh Exp $ -->
<div align="right"><img src="/grapevine-logo.png" alt="The Grapevine Project" width="150" height="178" /></div>
<table cellspacing="0" cellpadding="0" border="1" width="90%" align="center">
<tr>
<td align="center"><span class="c1"><font size="-2">Help us develop!
<br/>Install your very own shiny new Grapevine node today.
<br/>(Please note that it doesn't do much yet.)
- <br/>[<a target="_top" href="http://sourceforge.net/project/shownotes.php?release_id=165399">README</a>]
+ <br/>[<a target="_top" href="http://sourceforge.net/project/shownotes.php?release_id=200928">README</a>]
[<a target="_top" href="http://sourceforge.net/project/showfiles.php?group_id=32439">Download</a>]</td></font></span>
</tr>
</table>
@@ -40,4 +40,4 @@
src="http://sourceforge.net/sflogo.php?group_id=32439"
alt="SourceForge Logo" /></a>
<br />
- <!-- EOF: $Id: left.inc,v 1.33 2003/08/16 07:51:37 blackh Exp $ -->
+ <!-- EOF: $Id: left.inc,v 1.34 2003/12/01 03:38:07 blackh Exp $ -->
|
|
From: blackh <gra...@li...> - 2003-11-30 11:57:49
|
blackh Sun Nov 30 03:57:48 2003 EDT
Removed files:
/website plot-real.png
Modified files:
/website index.php plot-sim1.png plots.php
Log:
Add new plot to website.
Index: website/plots.php
diff -u website/plots.php:1.4 website/plots.php:1.5
--- website/plots.php:1.4 Tue Jul 22 20:11:11 2003
+++ website/plots.php Sun Nov 30 03:57:48 2003
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- $Id: plots.php,v 1.4 2003/07/23 03:11:11 blackh Exp $ -->
+<!-- $Id: plots.php,v 1.5 2003/11/30 11:57:48 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -25,23 +25,12 @@
<h1>Network plots</h1>
- <h3>The live network</h3>
-
- <p>This is a plot of the live Grapevine network with four whole nodes on it.
- The locations of three of these nodes are
- <ul>
- <li>Wellington, New Zealand</li>
- <li>Auckland, New Zealand</li>
- <li>Perth, Australia</li>
- </ul>
- The other one is a secret.</p>
-
- <p><img src="plot-real.png" width="641" height="481"/></p>
-
<h3>Test networks</h3>
- <p>Here's a nice one of a network with 5 nodes.
- I'm currently working on a larger test network.</p>
- <p><img src="plot-sim1.png" width="521" height="434"/></p>
+ <p>Test network with 30 nodes, of which 23 are working properly.
+ Note that the network has failed to wrap from top to bottom and left to right.
+ (There should be lines wrapping off one side and back onto the opposite side.)
+ This is hampering the routing of messages, and I'll have to solve it.</p>
+ <p><img src="plot-sim1.png" width="717" height="575"/></p>
</div>
<?php include("footer.inc"); ?>
|
|
From: blackh <gra...@li...> - 2003-11-30 11:56:02
|
blackh Sun Nov 30 03:56:01 2003 EDT
Modified files:
/grapevine/test-client Client.java Node.java VectorSpace.java
Log:
Improve plotting.
Index: grapevine/test-client/VectorSpace.java
diff -u grapevine/test-client/VectorSpace.java:1.4 grapevine/test-client/VectorSpace.java:1.5
--- grapevine/test-client/VectorSpace.java:1.4 Sun Nov 30 03:29:00 2003
+++ grapevine/test-client/VectorSpace.java Sun Nov 30 03:56:00 2003
@@ -15,7 +15,8 @@
*/
public class VectorSpace extends JPanel {
- private static final Color nodeColour = new Color(0,128,0);
+ private static final Color nodeColour = new Color(0,140,0);
+ private static final Color labelColour = new Color(0,40,160);
private Vector vertices = new Vector();
private Vector edges = new Vector();
@@ -48,7 +49,7 @@
public void labelVertex(Graphics g, Vertex v)
{
Point p = getPoint(v.getLocation());
- g.setColor(Color.blue);
+ g.setColor(labelColour);
g.drawString(v.getLocation().getBase64().substring(0,4), p.x + 3, p.y);
}
@@ -133,8 +134,10 @@
{
vertices.add(v);
Graphics g = getGraphics();
- if (g != null)
+ if (g != null) {
paintVertex(g, v);
+ labelVertex(g, v);
+ }
}
public void addEdge(Edge e)
|
|
From: blackh <gra...@li...> - 2003-11-30 11:29:02
|
blackh Sun Nov 30 03:29:01 2003 EDT
Modified files:
/grapevine/raisen/grapevine incoming-untrusted.xml
transaction-routing.xml
validate-prospective-neighbour.xml
/grapevine/test-client VectorSpace.java
Log:
Debugs off + improvement to plotting.
Index: grapevine/test-client/VectorSpace.java
diff -u grapevine/test-client/VectorSpace.java:1.3 grapevine/test-client/VectorSpace.java:1.4
--- grapevine/test-client/VectorSpace.java:1.3 Sat Jun 14 01:27:38 2003
+++ grapevine/test-client/VectorSpace.java Sun Nov 30 03:29:00 2003
@@ -15,6 +15,8 @@
*/
public class VectorSpace extends JPanel {
+ private static final Color nodeColour = new Color(0,128,0);
+
private Vector vertices = new Vector();
private Vector edges = new Vector();
@@ -34,7 +36,7 @@
public void paintVertex(Graphics g, Vertex v)
{
- g.setColor(v.getColor());
+ g.setColor(nodeColour);
Point p = getPoint(v.getLocation());
g.drawLine(p.x - 1, p.y - 2, p.x + 1, p.y - 2);
@@ -42,6 +44,13 @@
g.drawLine(p.x - 2, p.y - 1, p.x - 2, p.y + 1);
g.drawLine(p.x + 2, p.y - 1, p.x + 2, p.y + 1);
}
+
+ public void labelVertex(Graphics g, Vertex v)
+ {
+ Point p = getPoint(v.getLocation());
+ g.setColor(Color.blue);
+ g.drawString(v.getLocation().getBase64().substring(0,4), p.x + 3, p.y);
+ }
public void paintEdge(Graphics g, Edge v)
{
@@ -112,10 +121,12 @@
public void paint(Graphics g)
{
- for (int i = 0; i < vertices.size(); i++)
- paintVertex(g, (Vertex) vertices.elementAt(i));
for (int i = 0; i < edges.size(); i++)
paintEdge(g, (Edge) edges.elementAt(i));
+ for (int i = 0; i < vertices.size(); i++)
+ paintVertex(g, (Vertex) vertices.elementAt(i));
+ for (int i = 0; i < vertices.size(); i++)
+ labelVertex(g, (Vertex) vertices.elementAt(i));
}
public void addVertex(Vertex v)
|
blackh Sun Nov 30 03:09:50 2003 EDT
Modified files:
/grapevine/raisen/grapevine discovery.xml incoming-untrusted.xml
interface.xml
traceroute-transaction.xml
transaction-routing.xml
validate-prospective-neighbour.xml
/grapevine/raisen/local request.xml
/grapevine/test-client Traceroute.java
Log:
Code improvements.
Index: grapevine/test-client/Traceroute.java
diff -u grapevine/test-client/Traceroute.java:1.5 grapevine/test-client/Traceroute.java:1.6
--- grapevine/test-client/Traceroute.java:1.5 Sun Mar 30 16:24:43 2003
+++ grapevine/test-client/Traceroute.java Sun Nov 30 03:09:49 2003
@@ -103,8 +103,9 @@
throws java.io.IOException
{
String host = args.length > 0 ? args[0] : "localhost:5669";
+ String destinationStr = args.length > 1 ? args[1] : IDGenerator.generate(20);
- Location destination = new Location(IDGenerator.generate(20));
+ Location destination = new Location(destinationStr);
System.out.println("Traceroute to " + destination);
GrapevineConnection conn = new GrapevineConnection(host);
Info info = new Info(conn);
|
|
From: blackh <gra...@li...> - 2003-11-30 10:32:28
|
blackh Sun Nov 30 02:32:27 2003 EDT
Modified files:
/grapevine Makefile.in configure
/grapevine/raisen Makefile.in
Log:
Index: grapevine/raisen/Makefile.in
diff -u grapevine/raisen/Makefile.in:1.12 grapevine/raisen/Makefile.in:1.13
--- grapevine/raisen/Makefile.in:1.12 Sun Nov 30 00:01:44 2003
+++ grapevine/raisen/Makefile.in Sun Nov 30 02:32:26 2003
@@ -10,7 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# $Id: Makefile.in,v 1.12 2003/11/30 08:01:44 blackh Exp $
+# $Id: Makefile.in,v 1.13 2003/11/30 10:32:26 blackh Exp $
SHELL = @SHELL@
|
|
From: blackh <gra...@li...> - 2003-11-30 10:31:19
|
blackh Sun Nov 30 02:31:17 2003 EDT
Modified files:
/grapevine/cpp Allocator.h Makefile.in
/grapevine/cpp/lib Makefile.in
Log:
Bug fix.
Index: grapevine/cpp/lib/Makefile.in
diff -u grapevine/cpp/lib/Makefile.in:1.37 grapevine/cpp/lib/Makefile.in:1.38
--- grapevine/cpp/lib/Makefile.in:1.37 Sun Nov 30 00:01:42 2003
+++ grapevine/cpp/lib/Makefile.in Sun Nov 30 02:31:17 2003
@@ -10,7 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# $Id: Makefile.in,v 1.37 2003/11/30 08:01:42 blackh Exp $
+# $Id: Makefile.in,v 1.38 2003/11/30 10:31:17 blackh Exp $
SHELL = @SHELL@
|
|
From: blackh <gra...@li...> - 2003-11-30 08:50:44
|
blackh Sun Nov 30 00:50:43 2003 EDT
Modified files:
/grapevine README WARNING
/grapevine/debian postinst
/grapevine/raisen/grapevine validate-prospective-neighbour.xml
Log:
More tweaks.
Index: grapevine/raisen/grapevine/validate-prospective-neighbour.xml
diff -u grapevine/raisen/grapevine/validate-prospective-neighbour.xml:1.7 grapevine/raisen/grapevine/validate-prospective-neighbour.xml:1.8
--- grapevine/raisen/grapevine/validate-prospective-neighbour.xml:1.7 Sat Jul 13 07:11:30 2002
+++ grapevine/raisen/grapevine/validate-prospective-neighbour.xml Sun Nov 30 00:50:43 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: validate-prospective-neighbour.xml,v 1.7 2002/07/13 14:11:30 blackh Exp $ -->
+<!-- $Id: validate-prospective-neighbour.xml,v 1.8 2003/11/30 08:50:43 blackh Exp $ -->
<!DOCTYPE grapevine SYSTEM "../raisen.dtd" [
@@ -18,10 +18,10 @@
-->
<grapevine>
- <domain name="grapevine.validate-prospective-neighbour" author1="Stephen Blackheath" rev="$Revision: 1.7 $">
+ <domain name="grapevine.validate-prospective-neighbour" author1="Stephen Blackheath" rev="$Revision: 1.8 $">
<facts>
- <flag verbose="false"/>
+ <flag verbose="true"/>
<!-- Minimum SAHP power value below which nodes are not permitted to join. -->
<grapevine.validate-prospective-neighbour.minimum-power value="50000."/>
</facts>
@@ -53,11 +53,12 @@
noOfNeighbours = validate#noOfNeighbours,
farthestDistance = validate#farthestDistance,
-
+
{
<flag verbose="true"/>,
- println("validate-prospective-neighbour: interface=" ## interfaceID
- ## " noOfInterfaces=" ## noOfNeighbours
+ println("validate-prospective-neighbour: prospect=" ## joinLocation
+ ## " power=" ## power ## " interface=" ## interfaceID
+ ## " current no of neighbours=" ## noOfNeighbours
## " farthestDistance=" ## farthestDistance)
} ||
true,
@@ -67,15 +68,27 @@
<obj.interface id="[interfaceID]" location="[interfaceLocation]" state="[state]"/>,
<!-- A node can't join itself. -->
- joinLocation != interfaceLocation,
+ joinLocation != interfaceLocation || {
+ <flag verbose="true"/>,
+ println("validate-prospective-neighbour: rejected - node can't join itself"),
+ null
+ },
<!-- Don't allow a neighbour to join an interface of ours that is
disconnected. -->
- state != "disconnected",
+ state != "disconnected" || {
+ <flag verbose="true"/>,
+ println("validate-prospective-neighbour: rejected - our interface is disconnected"),
+ null
+ },
<!-- Power must be greater or equal to the minimum. -->
<grapevine.validate-prospective-neighbour.minimum-power value="[minimumPower]"/>,
- toBigInteger(power) >= toBigInteger(minimumPower),
+ toBigInteger(power) >= toBigInteger(minimumPower) || {
+ <flag verbose="true"/>,
+ println("validate-prospective-neighbour: rejected - power is less than minimum"),
+ null
+ },
<grapevine.vector.space neighbourliness="[maxNoOfNeighbours]"/>,
@@ -95,10 +108,19 @@
println("join-transaction: joining node distance = " ## joinerDistance)
} || true,
- joinerDistance <= farthestDistance
+ joinerDistance <= farthestDistance || {
+ <flag verbose="true"/>,
+ println("validate-prospective-neighbour: rejected - node is not within the definitive zone"),
+ null
+ },
},
- validate#verdict = "yes"
+ validate#verdict = "yes",
+ {
+ <flag verbose="true"/>,
+ println("validate-prospective-neighbour: accepted!")
+ } || true
+
} ||
validate#verdict = "no";
|
|
From: blackh <gra...@li...> - 2003-11-30 08:16:05
|
blackh Sun Nov 30 00:15:45 2003 EDT
Modified files:
/grapevine/debian rules
Log:
Autotools are a curse.
Index: grapevine/debian/rules
diff -u grapevine/debian/rules:1.18 grapevine/debian/rules:1.19
--- grapevine/debian/rules:1.18 Sat Nov 29 23:49:26 2003
+++ grapevine/debian/rules Sun Nov 30 00:15:44 2003
@@ -18,6 +18,7 @@
dh_testdir
rm -f config.cache
rm -f debian/files
+ ./autogen.sh
./configure \
--prefix=/usr \
--with-config-file=/etc/grapevine-config.xml \
|
|
From: blackh <gra...@li...> - 2003-11-30 08:01:47
|
blackh Sun Nov 30 00:01:46 2003 EDT
Modified files:
/grapevine Makefile.in
/grapevine/cpp Makefile.in
/grapevine/cpp/lib Makefile.in
/grapevine/debian init
/grapevine/fec Makefile.in
/grapevine/raisen Makefile.in
Log:
Index: grapevine/raisen/Makefile.in
diff -u grapevine/raisen/Makefile.in:1.11 grapevine/raisen/Makefile.in:1.12
--- grapevine/raisen/Makefile.in:1.11 Wed Nov 26 20:51:10 2003
+++ grapevine/raisen/Makefile.in Sun Nov 30 00:01:44 2003
@@ -1,6 +1,6 @@
-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -10,7 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# $Id: Makefile.in,v 1.11 2003/11/27 04:51:10 blackh Exp $
+# $Id: Makefile.in,v 1.12 2003/11/30 08:01:44 blackh Exp $
SHELL = @SHELL@
@@ -76,11 +76,8 @@
EXPATINCLUDE = @EXPATINCLUDE@
EXPATLIB = @EXPATLIB@
EXPATLIBNAME = @EXPATLIBNAME@
-HAVE_LIB = @HAVE_LIB@
HOST = @HOST@
-LIB = @LIB@
LN_S = @LN_S@
-LTLIB = @LTLIB@
MAKEINFO = @MAKEINFO@
PACKAGE = @PACKAGE@
PACKAGE_VERSION = @PACKAGE_VERSION@
@@ -153,7 +150,7 @@
dot_seen=no; \
rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
rev="$$subdir $$rev"; \
- test "$$subdir" != "." || dot_seen=yes; \
+ test "$$subdir" = "." && dot_seen=yes; \
done; \
test "$$dot_seen" = "no" && rev=". $$rev"; \
target=`echo $@ | sed s/-recursive//`; \
@@ -195,7 +192,7 @@
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
- || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP))
+ || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
mostlyclean-tags:
|
|
From: blackh <gra...@li...> - 2003-11-30 07:49:27
|
blackh Sat Nov 29 23:49:27 2003 EDT
Modified files:
/grapevine/debian init rules
Log:
Debian packaging tweaks.
Index: grapevine/debian/rules
diff -u grapevine/debian/rules:1.17 grapevine/debian/rules:1.18
--- grapevine/debian/rules:1.17 Fri Nov 28 04:53:41 2003
+++ grapevine/debian/rules Sat Nov 29 23:49:26 2003
@@ -20,12 +20,12 @@
rm -f debian/files
./configure \
--prefix=/usr \
+ --with-config-file=/etc/grapevine-config.xml \
--with-db-lib=/usr/lib/ \
--with-db-libname=db3 \
--with-db-include=/usr/include \
--with-expat-lib=/usr/lib/ \
- --with-expat-include=/usr/include \
- --with-config-file=/etc/grapevine-config.xml
+ --with-expat-include=/usr/include
$(MAKE)
touch build-stamp
|
|
From: blackh <gra...@li...> - 2003-11-28 12:53:53
|
blackh Fri Nov 28 04:53:42 2003 EDT
Modified files:
/grapevine README WARNING
/grapevine/debian rules
Log:
Debian tweaks (not yet complete).
Index: grapevine/debian/rules
diff -u grapevine/debian/rules:1.16 grapevine/debian/rules:1.17
--- grapevine/debian/rules:1.16 Fri Nov 28 00:53:05 2003
+++ grapevine/debian/rules Fri Nov 28 04:53:41 2003
@@ -19,6 +19,7 @@
rm -f config.cache
rm -f debian/files
./configure \
+ --prefix=/usr \
--with-db-lib=/usr/lib/ \
--with-db-libname=db3 \
--with-db-include=/usr/include \
|
