Menu
▾
▴
[Golok-commit] SF.net SVN: golok:[25] trunk
|
From: <sr...@us...> - 2010-03-25 17:52:44
|
Revision: 25
http://golok.svn.sourceforge.net/golok/?rev=25&view=rev
Author: sralmai
Date: 2010-03-25 17:52:38 +0000 (Thu, 25 Mar 2010)
Log Message:
-----------
[RELEASE PACKAGING]: version 1.2 candidate #2
Modified Paths:
--------------
trunk/examples/SpinLock-mult.amf
trunk/examples/SpinLock.amf
trunk/examples/dme-mult.amf
trunk/examples/dme.amf
trunk/examples/dpp.amf
trunk/examples/lr-dpp.amf
trunk/examples/producer-consumer.amf
trunk/parser.scm
Removed Paths:
-------------
trunk/examples/SpinLock-mult.topo
trunk/examples/SpinLock.topo
trunk/examples/dme-mult.topo
trunk/examples/dme.topo
trunk/examples/dpp.topo
trunk/examples/lr-dpp-11.topo
trunk/examples/lr-dpp-22.topo
trunk/examples/lr-dpp-33.topo
trunk/examples/lr-dpp-66.topo
trunk/examples/lr-dpp-88.topo
trunk/examples/lr-dpp.topo
trunk/examples/milners.topo
trunk/examples/producer-consumer.topo
Modified: trunk/examples/SpinLock-mult.amf
===================================================================
--- trunk/examples/SpinLock-mult.amf 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/SpinLock-mult.amf 2010-03-25 17:52:38 UTC (rev 25)
@@ -55,5 +55,5 @@
}
}
-initial-config {
+initialconfig {
}
Deleted: trunk/examples/SpinLock-mult.topo
===================================================================
--- trunk/examples/SpinLock-mult.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/SpinLock-mult.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,12 +0,0 @@
-model: SpinLock.amf
-
-counts:
-thread 2
-object 2
-
-links:
-
-thread 0 -- object 0
-thread 0 -- object 1
-thread 1 -- object 0
-thread 1 -- object 1
Modified: trunk/examples/SpinLock.amf
===================================================================
--- trunk/examples/SpinLock.amf 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/SpinLock.amf 2010-03-25 17:52:38 UTC (rev 25)
@@ -45,5 +45,5 @@
}
}
-initial-config {
+initialconfig {
}
Deleted: trunk/examples/SpinLock.topo
===================================================================
--- trunk/examples/SpinLock.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/SpinLock.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,10 +0,0 @@
-model: SpinLock.amf
-
-counts:
-thread 2
-object 1
-
-links:
-
-thread 0 -- object 0
-thread 1 -- object 0
Modified: trunk/examples/dme-mult.amf
===================================================================
--- trunk/examples/dme-mult.amf 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/dme-mult.amf 2010-03-25 17:52:38 UTC (rev 25)
@@ -43,6 +43,6 @@
}
}
-initial-config {
+initialconfig {
( forward 0 SND )
}
Deleted: trunk/examples/dme-mult.topo
===================================================================
--- trunk/examples/dme-mult.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/dme-mult.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,12 +0,0 @@
-model: dme-mult.amf
-
-counts:
-forward 2
-critical 2
-
-links:
-
-critical0 -> forward0
-forward0 -> critical1
-critical1 -> forward1
-forward1 -> critical0
Modified: trunk/examples/dme.amf
===================================================================
--- trunk/examples/dme.amf 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/dme.amf 2010-03-25 17:52:38 UTC (rev 25)
@@ -33,6 +33,6 @@
}
}
-initial-config {
+initialconfig {
( node 0 SND )
}
Deleted: trunk/examples/dme.topo
===================================================================
--- trunk/examples/dme.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/dme.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,9 +0,0 @@
-model: dme.amf
-
-counts:
-node 2
-
-links:
-
-node0 -> node1
-node1 -> node0
Modified: trunk/examples/dpp.amf
===================================================================
--- trunk/examples/dpp.amf 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/dpp.amf 2010-03-25 17:52:38 UTC (rev 25)
@@ -63,5 +63,5 @@
}
}
-initial-config {
+initialconfig {
}
Deleted: trunk/examples/dpp.topo
===================================================================
--- trunk/examples/dpp.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/dpp.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,21 +0,0 @@
-#
-# dpp.topo
-#
-# describes the initial system instance
-# for dining philosophers protocol
-#
-
-# corresponding automata file
-model: dpp.amf
-
-# simple process counts
-counts:
-
-diner 2
-
-# explicit links between processes
-links:
-
-# simple ring
-diner 0 -> diner 1
-diner 1 -> diner 0
Deleted: trunk/examples/lr-dpp-11.topo
===================================================================
--- trunk/examples/lr-dpp-11.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/lr-dpp-11.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,32 +0,0 @@
-#
-# lr-dpp.topo
-#
-# describes the initial system instance
-# for left right dining philosophers
-# protocol
-#
-
-# corresponding automata file
-model: lr-dpp.amf
-
-# simple process counts
-counts:
-
-left-diner 1
-right-diner 1
-
-# explicit links between processes
-links:
-
-# across this link, right-diner 1 is the
-# left peer (lpeer) and left-diner 0 is
-# the right peer (rpeer)
-#
-# so the topology rule
-# (left-diner, left-taken, lpeer)
-# means that left-diner 0 can
-# consume a "left-taken" message
-# from right-diner 1
-
-right-diner 0 -> left-diner 0
-left-diner 0 -> right-diner 0
Deleted: trunk/examples/lr-dpp-22.topo
===================================================================
--- trunk/examples/lr-dpp-22.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/lr-dpp-22.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,35 +0,0 @@
-#
-# lr-dpp.topo
-#
-# describes the initial system instance
-# for left right dining philosophers
-# protocol
-#
-
-# corresponding automata file
-model: lr-dpp.amf
-
-# simple process counts
-counts:
-
-left-diner 2
-right-diner 2
-
-# explicit links between processes
-links:
-
-# across this link, right-diner 1 is the
-# left peer (lpeer) and left-diner 0 is
-# the right peer (rpeer)
-#
-# so the topology rule
-# (left-diner, left-taken, lpeer)
-# means that left-diner 0 can
-# consume a "left-taken" message
-# from right-diner 1
-right-diner 1 -> left-diner 0
-
-left-diner 0 -> right-diner 0
-right-diner 0 -> left-diner 1
-
-left-diner 1 -> right-diner 1
Deleted: trunk/examples/lr-dpp-33.topo
===================================================================
--- trunk/examples/lr-dpp-33.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/lr-dpp-33.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,38 +0,0 @@
-#
-# lr-dpp.topo
-#
-# describes the initial system instance
-# for left right dining philosophers
-# protocol
-#
-
-# corresponding automata file
-model: lr-dpp.amf
-
-# simple process counts
-counts:
-
-left-diner 3
-right-diner 3
-
-# explicit links between processes
-links:
-
-# across this link, right-diner 1 is the
-# left peer (lpeer) and left-diner 0 is
-# the right peer (rpeer)
-#
-# so the topology rule
-# (left-diner, left-taken, lpeer)
-# means that left-diner 0 can
-# consume a "left-taken" message
-# from right-diner 1
-right-diner 2 -> left-diner 0
-
-left-diner 0 -> right-diner 0
-right-diner 0 -> left-diner 1
-
-left-diner 1 -> right-diner 1
-right-diner 1 -> left-diner 2
-
-left-diner 2 -> right-diner 2
Deleted: trunk/examples/lr-dpp-66.topo
===================================================================
--- trunk/examples/lr-dpp-66.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/lr-dpp-66.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,46 +0,0 @@
-#
-# lr-dpp.topo
-#
-# describes the initial system instance
-# for left right dining philosophers
-# protocol
-#
-
-# corresponding automata file
-model: lr-dpp.amf
-
-# simple process counts
-counts:
-
-left-diner 6
-right-diner 6
-
-# explicit links between processes
-links:
-
-# across this link, right-diner 1 is the
-# left peer (lpeer) and left-diner 0 is
-# the right peer (rpeer)
-#
-# so the topology rule
-# (left-diner, left-taken, lpeer)
-# means that left-diner 0 can
-# consume a "left-taken" message
-# from right-diner 1
-left-diner 0 -> right-diner 0
-right-diner 0 -> left-diner 1
-
-left-diner 1 -> right-diner 1
-right-diner 1 -> left-diner 2
-
-left-diner 2 -> right-diner 2
-right-diner 2 -> left-diner 3
-
-left-diner 3 -> right-diner 3
-right-diner 3 -> left-diner 4
-
-left-diner 4 -> right-diner 4
-right-diner 4 -> left-diner 5
-
-left-diner 5 -> right-diner 5
-right-diner 5 -> left-diner 0
Deleted: trunk/examples/lr-dpp-88.topo
===================================================================
--- trunk/examples/lr-dpp-88.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/lr-dpp-88.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,51 +0,0 @@
-#
-# lr-dpp.topo
-#
-# describes the initial system instance
-# for left right dining philosophers
-# protocol
-#
-
-# corresponding automata file
-model: lr-dpp.amf
-
-# simple process counts
-counts:
-
-left-diner 8
-right-diner 8
-
-# explicit links between processes
-links:
-
-# across this link, right-diner 1 is the
-# left peer (lpeer) and left-diner 0 is
-# the right peer (rpeer)
-#
-# so the topology rule
-# (left-diner, left-taken, lpeer)
-# means that left-diner 0 can
-# consume a "left-taken" message
-# from right-diner 1
-right-diner 7 -> left-diner 0
-
-left-diner 0 -> right-diner 0
-right-diner 0 -> left-diner 1
-
-left-diner 1 -> right-diner 1
-right-diner 1 -> left-diner 2
-
-left-diner 2 -> right-diner 2
-right-diner 2 -> left-diner 3
-
-left-diner 3 -> right-diner 3
-right-diner 3 -> left-diner 4
-
-left-diner 4 -> right-diner 4
-right-diner 4 -> left-diner 5
-
-left-diner 5 -> right-diner 5
-right-diner 5 -> left-diner 6
-
-left-diner 6 -> right-diner 6
-right-diner 6 -> left-diner 7
Modified: trunk/examples/lr-dpp.amf
===================================================================
--- trunk/examples/lr-dpp.amf 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/lr-dpp.amf 2010-03-25 17:52:38 UTC (rev 25)
@@ -125,5 +125,5 @@
# all right processes start in the first listed
# right process state
# (init in the automaton RIGHT-START)
-initial-config {
+initialconfig {
}
Deleted: trunk/examples/lr-dpp.topo
===================================================================
--- trunk/examples/lr-dpp.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/lr-dpp.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1 +0,0 @@
-link lr-dpp-22.topo
\ No newline at end of file
Deleted: trunk/examples/milners.topo
===================================================================
--- trunk/examples/milners.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/milners.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,10 +0,0 @@
-model: milners.amf
-
-counts:
-scheduler 2
-
-links:
-
-scheduler0 -> scheduler1
-scheduler1 -> scheduler0
-
Modified: trunk/examples/producer-consumer.amf
===================================================================
--- trunk/examples/producer-consumer.amf 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/producer-consumer.amf 2010-03-25 17:52:38 UTC (rev 25)
@@ -57,5 +57,5 @@
}
}
-initial-config {
+initialconfig {
}
Deleted: trunk/examples/producer-consumer.topo
===================================================================
--- trunk/examples/producer-consumer.topo 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/examples/producer-consumer.topo 2010-03-25 17:52:38 UTC (rev 25)
@@ -1,15 +0,0 @@
-model: producer-consumer.amf
-
-counts:
-
-producer 2
-consumer 2
-buffer 1
-
-links:
-
-producer 0 -- buffer 0
-producer 1 -- buffer 0
-
-consumer 0 -- buffer 0
-consumer 1 -- buffer 0
Modified: trunk/parser.scm
===================================================================
--- trunk/parser.scm 2010-03-25 16:20:53 UTC (rev 24)
+++ trunk/parser.scm 2010-03-25 17:52:38 UTC (rev 25)
@@ -90,7 +90,7 @@
(name-end ( number ) number-name-end)
(name-end ( identifier) variable-name-end)
- (initial-config ( "initial-config" "{" (arbno "(" start-spec ")" ) "}" ) the-initial-config)
+ (initial-config ( "initialconfig" "{" (arbno "(" start-spec ")" ) "}" ) the-initial-config)
(start-spec (identifier number identifier) a-start-spec)
))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
