[Pntool-developers] SF.net SVN: pntool:[238] codegen/src
Brought to you by:
compaqdrew,
miordache
Menu
▾
▴
[Pntool-developers] SF.net SVN: pntool:[238] codegen/src
|
From: <com...@us...> - 2009-08-23 07:45:31
|
Revision: 238
http://pntool.svn.sourceforge.net/pntool/?rev=238&view=rev
Author: compaqdrew
Date: 2009-08-23 07:45:21 +0000 (Sun, 23 Aug 2009)
Log Message:
-----------
Documentation improvements
Modified Paths:
--------------
codegen/src/codegen.xcodeproj/drew.mode1v3
codegen/src/codegen.xcodeproj/drew.pbxuser
codegen/src/supervisor_static_include.h
Modified: codegen/src/codegen.xcodeproj/drew.mode1v3
===================================================================
--- codegen/src/codegen.xcodeproj/drew.mode1v3 2009-08-23 07:45:14 UTC (rev 237)
+++ codegen/src/codegen.xcodeproj/drew.mode1v3 2009-08-23 07:45:21 UTC (rev 238)
@@ -216,10 +216,10 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3ABC8C091039CC1A0092549A</string>
+ <string>3A9EB43610411E80000F1EE2</string>
<key>history</key>
<array>
- <string>3AD43B42100600C3006F6A93</string>
+ <string>3ABC8C11103B24130092549A</string>
</array>
</dict>
<key>SplitCount</key>
@@ -377,7 +377,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>3ABC8C081039CC1A0092549A</string>
+ <string>3A9EB43310411E80000F1EE2</string>
<key>history</key>
<array>
<string>3A7FCEED0FBC046D00EF8097</string>
@@ -394,7 +394,6 @@
<string>3AF91D7F0FF708B2009F6B4F</string>
<string>3A47543F0FF732C700EE18BA</string>
<string>3AC8A55F0FF827A900DE2863</string>
- <string>3AC8A5610FF827A900DE2863</string>
<string>3AC8A57F0FF8282C00DE2863</string>
<string>3AC8A5D30FF8312800DE2863</string>
<string>3AC8A5D50FF8312800DE2863</string>
@@ -405,7 +404,8 @@
<string>3AD43B32100600C3006F6A93</string>
<string>3AD43B33100600C3006F6A93</string>
<string>3ABC8C051039CC1A0092549A</string>
- <string>3ABC8C061039CC1A0092549A</string>
+ <string>3ABC8C0A103B24130092549A</string>
+ <string>3ABC8C10103B24130092549A</string>
</array>
<key>prevStack</key>
<array>
@@ -435,7 +435,6 @@
<string>3A4754420FF732C700EE18BA</string>
<string>3AC8A56B0FF827A900DE2863</string>
<string>3AC8A5700FF827A900DE2863</string>
- <string>3ABC8C071039CC1A0092549A</string>
</array>
</dict>
<key>SplitCount</key>
@@ -493,9 +492,9 @@
</array>
<key>TableOfContents</key>
<array>
- <string>3ABC8BFC1039CB660092549A</string>
+ <string>3A9EB43410411E80000F1EE2</string>
<string>1CE0B1FE06471DED0097A5F4</string>
- <string>3ABC8BFD1039CB660092549A</string>
+ <string>3A9EB43510411E80000F1EE2</string>
<string>1CE0B20306471E060097A5F4</string>
<string>1CE0B20506471E060097A5F4</string>
</array>
@@ -833,13 +832,13 @@
<key>TableOfContents</key>
<array>
<string>1CD10A99069EF8BA00B06720</string>
- <string>3ABC8BFF1039CB660092549A</string>
+ <string>3A9EB43710411E80000F1EE2</string>
<string>1C162984064C10D400B95A72</string>
- <string>3ABC8C001039CB660092549A</string>
- <string>3ABC8C011039CB660092549A</string>
- <string>3ABC8C021039CB660092549A</string>
- <string>3ABC8C031039CB660092549A</string>
- <string>3ABC8C041039CB660092549A</string>
+ <string>3A9EB43810411E80000F1EE2</string>
+ <string>3A9EB43910411E80000F1EE2</string>
+ <string>3A9EB43A10411E80000F1EE2</string>
+ <string>3A9EB43B10411E80000F1EE2</string>
+ <string>3A9EB43C10411E80000F1EE2</string>
</array>
<key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.debugV3</string>
Modified: codegen/src/codegen.xcodeproj/drew.pbxuser
===================================================================
--- codegen/src/codegen.xcodeproj/drew.pbxuser 2009-08-23 07:45:14 UTC (rev 237)
+++ codegen/src/codegen.xcodeproj/drew.pbxuser 2009-08-23 07:45:21 UTC (rev 238)
@@ -17,15 +17,15 @@
3A3A77E70FC891BD00DB2D28 /* petriNetSerializer.c:33 */,
3A3A783D0FC894C600DB2D28 /* supervisorCompler.c:116 */,
3A13FC180FDA5F3C0051F833 /* supervisorCompler.c:176 */,
- 3A13FC1E0FDA5F810051F833 /* supervisor_static_include.h:314 */,
- 3A13FC220FDA5F970051F833 /* supervisor_static_include.h:307 */,
+ 3A13FC1E0FDA5F810051F833 /* supervisor_static_include.h:322 */,
+ 3A13FC220FDA5F970051F833 /* supervisor_static_include.h:315 */,
3A13FC250FDA5FBA0051F833 /* supervisorCompler.c:174 */,
- 3A13FC660FDA62D90051F833 /* supervisor_static_include.h:330 */,
- 3A13FC680FDA62DA0051F833 /* supervisor_static_include.h:305 */,
- 3A13FC750FDA64190051F833 /* supervisor_static_include.h:343 */,
- 3A13FC780FDA64220051F833 /* supervisor_static_include.h:336 */,
- 3A13FC800FDA64DC0051F833 /* supervisor_static_include.h:345 */,
- 3A13FC830FDA66170051F833 /* supervisor_static_include.h:338 */,
+ 3A13FC660FDA62D90051F833 /* supervisor_static_include.h:338 */,
+ 3A13FC680FDA62DA0051F833 /* supervisor_static_include.h:313 */,
+ 3A13FC750FDA64190051F833 /* supervisor_static_include.h:351 */,
+ 3A13FC780FDA64220051F833 /* supervisor_static_include.h:344 */,
+ 3A13FC800FDA64DC0051F833 /* supervisor_static_include.h:353 */,
+ 3A13FC830FDA66170051F833 /* supervisor_static_include.h:346 */,
);
codeSenseManager = 3A232C630FB214E900A5C7C2 /* Code sense */;
executables = (
@@ -76,8 +76,8 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 272223062;
- PBXWorkspaceStateSaveDate = 272223062;
+ PBXPerProjectTemplateStateSaveDate = 272703098;
+ PBXWorkspaceStateSaveDate = 272703098;
};
perUserProjectItems = {
3A09E2E70FED6EEA003FAB0D = 3A09E2E70FED6EEA003FAB0D /* PBXTextBookmark */;
@@ -104,42 +104,28 @@
3A99A6650FB8E3DC00B1F47C = 3A99A6650FB8E3DC00B1F47C /* PBXTextBookmark */;
3A99A6C60FB8E78600B1F47C = 3A99A6C60FB8E78600B1F47C /* PBXTextBookmark */;
3A99A7400FB8EC6800B1F47C = 3A99A7400FB8EC6800B1F47C /* PBXTextBookmark */;
- 3ABC8BFB1039CB660092549A /* PBXTextBookmark */ = 3ABC8BFB1039CB660092549A /* PBXTextBookmark */;
- 3ABC8BFE1039CB660092549A /* PBXTextBookmark */ = 3ABC8BFE1039CB660092549A /* PBXTextBookmark */;
- 3ABC8C051039CC1A0092549A /* PBXTextBookmark */ = 3ABC8C051039CC1A0092549A /* PBXTextBookmark */;
- 3ABC8C061039CC1A0092549A /* PBXTextBookmark */ = 3ABC8C061039CC1A0092549A /* PBXTextBookmark */;
- 3ABC8C071039CC1A0092549A /* PBXTextBookmark */ = 3ABC8C071039CC1A0092549A /* PBXTextBookmark */;
- 3ABC8C081039CC1A0092549A /* PBXTextBookmark */ = 3ABC8C081039CC1A0092549A /* PBXTextBookmark */;
- 3ABC8C091039CC1A0092549A /* PBXTextBookmark */ = 3ABC8C091039CC1A0092549A /* PBXTextBookmark */;
+ 3A9EB43310411E80000F1EE2 /* PBXTextBookmark */ = 3A9EB43310411E80000F1EE2 /* PBXTextBookmark */;
+ 3A9EB43610411E80000F1EE2 /* PBXTextBookmark */ = 3A9EB43610411E80000F1EE2 /* PBXTextBookmark */;
+ 3ABC8C051039CC1A0092549A = 3ABC8C051039CC1A0092549A /* PBXTextBookmark */;
+ 3ABC8C071039CC1A0092549A = 3ABC8C071039CC1A0092549A /* PBXTextBookmark */;
+ 3ABC8C0A103B24130092549A = 3ABC8C0A103B24130092549A /* PBXTextBookmark */;
+ 3ABC8C0B103B24130092549A = 3ABC8C0B103B24130092549A /* PBXTextBookmark */;
+ 3ABC8C0C103B24130092549A = 3ABC8C0C103B24130092549A /* PBXTextBookmark */;
+ 3ABC8C0D103B24130092549A = 3ABC8C0D103B24130092549A /* PBXTextBookmark */;
+ 3ABC8C10103B24130092549A = 3ABC8C10103B24130092549A /* PBXTextBookmark */;
+ 3ABC8C11103B24130092549A = 3ABC8C11103B24130092549A /* PBXTextBookmark */;
3AC8A55F0FF827A900DE2863 = 3AC8A55F0FF827A900DE2863 /* PBXTextBookmark */;
- 3AC8A5610FF827A900DE2863 = 3AC8A5610FF827A900DE2863 /* PBXTextBookmark */;
3AC8A56B0FF827A900DE2863 = 3AC8A56B0FF827A900DE2863 /* PBXTextBookmark */;
3AC8A5700FF827A900DE2863 = 3AC8A5700FF827A900DE2863 /* PBXTextBookmark */;
3AC8A57F0FF8282C00DE2863 = 3AC8A57F0FF8282C00DE2863 /* PBXTextBookmark */;
3AC8A5D30FF8312800DE2863 = 3AC8A5D30FF8312800DE2863 /* PBXTextBookmark */;
3AC8A5D50FF8312800DE2863 = 3AC8A5D50FF8312800DE2863 /* PBXTextBookmark */;
3AC8A5ED0FF831E800DE2863 = 3AC8A5ED0FF831E800DE2863 /* PBXTextBookmark */;
- 3AC8A5F20FF836F800DE2863 = 3AC8A5F20FF836F800DE2863 /* PBXTextBookmark */;
- 3AC8A5F60FF836F800DE2863 = 3AC8A5F60FF836F800DE2863 /* PBXTextBookmark */;
3AD43B091005F566006F6A93 = 3AD43B091005F566006F6A93 /* PBXTextBookmark */;
- 3AD43B0B1005F566006F6A93 = 3AD43B0B1005F566006F6A93 /* PBXTextBookmark */;
- 3AD43B2D1005F955006F6A93 = 3AD43B2D1005F955006F6A93 /* PBXBookmark */;
3AD43B2E100600C3006F6A93 = 3AD43B2E100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B2F100600C3006F6A93 = 3AD43B2F100600C3006F6A93 /* PBXTextBookmark */;
3AD43B31100600C3006F6A93 = 3AD43B31100600C3006F6A93 /* PBXTextBookmark */;
3AD43B32100600C3006F6A93 = 3AD43B32100600C3006F6A93 /* PBXTextBookmark */;
3AD43B33100600C3006F6A93 = 3AD43B33100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B34100600C3006F6A93 = 3AD43B34100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B35100600C3006F6A93 = 3AD43B35100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B36100600C3006F6A93 = 3AD43B36100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B37100600C3006F6A93 = 3AD43B37100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B38100600C3006F6A93 = 3AD43B38100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B3A100600C3006F6A93 = 3AD43B3A100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B3B100600C3006F6A93 = 3AD43B3B100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B3C100600C3006F6A93 = 3AD43B3C100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B3D100600C3006F6A93 = 3AD43B3D100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B3E100600C3006F6A93 = 3AD43B3E100600C3006F6A93 /* PBXTextBookmark */;
- 3AD43B41100600C3006F6A93 = 3AD43B41100600C3006F6A93 /* PBXTextBookmark */;
3AD43B42100600C3006F6A93 = 3AD43B42100600C3006F6A93 /* PBXTextBookmark */;
3AEAF9100FB2697C00D61E73 = 3AEAF9100FB2697C00D61E73 /* PBXTextBookmark */;
3AEAF9120FB2697C00D61E73 = 3AEAF9120FB2697C00D61E73 /* PBXTextBookmark */;
@@ -194,7 +180,7 @@
modificationTime = 267922699.957455;
state = 2;
};
- 3A13FC1E0FDA5F810051F833 /* supervisor_static_include.h:314 */ = {
+ 3A13FC1E0FDA5F810051F833 /* supervisor_static_include.h:322 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -206,12 +192,12 @@
functionName = "do_new_contract(char* buffer, int plant, reservation_structure *r)";
hitCount = 0;
ignoreCount = 0;
- lineNumber = 314;
+ lineNumber = 322;
location = codegen;
modificationTime = 267922699.957462;
state = 2;
};
- 3A13FC220FDA5F970051F833 /* supervisor_static_include.h:307 */ = {
+ 3A13FC220FDA5F970051F833 /* supervisor_static_include.h:315 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -222,7 +208,7 @@
fileReference = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
hitCount = 0;
ignoreCount = 0;
- lineNumber = 307;
+ lineNumber = 315;
location = codegen;
modificationTime = 267922699.957612;
state = 2;
@@ -243,7 +229,7 @@
modificationTime = 267922699.957716;
state = 2;
};
- 3A13FC660FDA62D90051F833 /* supervisor_static_include.h:330 */ = {
+ 3A13FC660FDA62D90051F833 /* supervisor_static_include.h:338 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -255,12 +241,12 @@
functionName = "do_new_contract(char* buffer, int plant, reservation_structure *r)";
hitCount = 0;
ignoreCount = 0;
- lineNumber = 330;
+ lineNumber = 338;
location = codegen;
modificationTime = 267922699.957726;
state = 2;
};
- 3A13FC680FDA62DA0051F833 /* supervisor_static_include.h:305 */ = {
+ 3A13FC680FDA62DA0051F833 /* supervisor_static_include.h:313 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -271,12 +257,12 @@
fileReference = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
hitCount = 0;
ignoreCount = 0;
- lineNumber = 305;
+ lineNumber = 313;
location = codegen;
modificationTime = 267922699.957816;
state = 2;
};
- 3A13FC750FDA64190051F833 /* supervisor_static_include.h:343 */ = {
+ 3A13FC750FDA64190051F833 /* supervisor_static_include.h:351 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -288,12 +274,12 @@
functionName = "do_new_contract(char* buffer, int plant, reservation_structure *r)";
hitCount = 0;
ignoreCount = 0;
- lineNumber = 343;
+ lineNumber = 351;
location = codegen;
modificationTime = 267922699.957918;
state = 2;
};
- 3A13FC780FDA64220051F833 /* supervisor_static_include.h:336 */ = {
+ 3A13FC780FDA64220051F833 /* supervisor_static_include.h:344 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -305,12 +291,12 @@
functionName = "do_new_contract(char* buffer, int plant, reservation_structure *r)";
hitCount = 0;
ignoreCount = 0;
- lineNumber = 336;
+ lineNumber = 344;
location = codegen;
modificationTime = 267922699.958003;
state = 2;
};
- 3A13FC800FDA64DC0051F833 /* supervisor_static_include.h:345 */ = {
+ 3A13FC800FDA64DC0051F833 /* supervisor_static_include.h:353 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -322,12 +308,12 @@
functionName = "do_new_contract(char* buffer, int plant, reservation_structure *r)";
hitCount = 0;
ignoreCount = 0;
- lineNumber = 345;
+ lineNumber = 353;
location = codegen;
modificationTime = 267922699.958088;
state = 2;
};
- 3A13FC830FDA66170051F833 /* supervisor_static_include.h:338 */ = {
+ 3A13FC830FDA66170051F833 /* supervisor_static_include.h:346 */ = {
isa = PBXFileBreakpoint;
actions = (
);
@@ -339,7 +325,7 @@
functionName = "do_new_contract(char* buffer, int plant, reservation_structure *r)";
hitCount = 0;
ignoreCount = 0;
- lineNumber = 338;
+ lineNumber = 346;
modificationTime = 267922700.446616;
state = 0;
};
@@ -496,9 +482,9 @@
};
3A4754340FF732AB00EE18BA /* supervisorCompiler.c */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {1011, 2702}}";
- sepNavSelRange = "{0, 0}";
- sepNavVisRange = "{2909, 1078}";
+ sepNavIntBoundsRect = "{{0, 0}, {1011, 2716}}";
+ sepNavSelRange = "{1973, 0}";
+ sepNavVisRange = "{0, 1308}";
};
};
3A47543F0FF732C700EE18BA /* PBXTextBookmark */ = {
@@ -836,10 +822,10 @@
};
3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */ = {
uiCtxt = {
- sepNavIntBoundsRect = "{{0, 0}, {968, 9282}}";
- sepNavSelRange = "{11646, 0}";
- sepNavVisRange = "{6559, 1036}";
- sepNavWindowFrame = "{{130, 4}, {1027, 774}}";
+ sepNavIntBoundsRect = "{{0, 0}, {1332, 8960}}";
+ sepNavSelRange = "{13114, 0}";
+ sepNavVisRange = "{3312, 1698}";
+ sepNavWindowFrame = "{{459, 284}, {1027, 774}}";
};
};
3A99A6650FB8E3DC00B1F47C /* PBXTextBookmark */ = {
@@ -847,7 +833,7 @@
fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
name = "supervisor_static_include.h: 15";
rLen = 0;
- rLoc = 15456;
+ rLoc = 16183;
rType = 0;
vrLen = 292;
vrLoc = 0;
@@ -879,25 +865,25 @@
vrLen = 457;
vrLoc = 0;
};
- 3ABC8BFB1039CB660092549A /* PBXTextBookmark */ = {
+ 3A9EB43310411E80000F1EE2 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
- fRef = 3AEE0D6D0FB3AA4900248D5F /* plantCompiler.c */;
- name = "plantCompiler.c: 1050";
- rLen = 0;
- rLoc = 35996;
+ fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
+ name = "supervisor_static_include.h: 146";
+ rLen = 6;
+ rLoc = 4294;
rType = 0;
- vrLen = 916;
- vrLoc = 544;
+ vrLen = 731;
+ vrLoc = 10697;
};
- 3ABC8BFE1039CB660092549A /* PBXTextBookmark */ = {
+ 3A9EB43610411E80000F1EE2 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 471";
+ name = "supervisor_static_include.h: 483";
rLen = 0;
- rLoc = 12387;
+ rLoc = 13114;
rType = 0;
- vrLen = 1036;
- vrLoc = 6557;
+ vrLen = 1698;
+ vrLoc = 3312;
};
3ABC8C051039CC1A0092549A /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
@@ -909,16 +895,6 @@
vrLen = 916;
vrLoc = 544;
};
- 3ABC8C061039CC1A0092549A /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 26";
- rLen = 0;
- rLoc = 671;
- rType = 0;
- vrLen = 809;
- vrLoc = 326;
- };
3ABC8C071039CC1A0092549A /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 3AEE0D6D0FB3AA4900248D5F /* plantCompiler.c */;
@@ -929,25 +905,62 @@
vrLen = 916;
vrLoc = 544;
};
- 3ABC8C081039CC1A0092549A /* PBXTextBookmark */ = {
+ 3ABC8C0A103B24130092549A /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
+ fRef = 3A4754340FF732AB00EE18BA /* supervisorCompiler.c */;
+ name = "supervisorCompiler.c: 56";
+ rLen = 0;
+ rLoc = 1973;
+ rType = 0;
+ vrLen = 1308;
+ vrLoc = 0;
+ };
+ 3ABC8C0B103B24130092549A /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 231";
+ rLen = 1;
+ rLoc = 144;
+ rType = 1;
+ };
+ 3ABC8C0C103B24130092549A /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
+ name = "supervisor_static_include.h: 140";
rLen = 0;
- rLoc = 6240;
+ rLoc = 4159;
rType = 0;
- vrLen = 751;
- vrLoc = 5032;
+ vrLen = 921;
+ vrLoc = 8120;
};
- 3ABC8C091039CC1A0092549A /* PBXTextBookmark */ = {
+ 3ABC8C0D103B24130092549A /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
+ fRef = 3A4754340FF732AB00EE18BA /* supervisorCompiler.c */;
+ name = "supervisorCompiler.c: 56";
+ rLen = 0;
+ rLoc = 1973;
+ rType = 0;
+ vrLen = 1308;
+ vrLoc = 0;
+ };
+ 3ABC8C10103B24130092549A /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 471";
+ name = "supervisor_static_include.h: 146";
+ rLen = 6;
+ rLoc = 4294;
+ rType = 0;
+ vrLen = 731;
+ vrLoc = 10697;
+ };
+ 3ABC8C11103B24130092549A /* PBXTextBookmark */ = {
+ isa = PBXTextBookmark;
+ fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
+ name = "supervisor_static_include.h: 483";
rLen = 0;
- rLoc = 12387;
+ rLoc = 13114;
rType = 0;
- vrLen = 1036;
- vrLoc = 6559;
+ vrLen = 1698;
+ vrLoc = 3312;
};
3AC8A5430FF81EE900DE2863 /* MakeGen.h */ = {
uiCtxt = {
@@ -973,16 +986,6 @@
vrLen = 218;
vrLoc = 0;
};
- 3AC8A5610FF827A900DE2863 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A4754340FF732AB00EE18BA /* supervisorCompiler.c */;
- name = "supervisorCompiler.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 1078;
- vrLoc = 2909;
- };
3AC8A56B0FF827A900DE2863 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 3AC8A5430FF81EE900DE2863 /* MakeGen.h */;
@@ -1043,26 +1046,6 @@
vrLen = 643;
vrLoc = 0;
};
- 3AC8A5F20FF836F800DE2863 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 26";
- rLen = 0;
- rLoc = 671;
- rType = 0;
- vrLen = 1135;
- vrLoc = 0;
- };
- 3AC8A5F60FF836F800DE2863 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
- name = "supervisor_static_include.h: 471";
- rLen = 0;
- rLoc = 12387;
- rType = 0;
- vrLen = 1249;
- vrLoc = 6344;
- };
3AD43B091005F566006F6A93 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 3AC8A5440FF81EE900DE2863 /* MakeGen.c */;
@@ -1073,20 +1056,6 @@
vrLen = 1056;
vrLoc = 0;
};
- 3AD43B0B1005F566006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3AC8A5440FF81EE900DE2863 /* MakeGen.c */;
- name = "MakeGen.c: 68";
- rLen = 0;
- rLoc = 1837;
- rType = 0;
- vrLen = 1056;
- vrLoc = 0;
- };
- 3AD43B2D1005F955006F6A93 /* PBXBookmark */ = {
- isa = PBXBookmark;
- fRef = 3A752B7E0FE6A2B300091C76 /* pns.h */;
- };
3AD43B2E100600C3006F6A93 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 3A752B7E0FE6A2B300091C76 /* pns.h */;
@@ -1097,23 +1066,6 @@
vrLen = 1325;
vrLoc = 283;
};
- 3AD43B2F100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3AD43B30100600C3006F6A93 /* main_function.c */;
- name = "main_function.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 922;
- vrLoc = 3933;
- };
- 3AD43B30100600C3006F6A93 /* main_function.c */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.c;
- name = main_function.c;
- path = /Users/drew/Dropbox/Code/pntool/pnheaders/main_function.c;
- sourceTree = "<absolute>";
- };
3AD43B31100600C3006F6A93 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 3A752B7D0FE6A2B300091C76 /* pns.c */;
@@ -1144,129 +1096,12 @@
vrLen = 1052;
vrLoc = 245;
};
- 3AD43B34100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3AEE0D6D0FB3AA4900248D5F /* plantCompiler.c */;
- name = "plantCompiler.c: 171";
- rLen = 0;
- rLoc = 4261;
- rType = 0;
- vrLen = 1276;
- vrLoc = 3447;
- };
- 3AD43B35100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3AEE0D6D0FB3AA4900248D5F /* plantCompiler.c */;
- name = "plantCompiler.c: 171";
- rLen = 0;
- rLoc = 4261;
- rType = 0;
- vrLen = 1276;
- vrLoc = 3447;
- };
- 3AD43B36100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A752B7E0FE6A2B300091C76 /* pns.h */;
- name = "pns.h: 249";
- rLen = 0;
- rLoc = 10108;
- rType = 0;
- vrLen = 1325;
- vrLoc = 283;
- };
- 3AD43B37100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A752B7D0FE6A2B300091C76 /* pns.c */;
- name = "pns.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 789;
- vrLoc = 825;
- };
- 3AD43B38100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3AD43B39100600C3006F6A93 /* main_function.c */;
- name = "main_function.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 922;
- vrLoc = 3933;
- };
- 3AD43B39100600C3006F6A93 /* main_function.c */ = {
- isa = PBXFileReference;
- lastKnownFileType = sourcecode.c.c;
- name = main_function.c;
- path = /Users/drew/Dropbox/Code/pntool/pnheaders/main_function.c;
- sourceTree = "<absolute>";
- };
- 3AD43B3A100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A752B7D0FE6A2B300091C76 /* pns.c */;
- name = "pns.c: 1";
- rLen = 0;
- rLoc = 0;
- rType = 0;
- vrLen = 789;
- vrLoc = 825;
- };
- 3AD43B3B100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A232C830FB21E0600A5C7C2 /* codegen.c */;
- name = "codegen.c: 36";
- rLen = 0;
- rLoc = 913;
- rType = 0;
- vrLen = 897;
- vrLoc = 241;
- };
- 3AD43B3C100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3AEE0D6D0FB3AA4900248D5F /* plantCompiler.c */;
- name = "plantCompiler.c: 171";
- rLen = 0;
- rLoc = 4261;
- rType = 0;
- vrLen = 1276;
- vrLoc = 3447;
- };
- 3AD43B3D100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3AEE0D6E0FB3AA4900248D5F /* plantCompiler.h */;
- name = "plantCompiler.h: 19";
- rLen = 0;
- rLoc = 248;
- rType = 0;
- vrLen = 1052;
- vrLoc = 245;
- };
- 3AD43B3E100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3AEE0D6D0FB3AA4900248D5F /* plantCompiler.c */;
- name = "plantCompiler.c: 1050";
- rLen = 0;
- rLoc = 35996;
- rType = 0;
- vrLen = 917;
- vrLoc = 544;
- };
- 3AD43B41100600C3006F6A93 /* PBXTextBookmark */ = {
- isa = PBXTextBookmark;
- fRef = 3A752B7E0FE6A2B300091C76 /* pns.h */;
- name = "pns.h: 20";
- rLen = 4;
- rLoc = 457;
- rType = 0;
- vrLen = 1119;
- vrLoc = 207;
- };
3AD43B42100600C3006F6A93 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 3A99A6500FB8E06100B1F47C /* supervisor_static_include.h */;
name = "supervisor_static_include.h: 471";
rLen = 0;
- rLoc = 12387;
+ rLoc = 13114;
rType = 0;
vrLen = 1036;
vrLoc = 6557;
Modified: codegen/src/supervisor_static_include.h
===================================================================
--- codegen/src/supervisor_static_include.h 2009-08-23 07:45:14 UTC (rev 237)
+++ codegen/src/supervisor_static_include.h 2009-08-23 07:45:21 UTC (rev 238)
@@ -118,7 +118,7 @@
#endif
if (can_transition_locally_fire(u->t, supervisor))
{
- somebodys_firing_transition = u->t;
+ somebodys_firing_transition = u->t; //this gridlocks much of the supervisor; we don't want things getting in an inconsistent state in the middle of a synchronized transition
send_fire_msg(u,id,pipe);
return YES;
@@ -136,7 +136,8 @@
if (attempt_fire_something(supervisor, how_many_plants, &r->u[i], r->id,pipe))
{
- r->selected_fire_something = i; //indicates which element of the reservation we've elected to fire
+ r->selected_fire_something = i; //indicates which element of the reservation we've elected to fire;
+ //this lets us address the fire_something by its reservation id.
r->sent = 1; //indicates that we've sent a firemsg and no further communication to the plant is necessary
return;
}
@@ -185,6 +186,8 @@
}
return -1;
}
+//determines if a transition can locally fire. Doesn't take into account plant states.
+//will return NO if a synchronized transition is in progress.
int can_transition_locally_fire(int t, pns* supervisor)
{
if (somebodys_firing_transition != -1) //todo: make this much more efficient
@@ -213,7 +216,7 @@
return YES;
}
-
+//Create and destroy the local tokens to represent the firing of some transition
void fire_transition_local(int t, pns* supervisor,int how_many_plants)
{
printf("Firing %d\n",t);
@@ -263,6 +266,7 @@
#endif*/
}
+//checks to see if transition t can be fired, and if so, fires it
void process_transition_at(int t, pns* supervisor, int how_many_plants)
{
printf("Entering transition %d\n",t);
@@ -271,6 +275,8 @@
fire_transition_local(t,supervisor, how_many_plants);
}
}
+
+//placeholder to run diagnostics or other place-centered code
void process_token_at(int node, pns* supervisor)
{
#ifdef NOISY_DEBUG
@@ -278,6 +284,8 @@
#endif
}
+
+//this does a local simulation pass (fires all transitions that have no external dependencies)
void simulation_pass_local(pns* supervisor, int how_many_plants, int* blocked_transitions)
{
int i = 0;
@@ -290,7 +298,7 @@
}
for(i = 0; i < supervisor->tnum; i++)
{
- if (blocked_transitions[i] == NO)
+ if (blocked_transitions[i] == NO) //only fire transitions that have no remote dependencies
{
process_transition_at(i,supervisor, how_many_plants);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
