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...> - 2003-07-14 10:41:41
|
blackh Mon Jul 14 03:41:41 2003 EDT
Modified files:
/grapevine Makefile.in
/grapevine/raisen/grapevine discovery.xml
/grapevine/raisen/local request.xml
Log:
Some work on neighbour discovery.
Index: grapevine/raisen/local/request.xml
diff -u grapevine/raisen/local/request.xml:1.28 grapevine/raisen/local/request.xml:1.29
--- grapevine/raisen/local/request.xml:1.28 Sat Jun 14 02:06:48 2003
+++ grapevine/raisen/local/request.xml Mon Jul 14 03:41:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: request.xml,v 1.28 2003/06/14 09:06:48 blackh Exp $ -->
+<!-- $Id: request.xml,v 1.29 2003/07/14 10:41:40 blackh Exp $ -->
<!DOCTYPE grapevine SYSTEM "../raisen.dtd" [
@@ -33,13 +33,18 @@
<grapevine>
- <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.28 $">
+ <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.29 $">
<rules>
main:
req=<request id="[id]" mode="process">
<url file="/"/>
</request>,
+<preprocess.if test="language >= '1.1'">
+ <!-- Calculate backlog first, so it is not influenced by all the other calculations -->
+ backlog = backlogMillis(),
+</preprocess.if>
+
<grapevine.vector.space dimensions="[dimensions]"/>,
<grapevine.validate-prospective-neighbour.minimum-power value="[minimumPower]"/>,
<sys.http-in.listen id="local" status="ok" port="[httpPort]"/>,
@@ -124,6 +129,13 @@
<td valign="top">Uptime</td>
<td valign="top">[uphours]:[upminutes]:[upseconds] ([uptime] seconds)</td>
</tr>
+<preprocess.if test="language >= '1.1'">
+ <tr>
+ <td valign="top">I/O backlog</td>
+ <td valign="top">[backlog] ms</td>
+ </tr>
+</preprocess.if>
+
</table></p>
</body>
</html>;
@@ -156,14 +168,20 @@
</request>,
{
fact=parseXML("local.rpc", req.text$),
+ println("PROCESSING... " ## id ## " " ## fact),
remember new <local.rpc.command id="[id]">[fact]</local.rpc.command>,
req#mode = "processing-rpc",
+ fire new <processed id="[id]"/>
} || {
remember new <local.rpc.reply id="[id]">
<error>Could not parse request</error>
</local.rpc.reply>
};
+ processed:
+ <processed id="[id]"/>,
+ println("DONE " ## id);
+
rpc_no_match-1000:
req=<request id="[id]" mode="processing-rpc"/>,
<local.rpc.command id="[id]" mode=""/>,
@@ -178,6 +196,7 @@
retract reply,
retract <local.rpc.command id="[id]"/> || true,
replyRaw = reply(0) || replyRaw = new <error>Malformed reply</error>,
+ println("REPLY " ## id ## " " ## replyRaw),
replyFact = formatXML(replyRaw),
assert new <sys.http-in.response id="[id]" code="200 OK">
<header content-type="text/xml"/>
|
|
From: blackh <gra...@li...> - 2003-07-10 11:30:05
|
blackh Thu Jul 10 04:30:04 2003 EDT
Modified files:
/website plots.php
Log:
Index: website/plots.php
diff -u website/plots.php:1.2 website/plots.php:1.3
--- website/plots.php:1.2 Thu Jul 10 04:27:57 2003
+++ website/plots.php Thu Jul 10 04:30:04 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.2 2003/07/10 11:27:57 blackh Exp $ -->
+<!-- $Id: plots.php,v 1.3 2003/07/10 11:30:04 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -39,8 +39,8 @@
<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 7 nodes.
- I'm working on some bugs that prevent me from running larger networks.</p>
+ <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>
</div>
|
|
From: blackh <gra...@li...> - 2003-07-10 11:27:57
|
blackh Thu Jul 10 04:27:57 2003 EDT
Added files:
/website plot-sim1.png
Modified files:
/website plots.php
Log:
Another plot.
Index: website/plots.php
diff -u website/plots.php:1.1 website/plots.php:1.2
--- website/plots.php:1.1 Sat Jun 14 03:37:41 2003
+++ website/plots.php Thu Jul 10 04:27:57 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.1 2003/06/14 10:37:41 blackh Exp $ -->
+<!-- $Id: plots.php,v 1.2 2003/07/10 11:27:57 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -37,6 +37,11 @@
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 7 nodes.
+ I'm working on some bugs that prevent me from running larger networks.</p>
+ <p><img src="plot-sim1.png" width="521" height="434"/></p>
</div>
<?php include("footer.inc"); ?>
|
|
From: blackh <gra...@li...> - 2003-07-10 11:02:17
|
blackh Thu Jul 10 04:02:17 2003 EDT
Modified files:
/grapevine Makefile.in configure configure.ac
/grapevine/cpp Allocator.h IOLoop.cpp IOLoop.h Makefile.in
Operation.cpp Operation.h RuleSAXHandler.cpp
grapevine.cpp
/grapevine/cpp/lib Makefile.in
/grapevine/doc raisen.lyx
/grapevine/raisen raisen.dtd
/grapevine/raisen/grapevine heartbeat.xml local-addr.xml
version.xml
Log:
Added the ability to measure the I/O backlog. Made it output this every
20 seconds to help debug 'bogging down' problem when I run multiple nodes
on one machine.
Fixed a bug in local-addr.xml.
Updated version numbers.
Index: grapevine/raisen/grapevine/version.xml
diff -u grapevine/raisen/grapevine/version.xml:1.22 grapevine/raisen/grapevine/version.xml:1.23
--- grapevine/raisen/grapevine/version.xml:1.22 Sat Jun 14 02:06:48 2003
+++ grapevine/raisen/grapevine/version.xml Thu Jul 10 04:02:16 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: version.xml,v 1.22 2003/06/14 09:06:48 blackh Exp $ -->
+<!-- $Id: version.xml,v 1.23 2003/07/10 11:02:16 blackh Exp $ -->
<!-- The version of the firmware. -->
@@ -9,10 +9,10 @@
]>
<grapevine>
- <domain name="grapevine.version" author1="Stephen Blackheath" rev="$Revision: 1.22 $">
+ <domain name="grapevine.version" author1="Stephen Blackheath" rev="$Revision: 1.23 $">
<facts>
- <grapevine.version.version grapevine="0.3.6"/>
+ <grapevine.version.version grapevine="0.3.7"/>
</facts>
<rules>
|
|
From: blackh <gra...@li...> - 2003-07-08 05:09:30
|
blackh Mon Jul 7 22:09:30 2003 EDT
Added files:
/grapevine/raisen/test factorial.xml
Log:
Factorial just for the halibut.
Index: grapevine/raisen/test/factorial.xml
+++ grapevine/raisen/test/factorial.xml
<?xml version="1.0"?>
<!-- A recursive factorial example, just because I can. - SB -->
<grapevine>
<domain name="test.factorial">
<rules>
init:
<init/>,
fire new <factorial n="6"/>,
<factorial n="6" answer="[answer]"/>,
answer != "",
println("The factorial of 6 is " ## answer);
factorial:
f=<factorial n="[n]" answer=""/>,
{
n > 1,
nm1 = n-1,
fire new <factorial n="[nm1]" answer=""/>
} ||
f#answer = 1;
factorial_answer:
f=<factorial n="[n]" answer=""/>,
nm1 = n-1,
<factorial n="[nm1]" answer="[a1]"/>,
a1 != "",
f#answer = a1 * n;
</rules>
</domain>
</grapevine>
|
|
From: blackh <gra...@li...> - 2003-07-07 12:19:08
|
blackh Mon Jul 7 05:19:06 2003 EDT
Modified files:
/grapevine/doc raisen.lyx
Log:
|
|
From: blackh <gra...@li...> - 2003-07-03 22:16:49
|
blackh Thu Jul 3 15:16:49 2003 EDT
Modified files:
/website links.php
Log:
Index: website/links.php
diff -u website/links.php:1.118 website/links.php:1.119
--- website/links.php:1.118 Wed Jun 4 18:24:19 2003
+++ website/links.php Thu Jul 3 15:16:48 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: links.php,v 1.118 2003/06/05 01:24:19 blackh Exp $ -->
+<!-- $Id: links.php,v 1.119 2003/07/03 22:16:48 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="generator" content=
@@ -382,10 +382,19 @@
<br/><a target="_top" href="http://www.couriermail.news.com.au/common/story_page/0,5936,5437553%255E8362,00.html">07 Nov 2002 - Ellison to pull plug on protest websites</a>
<br/>"THE Federal Government plans to stop Australians gaining access to websites used to organise protests."
-<br />
+<br/>
<br/>
<br/>
+<h3>Freedom in New Zealand</h3>
+
+<p><a target="_top" href="http://www.pcworld.co.nz/pcworld/pcw.nsf/UNID/C31C0D8269C307AACC256D4E0007261A?OpenDocument">30 Jun 2003 - Govt asks NZ ISPs to snoop</a>
+<br/>This action by the NZ Government supports the conclusion that the
+<a href="http://www.sovereignty.net/center/treaty.html" target="_top">Convention on Cybercrime</a>
+<i>is</i> going to be adopted worldwide. They're not even waiting for it.
+<br/>
+<br/>
+<br/>
<h3>Freedom in the US</h3>
|
|
From: blackh <gra...@li...> - 2003-06-29 22:38:04
|
blackh Sun Jun 29 15:38:03 2003 EDT
Modified files:
/grapevine/doc raisen.lyx
Log:
Index: grapevine/doc/raisen.lyx
diff -u grapevine/doc/raisen.lyx:1.33 grapevine/doc/raisen.lyx:1.34
--- grapevine/doc/raisen.lyx:1.33 Sun Jun 29 03:19:23 2003
+++ grapevine/doc/raisen.lyx Sun Jun 29 15:38:02 2003
@@ -2042,7 +2042,7 @@
\begin_inset Quotes eld
\end_inset
-There are no more animals
+There are no more dogs
\begin_inset Quotes erd
\end_inset
|
|
From: blackh <gra...@li...> - 2003-06-29 10:19:24
|
blackh Sun Jun 29 03:19:23 2003 EDT
Modified files:
/grapevine/doc raisen.lyx
Log:
|
|
From: rossta <gra...@li...> - 2003-06-22 18:01:40
|
rossta Sun Jun 22 11:01:40 2003 EDT
Modified files:
/grapevine/raisen/grapevine sahp.xml
Log:
Cleaned up HTML
Index: grapevine/raisen/grapevine/sahp.xml
diff -u grapevine/raisen/grapevine/sahp.xml:1.37 grapevine/raisen/grapevine/sahp.xml:1.38
--- grapevine/raisen/grapevine/sahp.xml:1.37 Mon May 12 05:28:32 2003
+++ grapevine/raisen/grapevine/sahp.xml Sun Jun 22 11:01:39 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: sahp.xml,v 1.37 2003/05/12 12:28:32 blackh Exp $ -->
+<!-- $Id: sahp.xml,v 1.38 2003/06/22 18:01:39 rossta Exp $ -->
<!DOCTYPE grapevine SYSTEM "../raisen.dtd" [
@@ -52,7 +52,7 @@
-->
<grapevine>
- <domain name="grapevine.sahp" author1="Stephen Blackheath" rev="$Revision: 1.37 $">
+ <domain name="grapevine.sahp" author1="Stephen Blackheath" rev="$Revision: 1.38 $">
<facts>
<flag verbose="false"/>
@@ -229,12 +229,37 @@
<meta name="Expires" content="Fri, 01 Jan 1990 00:00:00 GMT" />
<title>grapevine: SAHPs</title>
</head>
- <body><p>[str]</p></body>
+ <body><p>[str]</p>
+ <table>
+<!--
+ <td align='right'>
+ <u>#</u>
+ </td>
+-->
+ <td align='left'>
+ <u>Location</u>
+ </td>
+ <td align='right'>
+ <u>Power</u>
+ </td>
+ </table>
+ </body>
</html>,
remember html,
s=<obj.sahp location="[loc]" power="[power:numeric-descending]"/>,
- appendChild(html.body, " #" ## e#n ## " loc=" ## loc ## " power=" ## s#power),
- appendChild(html.body, new <br/>);
+ appendChild(html.body.table, new <tr>
+<!--
+ <td align='right'>
+ [e#n]
+ </td>
+-->
+ <td>
+ [loc]
+ </td>
+ <td align='right'>
+ [s#power]
+ </td>
+ </tr>);
export-10:
e=<grapevine.sahp.export id="[id]"/>,
|
|
From: rossta <gra...@li...> - 2003-06-15 15:15:41
|
rossta Sun Jun 15 08:15:40 2003 EDT
Modified files:
/website index.php
Log:
Announced windows version
Index: website/index.php
diff -u website/index.php:1.64 website/index.php:1.65
--- website/index.php:1.64 Sat Jun 14 16:15:58 2003
+++ website/index.php Sun Jun 15 08:15:40 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: index.php,v 1.64 2003/06/14 23:15:58 blackh Exp $ -->
+<!-- $Id: index.php,v 1.65 2003/06/15 15:15:40 rossta Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -79,9 +79,8 @@
and released a new version. I can now concentrate more on the network itself.</p>
<p>I've also made some bug fixes to the network, and it's currently running with
only three active nodes. I've also done some <a href="plots.php">network plots</a>.</p>
- <p><b>13 May 2003 - Windows binary broken</b></p>
- <p>The windows binary release doesn't work right at the moment unless you have
- CygWin installed. We're <a target="_top" href="http://sourceforge.net/tracker/index.php?func=detail&aid=727482&group_id=32439&atid=405158">working on it</a>.</p>
+ <p>A Windows version is also now <a href="http://prdownloads.sourceforge.net/grapevine/grapevine-1.0.5.exe?download">available</a>.
+ </p>
<p><b>6 May 2003 - A few people are testing</b></p>
<p>A couple of days ago I released 1.0.4 which fixes some minor bootstrapping issues.
The executable is solid and reliable now. I realize the packaging on most operating
|
rossta Sat Jun 14 17:00:27 2003 EDT
Added files:
/grapevine/raisen/test connect.xml listen.xml listenWriteLocal.xml
listenWriteLocalOnly.xml listenWriteOnly.xml
Modified files:
/grapevine/build/win32 grapevine.nsi
/grapevine/cpp IOLoop.cpp grapevine.cpp
/grapevine/raisen/test all.xml
Log:
MSVC bug fixes.
Seems Windows reports the wrong error if you connect() an already connected socket().
Index: grapevine/raisen/test/all.xml
diff -u grapevine/raisen/test/all.xml:1.47 grapevine/raisen/test/all.xml:1.48
--- grapevine/raisen/test/all.xml:1.47 Thu Jun 5 04:45:11 2003
+++ grapevine/raisen/test/all.xml Sat Jun 14 17:00:26 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: all.xml,v 1.47 2003/06/05 11:45:11 blackh Exp $ -->
+<!-- $Id: all.xml,v 1.48 2003/06/15 00:00:26 rossta Exp $ -->
<grapevine>
<domain name="test.all">
@@ -96,6 +96,10 @@
<!-- Unit tests of grapevine functionality -->
fire new <announce>grapevine unit tests</announce>,
remember new <test.vectorDistance.init/>,
+
+ <!-- Socket related tests -->
+ remember new <test.connect.init/>,
+ remember new <test.listen.init/>,
<!-- tests that take time to execute -->
fire new <announce>tests that take time to execute</announce>,
Index: grapevine/raisen/test/connect.xml
+++ grapevine/raisen/test/connect.xml
<?xml version="1.0"?>
<!-- $Id: connect.xml,v 1.1 2003/06/15 00:00:26 rossta Exp $ -->
<grapevine>
<domain name="test.connect">
<rules>
init:
<init/>,
print("connect(): "),
host = "www.google.com",
port = 80,
c = connect(host, port, "test.connect"),
{
c > 0,
println("1 ok")
} || println("failed to connect to " ## host ## ":" ## port);
</rules>
</domain>
</grapevine>
Index: grapevine/raisen/test/listen.xml
+++ grapevine/raisen/test/listen.xml
<?xml version="1.0"?>
<!-- $Id: listen.xml,v 1.1 2003/06/15 00:00:26 rossta Exp $ -->
<grapevine>
<domain name="test.listen">
<rules>
init:
<init/>,
print("listen(): "),
interface = "127.0.0.1",
port = 80,
c = listen(interface, port, "test.listen"),
{
c > 0,
println("1 ok")
} || println("failed to listen to " ## interface ## ":" ## port);
</rules>
</domain>
</grapevine>
Index: grapevine/raisen/test/listenWriteLocal.xml
+++ grapevine/raisen/test/listenWriteLocal.xml
<?xml version="1.0"?>
<!-- $Id: listenWriteLocal.xml,v 1.1 2003/06/15 00:00:26 rossta Exp $ -->
<grapevine>
<domain name="test.listenWriteLocal">
<rules>
init:
<init/>,
print("listenWriteLocal(): "),
assert new <sys.socket.connect host="localhost" port="80" listener="test.listenWriteLocal"/>;
connected:
<sys.socket.connection state="new" id="[connId]"/>,
<sys.socket.session id="[id]" fd="[fd]"/>,
print("1 "),
listenWrite(fd, "test.listenWriteLocal");
notified:
<sys.socket.session id="[id]" fd="[fd]"/>,
<write-ready_ fd="[fd]"/>,
println("2 ok"),
fire new <sys.socket.close id="[id]"/>,
retract <init/>;
</rules>
</domain>
</grapevine>
Index: grapevine/raisen/test/listenWriteLocalOnly.xml
+++ grapevine/raisen/test/listenWriteLocalOnly.xml
<?xml version="1.0"?>
<!-- $Id: listenWriteLocalOnly.xml,v 1.1 2003/06/15 00:00:26 rossta Exp $ -->
<grapevine>
<domain name="test.listenWriteLocalOnly">
<rules>
init:
init = <init/>,
stayRunning(true),
init#state = 2;
init-2:
init = <init state="2"/>,
remember new <test.listenWriteLocal.init/>,
init#state = 3;
init-3:
init = <init state="3"/>,
!<test.listenWriteLocal.init/>,
stayRunning(null),
println(""),
println("FINISHED.");
</rules>
</domain>
</grapevine>
Index: grapevine/raisen/test/listenWriteOnly.xml
+++ grapevine/raisen/test/listenWriteOnly.xml
<?xml version="1.0"?>
<!-- $Id: listenWriteOnly.xml,v 1.1 2003/06/15 00:00:26 rossta Exp $ -->
<grapevine>
<domain name="test.listenWriteOnly">
<rules>
init:
init = <init/>,
stayRunning(true),
init#state = 2;
init-2:
init = <init state="2"/>,
remember new <test.listenWrite.init/>,
init#state = 3;
init-3:
init = <init state="3"/>,
!<test.listenWrite.init/>,
stayRunning(null),
println(""),
println("FINISHED.");
</rules>
</domain>
</grapevine>
|
|
From: blackh <gra...@li...> - 2003-06-14 23:15:59
|
blackh Sat Jun 14 16:15:59 2003 EDT
Modified files:
/website index.php
Log:
Fix.
Index: website/index.php
diff -u website/index.php:1.63 website/index.php:1.64
--- website/index.php:1.63 Sat Jun 14 03:37:41 2003
+++ website/index.php Sat Jun 14 16:15:58 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: index.php,v 1.63 2003/06/14 10:37:41 blackh Exp $ -->
+<!-- $Id: index.php,v 1.64 2003/06/14 23:15:58 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -76,8 +76,7 @@
<p><b>14 Jun 2003 - Version 1.0.5 released / Network up and running again / Network plots</b></p>
<p>I have made some significant performance improvements to the Grapevine executable,
- and released a new version. I can now concentrate more on the network itself.
- Ross is working away on the Windows port.</p>
+ and released a new version. I can now concentrate more on the network itself.</p>
<p>I've also made some bug fixes to the network, and it's currently running with
only three active nodes. I've also done some <a href="plots.php">network plots</a>.</p>
<p><b>13 May 2003 - Windows binary broken</b></p>
|
|
From: blackh <gra...@li...> - 2003-06-14 11:44:43
|
blackh Sat Jun 14 04:44:42 2003 EDT
Modified files:
/website left.inc
Log:
New README.
Index: website/left.inc
diff -u website/left.inc:1.31 website/left.inc:1.32
--- website/left.inc:1.31 Sat Jun 14 03:37:41 2003
+++ website/left.inc Sat Jun 14 04:44:42 2003
@@ -1,10 +1,10 @@
- <!-- $Id: left.inc,v 1.31 2003/06/14 10:37:41 blackh Exp $ -->
+ <!-- $Id: left.inc,v 1.32 2003/06/14 11:44:42 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/>[<a target="_top" href="http://sourceforge.net/project/shownotes.php?release_id=156606">README</a>]
+ <br/>[<a target="_top" href="http://sourceforge.net/project/shownotes.php?release_id=165399">README</a>]
[<a target="_top" href="http://sourceforge.net/project/showfiles.php?group_id=32439">Download</a>]</td></font></span>
</tr>
</table>
@@ -39,4 +39,4 @@
src="http://sourceforge.net/sflogo.php?group_id=32439"
alt="SourceForge Logo" /></a>
<br />
- <!-- EOF: $Id: left.inc,v 1.31 2003/06/14 10:37:41 blackh Exp $ -->
+ <!-- EOF: $Id: left.inc,v 1.32 2003/06/14 11:44:42 blackh Exp $ -->
|
|
From: blackh <gra...@li...> - 2003-06-14 10:37:43
|
blackh Sat Jun 14 03:37:42 2003 EDT
Added files:
/website plot-real.png plots.php
Modified files:
/website favicon.ico favicon.png index.php left.inc
Log:
Website update, including a nice new 'plots' page.
Index: website/left.inc
diff -u website/left.inc:1.30 website/left.inc:1.31
--- website/left.inc:1.30 Mon May 5 17:18:23 2003
+++ website/left.inc Sat Jun 14 03:37:41 2003
@@ -1,4 +1,4 @@
- <!-- $Id: left.inc,v 1.30 2003/05/06 00:18:23 blackh Exp $ -->
+ <!-- $Id: left.inc,v 1.31 2003/06/14 10:37:41 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,6 +18,7 @@
<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 />
<a href="/poetry.php">Poetry</a><br />
@@ -38,4 +39,4 @@
src="http://sourceforge.net/sflogo.php?group_id=32439"
alt="SourceForge Logo" /></a>
<br />
- <!-- EOF: $Id: left.inc,v 1.30 2003/05/06 00:18:23 blackh Exp $ -->
+ <!-- EOF: $Id: left.inc,v 1.31 2003/06/14 10:37:41 blackh Exp $ -->
Index: website/plots.php
+++ website/plots.php
<!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.1 2003/06/14 10:37:41 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>The Grapevine Project - Network plots</title>
<link rel="stylesheet" href="grapevine.css" type="text/css" />
<style type="text/css">
@import "grapevine.css";
</style>
<link rel="icon" href="favicon.png" type="image/png" />
</head>
<body bgcolor="#f5efd9" link="#30a830" vlink="#1c601c" background="backdrop.jpg">
<div id="leftCol">
<?php include("left.inc"); ?>
</div>
<div id="rightCol">
<?php include("title.inc"); ?>
<h1>Network plots</h1>
<h3>The live network</h3>
<p>This is a plot of the live Grapevine network with three 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>
</div>
<?php include("footer.inc"); ?>
<?php include("babel.inc"); ?>
<?php include("logos.inc"); ?>
</body>
</html>
|
|
From: rossta <gra...@li...> - 2003-06-14 09:33:23
|
rossta Sat Jun 14 02:33:21 2003 EDT
Modified files:
/grapevine/build/win32 grapevine.nsi
/grapevine/cpp Allocator.h BigInt.cpp Crypt.cpp Debug.cpp Debug.h
Engine.cpp EngineEventQueue.cpp Event.cpp FEC.cpp
Fact.cpp FactChangeMeme.cpp Firing.cpp
GrapevineSAXHandler.cpp IOLoop.cpp Mutex.cpp
Object.cpp Object.h Operation.cpp ParseXML.cpp
PreprocessorSAXHandler.cpp Profiler.cpp RuleBase.cpp
RuleSAXHandler.cpp RuleState.cpp RuleState.h
SAHP.cpp grapevine.cpp longlong.cpp utils.cpp
Log:
Added -D 16 for socket debugging.
Changed x++ to --x as x++ creates an unused temporary (per Stroustrup).
Index: grapevine/cpp/utils.cpp
diff -u grapevine/cpp/utils.cpp:1.6 grapevine/cpp/utils.cpp:1.7
--- grapevine/cpp/utils.cpp:1.6 Wed Mar 12 01:26:36 2003
+++ grapevine/cpp/utils.cpp Sat Jun 14 02:33:21 2003
@@ -1,4 +1,4 @@
-// $Id: utils.cpp,v 1.6 2003/03/12 09:26:36 blackh Exp $
+// $Id: utils.cpp,v 1.7 2003/06/14 09:33:21 rossta Exp $
#include "config.h"
#include "utils.h"
@@ -12,7 +12,7 @@
{
int length = 0;
while (text[length] != 0)
- length++;
+ ++length;
return String((const char*) text, length);
}
|
|
From: blackh <gra...@li...> - 2003-06-14 09:06:48
|
blackh Sat Jun 14 02:06:48 2003 EDT
Modified files:
/grapevine/raisen/grapevine version.xml
/grapevine/raisen/local request.xml
Log:
Last bits.
Index: grapevine/raisen/local/request.xml
diff -u grapevine/raisen/local/request.xml:1.27 grapevine/raisen/local/request.xml:1.28
--- grapevine/raisen/local/request.xml:1.27 Fri Jun 13 23:15:38 2003
+++ grapevine/raisen/local/request.xml Sat Jun 14 02:06:48 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: request.xml,v 1.27 2003/06/14 06:15:38 blackh Exp $ -->
+<!-- $Id: request.xml,v 1.28 2003/06/14 09:06:48 blackh Exp $ -->
<!DOCTYPE grapevine SYSTEM "../raisen.dtd" [
@@ -33,7 +33,7 @@
<grapevine>
- <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.27 $">
+ <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.28 $">
<rules>
main:
req=<request id="[id]" mode="process">
@@ -84,7 +84,8 @@
are giving us by running it on your system, we can complete the project.</p>
<p><font size="-2">Latest code change (14 Jun 2003): Re-enabled the network after making
some performance improvements to the executable in 1.0.5. If the normal-priority thread is consuming
- too much CPU time then you should upgrade to 1.0.5. Note that the low-priority thread is <i>supposed</i> to consume all your remaining CPU time!</font></p>
+ too much CPU time then you should upgrade to 1.0.5. (Note that the low-priority thread is <i>supposed</i>
+ to consume all your remaining CPU time!) Lots of bug fixes in network logic.</font></p>
<p>
<table cellspacing="3" cellpadding="0" border="0">
<tr>
|
|
From: blackh <gra...@li...> - 2003-06-14 08:27:39
|
blackh Sat Jun 14 01:27:38 2003 EDT
Modified files:
/grapevine start.sh
/grapevine/raisen/grapevine interface.xml neighbour.xml
transmit.xml
/grapevine/test-client VectorSpace.java
Log:
Bug fixes.
Index: grapevine/test-client/VectorSpace.java
diff -u grapevine/test-client/VectorSpace.java:1.2 grapevine/test-client/VectorSpace.java:1.3
--- grapevine/test-client/VectorSpace.java:1.2 Thu Oct 31 06:32:27 2002
+++ grapevine/test-client/VectorSpace.java Sat Jun 14 01:27:38 2003
@@ -46,12 +46,59 @@
public void paintEdge(Graphics g, Edge v)
{
g.setColor(v.getColor());
+ double[] src = v.getSource().getCoOrdinates();
+ double[] dst = v.getDest().getCoOrdinates();
+
+ double distx = Math.abs(dst[0] - src[0]);
+ double disty = Math.abs(dst[1] - src[1]);
+
Point s = getPoint(v.getSource());
Point d = getPoint(v.getDest());
-
- bendLine(g, s, d);
+
+ // If it's closer to draw the line off the edge of the page and back onto
+ // the opposite edge, then draw it that way.
+ if (distx < 0.5) {
+ if (disty < 0.5) {
+ bendLine(g, s, d);
+ }
+ else {
+ if (s.y > d.y) {
+ Point temp = s;
+ s = d;
+ d = temp;
+ }
+ bendLine(g, d, new Point(s.x, s.y+getHeight()));
+ bendLine(g, new Point(d.x, d.y-getHeight()), s);
+ }
+ }
+ else {
+ if (disty < 0.5) {
+ if (s.x > d.x) {
+ Point temp = s;
+ s = d;
+ d = temp;
+ }
+ bendLine(g, d, new Point(s.x+getWidth(), s.y));
+ bendLine(g, new Point(d.x-getWidth(), d.y), s);
+ }
+ else {
+ if (s.x > d.x) {
+ Point temp = s;
+ s = d;
+ d = temp;
+ }
+ if (s.y < d.y) {
+ bendLine(g, d, new Point(s.x+getWidth(), s.y+getHeight()));
+ bendLine(g, new Point(d.x-getWidth(), d.y-getHeight()), s);
+ }
+ else {
+ bendLine(g, d, new Point(s.x+getWidth(), s.y-getHeight()));
+ bendLine(g, new Point(d.x-getWidth(), d.y+getHeight()), s);
+ }
+ }
+ }
}
-
+
public void bendLine(Graphics g, Point s, Point d)
{
Point midPoint = new Point();
|
|
From: blackh <gra...@li...> - 2003-06-14 06:16:52
|
blackh Fri Jun 13 23:16:48 2003 EDT
Modified files:
/grapevine/raisen/grapevine route.xml
Log:
Turn off a debug switch.
Index: grapevine/raisen/grapevine/route.xml
diff -u grapevine/raisen/grapevine/route.xml:1.13 grapevine/raisen/grapevine/route.xml:1.14
--- grapevine/raisen/grapevine/route.xml:1.13 Fri Jun 13 23:15:38 2003
+++ grapevine/raisen/grapevine/route.xml Fri Jun 13 23:16:47 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: route.xml,v 1.13 2003/06/14 06:15:38 blackh Exp $ -->
+<!-- $Id: route.xml,v 1.14 2003/06/14 06:16:47 blackh Exp $ -->
<!--
To route a message, try this:
@@ -46,7 +46,7 @@
]>
<grapevine>
- <domain name="grapevine.route" author1="Anthony Jones" author2="Stephen Blackheath" rev="$Revision: 1.13 $">
+ <domain name="grapevine.route" author1="Anthony Jones" author2="Stephen Blackheath" rev="$Revision: 1.14 $">
<!--
INPUTS:
@@ -63,7 +63,7 @@
-->
<facts>
- <flag verbose="true" debug="false"/>
+ <flag verbose="false" debug="false"/>
</facts>
<rules>
|
|
From: blackh <gra...@li...> - 2003-06-14 06:15:39
|
blackh Fri Jun 13 23:15:39 2003 EDT
Added files:
/grapevine/raisen/grapevine heartbeat.dtd heartbeat.xml
Modified files:
/grapevine start.sh
/grapevine/raisen rudimentary-html.dtd
/grapevine/raisen/grapevine address.xml discovery.xml
incoming-untrusted.xml init.xml
join-transaction.xml join.xml
negotiate-key.xml neighbour.xml
reliable-message.xml route.xml
transaction-routing.xml transmit.xml
vector.xml version.xml
/grapevine/raisen/local request.xml
/grapevine/test-client Base64.java
Log:
Lots of tweaks and bug fixes to raisen code.
Index: grapevine/test-client/Base64.java
diff -u grapevine/test-client/Base64.java:1.2 grapevine/test-client/Base64.java:1.3
--- grapevine/test-client/Base64.java:1.2 Tue Oct 8 20:11:04 2002
+++ grapevine/test-client/Base64.java Fri Jun 13 23:15:38 2003
@@ -9,7 +9,7 @@
* add these '=' characters.
*
* @author $Author: blackh $
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class Base64
{
@@ -66,17 +66,9 @@
}
/**
- * Encode to our shortened (non-standards-compliant) format.
- */
- public static String encode(byte[] in)
- {
- return encode(in, false);
- }
-
- /**
* Caller should specify equalsPad=true if they want a standards compliant encoding.
*/
- public static String encode(byte[] in, boolean equalsPad)
+ public static String encode(byte[] in)
{
char[] out = new char[((in.length+2)/3)*4];
int rem = in.length%3;
@@ -98,9 +90,8 @@
case 2: outLen -= 1; break;
}
// Pad with '=' signs up to a multiple of four if requested.
- if (equalsPad)
- while (outLen < out.length)
- out[outLen++] = '=';
+ while (outLen < out.length)
+ out[outLen++] = '=';
return new String(out, 0, outLen);
}
Index: grapevine/raisen/grapevine/heartbeat.dtd
+++ grapevine/raisen/grapevine/heartbeat.dtd
<!-- $Id: heartbeat.dtd,v 1.1 2003/06/14 06:15:38 blackh Exp $ -->
<!ELEMENT grapevine.heartbeat.twenty-seconds ANY>
<!ATTLIST grapevine.heartbeat.twenty-seconds
now CDATA #IMPLIED>
Index: grapevine/raisen/grapevine/heartbeat.xml
+++ grapevine/raisen/grapevine/heartbeat.xml
<?xml version="1.0"?>
<!DOCTYPE grapevine SYSTEM "../raisen.dtd" [
<!ENTITY % sys_dtd SYSTEM "../sys/sys.dtd"> %sys_dtd;
<!ENTITY % heartbeat_dtd SYSTEM "heartbeat.dtd"> %heartbeat_dtd;
<!ELEMENT timer EMPTY>
<!ATTLIST timer
last CDATA #IMPLIED>
]>
<grapevine>
<domain name="grapevine.join" author1="Stephen Blackheath" rev="$Revision: 1.1 $">
<facts>
<timer last="0"/>
</facts>
<rules>
<!-- Fire grapevine.heartbeat.twenty-seconds every 20 seconds -->
heartbeat_twenty:
t=<timer/>,
<sys.time.now secs="[now]"/>,
since = now - t#last,
since < 0 || since >= 20,
t#last = now,
fire new <grapevine.heartbeat.twenty-seconds now="[now]"/>;
</rules>
</domain>
</grapevine>
|
|
From: blackh <gra...@li...> - 2003-06-14 01:27:48
|
blackh Fri Jun 13 18:27:47 2003 EDT
Modified files:
/website index.php
Log:
Typo.
Index: website/index.php
diff -u website/index.php:1.61 website/index.php:1.62
--- website/index.php:1.61 Fri Jun 13 17:34:05 2003
+++ website/index.php Fri Jun 13 18:27:47 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: index.php,v 1.61 2003/06/14 00:34:05 blackh Exp $ -->
+<!-- $Id: index.php,v 1.62 2003/06/14 01:27:47 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -75,7 +75,7 @@
<h3>News</h3>
<p><b>14 Jun 2003 - Version 1.0.5 released</b></p>
- <p>I have made some singificant performance improvements to the Grapevine executable,
+ <p>I have made some significant performance improvements to the Grapevine executable,
and released a new version. I can now concentrate more on the network itself.
Ross is working away on the Windows port.</p>
<p><b>13 May 2003 - Windows binary broken</b></p>
|
|
From: blackh <gra...@li...> - 2003-06-14 00:34:07
|
blackh Fri Jun 13 17:34:05 2003 EDT
Modified files:
/website index.php
Log:
Announce new version.
Index: website/index.php
diff -u website/index.php:1.60 website/index.php:1.61
--- website/index.php:1.60 Thu Jun 12 04:08:18 2003
+++ website/index.php Fri Jun 13 17:34:05 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: index.php,v 1.60 2003/06/12 11:08:18 blackh Exp $ -->
+<!-- $Id: index.php,v 1.61 2003/06/14 00:34:05 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -74,10 +74,10 @@
<h3>News</h3>
- <p><b>12 Jun 2003 - Made many performance improvements - ver 1.0.5 shortly</b></p>
- <p>I found a few performance bottlenecks, and I've been working on them.
- I'll release a new version of the executable (1.0.5) which is significantly faster shortly
- once I've tested it for memory leaks.</p>
+ <p><b>14 Jun 2003 - Version 1.0.5 released</b></p>
+ <p>I have made some singificant performance improvements to the Grapevine executable,
+ and released a new version. I can now concentrate more on the network itself.
+ Ross is working away on the Windows port.</p>
<p><b>13 May 2003 - Windows binary broken</b></p>
<p>The windows binary release doesn't work right at the moment unless you have
CygWin installed. We're <a target="_top" href="http://sourceforge.net/tracker/index.php?func=detail&aid=727482&group_id=32439&atid=405158">working on it</a>.</p>
|
|
From: blackh <gra...@li...> - 2003-06-13 23:58:23
|
blackh Fri Jun 13 16:58:22 2003 EDT
Modified files:
/grapevine/cpp Allocator.h
Log:
Index: grapevine/cpp/Allocator.h
diff -u grapevine/cpp/Allocator.h:1.7 grapevine/cpp/Allocator.h:1.8
--- grapevine/cpp/Allocator.h:1.7 Fri Jun 13 11:56:13 2003
+++ grapevine/cpp/Allocator.h Fri Jun 13 16:58:22 2003
@@ -1,4 +1,4 @@
-// $Id: Allocator.h,v 1.7 2003/06/13 18:56:13 rossta Exp $
+// $Id: Allocator.h,v 1.8 2003/06/13 23:58:22 blackh Exp $
#ifndef _ALLOCATOR_H_
#define _ALLOCATOR_H_
@@ -104,7 +104,7 @@
pointer allocate(size_type n, const void * = 0)
{
- return (T*) n != 0 ? grapevineAllocateBig(n * sizeof(T)) : 0;
+ return n != 0 ? (T*) grapevineAllocateBig(n * sizeof(T)) : (T*) 0;
}
void deallocate(void* p, size_type n)
|
|
From: blackh <gra...@li...> - 2003-06-13 22:32:33
|
blackh Fri Jun 13 15:32:33 2003 EDT
Modified files:
/grapevine/raisen/grapevine config.dtd
Log:
Fix XML error.
Index: grapevine/raisen/grapevine/config.dtd
diff -u grapevine/raisen/grapevine/config.dtd:1.3 grapevine/raisen/grapevine/config.dtd:1.4
--- grapevine/raisen/grapevine/config.dtd:1.3 Wed Mar 26 02:13:03 2003
+++ grapevine/raisen/grapevine/config.dtd Fri Jun 13 15:32:32 2003
@@ -1,8 +1,12 @@
<!-- DTD for the /etc/grapevine-config.xml file -->
+ <!-- 'added' is for internal use only: don't put it in the
+ config file. Maybe one day I'll have a better way to
+ deal with this kind of thing. -->
<!ELEMENT config.seed EMPTY>
<!ATTLIST config.seed
- address CDATA #IMPLIED>
+ address CDATA #IMPLIED
+ added CDATA #IMPLIED>
<!ELEMENT config.client EMPTY>
<!ATTLIST config.client
|
|
From: rossta <gra...@li...> - 2003-06-13 18:56:15
|
rossta Fri Jun 13 11:56:13 2003 EDT
Modified files:
/grapevine/cpp Allocator.cpp Allocator.h BerkDB.cpp IOLoop.cpp
Profiler.cpp Thread.cpp
Log:
Removed pesky CR's
Index: grapevine/cpp/Thread.cpp
diff -u grapevine/cpp/Thread.cpp:1.23 grapevine/cpp/Thread.cpp:1.24
--- grapevine/cpp/Thread.cpp:1.23 Fri Jun 13 09:33:29 2003
+++ grapevine/cpp/Thread.cpp Fri Jun 13 11:56:13 2003
@@ -1,4 +1,4 @@
-// $Id: Thread.cpp,v 1.23 2003/06/13 16:33:29 rossta Exp $
+// $Id: Thread.cpp,v 1.24 2003/06/13 18:56:13 rossta Exp $
#include "config.h"
@@ -245,8 +245,8 @@
}
if (!::SetThreadPriority(hThread, os_priority)) {
- std::cerr << "SetThreadPriority() failed: ";
- std::cerr << System::lastErrorMessage().c_str();
+ std::cerr << "SetThreadPriority() failed: ";
+ std::cerr << System::lastErrorMessage().c_str();
std::cerr << std::endl;
; /* throw(this); */ // ignore fow now
}
|
