ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.204 by root, Fri Feb 2 19:59:22 2007 UTC vs.
Revision 1.249 by root, Wed Apr 18 12:43:54 2007 UTC

4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Storable;
9use Event;
9use Opcode; 10use Opcode;
10use Safe; 11use Safe;
11use Safe::Hole; 12use Safe::Hole;
12 13
13use Coro 3.5 (); 14use Coro 3.61 ();
15use Coro::State;
14use Coro::Event; 16use Coro::Event;
15use Coro::Timer; 17use Coro::Timer;
16use Coro::Signal; 18use Coro::Signal;
17use Coro::Semaphore; 19use Coro::Semaphore;
18use Coro::AIO; 20use Coro::AIO;
21use Coro::Storable;
19 22
23use BDB ();
20use Data::Dumper; 24use Data::Dumper;
21use Digest::MD5; 25use Digest::MD5;
22use Fcntl; 26use Fcntl;
27use YAML::Syck ();
23use IO::AIO 2.32 (); 28use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 29use Time::HiRes;
30use Compress::LZF;
26 31
32# configure various modules to our taste
33#
34$Storable::canonical = 1; # reduce rsync transfers
35Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
36Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
37
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 38$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 39
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 40# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 41$YAML::Syck::ImplicitUnicode = 1;
33 42
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 43$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
44
45sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
35 46
36our %COMMAND = (); 47our %COMMAND = ();
37our %COMMAND_TIME = (); 48our %COMMAND_TIME = ();
38 49
39our @EXTS = (); # list of extension package names 50our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 51our %EXTCMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 52our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 53our %EXT_MAP = (); # pluggable maps
43 54
55our $RELOAD; # number of reloads so far
44our @EVENT; 56our @EVENT;
45our $LIBDIR = datadir . "/ext"; 57our $LIBDIR = datadir . "/ext";
46 58
47our $TICK = MAX_TIME * 1e-6; 59our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 60our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 61our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 62our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 63our $NEXT_TICK;
52our $NOW; 64our $NOW;
53our $USE_FSYNC; # use fsync to write maps - default off 65our $USE_FSYNC = 1; # use fsync to write maps - default off
66
67our $BDB_POLL_WATCHER;
68our $DB_ENV;
54 69
55our %CFG; 70our %CFG;
56 71
57our $UPTIME; $UPTIME ||= time; 72our $UPTIME; $UPTIME ||= time;
58our $RUNTIME; 73our $RUNTIME;
59 74
60our %PLAYER; # all users 75our %PLAYER; # all users
61our %MAP; # all maps 76our %MAP; # all maps
62our $LINK_MAP; # the special {link} map, which is always available 77our $LINK_MAP; # the special {link} map, which is always available
63our $RANDOM_MAPS = cf::localdir . "/random"; 78our $RANDOM_MAPS = cf::localdir . "/random";
64 79our $BDB_ENV_DIR = cf::localdir . "/db";
65our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
66our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
67 80
68# used to convert map paths into valid unix filenames by replacing / by ∕ 81# used to convert map paths into valid unix filenames by replacing / by ∕
69our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 82our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
70 83
71binmode STDOUT; 84binmode STDOUT;
81mkdir cf::localdir; 94mkdir cf::localdir;
82mkdir cf::localdir . "/" . cf::playerdir; 95mkdir cf::localdir . "/" . cf::playerdir;
83mkdir cf::localdir . "/" . cf::tmpdir; 96mkdir cf::localdir . "/" . cf::tmpdir;
84mkdir cf::localdir . "/" . cf::uniquedir; 97mkdir cf::localdir . "/" . cf::uniquedir;
85mkdir $RANDOM_MAPS; 98mkdir $RANDOM_MAPS;
99mkdir $BDB_ENV_DIR;
86 100
87our $EMERGENCY_POSITION; 101our $EMERGENCY_POSITION;
88 102
89sub cf::map::normalise; 103sub cf::map::normalise;
90 104
119=item %cf::CFG 133=item %cf::CFG
120 134
121Configuration for the server, loaded from C</etc/crossfire/config>, or 135Configuration for the server, loaded from C</etc/crossfire/config>, or
122from wherever your confdir points to. 136from wherever your confdir points to.
123 137
124=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 138=item cf::wait_for_tick, cf::wait_for_tick_begin
125 139
126These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 140These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
127or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 141returns directly I<after> the tick processing (and consequently, can only wake one process
128processing has been done. Call C<< ->wait >> on them to maximise the 142per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
129window of cpu time available, or simply to synchronise to the server tick.
130 143
131=back 144=back
132 145
133=cut 146=cut
134 147
193 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 206 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
194 $d 207 $d
195 } || "[unable to dump $_[0]: '$@']"; 208 } || "[unable to dump $_[0]: '$@']";
196} 209}
197 210
198use JSON::Syck (); # TODO# replace by JSON::PC once working 211use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
199 212
200=item $ref = cf::from_json $json 213=item $ref = cf::from_json $json
201 214
202Converts a JSON string into the corresponding perl data structure. 215Converts a JSON string into the corresponding perl data structure.
203 216
204=cut
205
206sub from_json($) {
207 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
208 JSON::Syck::Load $_[0]
209}
210
211=item $json = cf::to_json $ref 217=item $json = cf::to_json $ref
212 218
213Converts a perl data structure into its JSON representation. 219Converts a perl data structure into its JSON representation.
214
215=cut
216
217sub to_json($) {
218 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
219 JSON::Syck::Dump $_[0]
220}
221 220
222=item cf::lock_wait $string 221=item cf::lock_wait $string
223 222
224Wait until the given lock is available. See cf::lock_acquire. 223Wait until the given lock is available. See cf::lock_acquire.
225 224
264sub freeze_mainloop { 263sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 264 return unless $TICK_WATCHER->is_active;
266 265
267 my $guard = Coro::guard { 266 my $guard = Coro::guard {
268 $TICK_WATCHER->start; 267 $TICK_WATCHER->start;
269 $WRITE_RUNTIME_WATCHER->start;
270 }; 268 };
271 $WRITE_RUNTIME_WATCHER->stop;
272 $TICK_WATCHER->stop; 269 $TICK_WATCHER->stop;
273 $guard 270 $guard
274} 271}
275 272
276=item cf::async { BLOCK } 273=item cf::async { BLOCK }
347 344
348 $coro 345 $coro
349} 346}
350 347
351sub write_runtime { 348sub write_runtime {
349 my $guard = cf::lock_acquire "write_runtime";
350
352 my $runtime = cf::localdir . "/runtime"; 351 my $runtime = cf::localdir . "/runtime";
353 352
354 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 353 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
355 or return; 354 or return;
356 355
370 369
371 aio_rename "$runtime~", $runtime 370 aio_rename "$runtime~", $runtime
372 and return; 371 and return;
373 372
374 1 373 1
374}
375
376=item cf::datalog type => key => value, ...
377
378Log a datalog packet of the given type with the given key-value pairs.
379
380=cut
381
382sub datalog($@) {
383 my ($type, %kv) = @_;
384 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
375} 385}
376 386
377=back 387=back
378 388
379=cut 389=cut
778 } 788 }
779 } else { 789 } else {
780 aio_unlink $filename; 790 aio_unlink $filename;
781 aio_unlink "$filename.pst"; 791 aio_unlink "$filename.pst";
782 } 792 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
789 } 793 }
790} 794}
791 795
792sub object_freezer_as_string { 796sub object_freezer_as_string {
793 my ($rdata, $objs) = @_; 797 my ($rdata, $objs) = @_;
799 803
800sub object_thawer_load { 804sub object_thawer_load {
801 my ($filename) = @_; 805 my ($filename) = @_;
802 806
803 my ($data, $av); 807 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
807 808
808 (aio_load $filename, $data) >= 0 809 (aio_load $filename, $data) >= 0
809 or return; 810 or return;
810 811
811 unless (aio_stat "$filename.pst") { 812 unless (aio_stat "$filename.pst") {
960} 961}
961 962
962sub path($) { 963sub path($) {
963 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 964 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964 965
965 (playerdir $login) . "/$login.pl" 966 (playerdir $login) . "/playerdata"
966} 967}
967 968
968sub find_active($) { 969sub find_active($) {
969 $cf::PLAYER{$_[0]} 970 $cf::PLAYER{$_[0]}
970 and $cf::PLAYER{$_[0]}->active 971 and $cf::PLAYER{$_[0]}->active
983 my $login = $_[0]; 984 my $login = $_[0];
984 985
985 my $guard = cf::lock_acquire "user_find:$login"; 986 my $guard = cf::lock_acquire "user_find:$login";
986 987
987 $cf::PLAYER{$_[0]} || do { 988 $cf::PLAYER{$_[0]} || do {
989 # rename old playerfiles to new ones
990 #TODO: remove when no longer required
991 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
992 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
993 aio_unlink +(playerdir $login) . "/$login.pl.pst";
994 aio_unlink +(playerdir $login) . "/$login.pl";
995
988 my $pl = load_pl path $login 996 my $pl = load_pl path $login
989 or return; 997 or return;
990 $cf::PLAYER{$login} = $pl 998 $cf::PLAYER{$login} = $pl
991 } 999 }
992 } 1000 }
1029 1037
1030=cut 1038=cut
1031 1039
1032sub quit_character { 1040sub quit_character {
1033 my ($pl) = @_; 1041 my ($pl) = @_;
1042
1043 my $name = $pl->ob->name;
1034 1044
1035 $pl->{deny_save} = 1; 1045 $pl->{deny_save} = 1;
1036 $pl->password ("*"); # this should lock out the player until we nuked the dir 1046 $pl->password ("*"); # this should lock out the player until we nuked the dir
1037 1047
1038 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1048 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1043 my $path = playerdir $pl; 1053 my $path = playerdir $pl;
1044 my $temp = "$path~$cf::RUNTIME~deleting~"; 1054 my $temp = "$path~$cf::RUNTIME~deleting~";
1045 aio_rename $path, $temp; 1055 aio_rename $path, $temp;
1046 delete $cf::PLAYER{$pl->ob->name}; 1056 delete $cf::PLAYER{$pl->ob->name};
1047 $pl->destroy; 1057 $pl->destroy;
1058
1059 my $prefix = qr<^~\Q$name\E/>;
1060
1061 # nuke player maps
1062 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1063
1048 IO::AIO::aio_rmtree $temp; 1064 IO::AIO::aio_rmtree $temp;
1065}
1066
1067=item $pl->kick
1068
1069Kicks a player out of the game. This destroys the connection.
1070
1071=cut
1072
1073sub kick {
1074 my ($pl, $kicker) = @_;
1075
1076 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1077 $pl->killer ("kicked");
1078 $pl->ns->destroy;
1049} 1079}
1050 1080
1051=item cf::player::list_logins 1081=item cf::player::list_logins
1052 1082
1053Returns am arrayref of all valid playernames in the system, can take a 1083Returns am arrayref of all valid playernames in the system, can take a
1099 } 1129 }
1100 1130
1101 \@paths 1131 \@paths
1102} 1132}
1103 1133
1104=item $player->ext_reply ($msgid, $msgtype, %msg) 1134=item $player->ext_reply ($msgid, %msg)
1105 1135
1106Sends an ext reply to the player. 1136Sends an ext reply to the player.
1107 1137
1108=cut 1138=cut
1109 1139
1110sub ext_reply($$$%) { 1140sub ext_reply($$%) {
1111 my ($self, $id, %msg) = @_; 1141 my ($self, $id, %msg) = @_;
1112 1142
1113 $msg{msgid} = $id; 1143 $msg{msgid} = $id;
1114 1144
1115 $self->send ("ext " . cf::to_json \%msg); 1145 $self->send ("ext " . cf::to_json \%msg);
1116} 1146}
1117 1147
1118package cf; 1148=item $player->ext_event ($type, %msg)
1149
1150Sends an ext event to the client.
1151
1152=cut
1153
1154sub ext_event($$%) {
1155 my ($self, $type, %msg) = @_;
1156
1157 $self->ns->ext_event ($type, %msg);
1158}
1159
1160=head3 cf::region
1161
1162=over 4
1163
1164=cut
1165
1166package cf::region;
1167
1168=item cf::region::find_by_path $path
1169
1170Tries to decuce the probable region for a map knowing only its path.
1171
1172=cut
1173
1174sub find_by_path($) {
1175 my ($path) = @_;
1176
1177 my ($match, $specificity);
1178
1179 for my $region (list) {
1180 if ($region->match && $path =~ $region->match) {
1181 ($match, $specificity) = ($region, $region->specificity)
1182 if $region->specificity > $specificity;
1183 }
1184 }
1185
1186 $match
1187}
1119 1188
1120=back 1189=back
1121
1122 1190
1123=head3 cf::map 1191=head3 cf::map
1124 1192
1125=over 4 1193=over 4
1126 1194
1298 my ($self) = @_; 1366 my ($self) = @_;
1299 1367
1300 utf8::encode (my $save = $self->save_path); 1368 utf8::encode (my $save = $self->save_path);
1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1369 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1370 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1308} 1371}
1309 1372
1310sub load_header_from($) { 1373sub load_header_from($) {
1311 my ($self, $path) = @_; 1374 my ($self, $path) = @_;
1312 1375
1362 $self->load_header_orig 1425 $self->load_header_orig
1363 or return; 1426 or return;
1364 $self->prepare_orig; 1427 $self->prepare_orig;
1365 } 1428 }
1366 1429
1430 $self->default_region (cf::region::find_by_path $self->{path})
1431 unless $self->default_region;
1432
1367 1 1433 1
1368} 1434}
1369 1435
1370sub find; 1436sub find;
1371sub find { 1437sub find {
1413 $self->in_memory (cf::MAP_LOADING); 1479 $self->in_memory (cf::MAP_LOADING);
1414 1480
1415 $self->alloc; 1481 $self->alloc;
1416 1482
1417 $self->pre_load; 1483 $self->pre_load;
1484 Coro::cede;
1418 1485
1419 $self->_load_objects ($self->{load_path}, 1) 1486 $self->_load_objects ($self->{load_path}, 1)
1420 or return; 1487 or return;
1421 1488
1422 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1489 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1429 $self->_load_objects ($uniq, 0); 1496 $self->_load_objects ($uniq, 0);
1430 } 1497 }
1431 } 1498 }
1432 1499
1433 Coro::cede; 1500 Coro::cede;
1434
1435 # now do the right thing for maps 1501 # now do the right thing for maps
1436 $self->link_multipart_objects; 1502 $self->link_multipart_objects;
1503 Coro::cede;
1437 1504
1438 unless ($self->{deny_activate}) { 1505 unless ($self->{deny_activate}) {
1439 $self->decay_objects; 1506 $self->decay_objects;
1440 $self->fix_auto_apply; 1507 $self->fix_auto_apply;
1441 $self->update_buttons; 1508 $self->update_buttons;
1443 $self->set_darkness_map; 1510 $self->set_darkness_map;
1444 $self->difficulty ($self->estimate_difficulty) 1511 $self->difficulty ($self->estimate_difficulty)
1445 unless $self->difficulty; 1512 unless $self->difficulty;
1446 Coro::cede; 1513 Coro::cede;
1447 $self->activate; 1514 $self->activate;
1515 Coro::cede;
1448 } 1516 }
1449 1517
1450 $self->post_load; 1518 $self->post_load;
1519 Coro::cede;
1451 1520
1452 $self->in_memory (cf::MAP_IN_MEMORY); 1521 $self->in_memory (cf::MAP_IN_MEMORY);
1453} 1522}
1454 1523
1455sub customise_for { 1524sub customise_for {
1600 return if $self->players; 1669 return if $self->players;
1601 return if $self->isa ("ext::map_per_player");#d# 1670 return if $self->isa ("ext::map_per_player");#d#
1602 1671
1603 warn "resetting map ", $self->path;#d# 1672 warn "resetting map ", $self->path;#d#
1604 1673
1674 $self->in_memory (cf::MAP_SWAPPED);
1675
1676 # need to save uniques path
1677 unless ($self->{deny_save}) {
1678 my $uniq = $self->uniq_path; utf8::encode $uniq;
1679
1680 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1681 if $uniq;
1682 }
1683
1605 delete $cf::MAP{$self->path}; 1684 delete $cf::MAP{$self->path};
1606 1685
1607 $self->in_memory (cf::MAP_SWAPPED);
1608 $self->clear; 1686 $self->clear;
1609 1687
1610 $_->clear_links_to ($self) for values %cf::MAP; 1688 $_->clear_links_to ($self) for values %cf::MAP;
1611 1689
1612 $self->unlink_save; 1690 $self->unlink_save;
1802 $map->load; 1880 $map->load;
1803 $map->load_diag; 1881 $map->load_diag;
1804 1882
1805 return unless $self->contr->active; 1883 return unless $self->contr->active;
1806 $self->activate_recursive; 1884 $self->activate_recursive;
1885
1886 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1807 $self->enter_map ($map, $x, $y); 1887 $self->enter_map ($map, $x, $y);
1808} 1888}
1809 1889
1810cf::player->attach ( 1890cf::player->attach (
1811 on_logout => sub { 1891 on_logout => sub {
1824 # try to abort aborted map switching on player login :) 1904 # try to abort aborted map switching on player login :)
1825 # should happen only on crashes 1905 # should happen only on crashes
1826 if ($pl->ob->{_link_pos}) { 1906 if ($pl->ob->{_link_pos}) {
1827 $pl->ob->enter_link; 1907 $pl->ob->enter_link;
1828 (async { 1908 (async {
1829 # we need this sleep as the login has a concurrent enter_exit running
1830 # and this sleep increases chances of the player not ending up in scorn
1831 $pl->ob->reply (undef, 1909 $pl->ob->reply (undef,
1832 "There was an internal problem at your last logout, " 1910 "There was an internal problem at your last logout, "
1833 . "the server will try to bring you to your intended destination in a second.", 1911 . "the server will try to bring you to your intended destination in a second.",
1834 cf::NDI_RED); 1912 cf::NDI_RED);
1913 # we need this sleep as the login has a concurrent enter_exit running
1914 # and this sleep increases chances of the player not ending up in scorn
1835 Coro::Timer::sleep 1; 1915 Coro::Timer::sleep 1;
1836 $pl->ob->leave_link; 1916 $pl->ob->leave_link;
1837 })->prio (2); 1917 })->prio (2);
1838 } 1918 }
1839 }, 1919 },
1922 2002
1923 return unless $self->type == cf::PLAYER; 2003 return unless $self->type == cf::PLAYER;
1924 2004
1925 if ($exit->slaying eq "/!") { 2005 if ($exit->slaying eq "/!") {
1926 #TODO: this should de-fi-ni-te-ly not be a sync-job 2006 #TODO: this should de-fi-ni-te-ly not be a sync-job
2007 # the problem is that $exit might not survive long enough
2008 # so it needs to be done right now, right here
1927 cf::sync_job { prepare_random_map $exit }; 2009 cf::sync_job { prepare_random_map $exit };
1928 } 2010 }
1929 2011
1930 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2012 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1931 my $hp = $exit->stats->hp; 2013 my $hp = $exit->stats->hp;
1939 $self->goto ($slaying, $hp, $sp); 2021 $self->goto ($slaying, $hp, $sp);
1940 2022
1941 1; 2023 1;
1942 }) { 2024 }) {
1943 $self->message ("Something went wrong deep within the crossfire server. " 2025 $self->message ("Something went wrong deep within the crossfire server. "
1944 . "I'll try to bring you back to the map you were before. " 2026 . "I'll try to bring you back to the map you were before. "
1945 . "Please report this to the dungeon master!", 2027 . "Please report this to the dungeon master!",
1946 cf::NDI_UNIQUE | cf::NDI_RED); 2028 cf::NDI_UNIQUE | cf::NDI_RED);
1947 2029
1948 warn "ERROR in enter_exit: $@"; 2030 warn "ERROR in enter_exit: $@";
1949 $self->leave_link; 2031 $self->leave_link;
1950 } 2032 }
1951 })->prio (1); 2033 })->prio (1);
1964 2046
1965sub cf::client::send_drawinfo { 2047sub cf::client::send_drawinfo {
1966 my ($self, $text, $flags) = @_; 2048 my ($self, $text, $flags) = @_;
1967 2049
1968 utf8::encode $text; 2050 utf8::encode $text;
1969 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2051 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1970} 2052}
1971 2053
2054=item $client->ext_event ($type, %msg)
2055
2056Sends an exti event to the client.
2057
2058=cut
2059
2060sub cf::client::ext_event($$%) {
2061 my ($self, $type, %msg) = @_;
2062
2063 $msg{msgtype} = "event_$type";
2064 $self->send_packet ("ext " . cf::to_json \%msg);
2065}
1972 2066
1973=item $success = $client->query ($flags, "text", \&cb) 2067=item $success = $client->query ($flags, "text", \&cb)
1974 2068
1975Queues a query to the client, calling the given callback with 2069Queues a query to the client, calling the given callback with
1976the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2070the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2073 2167
2074# here we export the classes and methods available to script code 2168# here we export the classes and methods available to script code
2075 2169
2076=pod 2170=pod
2077 2171
2078The following fucntions and emthods are available within a safe environment: 2172The following functions and methods are available within a safe environment:
2079 2173
2080 cf::object contr pay_amount pay_player map 2174 cf::object contr pay_amount pay_player map
2081 cf::object::player player 2175 cf::object::player player
2082 cf::player peaceful 2176 cf::player peaceful
2083 cf::map trigger 2177 cf::map trigger
2176The parameter C<$family> should best start with the name of the extension 2270The parameter C<$family> should best start with the name of the extension
2177using it, it should be unique. 2271using it, it should be unique.
2178 2272
2179=over 4 2273=over 4
2180 2274
2181=item $hashref = cf::db_get $family
2182
2183Return a hashref for use by the extension C<$family>, which can be
2184modified. After modifications, you have to call C<cf::db_dirty> or
2185C<cf::db_sync>.
2186
2187=item $value = cf::db_get $family => $key 2275=item $value = cf::db_get $family => $key
2188 2276
2189Returns a single value from the database 2277Returns a single value from the database.
2190
2191=item cf::db_put $family => $hashref
2192
2193Stores the given family hashref into the database. Updates are delayed, if
2194you want the data to be synced to disk immediately, use C<cf::db_sync>.
2195 2278
2196=item cf::db_put $family => $key => $value 2279=item cf::db_put $family => $key => $value
2197 2280
2198Stores the given C<$value> in the family hash. Updates are delayed, if you 2281Stores the given C<$value> in the family.
2199want the data to be synced to disk immediately, use C<cf::db_sync>.
2200
2201=item cf::db_dirty
2202
2203Marks the database as dirty, to be updated at a later time.
2204
2205=item cf::db_sync
2206
2207Immediately write the database to disk I<if it is dirty>.
2208 2282
2209=cut 2283=cut
2210 2284
2211our $DB; 2285our $DB;
2212 2286
2213{ 2287sub db_init {
2288 unless ($DB) {
2289 $DB = BDB::db_create $DB_ENV;
2290
2291 cf::sync_job {
2292 eval {
2293 $DB->set_flags (BDB::CHKSUM);
2294
2295 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2296 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2297 cf::cleanup "db_open(db): $!" if $!;
2298 };
2299 cf::cleanup "db_open(db): $@" if $@;
2300 };
2301
2214 my $path = cf::localdir . "/database.pst"; 2302 my $path = cf::localdir . "/database.pst";
2303 if (stat $path) {
2304 cf::sync_job {
2305 my $pst = Storable::retrieve $path;
2215 2306
2216 sub db_load() { 2307 cf::db_put (board => data => $pst->{board});
2217 $DB = stat $path ? Storable::retrieve $path : { }; 2308 cf::db_put (guildrules => data => $pst->{guildrules});
2218 } 2309 cf::db_put (rent => balance => $pst->{rent}{balance});
2310 BDB::db_env_txn_checkpoint $DB_ENV;
2219 2311
2220 my $pid; 2312 unlink $path;
2221
2222 sub db_save() {
2223 waitpid $pid, 0 if $pid;
2224 if (0 == ($pid = fork)) {
2225 $DB->{_meta}{version} = 1;
2226 Storable::nstore $DB, "$path~";
2227 rename "$path~", $path;
2228 cf::_exit 0 if defined $pid;
2229 } 2313 };
2230 }
2231
2232 my $dirty;
2233
2234 sub db_sync() {
2235 db_save if $dirty;
2236 undef $dirty;
2237 }
2238
2239 my $idle = Event->idle (
2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2246 );
2247
2248 sub db_dirty() {
2249 $dirty = 1;
2250 $idle->start;
2251 }
2252
2253 sub db_get($;$) {
2254 @_ >= 2
2255 ? $DB->{$_[0]}{$_[1]}
2256 : ($DB->{$_[0]} ||= { })
2257 }
2258
2259 sub db_put($$;$) {
2260 if (@_ >= 3) {
2261 $DB->{$_[0]}{$_[1]} = $_[2];
2262 } else {
2263 $DB->{$_[0]} = $_[1];
2264 }
2265 db_dirty;
2266 }
2267
2268 cf::global->attach (
2269 prio => 10000,
2270 on_cleanup => sub {
2271 db_sync;
2272 }, 2314 }
2273 ); 2315 }
2316}
2317
2318sub db_get($$) {
2319 my $key = "$_[0]/$_[1]";
2320
2321 cf::sync_job {
2322 BDB::db_get $DB, undef, $key, my $data;
2323
2324 $! ? ()
2325 : Compress::LZF::sthaw $data
2326 }
2327}
2328
2329sub db_put($$$) {
2330 BDB::dbreq_pri 4;
2331 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2332}
2333
2334=item cf::cache $id => ...
2335
2336Generic caching function that returns the value of the resource $id,
2337caching and regenerating as required.
2338
2339This function can block.
2340
2341 source => filename returning the data (must be a scalar)
2342 expensive => true == try to cache harder
2343 filter => sub that processes the data into a scalar
2344
2345=cut
2346
2347sub cache {
2348 my ($id, %arg) = @_;
2349
2350 aio_stat $arg{source}
2351 and Carp::croak "$arg{source}: $!";
2352
2353 my $meta = join ":", (stat _)[7,9];
2354 my $md5;
2355
2356 if ($arg{expensive}) {
2357 0 <= aio_load $arg{source}, my $buf
2358 or Carp::croak "$arg{source}: $!";
2359
2360 $md5 = Digest::MD5::md5_hex $buf;
2361 }
2362
2363 my $dbmeta = db_get "$id/meta";
2364 if ($dbmeta ne $meta) {
2365 # changed, we need to process
2366 } else {
2367 # just fetch
2368 }
2369
2370
2274} 2371}
2275 2372
2276############################################################################# 2373#############################################################################
2277# the server's init and main functions 2374# the server's init and main functions
2278 2375
2279sub load_resources { 2376sub load_facedata($) {
2377 my ($path) = @_;
2378
2379 warn "loading facedata from $path\n";
2380
2381 my $facedata;
2382 0 < aio_load $path, $facedata
2383 or die "$path: $!";
2384
2385 $facedata = Coro::Storable::thaw $facedata;
2386
2387 $facedata->{version} == 2
2388 or cf::cleanup "$path: version mismatch, cannot proceed.";
2389
2390 {
2391 my $faces = $facedata->{faceinfo};
2392
2393 while (my ($face, $info) = each %$faces) {
2394 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2395 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2396 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2397 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2398 Coro::cede;
2399 }
2400
2401 while (my ($face, $info) = each %$faces) {
2402 next unless $info->{smooth};
2403 my $idx = cf::face::find $face
2404 or next;
2405 if (my $smooth = cf::face::find $info->{smooth}) {
2406 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2407 } else {
2408 warn "smooth face '$info->{smooth}' not found for face '$face'";
2409 }
2410 Coro::cede;
2411 }
2412 }
2413
2414 {
2415 my $anims = $facedata->{animinfo};
2416
2417 while (my ($anim, $info) = each %$anims) {
2418 cf::anim::set $anim, $info->{frames}, $info->{facings};
2419 Coro::cede;
2420 }
2421
2422 cf::anim::invalidate_all; # d'oh
2423 }
2424
2425 1
2426}
2427
2428sub reload_facedata {
2429 load_facedata sprintf "%s/facedata", cf::datadir
2430 or die "unable to load facedata\n";
2431}
2432
2433sub reload_regions {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2434 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir
2281 or die "unable to load regions file\n";#d# 2435 or die "unable to load regions file\n";
2436}
2437
2438sub reload_archetypes {
2439 load_resource_file sprintf "%s/archetypes", cf::datadir
2440 or die "unable to load archetypes\n";
2441}
2442
2443sub reload_treasures {
2444 load_resource_file sprintf "%s/treasures", cf::datadir
2445 or die "unable to load treasurelists\n";
2446}
2447
2448sub reload_resources {
2449 warn "reloading resource files...\n";
2450
2451 reload_regions;
2452 reload_facedata;
2453 reload_archetypes;
2454 reload_treasures;
2455
2456 warn "finished reloading resource files\n";
2457}
2458
2459sub init {
2460 reload_resources;
2282} 2461}
2283 2462
2284sub cfg_load { 2463sub cfg_load {
2285 open my $fh, "<:utf8", cf::confdir . "/config" 2464 open my $fh, "<:utf8", cf::confdir . "/config"
2286 or return; 2465 or return;
2298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2477 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2299 and die "WARNING: m(un)lockall failed: $!\n"; 2478 and die "WARNING: m(un)lockall failed: $!\n";
2300 }; 2479 };
2301 warn $@ if $@; 2480 warn $@ if $@;
2302 } 2481 }
2303}
2304
2305sub init {
2306 load_resources;
2307} 2482}
2308 2483
2309sub main { 2484sub main {
2310 # we must not ever block the main coroutine 2485 # we must not ever block the main coroutine
2311 local $Coro::idle = sub { 2486 local $Coro::idle = sub {
2314 Event::one_event; 2489 Event::one_event;
2315 })->prio (Coro::PRIO_MAX); 2490 })->prio (Coro::PRIO_MAX);
2316 }; 2491 };
2317 2492
2318 cfg_load; 2493 cfg_load;
2319 db_load; 2494 db_init;
2320 load_extensions; 2495 load_extensions;
2321 2496
2322 $TICK_WATCHER->start; 2497 $TICK_WATCHER->start;
2323 Event::loop; 2498 Event::loop;
2324} 2499}
2363 my $map = $cf::MAP{$path} or next; 2538 my $map = $cf::MAP{$path} or next;
2364 $map->valid or next; 2539 $map->valid or next;
2365 $map->save; 2540 $map->save;
2366 } 2541 }
2367 warn "end emergency map save\n"; 2542 warn "end emergency map save\n";
2543
2544 warn "begin emergency database checkpoint\n";
2545 BDB::db_env_txn_checkpoint $DB_ENV;
2546 warn "end emergency database checkpoint\n";
2368 }; 2547 };
2369 2548
2370 warn "leave emergency perl save\n"; 2549 warn "leave emergency perl save\n";
2371} 2550}
2372 2551
2552sub post_cleanup {
2553 my ($make_core) = @_;
2554
2555 warn Carp::longmess "post_cleanup backtrace"
2556 if $make_core;
2557}
2558
2373sub reload() { 2559sub do_reload_perl() {
2374 # can/must only be called in main 2560 # can/must only be called in main
2375 if ($Coro::current != $Coro::main) { 2561 if ($Coro::current != $Coro::main) {
2376 warn "can only reload from main coroutine"; 2562 warn "can only reload from main coroutine";
2377 return; 2563 return;
2378 } 2564 }
2379 2565
2380 warn "reloading..."; 2566 warn "reloading...";
2381 2567
2382 warn "cancelling server ticker"; 2568 warn "entering sync_job";
2383 $TICK_WATCHER->cancel;
2384 2569
2570 cf::sync_job {
2571 cf::write_runtime; # external watchdog should not bark
2385 cf::emergency_save; 2572 cf::emergency_save;
2573 cf::write_runtime; # external watchdog should not bark
2386 2574
2387 eval { 2575 warn "syncing database to disk";
2576 BDB::db_env_txn_checkpoint $DB_ENV;
2577
2388 # if anything goes wrong in here, we should simply crash as we already saved 2578 # if anything goes wrong in here, we should simply crash as we already saved
2389
2390 warn "syncing database to disk";
2391 cf::db_sync;
2392 2579
2393 warn "cancelling all WF_AUTOCANCEL watchers"; 2580 warn "cancelling all WF_AUTOCANCEL watchers";
2394 for (Event::all_watchers) { 2581 for (Event::all_watchers) {
2395 $_->cancel if $_->data & WF_AUTOCANCEL; 2582 $_->cancel if $_->data & WF_AUTOCANCEL;
2396 } 2583 }
2397 2584
2398 warn "flushing outstanding aio requests"; 2585 warn "flushing outstanding aio requests";
2399 for (;;) { 2586 for (;;) {
2587 BDB::flush;
2400 IO::AIO::flush; 2588 IO::AIO::flush;
2401 Coro::cede; 2589 Coro::cede;
2402 last unless IO::AIO::nreqs; 2590 last unless IO::AIO::nreqs || BDB::nreqs;
2403 warn "iterate..."; 2591 warn "iterate...";
2404 } 2592 }
2593
2594 ++$RELOAD;
2405 2595
2406 warn "cancelling all extension coros"; 2596 warn "cancelling all extension coros";
2407 $_->cancel for values %EXT_CORO; 2597 $_->cancel for values %EXT_CORO;
2408 %EXT_CORO = (); 2598 %EXT_CORO = ();
2409 2599
2462 require cf; 2652 require cf;
2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2653 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2464 2654
2465 warn "loading config and database again"; 2655 warn "loading config and database again";
2466 cf::cfg_load; 2656 cf::cfg_load;
2467 cf::db_load;
2468 2657
2469 warn "loading extensions"; 2658 warn "loading extensions";
2470 cf::load_extensions; 2659 cf::load_extensions;
2471 2660
2472 warn "reattaching attachments to objects/players"; 2661 warn "reattaching attachments to objects/players";
2473 _global_reattach; 2662 _global_reattach; # objects, sockets
2474 warn "reattaching attachments to maps"; 2663 warn "reattaching attachments to maps";
2475 reattach $_ for values %MAP; 2664 reattach $_ for values %MAP;
2665 warn "reattaching attachments to players";
2666 reattach $_ for values %PLAYER;
2476 2667
2477 warn "loading reloadable resources"; 2668 warn "leaving sync_job";
2478 load_resources;
2479 2669
2480 warn "restarting server ticker"; 2670 1
2481 2671 } or do {
2482 $TICK_WATCHER->start;
2483 };
2484
2485 if ($@) {
2486 warn $@; 2672 warn $@;
2487 warn "error while reloading, exiting."; 2673 warn "error while reloading, exiting.";
2488 exit 1; 2674 exit 1;
2489 } 2675 };
2490 2676
2491 warn "reloaded"; 2677 warn "reloaded";
2492}; 2678};
2493 2679
2494our $RELOAD_WATCHER; # used only during reload 2680our $RELOAD_WATCHER; # used only during reload
2495 2681
2682sub reload_perl() {
2683 # doing reload synchronously and two reloads happen back-to-back,
2684 # coro crashes during coro_state_free->destroy here.
2685
2686 $RELOAD_WATCHER ||= Event->timer (
2687 reentrant => 0,
2688 after => 0,
2689 data => WF_AUTOCANCEL,
2690 cb => sub {
2691 do_reload_perl;
2692 undef $RELOAD_WATCHER;
2693 },
2694 );
2695}
2696
2496register_command "reload" => sub { 2697register_command "reload" => sub {
2497 my ($who, $arg) = @_; 2698 my ($who, $arg) = @_;
2498 2699
2499 if ($who->flag (FLAG_WIZ)) { 2700 if ($who->flag (FLAG_WIZ)) {
2500 $who->message ("reloading server."); 2701 $who->message ("reloading server.");
2501 2702 async { reload_perl };
2502 # doing reload synchronously and two reloads happen back-to-back,
2503 # coro crashes during coro_state_free->destroy here.
2504
2505 $RELOAD_WATCHER ||= Event->timer (
2506 reentrant => 0,
2507 after => 0,
2508 data => WF_AUTOCANCEL,
2509 cb => sub {
2510 reload;
2511 undef $RELOAD_WATCHER;
2512 },
2513 );
2514 } 2703 }
2515}; 2704};
2516 2705
2517unshift @INC, $LIBDIR; 2706unshift @INC, $LIBDIR;
2518 2707
2519my $bug_warning = 0; 2708my $bug_warning = 0;
2709
2710our @WAIT_FOR_TICK;
2711our @WAIT_FOR_TICK_BEGIN;
2712
2713sub wait_for_tick {
2714 return unless $TICK_WATCHER->is_active;
2715 return if $Coro::current == $Coro::main;
2716
2717 my $signal = new Coro::Signal;
2718 push @WAIT_FOR_TICK, $signal;
2719 $signal->wait;
2720}
2721
2722sub wait_for_tick_begin {
2723 return unless $TICK_WATCHER->is_active;
2724 return if $Coro::current == $Coro::main;
2725
2726 my $signal = new Coro::Signal;
2727 push @WAIT_FOR_TICK_BEGIN, $signal;
2728 $signal->wait;
2729}
2520 2730
2521$TICK_WATCHER = Event->timer ( 2731$TICK_WATCHER = Event->timer (
2522 reentrant => 0, 2732 reentrant => 0,
2523 parked => 1, 2733 parked => 1,
2524 prio => 0, 2734 prio => 0,
2532 } 2742 }
2533 2743
2534 $NOW = Event::time; 2744 $NOW = Event::time;
2535 2745
2536 cf::server_tick; # one server iteration 2746 cf::server_tick; # one server iteration
2747
2537 $RUNTIME += $TICK; 2748 $RUNTIME += $TICK;
2538 $NEXT_TICK += $TICK; 2749 $NEXT_TICK += $TICK;
2539 2750
2540 $WAIT_FOR_TICK->broadcast; 2751 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 2752 $NEXT_RUNTIME_WRITE = $NOW + 10;
2542 2753 Coro::async_pool {
2543 Event::sweep; 2754 write_runtime
2544 Coro::cede_notself; 2755 or warn "ERROR: unable to write runtime file: $!";
2756 };
2545 2757 }
2758
2546# my $AFTER = Event::time; 2759# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d# 2760# warn $AFTER - $NOW;#d#
2548 2761
2549 # if we are delayed by four ticks or more, skip them all 2762 # if we are delayed by four ticks or more, skip them all
2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2763 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2551 2764
2552 $TICK_WATCHER->at ($NEXT_TICK); 2765 $TICK_WATCHER->at ($NEXT_TICK);
2553 $TICK_WATCHER->start; 2766 $TICK_WATCHER->start;
2767
2768 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2769 $sig->send;
2770 }
2771 while (my $sig = shift @WAIT_FOR_TICK) {
2772 $sig->send;
2773 }
2774
2775 _post_tick;
2554 }, 2776 },
2555); 2777);
2556 2778
2779{
2780 BDB::max_poll_time $TICK * 0.1;
2781 $BDB_POLL_WATCHER = Event->io (
2782 reentrant => 0,
2783 fd => BDB::poll_fileno,
2784 poll => 'r',
2785 prio => 0,
2786 data => WF_AUTOCANCEL,
2787 cb => \&BDB::poll_cb,
2788 );
2789 BDB::min_parallel 8;
2790
2791 BDB::set_sync_prepare {
2792 my $status;
2793 my $current = $Coro::current;
2794 (
2795 sub {
2796 $status = $!;
2797 $current->ready; undef $current;
2798 },
2799 sub {
2800 Coro::schedule while defined $current;
2801 $! = $status;
2802 },
2803 )
2804 };
2805
2806 unless ($DB_ENV) {
2807 $DB_ENV = BDB::db_env_create;
2808
2809 cf::sync_job {
2810 eval {
2811 BDB::db_env_open
2812 $DB_ENV,
2813 $BDB_ENV_DIR,
2814 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2815 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2816 0666;
2817
2818 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!;
2819
2820 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2821 $DB_ENV->set_lk_detect;
2822 };
2823
2824 cf::cleanup "db_env_open(db): $@" if $@;
2825 };
2826 }
2827}
2828
2829{
2830 IO::AIO::min_parallel 8;
2831
2832 undef $Coro::AIO::WATCHER;
2557IO::AIO::max_poll_time $TICK * 0.1; 2833 IO::AIO::max_poll_time $TICK * 0.1;
2558
2559undef $Coro::AIO::WATCHER;
2560$AIO_POLL_WATCHER = Event->io ( 2834 $AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0, 2835 reentrant => 0,
2836 data => WF_AUTOCANCEL,
2562 fd => IO::AIO::poll_fileno, 2837 fd => IO::AIO::poll_fileno,
2563 poll => 'r', 2838 poll => 'r',
2564 prio => 6, 2839 prio => 6,
2565 data => WF_AUTOCANCEL,
2566 cb => \&IO::AIO::poll_cb, 2840 cb => \&IO::AIO::poll_cb,
2567); 2841 );
2842}
2568 2843
2569$WRITE_RUNTIME_WATCHER = Event->timer ( 2844# load additional modules
2570 reentrant => 0, 2845use cf::pod;
2571 data => WF_AUTOCANCEL,
2572 after => 1,
2573 interval => 10,
2574 prio => 6, # keep it lowest so it acts like a watchdog
2575 cb => Coro::unblock_sub {
2576 write_runtime
2577 or warn "ERROR: unable to write runtime file: $!";
2578 },
2579);
2580 2846
2581END { cf::emergency_save } 2847END { cf::emergency_save }
2582 2848
25831 28491
2584 2850

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines