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-11-28 12:25:24
|
blackh Fri Nov 28 04:25:23 2003 EDT
Modified files:
/grapevine/debian changelog
/grapevine/raisen/grapevine transaction-routing.xml
Log:
Tweaks.
Index: grapevine/raisen/grapevine/transaction-routing.xml
diff -u grapevine/raisen/grapevine/transaction-routing.xml:1.43 grapevine/raisen/grapevine/transaction-routing.xml:1.44
--- grapevine/raisen/grapevine/transaction-routing.xml:1.43 Fri Nov 28 04:17:43 2003
+++ grapevine/raisen/grapevine/transaction-routing.xml Fri Nov 28 04:25:23 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: transaction-routing.xml,v 1.43 2003/11/28 12:17:43 blackh Exp $ -->
+<!-- $Id: transaction-routing.xml,v 1.44 2003/11/28 12:25:23 blackh Exp $ -->
<!--
To route a transaction to another node, set the transaction#
@@ -71,7 +71,7 @@
]>
<grapevine>
- <domain name="grapevine.transaction-routing" author1="Stephen Blackheath" rev="$Revision: 1.43 $">
+ <domain name="grapevine.transaction-routing" author1="Stephen Blackheath" rev="$Revision: 1.44 $">
<facts>
<flag verbose="true" debug="true"/>
@@ -174,7 +174,7 @@
<!-- Delete 'deleted' transaction once all outgoing messages are sent. -->
transaction_delete:
- trans=<obj.transaction id="[id]" state="deleted"/>,
+ trans=<obj.transaction id="[id]" band="[band]" state="deleted"/>,
!<grapevine.transaction.reply-with id="[id]"/>,
retract trans;
|
|
From: blackh <gra...@li...> - 2003-11-28 12:17:44
|
blackh Fri Nov 28 04:17:43 2003 EDT
Modified files:
/grapevine README
/grapevine/raisen/grapevine grapevine.dtd route.xml
transaction-routing.xml transaction.xml
vector.xml
/grapevine/test-client Base64.java
Log:
Transaction routing improvements.
Index: grapevine/test-client/Base64.java
diff -u grapevine/test-client/Base64.java:1.3 grapevine/test-client/Base64.java:1.4
--- grapevine/test-client/Base64.java:1.3 Fri Jun 13 23:15:38 2003
+++ grapevine/test-client/Base64.java Fri Nov 28 04:17:43 2003
@@ -9,7 +9,7 @@
* add these '=' characters.
*
* @author $Author: blackh $
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class Base64
{
@@ -89,7 +89,6 @@
case 1: outLen -= 2; break;
case 2: outLen -= 1; break;
}
- // Pad with '=' signs up to a multiple of four if requested.
while (outLen < out.length)
out[outLen++] = '=';
return new String(out, 0, outLen);
|
|
From: blackh <gra...@li...> - 2003-11-28 08:53:07
|
blackh Fri Nov 28 00:53:06 2003 EDT
Modified files:
/grapevine Makefile.in configure
/grapevine/cpp IOLoop.cpp
/grapevine/debian rules
/grapevine/raisen/grapevine incoming-net-http.xml neighbour.xml
neighbours-transaction.xml route.xml
transmit.xml
Log:
Set SO_REUSEADDR on server socket, which makes it release the socket when
the program ends.
Index: grapevine/raisen/grapevine/transmit.xml
diff -u grapevine/raisen/grapevine/transmit.xml:1.51 grapevine/raisen/grapevine/transmit.xml:1.52
--- grapevine/raisen/grapevine/transmit.xml:1.51 Thu Aug 7 04:43:02 2003
+++ grapevine/raisen/grapevine/transmit.xml Fri Nov 28 00:53:05 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: transmit.xml,v 1.51 2003/08/07 11:43:02 blackh Exp $ -->
+<!-- $Id: transmit.xml,v 1.52 2003/11/28 08:53:05 blackh Exp $ -->
<!--
The tranmission part of the transport layer.
@@ -42,10 +42,10 @@
]>
<grapevine>
- <domain name="grapevine.transmit" author1="Stephen Blackheath" rev="$Revision: 1.51 $">
+ <domain name="grapevine.transmit" author1="Stephen Blackheath" rev="$Revision: 1.52 $">
<facts>
- <flag verbose="true" debug="false"/>
+ <flag verbose="false" debug="false"/>
</facts>
<!--
|
|
From: blackh <gra...@li...> - 2003-11-27 05:03:08
|
blackh Wed Nov 26 21:03:07 2003 EDT
Modified files:
/grapevine start.sh
Log:
Tweak.
Index: grapevine/start.sh
diff -u grapevine/start.sh:1.5 grapevine/start.sh:1.6
--- grapevine/start.sh:1.5 Wed Jul 30 03:08:50 2003
+++ grapevine/start.sh Wed Nov 26 21:03:07 2003
@@ -8,12 +8,12 @@
mkdir -p 1
echo 1
(cd 1 ;
-../cpp/grapevine -t -i \#1 -x grapevine.init -P -c ../conf.xml "$1" net=8001 local=7001 > log 2>&1 &)
+../cpp/grapevine -p ../raisen -t -i \#1 -x grapevine.init -P -c ../conf.xml "$1" net=8001 local=7001 > log 2>&1 &)
i=2
while expr $i \<= "$2" >/dev/null ; do
sleep "$3"
echo $i
mkdir -p $i
- (cd $i ; ../cpp/grapevine -t -i \#$i -x grapevine.init -P -c ../conf.xml "$1" net=`expr 8000 + $i` local=`expr 7000 + $i`> log 2>&1 &)
+ (cd $i ; ../cpp/grapevine -p ../raisen -t -i \#$i -x grapevine.init -P -c ../conf.xml "$1" net=`expr 8000 + $i` local=`expr 7000 + $i`> log 2>&1 &)
i=`expr $i + 1`
done
|
|
From: blackh <gra...@li...> - 2003-11-27 04:51:11
|
blackh Wed Nov 26 20:51:10 2003 EDT
Modified files:
/grapevine Makefile.in configure configure.ac
/grapevine/cpp Makefile.in
/grapevine/raisen Makefile.in
Log:
It builds! It works!
Index: grapevine/raisen/Makefile.in
diff -u grapevine/raisen/Makefile.in:1.10 grapevine/raisen/Makefile.in:1.11
--- grapevine/raisen/Makefile.in:1.10 Wed Nov 26 20:06:40 2003
+++ grapevine/raisen/Makefile.in Wed Nov 26 20:51:10 2003
@@ -10,7 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# $Id: Makefile.in,v 1.10 2003/11/27 04:06:40 blackh Exp $
+# $Id: Makefile.in,v 1.11 2003/11/27 04:51:10 blackh Exp $
SHELL = @SHELL@
|
|
From: blackh <gra...@li...> - 2003-11-27 04:28:15
|
blackh Wed Nov 26 20:28:14 2003 EDT
Modified files:
/grapevine config.h.in configure configure.ac
Log:
Makefile tweaks.
Index: grapevine/configure.ac
diff -u grapevine/configure.ac:1.48 grapevine/configure.ac:1.49
--- grapevine/configure.ac:1.48 Tue Nov 25 12:55:24 2003
+++ grapevine/configure.ac Wed Nov 26 20:28:14 2003
@@ -5,7 +5,7 @@
AC_INIT(GrapevineC++Engine, 1.0.6)
AC_PREREQ(2.50)
AM_CONFIG_HEADER(config.h)
-AC_REVISION($Revision: 1.48 $)
+AC_REVISION($Revision: 1.49 $)
PACKAGE="$PACKAGE_NAME"
VERSION="$PACKAGE_VERSION"
@@ -131,9 +131,7 @@
#DBLIB=/usr/local/BerkeleyDB/lib
#DBLIBNAME_TRIES=db
-EXPATROOT=/usr/local
-EXPATINCLUDE=/usr/local/include
-EXPATLIB=/usr/local/lib
+EXPATROOT=/usr
EXPATLIBNAME=expat
dnl to support a new system, you need to add its canonical name (as determined
@@ -243,8 +241,8 @@
RESCOMP=windres
# DBINCLUDE=/usr/include/db3
# DBLIB=/lib
- EXPATINCLUDE=/usr/include
- EXPATLIB=/lib
+ #EXPATINCLUDE=/usr/include
+ #EXPATLIB=/lib
;;
*-pc-msdosdjgpp )
@@ -737,7 +735,7 @@
dnl expat
dnl ---------------------------------------------------------------------------
-AC_ARG_WITH(expat-root, [ --with-expat-root=<dir> Specify Expat root directory, default=/usr/local],
+AC_ARG_WITH(expat-root, [ --with-expat-root=<dir> Specify Expat root directory, default=/usr],
EXPATROOT=$withval
)
if test "$EXPATROOT" != "" ; then
@@ -745,10 +743,10 @@
EXPATLIB="$EXPATROOT/lib"
fi
-AC_ARG_WITH(expat-include, [ --with-expat-include=<dir> Specify Expat include directory, default=/usr/local/include],
+AC_ARG_WITH(expat-include, [ --with-expat-include=<dir> Specify Expat include directory, default=/usr/include],
EXPATINCLUDE=$withval
)
-AC_ARG_WITH(expat-lib, [ --with-expat-lib=<dir> Specify Expat library directory, default=/usr/local/lib],
+AC_ARG_WITH(expat-lib, [ --with-expat-lib=<dir> Specify Expat library directory, default=/usr/lib],
EXPATLIB=$withval
)
AC_ARG_WITH(expat-libname, [ --with-expat-libname=<name> Specify Expat library name, default=expat],
@@ -1001,8 +999,12 @@
TARGET=$target
CRYPTOPP_CPPFLAGS="${CRYPTOPP_CPPFLAGS} ${CPPFLAGS}"
-AC_DEFINE_UNQUOTED(DATADIR, ["`eval echo $datadir`"], [Architecture-independent data directory])
-AC_DEFINE_UNQUOTED(CONFIG_FILE, ["`eval echo $sysconfdir`/grapevine-config.xml"], [Grapevine configuration file])
+
+CONFIG_FILE="$sysconfdir/grapevine-config.xml"
+AC_ARG_WITH(config-file, [ --with-config-file=<file> Specify location of grapevine config file],
+ CONFIG_FILE="$withval"
+)
+CPPFLAGS="$CPPFLAGS -DDATADIR=$datadir -DCONFIG_FILE=$CONFIG_FILE"
AC_SUBST(ac_doc_dir)
AC_SUBST(ac_lib_dir)
|
|
From: blackh <gra...@li...> - 2003-11-27 04:06:41
|
blackh Wed Nov 26 20:06:40 2003 EDT
Modified files:
/grapevine/cpp Engine.cpp Engine.h RuleState.cpp RuleState.h
/grapevine/raisen Makefile.in
/grapevine/raisen/test lazy1b.xml
Log:
Performance improvement!
Index: grapevine/raisen/test/lazy1b.xml
diff -u grapevine/raisen/test/lazy1b.xml:1.6 grapevine/raisen/test/lazy1b.xml:1.7
--- grapevine/raisen/test/lazy1b.xml:1.6 Sat Mar 1 04:39:39 2003
+++ grapevine/raisen/test/lazy1b.xml Wed Nov 26 20:06:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: lazy1b.xml,v 1.6 2003/03/01 12:39:39 blackh Exp $ -->
+<!-- $Id: lazy1b.xml,v 1.7 2003/11/27 04:06:40 blackh Exp $ -->
<grapevine>
<domain name="test.lazy1b">
@@ -16,7 +16,8 @@
!<check/>,
idx < 100,
{
- <test.lazy1a.block idx="[idx]"/>,
+ idxStr=toString(idx),
+ <test.lazy1a.block idx="[idxStr]"/> || {println("NO!!"), null},
datum=sha1(base64encode(idx)),
fire new <check idx="[idx]" block="0">[datum]</check>
} || {
@@ -50,7 +51,8 @@
data = scrunchBinary(b$),
hash = sha1(data),
- blk=<test.lazy1a.block idx="[idx]" hash="[matchhash]"/> || {
+ idxStr=toString(idx),
+ blk=<test.lazy1a.block idx="[idxStr]" hash="[matchhash]"/> || {
err = "failed: couldn't find block " ## idx,
null
},
|
|
From: blackh <gra...@li...> - 2003-11-26 00:00:03
|
blackh Tue Nov 25 16:00:03 2003 EDT
Added files:
/grapevine/raisen Makefile.am
Log:
Index: grapevine/raisen/Makefile.am
+++ grapevine/raisen/Makefile.am
# $Id: Makefile.am,v 1.1 2003/11/26 00:00:03 blackh Exp $
XMLLINT=@XMLLINT@
XMLFILES=\
$(shell ls -1 *.xml) \
$(shell find sys -name \*.xml) \
$(shell find grapevine -name \*.xml) \
$(shell find local -name \*.xml)
all-local:
expr "x$(XMLLINT)" = "x" >/dev/null || $(XMLLINT) $(XMLFILES) 2>&1
|
|
From: blackh <gra...@li...> - 2003-11-25 23:49:45
|
blackh Tue Nov 25 15:49:43 2003 EDT
Modified files:
/grapevine/raisen/test lazy-tests.sh persist-tests.sh
Log:
Index: grapevine/raisen/test/persist-tests.sh
diff -u grapevine/raisen/test/persist-tests.sh:1.2 grapevine/raisen/test/persist-tests.sh:1.3
--- grapevine/raisen/test/persist-tests.sh:1.2 Sat Apr 20 02:18:01 2002
+++ grapevine/raisen/test/persist-tests.sh Tue Nov 25 15:49:43 2003
@@ -1,7 +1,7 @@
#!/bin/sh
if [ "x$GRAPEVINE" = "x" ] ; then
- GRAPEVINE=grapevine
+ GRAPEVINE="../../cpp/grapevine -p .."
fi
rm -f grapevine.dbm
|
|
From: blackh <gra...@li...> - 2003-11-25 23:46:42
|
blackh Tue Nov 25 15:46:41 2003 EDT
Modified files:
/grapevine Makefile.in config.guess config.sub mkinstalldirs
release-firmware.sh
/grapevine/cpp Makefile.in
/grapevine/cpp/lib Makefile.in
/grapevine/raisen Makefile.in
Log:
Tweaks.
Index: grapevine/raisen/Makefile.in
diff -u grapevine/raisen/Makefile.in:1.8 grapevine/raisen/Makefile.in:1.9
--- grapevine/raisen/Makefile.in:1.8 Tue Nov 25 15:16:54 2003
+++ grapevine/raisen/Makefile.in Tue Nov 25 15:46:41 2003
@@ -10,7 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# $Id: Makefile.in,v 1.8 2003/11/25 23:16:54 blackh Exp $
+# $Id: Makefile.in,v 1.9 2003/11/25 23:46:41 blackh Exp $
SHELL = @SHELL@
|
|
From: blackh <gra...@li...> - 2003-11-25 23:16:55
|
blackh Tue Nov 25 15:16:54 2003 EDT
Modified files:
/grapevine Makefile.in configure
/grapevine/cpp Makefile.in
/grapevine/cpp/lib Makefile.in
/grapevine/raisen Makefile.in
Log:
Build fix.
Index: grapevine/raisen/Makefile.in
diff -u grapevine/raisen/Makefile.in:1.7 grapevine/raisen/Makefile.in:1.8
--- grapevine/raisen/Makefile.in:1.7 Mon Nov 17 02:26:04 2003
+++ grapevine/raisen/Makefile.in Tue Nov 25 15:16:54 2003
@@ -10,7 +10,7 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
-# $Id: Makefile.in,v 1.7 2003/11/17 10:26:04 blackh Exp $
+# $Id: Makefile.in,v 1.8 2003/11/25 23:16:54 blackh Exp $
SHELL = @SHELL@
|
|
From: blackh <gra...@li...> - 2003-11-25 20:55:25
|
blackh Tue Nov 25 12:55:24 2003 EDT
Modified files:
/grapevine configure.ac
Log:
Index: grapevine/configure.ac
diff -u grapevine/configure.ac:1.47 grapevine/configure.ac:1.48
--- grapevine/configure.ac:1.47 Mon Nov 17 02:26:03 2003
+++ grapevine/configure.ac Tue Nov 25 12:55:24 2003
@@ -5,7 +5,7 @@
AC_INIT(GrapevineC++Engine, 1.0.6)
AC_PREREQ(2.50)
AM_CONFIG_HEADER(config.h)
-AC_REVISION($Revision: 1.47 $)
+AC_REVISION($Revision: 1.48 $)
PACKAGE="$PACKAGE_NAME"
VERSION="$PACKAGE_VERSION"
@@ -956,7 +956,7 @@
# on gcc-3.3.1. We only add these options if the compiler will accept them.
OLD_CXXFLAGS="$CXXFLAGS"
- CXXFLAGS_DEBUG="-DNDEBUG -O3"
+ CFLAGS_DEBUG="-DNDEBUG -O3"
AC_MSG_CHECKING([compiler option --fno-schedule-insns])
CXXFLAGS="-fno-schedule-insns"
AC_TRY_COMPILE([], [int i = 0;], [CFLAGS_DEBUG="$CFLAGS_DEBUG -fno-schedule-insns";AC_MSG_RESULT([yes])],
|
|
From: blackh <gra...@li...> - 2003-11-24 09:08:07
|
blackh Mon Nov 24 01:08:06 2003 EDT
Modified files:
/grapevine Makefile.in README configure
Log:
More wanderings in README file.
Index: grapevine/configure
diff -u grapevine/configure:1.86 grapevine/configure:1.87
--- grapevine/configure:1.86 Mon Nov 17 02:26:02 2003
+++ grapevine/configure Mon Nov 24 01:08:05 2003
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1.46 .
+# From configure.ac Revision: 1.47 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.57 for GrapevineC++Engine 1.0.6.
#
|
|
From: blackh <gra...@li...> - 2003-08-29 12:13:06
|
blackh Fri Aug 29 05:13:03 2003 EDT
Modified files:
/grapevine/raisen/grapevine init.xml route.xml
transaction-routing.xml transaction.xml
/grapevine/raisen/local request.xml
Log:
Various improvements.
Index: grapevine/raisen/local/request.xml
diff -u grapevine/raisen/local/request.xml:1.32 grapevine/raisen/local/request.xml:1.33
--- grapevine/raisen/local/request.xml:1.32 Thu Aug 7 04:43:02 2003
+++ grapevine/raisen/local/request.xml Fri Aug 29 05:13:03 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: request.xml,v 1.32 2003/08/07 11:43:02 blackh Exp $ -->
+<!-- $Id: request.xml,v 1.33 2003/08/29 12:13:03 blackh Exp $ -->
<!DOCTYPE grapevine SYSTEM "../raisen.dtd" [
@@ -37,7 +37,7 @@
<grapevine>
- <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.32 $">
+ <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.33 $">
<rules>
main:
req=<request id="[id]" mode="process">
@@ -62,9 +62,11 @@
<obj.band id="[band]"/>,
<grapevine.init.start secs="[start]" />,
- <sys.time.now secs="[now]" />,
+ now=<sys.time.now/>#secs,
elapsed = now - start,
uptime = elapsed,
+ updays = elapsed / 86400,
+ elapsed = elapsed - (updays * 86400),
uphours = elapsed / 3600,
elapsed = elapsed - (uphours * 3600),
upminutes = elapsed / 60,
@@ -83,7 +85,7 @@
} || true,
<grapevine.local-addr.local-addr address="[myIPAddress]"/> ||
myIPAddress="<unknown>",
- !!,
+ !!, <!-- Just in case -->
assert new <html id="[id]">
<head><title>grapevine: main</title></head>
@@ -133,7 +135,7 @@
</tr>
<tr>
<td valign="top">Uptime</td>
- <td valign="top">[uphours]:[upminutes]:[upseconds] ([uptime] seconds)</td>
+ <td valign="top">[updays] days [uphours]:[upminutes]:[upseconds]</td>
</tr>
<preprocess.if test="language >= '1.1'">
<tr>
@@ -174,7 +176,6 @@
</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]"/>
@@ -184,11 +185,6 @@
</local.rpc.reply>
};
- <!-- Diagnostic... -->
- processed:
- <processed id="[id]"/>,
- println("DONE " ## id);
-
rpc_no_match-1000:
req=<request id="[id]" mode="processing-rpc"/>,
<local.rpc.command id="[id]" mode=""/>,
@@ -203,7 +199,6 @@
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-08-28 22:14:54
|
blackh Thu Aug 28 15:13:01 2003 EDT
Modified files:
/website index.php logos.inc
Log:
Anti-patent stuff.
Index: website/logos.inc
diff -u website/logos.inc:1.12 website/logos.inc:1.13
--- website/logos.inc:1.12 Sat Dec 28 08:24:12 2002
+++ website/logos.inc Thu Aug 28 15:13:00 2003
@@ -1,4 +1,4 @@
-<!-- $Id: logos.inc,v 1.12 2002/12/28 16:24:12 rossta Exp $ -->
+<!-- $Id: logos.inc,v 1.13 2003/08/28 22:13:00 blackh Exp $ -->
<?php
$url = "http" . ($HTTPS == "on" ? "s" : "") . "://" . $HTTP_HOST . "/grapevine.css";
?>
@@ -43,9 +43,11 @@
width=150
src="http://br.eff.org/brstrip.gif"
alt="Free Speech Online; Blue Ribbon Campaign" /></a>
+
+<A target="_top" HREF="http://petition.eurolinux.org"><img src="http://aful.org/images/patent_button.gif" border="0"></A>
<!-- style="border:0;width:150px;height:41px;vertical-align:middle"-->
<p />
<script language="JavaScript1.2" src="http://www.altavista.com/r?entr"></script>
-<!-- EOF $Id: logos.inc,v 1.12 2002/12/28 16:24:12 rossta Exp $ -->
+<!-- EOF $Id: logos.inc,v 1.13 2003/08/28 22:13:00 blackh Exp $ -->
|
|
From: blackh <gra...@li...> - 2003-08-27 21:09:01
|
blackh Wed Aug 27 03:25:32 2003 EDT
Modified files:
/grapevine/cpp Fact.h FactChangeMeme.h Meme.h Object.h Operation.h
RuleBase.h RuleState.h
Log:
Performance improvements.
Index: grapevine/cpp/RuleState.h
diff -u grapevine/cpp/RuleState.h:1.3 grapevine/cpp/RuleState.h:1.4
--- grapevine/cpp/RuleState.h:1.3 Sat Jun 14 02:33:21 2003
+++ grapevine/cpp/RuleState.h Wed Aug 27 03:25:32 2003
@@ -1,4 +1,4 @@
-// $Id: RuleState.h,v 1.3 2003/06/14 09:33:21 rossta Exp $
+// $Id: RuleState.h,v 1.4 2003/08/27 10:25:32 blackh Exp $
#ifndef _RULESTATE_H_
#define _RULESTATE_H_
@@ -14,7 +14,7 @@
public:
- class BoundList : public std::vector<bool>
+ class BoundList : public std::vector<bool, grapevine_allocator<bool> >
{
public:
BoundList()
@@ -22,7 +22,7 @@
}
BoundList(const BoundList& other)
- : std::vector<bool>(other)
+ : std::vector<bool, grapevine_allocator<bool> >(other)
{
}
@@ -80,7 +80,7 @@
}
};
- typedef std::vector<Object> SlotVector;
+ typedef std::vector<Object, grapevine_allocator<Object> > SlotVector;
private:
SlotVector variables;
|
|
From: blackh <gra...@li...> - 2003-08-27 12:43:44
|
blackh Wed Aug 27 05:43:43 2003 EDT
Modified files:
/grapevine/cpp Fact.h
Log:
This should fix the bug where the SAHP powers are being sorted alphabetically
instead of numerically.
Index: grapevine/cpp/Fact.h
diff -u grapevine/cpp/Fact.h:1.31 grapevine/cpp/Fact.h:1.32
--- grapevine/cpp/Fact.h:1.31 Wed Aug 27 05:34:16 2003
+++ grapevine/cpp/Fact.h Wed Aug 27 05:43:43 2003
@@ -1,4 +1,4 @@
-// $Id: Fact.h,v 1.31 2003/08/27 12:34:16 blackh Exp $
+// $Id: Fact.h,v 1.32 2003/08/27 12:43:43 blackh Exp $
#include "Object.h" // must be here or MSVC barfs: error C2680: 'class FactImpl *' : invalid target type for dynamic_cast
@@ -49,7 +49,7 @@
enum SortStyle {
// Masks
- SSM_TYPE = 0x01,
+ SSM_TYPE = 0x03,
SSM_DIRECTION = 0x04,
// Type values
|
|
From: blackh <gra...@li...> - 2003-08-27 12:34:20
|
blackh Wed Aug 27 05:34:17 2003 EDT
Modified files:
/grapevine/cpp Engine.cpp EngineEventQueue.cpp EngineEventQueue.h
Fact.h Firing.cpp Firing.h IOLoop.cpp Operation.cpp
Persist.h Reference.h RuleBase.h
Log:
More performance tweaks.
Index: grapevine/cpp/RuleBase.h
diff -u grapevine/cpp/RuleBase.h:1.24 grapevine/cpp/RuleBase.h:1.25
--- grapevine/cpp/RuleBase.h:1.24 Wed Aug 27 03:25:32 2003
+++ grapevine/cpp/RuleBase.h Wed Aug 27 05:34:16 2003
@@ -1,4 +1,4 @@
-// $Id: RuleBase.h,v 1.24 2003/08/27 10:25:32 blackh Exp $
+// $Id: RuleBase.h,v 1.25 2003/08/27 12:34:16 blackh Exp $
#ifndef _RULEBASE_H_
#define _RULEBASE_H_
@@ -11,6 +11,7 @@
#include <expat.h>
+#include "Allocator.h"
#include "EngineEventQueue.h"
#include "Fact.h"
#include "FactListener.h"
@@ -29,9 +30,9 @@
class Prime;
class SAXHandler;
-typedef std::vector<Rule*> RuleSeq;
-typedef std::map<String, Domain*> DomainMap;
-typedef std::vector<std::pair<int, Reference> > TagBindingSeq;
+typedef std::vector<Rule*, grapevine_allocator<Rule*> > RuleSeq;
+typedef std::map<String, Domain*, std::less<String>, grapevine_allocator<Domain*> > DomainMap;
+typedef std::vector<std::pair<int, Reference>, grapevine_allocator<std::pair<int, Reference> > > TagBindingSeq;
class RuleBase : public FactListener, public RuleListener
{
|
|
From: blackh <gra...@li...> - 2003-08-27 11:10:39
|
blackh Wed Aug 27 04:08:44 2003 EDT
Modified files:
/grapevine Makefile.in
/grapevine/cpp Object.cpp Object.h
Log:
Yet another performance improvement.
Index: grapevine/cpp/Object.h
diff -u grapevine/cpp/Object.h:1.28 grapevine/cpp/Object.h:1.29
--- grapevine/cpp/Object.h:1.28 Wed Aug 27 03:25:32 2003
+++ grapevine/cpp/Object.h Wed Aug 27 04:08:43 2003
@@ -1,4 +1,4 @@
-// $Id: Object.h,v 1.28 2003/08/27 10:25:32 blackh Exp $
+// $Id: Object.h,v 1.29 2003/08/27 11:08:43 blackh Exp $
#ifndef _OBJECT_H_
#define _OBJECT_H_
@@ -251,8 +251,19 @@
* Get the characters of this string. If this string is lazy, then
* it may pull the text in from the database.
*/
- inline const char* getUTF8Chars() const;
- int getUTF8Length() const;
+ inline const char* getUTF8Chars() const
+ {
+ if (lazyInfo != NULL)
+ getUTF8CharsRetrieve();
+ return text__;
+ }
+
+ inline int getUTF8Length() const
+ {
+ if (length__ < 0)
+ getUTF8LengthRetrieve();
+ return length__;
+ }
void getUnicodeChars(Char chars[]) const;
int getUnicodeLength() const;
@@ -268,6 +279,9 @@
static void purgeOldestStrings();
private:
+ void getUTF8CharsRetrieve() const;
+ void getUTF8LengthRetrieve() const;
+
int compare(const ObjectImpl& other) const;
int unicodeToUTF8Index(int unicodeIndex, bool strict) const;
int retrieve_();
|
|
From: blackh <gra...@li...> - 2003-08-17 22:03:37
|
blackh Sun Aug 17 15:03:36 2003 EDT
Modified files:
/website links.php
Log:
Remove duplicate.
Index: website/links.php
diff -u website/links.php:1.122 website/links.php:1.123
--- website/links.php:1.122 Sun Aug 17 14:38:03 2003
+++ website/links.php Sun Aug 17 15:03:36 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.122 2003/08/17 21:38:03 blackh Exp $ -->
+<!-- $Id: links.php,v 1.123 2003/08/17 22:03:36 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="generator" content=
@@ -116,9 +116,6 @@
the actions of the Government of Israel.
Will this change to the Convention on Cybercrime scare Europeans away from criticizing Israel?
<br/>See also <a target="_top" href="http://freedom.orlingrabbe.com/lfetimes/freedoms_coupdegrace.htm">30 May 2002 - Freedom's <i>Coup de Grâce</i></a> regarding free speech in Europe.
-<br/><a target="_top" href="http://www.darpa.mil/iao/">Information Awareness Office</a>
-<br/>The US Government's department for counter-terrorism through electronic surveillance,
-straight out of Orwell's 1984 - Check out the logo!
<br/><a target="_top" href="http://www.counterpunch.org/davidson0922.html">23 Sep 2002 - Web Warfare Comes to America</a>
<br/>"Action on this new front has taken the form of identity theft, harassment, incitement to harassment, defamation of character, and malicious misrepresentation through the misuse and misappropriation of computer e-mail facilities and lists. In the process, the reliability of the web based system of communication has been undercut, the integrity of some very prestigious universities have been called into question, and the judgment of law enforcement authorities made to look tainted with bias."
<br/><a target="_top" href="http://www.inminds.co.uk/inminds-newsletter-08.txt">26 Apr 2002 - Boycott Israel Campaign website silenced with threats and denial-of-service attacks</a>
|
|
From: blackh <gra...@li...> - 2003-08-17 21:38:04
|
blackh Sun Aug 17 14:38:04 2003 EDT
Modified files:
/website links.php
Log:
Independent journalism retitled and one site added.
Index: website/links.php
diff -u website/links.php:1.121 website/links.php:1.122
--- website/links.php:1.121 Mon Jul 21 00:46:54 2003
+++ website/links.php Sun Aug 17 14:38:03 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.121 2003/07/21 07:46:54 blackh Exp $ -->
+<!-- $Id: links.php,v 1.122 2003/08/17 21:38:03 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="generator" content=
@@ -551,9 +551,14 @@
<br />
-<h3>The War In/On ...</h3>
+<h3>Independent journalism</h3>
+
+<p>Where have all the journalists gone? The mass media replaced all theirs with
+monkeys. The real journalists are now on the Internet.</p>
<p><a target="_top" href=
+"http://www.babelmagazine.com/">http://www.babelmagazine.com/</a><br />
+<a target="_top" href=
"http://www.emperors-clothes.com/">http://www.emperors-clothes.com/</a><br />
<a target="_top" href=
"http://www.whatreallyhappened.com/">http://www.whatreallyhappened.com/</a><br />
|
|
From: blackh <gra...@li...> - 2003-08-16 20:21:08
|
blackh Sat Aug 16 13:21:08 2003 EDT
Modified files:
/grapevine/cpp Engine.cpp Fact.cpp Fact.h Object.cpp Object.h
Operation.cpp Persist.cpp RuleState.cpp
Log:
Performance improvement of about 20% for vectorDistanceBenchmark.
Index: grapevine/cpp/RuleState.cpp
diff -u grapevine/cpp/RuleState.cpp:1.5 grapevine/cpp/RuleState.cpp:1.6
--- grapevine/cpp/RuleState.cpp:1.5 Thu Aug 7 23:05:43 2003
+++ grapevine/cpp/RuleState.cpp Sat Aug 16 13:21:08 2003
@@ -1,4 +1,4 @@
-// $Id: RuleState.cpp,v 1.5 2003/08/08 06:05:43 blackh Exp $
+// $Id: RuleState.cpp,v 1.6 2003/08/16 20:21:08 blackh Exp $
#include "RuleState.h"
@@ -121,7 +121,7 @@
*/
/*static*/ int RuleState::combineCompare(const RuleState& left, const RuleState& right, const IndexVector& indexVector)
{
- int leftSize = left.variables.size(); // !!!
+ int leftSize = left.variables.size();
int rightSize = right.variables.size();
// Compare only the fields specified by the indexVector.
@@ -129,15 +129,18 @@
int index = (*it).first;
SortStyle sortStyle = (*it).second;
if (index < leftSize && index < rightSize) {
- Object vLeft;
- Object vRight;
- if ((sortStyle & SSM_TYPE) == SS_ALPHA) {
- vLeft = left.variables[index].asString();
- vRight = right.variables[index].asString(); // !!!
- }
- else {
- vLeft = left.variables[index].asBigInteger();
- vRight = right.variables[index].asBigInteger();
+ Object vLeft = left.variables[index];
+ Object vRight = right.variables[index];
+ int sortType = sortStyle & SSM_TYPE;
+ switch (sortStyle & SSM_TYPE) {
+ case SS_ALPHA:
+ vLeft = vLeft.asString();
+ vRight = vRight.asString();
+ break;
+ case SS_NUMERIC:
+ vLeft = vLeft.asBigInteger();
+ vRight = vRight.asBigInteger();
+ break;
}
// Assume both are bound. The validity of this assumption depends on
@@ -149,10 +152,12 @@
// variable in this case changing the basic nature of the match that follows.
// Compare the variables as one might compare characters in a string.
- if (vLeft < vRight)
- return ((sortStyle & SSM_DIRECTION) == SS_ASCENDING) ? -1 : 1;
- if (!(vLeft == vRight))
- return ((sortStyle & SSM_DIRECTION) == SS_ASCENDING) ? 1 : -1;
+ if (vLeft != vRight) {
+ if (vLeft < vRight)
+ return ((sortStyle & SSM_DIRECTION) == SS_ASCENDING) ? -1 : 1;
+ else
+ return ((sortStyle & SSM_DIRECTION) == SS_ASCENDING) ? 1 : -1;
+ }
}
}
|
|
From: blackh <gra...@li...> - 2003-08-16 09:47:39
|
blackh Sat Aug 16 02:46:49 2003 EDT
Modified files:
/grapevine Makefile.in configure configure.ac
/grapevine/cpp Makefile.in
/grapevine/cpp/lib Makefile.in
/grapevine/raisen/test vectorDistanceBenchmark.xml
Log:
Tweaks.
Index: grapevine/raisen/test/vectorDistanceBenchmark.xml
diff -u grapevine/raisen/test/vectorDistanceBenchmark.xml:1.1 grapevine/raisen/test/vectorDistanceBenchmark.xml:1.2
--- grapevine/raisen/test/vectorDistanceBenchmark.xml:1.1 Thu Jun 5 04:45:11 2003
+++ grapevine/raisen/test/vectorDistanceBenchmark.xml Sat Aug 16 02:46:49 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: vectorDistanceBenchmark.xml,v 1.1 2003/06/05 11:45:11 blackh Exp $ -->
+<!-- $Id: vectorDistanceBenchmark.xml,v 1.2 2003/08/16 09:46:49 blackh Exp $ -->
<grapevine>
<domain name="test.vectorDistanceBenchmark">
@@ -89,7 +89,7 @@
i=<init/>,
retract i,
{i#no == "", no=1} || no=i#no+1,
- no < 50,
+ no < 200,
remember new <init no="[no]"/>;
</rules>
|
|
From: blackh <gra...@li...> - 2003-08-16 08:19:56
|
blackh Sat Aug 16 01:19:56 2003 EDT
Modified files:
/grapevine README
Log:
Improvements to README file for next release.
Index: grapevine/README
diff -u grapevine/README:1.12 grapevine/README:1.13
--- grapevine/README:1.12 Sat Aug 16 01:03:14 2003
+++ grapevine/README Sat Aug 16 01:19:56 2003
@@ -1,7 +1,7 @@
-$Id: README,v 1.12 2003/08/16 08:03:14 blackh Exp $
+$Id: README,v 1.13 2003/08/16 08:19:56 blackh Exp $
------------------------------------------------------------------------------
-Stephen Blackheath 02 May 2003 http://www.grapevineproject.org/
+Stephen Blackheath 16 Aug 2003 http://www.grapevineproject.org/
Thank you for helping us test the Grapevine Project!
@@ -9,8 +9,6 @@
NOTE: The use of this software entails some risk to you. It is important
that you read the WARNING document before using it.
-For usage instructions, see README.<Your Operating System>
-
WHAT IS IT?
@@ -47,6 +45,8 @@
network, you will need to add them as allowed addresses in
grapevine-config.xml and re-start the daemon.
+For more detailed usage instructions, see README.<Your Operating System>
+
CAN I USE IT WITH A DIAL-UP CONNECTION?
@@ -103,9 +103,9 @@
Information as power
Few people truly grasp the political power that comes from the control of the
-flow of information in human society. The withholding of information is one
-of the primary mechanisms of power at all strata of society. When this power
-is concentrated, the result is tyranny. When this power is diffused, tyranny
+flow of information. The withholding of information is one of the primary
+mechanisms of power at all strata of society. When this power is
+concentrated, the result is tyranny. When this power is diffused, tyranny
cannot exist.
@@ -116,7 +116,7 @@
information, I do not lose it. The free exchange of information produces the
greatest possible material wealth (which is quite distinct from monetary
wealth, which represents the distribution of economic control rather than
-a measure the amount of wealth as is commonly believed).
+a measure the amount of wealth).
Intellectual property in its modern form is an economic system that sacrifices
this great benefit to society, so that corporations can translate the power of
@@ -124,7 +124,8 @@
expiry period has gradually increased from 15 years to 99 years, and so these
corporations now own a large section of our culture, and even much of our
language (the basis of thought). And, they are constantly dreaming up new
-things that can be owned, such as genetic material.
+things that can be owned, such as genetic material and Internet search
+keywords.
Our purpose is to shift the balance of power.
@@ -133,9 +134,9 @@
Libel (defamation) laws were created to protect a person's good name from
mud slinging, which is a very good idea. Unfortunately, some while ago
-companies became 'legal persons'. And so they had an unbeatable combination:
-The legal rights of a person, and the political power of a homicidal robot
-from the future. So for example, they are protected by libel laws, but not
+companies became 'legal persons'. And so this meant they had the legal
+rights of a person, but the political power of a homicidal robot from the
+future. For example, they are protected by libel laws, but not effectively
bound by murder laws. This has allowed them to go into Third World countries
and shoot people (which is becoming a regular occurrence), and then prosecute
anyone who tells on them.
@@ -161,9 +162,8 @@
modems. The Internet is slowly being converted into interactive television.
Many news websites drop old articles into the memory hole, freeing themselves
-from scrutiny. New Zealand's leading news website drops articles after a day!
-The global news agencies are swiftly degenerating into outright lying,
-especially regarding economics and war.
+from scrutiny. The global news agencies are swiftly degenerating into
+outright lying, especially regarding economics and war.
Governments - the Australian Government being a shining example - are dreaming
up fake crackdowns on child pornography, hate speech, and other acts of
@@ -171,10 +171,11 @@
this marvellous property of being inherently unaccountable. It only needs to
be introduced - it does not need to be justified on an ongoing basis.
-Various "terrorist" websites have been shut down in the USA (First Amendment
-be damned!). Internet Service Providers (which are owned by news and
-entertainment corporations) are increasingly being required to police
-censorship and copyright laws, and more recently, "counter-terrorism".
+Various "terrorist" websites have been shut down in the USA (the Home of the
+Brave rather than the Land of the Free). Internet Service Providers (which
+are owned by news and entertainment corporations) are increasingly being
+required to police censorship and copyright laws, and more recently,
+"counter-terrorism".
And importantly, hate speech is now illegal in Europe, providing a panorama
of excuses for political censorship.
@@ -198,11 +199,8 @@
system. When the government is corrupt, freedom is dead. Which kind of
government do you live under?
-Surveillance is a central theme in Orwell's "Nineteen Eighty Four". This
-surveillance violates the Fourth Amendment of the American Constitution. And,
-if you think about it the Third Amendment is also about surveillance, but it
-was written before Orwell's notion of "continuous warfare" became non-fiction,
-and before the advent of police and digitally networked video cameras.
+It is important to note that total surveillance violates TWO ammendments to
+the American Constitution.
ARTICLE THREE
@@ -210,6 +208,9 @@
consent of the owner, nor in time of war, but in a manner to be prescribed
by law.
+In the modern world, read "police" and "electronic surveillance equipment",
+neither of which existed when this law was written.
+
ARTICLE FOUR
The right of the people to be secure in their persons, houses, papers, and
@@ -217,4 +218,7 @@
and no warrants shall issue, but upon probable cause, supported by oath or
affirmation, and particularly describing the place to be searched, and the
persons or things to be seized.
+
+Surveillance is a central theme in Orwell's "Nineteen Eighty Four", a book
+which every adult should read.
|
|
From: blackh <gra...@li...> - 2003-08-16 08:10:03
|
blackh Sat Aug 16 00:59:32 2003 EDT
Modified files:
/website index.php
Log:
Index: website/index.php
diff -u website/index.php:1.67 website/index.php:1.68
--- website/index.php:1.67 Thu Aug 14 14:59:49 2003
+++ website/index.php Sat Aug 16 00:59:32 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.67 2003/08/14 21:59:49 blackh Exp $ -->
+<!-- $Id: index.php,v 1.68 2003/08/16 07:59:32 blackh Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
@@ -73,6 +73,11 @@
<hr width="100%" size="1" />
<h3>News</h3>
+
+ <p><b>16 Aug 2003 - Grapevine-announce list created</b></p>
+
+ <p>I have created a Grapevine-announce list, which I can use to announce things to
+ interested grapevine testers. <a target="_top" href="http://lists.sourceforge.net/lists/listinfo/grapevine-announce">Click here</a> to subscribe to Grapevine-announce.</p>
<p><b>15 Aug 2003 - ACCOPS law</b></p>
|
![http://br.eff.org/brstrip.gif"](http://br.eff.org/brstrip.gif"){kind=link}
![http://aful.org/images/patent_button.gif"](http://aful.org/images/patent_button.gif"){kind=link}