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.458 by root, Sat Dec 13 20:34:37 2008 UTC vs.
Revision 1.513 by root, Mon Apr 12 05:22:38 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
41use Coro::EV; 43use Coro::EV;
42use Coro::AnyEvent; 44use Coro::AnyEvent;
43use Coro::Timer; 45use Coro::Timer;
44use Coro::Signal; 46use Coro::Signal;
45use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
46use Coro::AnyEvent; 49use Coro::AnyEvent;
47use Coro::AIO; 50use Coro::AIO;
48use Coro::BDB 1.6; 51use Coro::BDB 1.6;
49use Coro::Storable; 52use Coro::Storable;
50use Coro::Util (); 53use Coro::Util ();
51 54
52use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
53use BDB (); 56use BDB ();
54use Data::Dumper; 57use Data::Dumper;
55use Digest::MD5;
56use Fcntl; 58use Fcntl;
57use YAML (); 59use YAML::XS ();
58use IO::AIO (); 60use IO::AIO ();
59use Time::HiRes; 61use Time::HiRes;
60use Compress::LZF; 62use Compress::LZF;
61use Digest::MD5 (); 63use Digest::MD5 ();
62 64
… …
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71 73
72# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
75 80
76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
77 82
78our %COMMAND = (); 83our %COMMAND = ();
79our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
84our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
85our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
86 91
87our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
88our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
89 96
90our $CONFDIR = confdir; 97our $CONFDIR = confdir;
91our $DATADIR = datadir; 98our $DATADIR = datadir;
92our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
93our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
101our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
102our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
103 110
104our %RESOURCE; 111our %RESOURCE;
105 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
108our $NEXT_TICK; 118our $NEXT_TICK;
109our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
110 120
111our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
112our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
113our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
114our $DB_ENV; 124our $DB_ENV;
115 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
116our %CFG; 128our %CFG;
117 129
118our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
119our $RUNTIME; 131our $RUNTIME;
120our $NOW; 132our $NOW;
… …
131our $JITTER; # average jitter 143our $JITTER; # average jitter
132our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
133 145
134our @POST_INIT; 146our @POST_INIT;
135 147
136our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
137 150
138binmode STDOUT; 151binmode STDOUT;
139binmode STDERR; 152binmode STDERR;
140 153
141# read virtual server time, if available 154# read virtual server time, if available
… …
143 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
144 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
145 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
146} 159}
147 160
161eval "sub TICK() { $TICK } 1" or die;
162
148mkdir $_ 163mkdir $_
149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
150 165
151our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
152 167
153sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
154 180
155############################################################################# 181#############################################################################
156 182
157=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
158 184
… …
205returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
206per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
207 233
208=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
209 235
210This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
211C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
212that call. 238that call.
213 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
214=back 246=back
215 247
216=cut 248=cut
217 249
218BEGIN { 250$Coro::State::WARNHOOK = sub {
219 *CORE::GLOBAL::warn = sub {
220 my $msg = join "", @_; 251 my $msg = join "", @_;
221 252
222 $msg .= "\n" 253 $msg .= "\n"
223 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
224 255
225 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
226 257
227 LOG llevError, $msg; 258 LOG llevError, $msg;
228 }; 259};
229}
230 260
231$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
232 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
233 265
234 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
235 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
236 return;#d# 268 return;#d#
237 }#d# 269 }#d#
238 270
239 # kill coroutine otherwise 271 # kill coroutine otherwise
240 warn Carp::longmess $_[0];
241 Coro::terminate 272 Coro::terminate
242}; 273};
243
244$SIG{__DIE__} = sub { }; #d#?
245 274
246@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
247@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
248@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
249@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
263)) { 292)) {
264 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
265} 294}
266 295
267$EV::DIED = sub { 296$EV::DIED = sub {
268 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
269}; 298};
270 299
271############################################################################# 300#############################################################################
272 301
273=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
347 376
348Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
349 378
350=cut 379=cut
351 380
352our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
353our %LOCKER;#d#
354 382
355sub lock_wait($) { 383sub lock_wait($) {
356 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
357
358 if ($LOCKER{$key} == $Coro::current) {#d#
359 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
360 return;#d#
361 }#d#
362
363 # wait for lock, if any
364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
366 push @{ $LOCK{$key} }, $Coro::current;
367 Coro::schedule;
368 }
369} 385}
370 386
371sub lock_acquire($) { 387sub lock_acquire($) {
372 my ($key) = @_; 388 $LOCKS->guard ($_[0])
373
374 # wait, to be sure we are not locked
375 lock_wait $key;
376
377 $LOCK{$key} = [];
378 $LOCKER{$key} = $Coro::current;#d#
379
380 Guard::guard {
381 delete $LOCKER{$key};#d#
382 # wake up all waiters, to be on the safe side
383 $_->ready for @{ delete $LOCK{$key} };
384 }
385} 389}
386 390
387sub lock_active($) { 391sub lock_active($) {
388 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
389
390 ! ! $LOCK{$key}
391} 393}
392 394
393sub freeze_mainloop { 395sub freeze_mainloop {
394 tick_inhibit_inc; 396 tick_inhibit_inc;
395 397
… …
424 426
425=cut 427=cut
426 428
427our @SLOT_QUEUE; 429our @SLOT_QUEUE;
428our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
429 432
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
433 436
434 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
435 439
436 while () { 440 while () {
437 next_job: 441 next_job:
442
438 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 444
440 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 449 $job->[2]->send;
444 Coro::cede; 450 Coro::cede;
445 goto next_job; 451 goto next_job;
446 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 454 }
448 } 455 }
449 456
450 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 460 $signal->wait;
454 } else { 461 } else {
462 $busy = 0;
455 Coro::schedule; 463 Coro::schedule;
456 } 464 }
457 } 465 }
458}; 466};
459 467
460sub get_slot($;$$) { 468sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
462 470
463 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
464 472
465 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
466 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
467 476
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
497 506
498sub sync_job(&) { 507sub sync_job(&) {
499 my ($job) = @_; 508 my ($job) = @_;
500 509
501 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
502 my $time = EV::time; 511 my $time = AE::time;
503 512
504 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
506 515
507 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
524 } else { 533 } else {
525 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
526 } 535 }
527 } 536 }
528 537
529 my $time = EV::time - $time; 538 my $time = AE::time - $time;
530 539
531 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
532 541
533 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
534 } else { 543 } else {
… …
1173 $decname, length $$rdata, scalar @$objs; 1182 $decname, length $$rdata, scalar @$objs;
1174 1183
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1185 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1189 aio_fsync $fh;
1190 }
1179 aio_close $fh; 1191 aio_close $fh;
1180 1192
1181 if (@$objs) { 1193 if (@$objs) {
1182 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1194 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1183 aio_chmod $fh, SAVE_MODE; 1195 aio_chmod $fh, SAVE_MODE;
1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1196 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1185 aio_write $fh, 0, (length $data), $data, 0; 1197 aio_write $fh, 0, (length $data), $data, 0;
1186 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1200 aio_fsync $fh;
1201 }
1187 aio_close $fh; 1202 aio_close $fh;
1188 aio_rename "$filename.pst~", "$filename.pst"; 1203 aio_rename "$filename.pst~", "$filename.pst";
1189 } 1204 }
1190 } else { 1205 } else {
1191 aio_unlink "$filename.pst"; 1206 aio_unlink "$filename.pst";
… …
1194 aio_rename "$filename~", $filename; 1209 aio_rename "$filename~", $filename;
1195 1210
1196 $filename =~ s%/[^/]+$%%; 1211 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC; 1212 aio_pathsync $filename if $cf::USE_FSYNC;
1198 } else { 1213 } else {
1199 warn "FATAL: $filename~: $!\n"; 1214 warn "unable to save objects: $filename~: $!\n";
1200 } 1215 }
1201 } else { 1216 } else {
1202 aio_unlink $filename; 1217 aio_unlink $filename;
1203 aio_unlink "$filename.pst"; 1218 aio_unlink "$filename.pst";
1204 } 1219 }
… …
1298} 1313}
1299 1314
1300use File::Glob (); 1315use File::Glob ();
1301 1316
1302cf::player->attach ( 1317cf::player->attach (
1303 on_command => sub { 1318 on_unknown_command => sub {
1304 my ($pl, $name, $params) = @_; 1319 my ($pl, $name, $params) = @_;
1305 1320
1306 my $cb = $COMMAND{$name} 1321 my $cb = $COMMAND{$name}
1307 or return; 1322 or return;
1308 1323
… …
1342 1357
1343# "readahead" all extensions 1358# "readahead" all extensions
1344sub cache_extensions { 1359sub cache_extensions {
1345 my $grp = IO::AIO::aio_group; 1360 my $grp = IO::AIO::aio_group;
1346 1361
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1362 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1348 for (grep /\.ext$/, @{$_[0]}) { 1363 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1364 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 } 1365 }
1351 }; 1366 };
1352 1367
… …
1387 . "\n};\n1"; 1402 . "\n};\n1";
1388 1403
1389 $todo{$base} = \%ext; 1404 $todo{$base} = \%ext;
1390 } 1405 }
1391 1406
1407 my $pass = 0;
1392 my %done; 1408 my %done;
1393 while (%todo) { 1409 while (%todo) {
1394 my $progress; 1410 my $progress;
1395 1411
1412 ++$pass;
1413
1414 ext:
1396 while (my ($k, $v) = each %todo) { 1415 while (my ($k, $v) = each %todo) {
1397 for (split /,\s*/, $v->{meta}{depends}) { 1416 for (split /,\s*/, $v->{meta}{depends}) {
1398 goto skip 1417 next ext
1399 unless exists $done{$_}; 1418 unless exists $done{$_};
1400 } 1419 }
1401 1420
1402 warn "... loading '$k' into '$v->{pkg}'\n"; 1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1403 1422
1404 unless (eval $v->{source}) { 1423 my $active = eval $v->{source};
1424
1425 if (length $@) {
1405 my $msg = $@ ? "$v->{path}: $@\n" 1426 warn "$v->{path}: $@\n";
1406 : "$v->{base}: extension inactive.\n";
1407 1427
1408 if (exists $v->{meta}{mandatory}) {
1409 warn $msg;
1410 cf::cleanup "mandatory extension failed to load, exiting."; 1428 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1411 } 1429 if exists $v->{meta}{mandatory};
1412 1430 } else {
1413 warn $msg; 1431 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg};
1433 $progress = 1;
1434
1435 warn "$v->{base}: extension inactive.\n"
1436 unless $active;
1414 } 1437 }
1415
1416 $done{$k} = delete $todo{$k};
1417 push @EXTS, $v->{pkg};
1418 $progress = 1;
1419 } 1438 }
1420 1439
1421 skip: 1440 unless ($progress) {
1422 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1441 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1423 unless $progress; 1442
1443 while (my ($k, $v) = each %todo) {
1444 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445 if exists $v->{meta}{mandatory};
1446 }
1447 }
1424 } 1448 }
1425 }; 1449 };
1426} 1450}
1427 1451
1428############################################################################# 1452#############################################################################
… …
1512 $cf::PLAYER{$login} = $pl 1536 $cf::PLAYER{$login} = $pl
1513 } 1537 }
1514 } 1538 }
1515} 1539}
1516 1540
1541cf::player->attach (
1542 on_load => sub {
1543 my ($pl, $path) = @_;
1544
1545 # restore slots saved in save, below
1546 my $slots = delete $pl->{_slots};
1547
1548 $pl->ob->current_weapon ($slots->[0]);
1549 $pl->combat_ob ($slots->[1]);
1550 $pl->ranged_ob ($slots->[2]);
1551 },
1552);
1553
1517sub save($) { 1554sub save($) {
1518 my ($pl) = @_; 1555 my ($pl) = @_;
1519 1556
1520 return if $pl->{deny_save}; 1557 return if $pl->{deny_save};
1521 1558
… …
1526 1563
1527 aio_mkdir playerdir $pl, 0770; 1564 aio_mkdir playerdir $pl, 0770;
1528 $pl->{last_save} = $cf::RUNTIME; 1565 $pl->{last_save} = $cf::RUNTIME;
1529 1566
1530 cf::get_slot 0.01; 1567 cf::get_slot 0.01;
1568
1569 # save slots, to be restored later
1570 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1531 1571
1532 $pl->save_pl ($path); 1572 $pl->save_pl ($path);
1533 cf::cede_to_tick; 1573 cf::cede_to_tick;
1534} 1574}
1535 1575
… …
1748 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1788 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1749 1789
1750 # mit "rum" bekleckern, nicht 1790 # mit "rum" bekleckern, nicht
1751 $self->_create_random_map ( 1791 $self->_create_random_map (
1752 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1753 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1754 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1755 $rmp->{exit_on_final_map}, 1795 $rmp->{exit_on_final_map},
1756 $rmp->{xsize}, $rmp->{ysize}, 1796 $rmp->{xsize}, $rmp->{ysize},
1757 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1758 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1888 1928
1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1929 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1890 "$UNIQUEDIR/$path" 1930 "$UNIQUEDIR/$path"
1891} 1931}
1892 1932
1893# and all this just because we cannot iterate over
1894# all maps in C++...
1895sub change_all_map_light {
1896 my ($change) = @_;
1897
1898 $_->change_map_light ($change)
1899 for grep $_->outdoor, values %cf::MAP;
1900}
1901
1902sub decay_objects { 1933sub decay_objects {
1903 my ($self) = @_; 1934 my ($self) = @_;
1904 1935
1905 return if $self->{deny_reset}; 1936 return if $self->{deny_reset};
1906 1937
… …
1988sub find { 2019sub find {
1989 my ($path, $origin) = @_; 2020 my ($path, $origin) = @_;
1990 2021
1991 $path = normalise $path, $origin && $origin->path; 2022 $path = normalise $path, $origin && $origin->path;
1992 2023
1993 cf::lock_wait "map_data:$path";#d#remove 2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1994 cf::lock_wait "map_find:$path"; 2025 my $guard2 = cf::lock_acquire "map_find:$path";
1995 2026
1996 $cf::MAP{$path} || do { 2027 $cf::MAP{$path} || do {
1997 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1998 my $guard2 = cf::lock_acquire "map_find:$path";
1999
2000 my $map = new_from_path cf::map $path 2028 my $map = new_from_path cf::map $path
2001 or return; 2029 or return;
2002 2030
2003 $map->{last_save} = $cf::RUNTIME; 2031 $map->{last_save} = $cf::RUNTIME;
2004 2032
… …
2016 2044
2017 $cf::MAP{$path} = $map 2045 $cf::MAP{$path} = $map
2018 } 2046 }
2019} 2047}
2020 2048
2021sub pre_load { } 2049sub pre_load { }
2022sub post_load { } 2050#sub post_load { } # XS
2023 2051
2024sub load { 2052sub load {
2025 my ($self) = @_; 2053 my ($self) = @_;
2026 2054
2027 local $self->{deny_reset} = 1; # loading can take a long time 2055 local $self->{deny_reset} = 1; # loading can take a long time
… …
2072 unless ($self->{deny_activate}) { 2100 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2101 $self->decay_objects;
2074 $self->fix_auto_apply; 2102 $self->fix_auto_apply;
2075 $self->update_buttons; 2103 $self->update_buttons;
2076 cf::cede_to_tick; 2104 cf::cede_to_tick;
2077 $self->set_darkness_map;
2078 cf::cede_to_tick;
2079 $self->activate; 2105 $self->activate;
2080 } 2106 }
2081 2107
2082 $self->{last_save} = $cf::RUNTIME; 2108 $self->{last_save} = $cf::RUNTIME;
2083 $self->last_access ($cf::RUNTIME); 2109 $self->last_access ($cf::RUNTIME);
… …
2086 } 2112 }
2087 2113
2088 $self->post_load; 2114 $self->post_load;
2089} 2115}
2090 2116
2117# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath
2091sub customise_for { 2120sub customise_for {
2092 my ($self, $ob) = @_; 2121 my ($self, $ob) = @_;
2093 2122
2094 return find "~" . $ob->name . "/" . $self->{path} 2123 return find "~" . $ob->name . "/" . $self->{path}
2095 if $self->per_player; 2124 if $self->per_player;
… …
2249 2278
2250 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2251 2280
2252 return if $self->players; 2281 return if $self->players;
2253 2282
2254 warn "resetting map ", $self->path; 2283 warn "resetting map ", $self->path, "\n";
2255 2284
2256 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2257 2286
2258 # need to save uniques path 2287 # need to save uniques path
2259 unless ($self->{deny_save}) { 2288 unless ($self->{deny_save}) {
… …
2350 : normalise $_ 2379 : normalise $_
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2380 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2381 ]
2353} 2382}
2354 2383
2384=item cf::map::static_maps
2385
2386Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2387file in the shared directory excluding F</styles> and F</editor>). May
2388block.
2389
2390=cut
2391
2392sub static_maps() {
2393 my @dirs = "";
2394 my @maps;
2395
2396 while (@dirs) {
2397 my $dir = shift @dirs;
2398
2399 next if $dir eq "/styles" || $dir eq "/editor";
2400
2401 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2402 or return;
2403
2404 for (@$files) {
2405 s/\.map$// or next;
2406 utf8::decode $_;
2407 push @maps, "$dir/$_";
2408 }
2409
2410 push @dirs, map "$dir/$_", @$dirs;
2411 }
2412
2413 \@maps
2414}
2415
2355=back 2416=back
2356 2417
2357=head3 cf::object 2418=head3 cf::object
2358 2419
2359=cut 2420=cut
… …
2424 2485
2425our $SAY_CHANNEL = { 2486our $SAY_CHANNEL = {
2426 id => "say", 2487 id => "say",
2427 title => "Map", 2488 title => "Map",
2428 reply => "say ", 2489 reply => "say ",
2429 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2490 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2430}; 2491};
2431 2492
2432our $CHAT_CHANNEL = { 2493our $CHAT_CHANNEL = {
2433 id => "chat", 2494 id => "chat",
2434 title => "Chat", 2495 title => "Chat",
… …
2554 ($x, $y) = (-1, -1) 2615 ($x, $y) = (-1, -1)
2555 unless (defined $x) && (defined $y); 2616 unless (defined $x) && (defined $y);
2556 2617
2557 # use -1 or undef as default coordinates, not 0, 0 2618 # use -1 or undef as default coordinates, not 0, 0
2558 ($x, $y) = ($map->enter_x, $map->enter_y) 2619 ($x, $y) = ($map->enter_x, $map->enter_y)
2559 if $x <=0 && $y <= 0; 2620 if $x <= 0 && $y <= 0;
2560 2621
2561 $map->load; 2622 $map->load;
2562 $map->load_neighbours; 2623 $map->load_neighbours;
2563 2624
2564 return unless $self->contr->active; 2625 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2566 $self->activate_recursive;
2567 2626
2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2569 $self->enter_map ($map, $x, $y); 2628 $self->enter_map ($map, $x, $y);
2629
2630 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive;
2570} 2632}
2571 2633
2572=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2634=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2573 2635
2574Moves the player to the given map-path and coordinates by first freezing 2636Moves the player to the given map-path and coordinates by first freezing
… …
2762 2824
2763 utf8::encode $text; 2825 utf8::encode $text;
2764 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2826 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2765} 2827}
2766 2828
2829=item $client->send_big_packet ($pkt)
2830
2831Like C<send_packet>, but tries to compress large packets, and fragments
2832them as required.
2833
2834=cut
2835
2836our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2837
2838sub cf::client::send_big_packet {
2839 my ($self, $pkt) = @_;
2840
2841 # try lzf for large packets
2842 $pkt = "lzf " . Compress::LZF::compress $pkt
2843 if 1024 <= length $pkt and $self->{can_lzf};
2844
2845 # split very large packets
2846 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2847 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2848 $pkt = "frag";
2849 }
2850
2851 $self->send_packet ($pkt);
2852}
2853
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2854=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2855
2769Send a drawinfo or msg packet to the client, formatting the msg for the 2856Send a drawinfo or msg packet to the client, formatting the msg for the
2770client if neccessary. C<$type> should be a string identifying the type of 2857client if neccessary. C<$type> should be a string identifying the type of
2771the message, with C<log> being the default. If C<$color> is negative, suppress 2858the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2773 2860
2774=cut 2861=cut
2775 2862
2776# non-persistent channels (usually the info channel) 2863# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2864our %CHANNEL = (
2865 "c/motd" => {
2866 id => "infobox",
2867 title => "MOTD",
2868 reply => undef,
2869 tooltip => "The message of the day",
2870 },
2778 "c/identify" => { 2871 "c/identify" => {
2779 id => "infobox", 2872 id => "infobox",
2780 title => "Identify", 2873 title => "Identify",
2781 reply => undef, 2874 reply => undef,
2782 tooltip => "Items recently identified", 2875 tooltip => "Items recently identified",
… …
2784 "c/examine" => { 2877 "c/examine" => {
2785 id => "infobox", 2878 id => "infobox",
2786 title => "Examine", 2879 title => "Examine",
2787 reply => undef, 2880 reply => undef,
2788 tooltip => "Signs and other items you examined", 2881 tooltip => "Signs and other items you examined",
2882 },
2883 "c/shopinfo" => {
2884 id => "infobox",
2885 title => "Shop Info",
2886 reply => undef,
2887 tooltip => "What your bargaining skill tells you about the shop",
2789 }, 2888 },
2790 "c/book" => { 2889 "c/book" => {
2791 id => "infobox", 2890 id => "infobox",
2792 title => "Book", 2891 title => "Book",
2793 reply => undef, 2892 reply => undef,
… …
2809 id => "infobox", 2908 id => "infobox",
2810 title => "Body Parts", 2909 title => "Body Parts",
2811 reply => undef, 2910 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2911 tooltip => "Shows which body parts you posess and are available",
2813 }, 2912 },
2913 "c/statistics" => {
2914 id => "infobox",
2915 title => "Statistics",
2916 reply => undef,
2917 tooltip => "Shows your primary statistics",
2918 },
2814 "c/skills" => { 2919 "c/skills" => {
2815 id => "infobox", 2920 id => "infobox",
2816 title => "Skills", 2921 title => "Skills",
2817 reply => undef, 2922 reply => undef,
2818 tooltip => "Shows your experience per skill and item power", 2923 tooltip => "Shows your experience per skill and item power",
2924 },
2925 "c/shopitems" => {
2926 id => "infobox",
2927 title => "Shop Items",
2928 reply => undef,
2929 tooltip => "Shows the items currently for sale in this shop",
2930 },
2931 "c/resistances" => {
2932 id => "infobox",
2933 title => "Resistances",
2934 reply => undef,
2935 tooltip => "Shows your resistances",
2936 },
2937 "c/pets" => {
2938 id => "infobox",
2939 title => "Pets",
2940 reply => undef,
2941 tooltip => "Shows information abotu your pets/a specific pet",
2942 },
2943 "c/perceiveself" => {
2944 id => "infobox",
2945 title => "Perceive Self",
2946 reply => undef,
2947 tooltip => "You gained detailed knowledge about yourself",
2819 }, 2948 },
2820 "c/uptime" => { 2949 "c/uptime" => {
2821 id => "infobox", 2950 id => "infobox",
2822 title => "Uptime", 2951 title => "Uptime",
2823 reply => undef, 2952 reply => undef,
… …
2833 id => "party", 2962 id => "party",
2834 title => "Party", 2963 title => "Party",
2835 reply => "gsay ", 2964 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party", 2965 tooltip => "Messages and chat related to your party",
2837 }, 2966 },
2967 "c/death" => {
2968 id => "death",
2969 title => "Death",
2970 reply => undef,
2971 tooltip => "Reason for and more info about your most recent death",
2972 },
2973 "c/say" => $SAY_CHANNEL,
2974 "c/chat" => $CHAT_CHANNEL,
2838); 2975);
2839 2976
2840sub cf::client::send_msg { 2977sub cf::client::send_msg {
2841 my ($self, $channel, $msg, $color, @extra) = @_; 2978 my ($self, $channel, $msg, $color, @extra) = @_;
2842 2979
… …
2847 2984
2848 # check predefined channels, for the benefit of C 2985 # check predefined channels, for the benefit of C
2849 if ($CHANNEL{$channel}) { 2986 if ($CHANNEL{$channel}) {
2850 $channel = $CHANNEL{$channel}; 2987 $channel = $CHANNEL{$channel};
2851 2988
2852 $self->ext_msg (channel_info => $channel) 2989 $self->ext_msg (channel_info => $channel);
2853 if $self->can_msg;
2854
2855 $channel = $channel->{id}; 2990 $channel = $channel->{id};
2856 2991
2857 } elsif (ref $channel) { 2992 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent 2993 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) { 2994 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel; 2995 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel) 2996 $self->ext_msg (channel_info => $channel);
2862 if $self->can_msg;
2863 } 2997 }
2864 2998
2865 $channel = $channel->{id}; 2999 $channel = $channel->{id};
2866 } 3000 }
2867 3001
2868 return unless @extra || length $msg; 3002 return unless @extra || length $msg;
2869 3003
2870 if ($self->can_msg) {
2871 # default colour, mask it out 3004 # default colour, mask it out
2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3005 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2873 if $color & cf::NDI_DEF; 3006 if $color & cf::NDI_DEF;
2874 3007
2875 my $pkt = "msg " 3008 my $pkt = "msg "
2876 . $self->{json_coder}->encode ( 3009 . $self->{json_coder}->encode (
2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3010 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 ); 3011 );
2879 3012
2880 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf};
2883
2884 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag";
2888 }
2889
2890 $self->send_packet ($pkt); 3013 $self->send_big_packet ($pkt);
2891 } else {
2892 if ($color >= 0) {
2893 # replace some tags by gcfclient-compatible ones
2894 for ($msg) {
2895 1 while
2896 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2897 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2898 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2899 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2900 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2901 }
2902
2903 $color &= cf::NDI_COLOR_MASK;
2904
2905 utf8::encode $msg;
2906
2907 if (0 && $msg =~ /\[/) {
2908 # COMMAND/INFO
2909 $self->send_packet ("drawextinfo $color 10 8 $msg")
2910 } else {
2911 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2912 $self->send_packet ("drawinfo $color $msg")
2913 }
2914 }
2915 }
2916} 3014}
2917 3015
2918=item $client->ext_msg ($type, @msg) 3016=item $client->ext_msg ($type, @msg)
2919 3017
2920Sends an ext event to the client. 3018Sends an ext event to the client.
… …
2923 3021
2924sub cf::client::ext_msg($$@) { 3022sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3023 my ($self, $type, @msg) = @_;
2926 3024
2927 if ($self->extcmd == 2) { 3025 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3027 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3028 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3029 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3030 }
2933} 3031}
2934 3032
2935=item $client->ext_reply ($msgid, @msg) 3033=item $client->ext_reply ($msgid, @msg)
2936 3034
… …
2940 3038
2941sub cf::client::ext_reply($$@) { 3039sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3040 my ($self, $id, @msg) = @_;
2943 3041
2944 if ($self->extcmd == 2) { 3042 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3043 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3044 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3045 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3046 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3047 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3048 }
2951} 3049}
2952 3050
2953=item $success = $client->query ($flags, "text", \&cb) 3051=item $success = $client->query ($flags, "text", \&cb)
2954 3052
… …
3055 3153
3056 $coro 3154 $coro
3057} 3155}
3058 3156
3059cf::client->attach ( 3157cf::client->attach (
3060 on_destroy => sub { 3158 on_client_destroy => sub {
3061 my ($ns) = @_; 3159 my ($ns) = @_;
3062 3160
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3161 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3162 },
3065); 3163);
… …
3081our $safe_hole = new Safe::Hole; 3179our $safe_hole = new Safe::Hole;
3082 3180
3083$SIG{FPE} = 'IGNORE'; 3181$SIG{FPE} = 'IGNORE';
3084 3182
3085$safe->permit_only (Opcode::opset qw( 3183$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3184 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3185 grepstart grepwhile mapstart mapwhile
3088 sort time 3186 sort time
3089)); 3187));
3090 3188
3091# here we export the classes and methods available to script code 3189# here we export the classes and methods available to script code
… …
3095The following functions and methods are available within a safe environment: 3193The following functions and methods are available within a safe environment:
3096 3194
3097 cf::object 3195 cf::object
3098 contr pay_amount pay_player map x y force_find force_add destroy 3196 contr pay_amount pay_player map x y force_find force_add destroy
3099 insert remove name archname title slaying race decrease split 3197 insert remove name archname title slaying race decrease split
3198 value
3100 3199
3101 cf::object::player 3200 cf::object::player
3102 player 3201 player
3103 3202
3104 cf::player 3203 cf::player
… …
3110=cut 3209=cut
3111 3210
3112for ( 3211for (
3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3212 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3114 insert remove inv nrof name archname title slaying race 3213 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)], 3214 decrease split destroy change_exp value msg lore send_msg)],
3116 ["cf::object::player" => qw(player)], 3215 ["cf::object::player" => qw(player)],
3117 ["cf::player" => qw(peaceful)], 3216 ["cf::player" => qw(peaceful send_msg)],
3118 ["cf::map" => qw(trigger)], 3217 ["cf::map" => qw(trigger)],
3119) { 3218) {
3120 no strict 'refs'; 3219 no strict 'refs';
3121 my ($pkg, @funs) = @$_; 3220 my ($pkg, @funs) = @$_;
3122 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3140 3239
3141 my $qcode = $code; 3240 my $qcode = $code;
3142 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3241 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3143 $qcode =~ s/\n/\\n/g; 3242 $qcode =~ s/\n/\\n/g;
3144 3243
3244 %vars = (_dummy => 0) unless %vars;
3245
3246 my @res;
3145 local $_; 3247 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3248
3148 my $eval = 3249 my $eval =
3149 "do {\n" 3250 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3251 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3252 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3253 . $code
3153 . "\n}" 3254 . "\n}"
3154 ; 3255 ;
3155 3256
3257 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3258 sub_generation_inc;
3259 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3260 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 sub_generation_inc; 3261 sub_generation_inc;
3262 } else {
3263 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval;
3265 }
3159 3266
3160 if ($@) { 3267 if ($@) {
3161 warn "$@"; 3268 warn "$@";
3162 warn "while executing safe code '$code'\n"; 3269 warn "while executing safe code '$code'\n";
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3270 warn "with arguments " . (join " ", %vars) . "\n";
… …
3182=cut 3289=cut
3183 3290
3184sub register_script_function { 3291sub register_script_function {
3185 my ($fun, $cb) = @_; 3292 my ($fun, $cb) = @_;
3186 3293
3187 no strict 'refs'; 3294 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3295 *$fun = $safe_hole->wrap ($cb);
3189} 3296}
3190 3297
3191=back 3298=back
3192 3299
3193=cut 3300=cut
… …
3214 3321
3215 $facedata->{version} == 2 3322 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3323 or cf::cleanup "$path: version mismatch, cannot proceed.";
3217 3324
3218 # patch in the exptable 3325 # patch in the exptable
3326 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3219 $facedata->{resource}{"res/exp_table"} = { 3327 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC, 3328 type => FT_RSRC,
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3329 data => $exp_table,
3330 hash => (Digest::MD5::md5 $exp_table),
3222 }; 3331 };
3223 cf::cede_to_tick; 3332 cf::cede_to_tick;
3224 3333
3225 { 3334 {
3226 my $faces = $facedata->{faceinfo}; 3335 my $faces = $facedata->{faceinfo};
… …
3228 while (my ($face, $info) = each %$faces) { 3337 while (my ($face, $info) = each %$faces) {
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3338 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3339
3231 cf::face::set_visibility $idx, $info->{visibility}; 3340 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3341 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3343 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3235 3344
3236 cf::cede_to_tick; 3345 cf::cede_to_tick;
3237 } 3346 }
3238 3347
3239 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
… …
3263 3372
3264 cf::anim::invalidate_all; # d'oh 3373 cf::anim::invalidate_all; # d'oh
3265 } 3374 }
3266 3375
3267 { 3376 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3377 my $res = $facedata->{resource};
3271 3378
3272 while (my ($name, $info) = each %$res) { 3379 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3380 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3381 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3382
3277 if ($info->{type} & 1) { 3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type}; 3384 cf::face::set_type $idx, $info->{type};
3292 } else { 3385 } else {
3293 $RESOURCE{$name} = $info; 3386 $RESOURCE{$name} = $info;
3294 } 3387 }
3295 3388
… …
3379 3472
3380 warn "finished reloading resource files\n"; 3473 warn "finished reloading resource files\n";
3381} 3474}
3382 3475
3383sub reload_config { 3476sub reload_config {
3477 warn "reloading config file...\n";
3478
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3479 open my $fh, "<:utf8", "$CONFDIR/config"
3385 or return; 3480 or return;
3386 3481
3387 local $/; 3482 local $/;
3388 *CFG = YAML::Load <$fh>; 3483 *CFG = YAML::XS::Load scalar <$fh>;
3389 3484
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3391 3486
3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3487 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3393 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3488 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3397 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3398 and die "WARNING: m(un)lockall failed: $!\n"; 3493 and die "WARNING: m(un)lockall failed: $!\n";
3399 }; 3494 };
3400 warn $@ if $@; 3495 warn $@ if $@;
3401 } 3496 }
3497
3498 warn "finished reloading resource files\n";
3402} 3499}
3403 3500
3404sub pidfile() { 3501sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!"; 3503 or die "$PIDFILE: $!";
… …
3418 3515
3419 seek $fh, 0, 0; 3516 seek $fh, 0, 0;
3420 print $fh $$; 3517 print $fh $$;
3421} 3518}
3422 3519
3520sub main_loop {
3521 warn "EV::loop starting\n";
3522 if (1) {
3523 EV::loop;
3524 }
3525 warn "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP;
3527}
3528
3423sub main { 3529sub main {
3424 cf::init_globals; # initialise logging 3530 cf::init_globals; # initialise logging
3425 3531
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3533 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
… …
3430 3536
3431 cf::init_experience; 3537 cf::init_experience;
3432 cf::init_anim; 3538 cf::init_anim;
3433 cf::init_attackmess; 3539 cf::init_attackmess;
3434 cf::init_dynamic; 3540 cf::init_dynamic;
3435 cf::init_block;
3436 3541
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3542 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438 3543
3439 # we must not ever block the main coroutine 3544 # we must not ever block the main coroutine
3440 local $Coro::idle = sub { 3545 local $Coro::idle = sub {
… …
3446 }; 3551 };
3447 3552
3448 evthread_start IO::AIO::poll_fileno; 3553 evthread_start IO::AIO::poll_fileno;
3449 3554
3450 cf::sync_job { 3555 cf::sync_job {
3556 cf::load_settings;
3557 cf::load_materials;
3558
3451 reload_resources; 3559 reload_resources;
3452 reload_config; 3560 reload_config;
3453 db_init; 3561 db_init;
3454 3562
3455 cf::load_settings;
3456 cf::load_materials;
3457 cf::init_uuid; 3563 cf::init_uuid;
3458 cf::init_signals; 3564 cf::init_signals;
3459 cf::init_commands;
3460 cf::init_skills; 3565 cf::init_skills;
3461 3566
3462 cf::init_beforeplay; 3567 cf::init_beforeplay;
3463 3568
3464 atomic; 3569 atomic;
… …
3466 load_extensions; 3571 load_extensions;
3467 3572
3468 utime time, time, $RUNTIMEFILE; 3573 utime time, time, $RUNTIMEFILE;
3469 3574
3470 # no (long-running) fork's whatsoever before this point(!) 3575 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX ();
3471 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3577 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3472 3578
3473 (pop @POST_INIT)->(0) while @POST_INIT; 3579 (pop @POST_INIT)->(0) while @POST_INIT;
3474 }; 3580 };
3475 3581
3476 EV::loop; 3582 main_loop;
3477} 3583}
3478 3584
3479############################################################################# 3585#############################################################################
3480# initialisation and cleanup 3586# initialisation and cleanup
3481 3587
3482# install some emergency cleanup handlers 3588# install some emergency cleanup handlers
3483BEGIN { 3589BEGIN {
3484 our %SIGWATCHER = (); 3590 our %SIGWATCHER = ();
3485 for my $signal (qw(INT HUP TERM)) { 3591 for my $signal (qw(INT HUP TERM)) {
3486 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3592 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3487 cf::cleanup "SIG$signal"; 3593 cf::cleanup "SIG$signal";
3488 }; 3594 };
3489 } 3595 }
3490} 3596}
3491 3597
3492sub write_runtime_sync { 3598sub write_runtime_sync {
3599 my $t0 = AE::time;
3600
3493 # first touch the runtime file to show we are still running: 3601 # first touch the runtime file to show we are still running:
3494 # the fsync below can take a very very long time. 3602 # the fsync below can take a very very long time.
3495 3603
3496 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3604 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3497 3605
3498 my $guard = cf::lock_acquire "write_runtime"; 3606 my $guard = cf::lock_acquire "write_runtime";
3499 3607
3500 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3608 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3501 or return; 3609 or return;
3502 3610
3503 my $value = $cf::RUNTIME + 90 + 10; 3611 my $value = $cf::RUNTIME + 90 + 10;
3504 # 10 is the runtime save interval, for a monotonic clock 3612 # 10 is the runtime save interval, for a monotonic clock
3505 # 60 allows for the watchdog to kill the server. 3613 # 60 allows for the watchdog to kill the server.
… …
3518 or return; 3626 or return;
3519 3627
3520 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3521 and return; 3629 and return;
3522 3630
3523 warn "runtime file written.\n"; 3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3524 3632
3525 1 3633 1
3526} 3634}
3527 3635
3528our $uuid_lock; 3636our $uuid_lock;
… …
3666 return; 3774 return;
3667 } 3775 }
3668 3776
3669 return if $RELOAD++; 3777 return if $RELOAD++;
3670 3778
3671 my $t1 = EV::time; 3779 my $t1 = AE::time;
3672 3780
3673 while ($RELOAD) { 3781 while ($RELOAD) {
3674 warn "reloading..."; 3782 warn "reloading...";
3675 3783
3676 warn "entering sync_job"; 3784 warn "entering sync_job";
… …
3737 clear_package "safe::$_" 3845 clear_package "safe::$_"
3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3846 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3739 3847
3740 warn "unloading cf.pm \"a bit\""; 3848 warn "unloading cf.pm \"a bit\"";
3741 delete $INC{"cf.pm"}; 3849 delete $INC{"cf.pm"};
3742 delete $INC{"cf/pod.pm"}; 3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3743 3851
3744 # don't, removes xs symbols, too, 3852 # don't, removes xs symbols, too,
3745 # and global variables created in xs 3853 # and global variables created in xs
3746 #clear_package __PACKAGE__; 3854 #clear_package __PACKAGE__;
3747 3855
3748 warn "unload completed, starting to reload now"; 3856 warn "unload completed, starting to reload now";
3749 3857
3750 warn "reloading cf.pm"; 3858 warn "reloading cf.pm";
3751 require cf; 3859 require cf;
3752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3860 cf::_connect_to_perl_1;
3753 3861
3754 warn "loading config and database again"; 3862 warn "loading config and database again";
3755 cf::reload_config; 3863 cf::reload_config;
3756 3864
3757 warn "loading extensions"; 3865 warn "loading extensions";
… …
3779 3887
3780 warn "reloaded"; 3888 warn "reloaded";
3781 --$RELOAD; 3889 --$RELOAD;
3782 } 3890 }
3783 3891
3784 $t1 = EV::time - $t1; 3892 $t1 = AE::time - $t1;
3785 warn "reload completed in ${t1}s\n"; 3893 warn "reload completed in ${t1}s\n";
3786}; 3894};
3787 3895
3788our $RELOAD_WATCHER; # used only during reload 3896our $RELOAD_WATCHER; # used only during reload
3789 3897
… …
3792 # coro crashes during coro_state_free->destroy here. 3900 # coro crashes during coro_state_free->destroy here.
3793 3901
3794 $RELOAD_WATCHER ||= cf::async { 3902 $RELOAD_WATCHER ||= cf::async {
3795 Coro::AIO::aio_wait cache_extensions; 3903 Coro::AIO::aio_wait cache_extensions;
3796 3904
3797 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3905 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3798 do_reload_perl; 3906 do_reload_perl;
3799 undef $RELOAD_WATCHER; 3907 undef $RELOAD_WATCHER;
3800 }; 3908 };
3801 }; 3909 };
3802} 3910}
… …
3819 3927
3820our @WAIT_FOR_TICK; 3928our @WAIT_FOR_TICK;
3821our @WAIT_FOR_TICK_BEGIN; 3929our @WAIT_FOR_TICK_BEGIN;
3822 3930
3823sub wait_for_tick { 3931sub wait_for_tick {
3824 return if tick_inhibit || $Coro::current == $Coro::main; 3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3825 3933
3826 my $signal = new Coro::Signal; 3934 my $signal = new Coro::Signal;
3827 push @WAIT_FOR_TICK, $signal; 3935 push @WAIT_FOR_TICK, $signal;
3828 $signal->wait; 3936 $signal->wait;
3829} 3937}
3830 3938
3831sub wait_for_tick_begin { 3939sub wait_for_tick_begin {
3832 return if tick_inhibit || $Coro::current == $Coro::main; 3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3833 3941
3834 my $signal = new Coro::Signal; 3942 my $signal = new Coro::Signal;
3835 push @WAIT_FOR_TICK_BEGIN, $signal; 3943 push @WAIT_FOR_TICK_BEGIN, $signal;
3836 $signal->wait; 3944 $signal->wait;
3837} 3945}
… …
3842 unless ++$bug_warning > 10; 3950 unless ++$bug_warning > 10;
3843 return; 3951 return;
3844 } 3952 }
3845 3953
3846 cf::server_tick; # one server iteration 3954 cf::server_tick; # one server iteration
3955
3956 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3847 3957
3848 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3958 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3849 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3959 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3850 Coro::async_pool { 3960 Coro::async_pool {
3851 $Coro::current->{desc} = "runtime saver"; 3961 $Coro::current->{desc} = "runtime saver";
… …
3874} 3984}
3875 3985
3876{ 3986{
3877 # configure BDB 3987 # configure BDB
3878 3988
3879 BDB::min_parallel 8; 3989 BDB::min_parallel 16;
3880 BDB::max_poll_reqs $TICK * 0.1; 3990 BDB::max_poll_reqs $TICK * 0.1;
3881 $AnyEvent::BDB::WATCHER->priority (1); 3991 $AnyEvent::BDB::WATCHER->priority (1);
3882 3992
3883 unless ($DB_ENV) { 3993 unless ($DB_ENV) {
3884 $DB_ENV = BDB::db_env_create; 3994 $DB_ENV = BDB::db_env_create;
… …
3964 LOG llevInfo, "[ABT] [suppressed]\n"; 4074 LOG llevInfo, "[ABT] [suppressed]\n";
3965 } 4075 }
3966} 4076}
3967 4077
3968# load additional modules 4078# load additional modules
3969use cf::pod; 4079require "cf/$_.pm" for @EXTRA_MODULES;
4080cf::_connect_to_perl_2;
3970 4081
3971END { cf::emergency_save } 4082END { cf::emergency_save }
3972 4083
39731 40841
3974 4085

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines