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.195 by root, Fri Jan 26 20:59:57 2007 UTC vs.
Revision 1.288 by root, Mon Jun 25 07:40:53 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.5 (); 15use Coro 3.61 ();
16use Coro::State;
17use Coro::Handle;
14use Coro::Event; 18use Coro::Event;
15use Coro::Timer; 19use Coro::Timer;
16use Coro::Signal; 20use Coro::Signal;
17use Coro::Semaphore; 21use Coro::Semaphore;
18use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
19 24
25use JSON::XS 1.4 ();
26use BDB ();
20use Data::Dumper; 27use Data::Dumper;
21use Digest::MD5; 28use Digest::MD5;
22use Fcntl; 29use Fcntl;
30use YAML::Syck ();
23use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 32use Time::HiRes;
33use Compress::LZF;
26 34
35# configure various modules to our taste
36#
37$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 41$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 42
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 44$YAML::Syck::ImplicitUnicode = 1;
33 45
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 47
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49
36our %COMMAND = (); 50our %COMMAND = ();
37our %COMMAND_TIME = (); 51our %COMMAND_TIME = ();
38 52
39our @EXTS = (); # list of extension package names 53our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 54our %EXTCMD = ();
55our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 56our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 57our %EXT_MAP = (); # pluggable maps
43 58
59our $RELOAD; # number of reloads so far
44our @EVENT; 60our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 61
47our $TICK = MAX_TIME * 1e-6; 62our $CONFDIR = confdir;
63our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db";
73
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 75our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 76our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 78our $NEXT_TICK;
52our $NOW; 79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off
81
82our $BDB_POLL_WATCHER;
83our $DB_ENV;
53 84
54our %CFG; 85our %CFG;
55 86
56our $UPTIME; $UPTIME ||= time; 87our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 88our $RUNTIME;
58 89
59our %PLAYER; # all users 90our %PLAYER; # all users
60our %MAP; # all maps 91our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
62our $RANDOM_MAPS = cf::localdir . "/random";
63
64our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
65our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
66 93
67# used to convert map paths into valid unix filenames by replacing / by ∕ 94# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 96
97our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing
99our $tick_start; # for load detecting purposes
100
70binmode STDOUT; 101binmode STDOUT;
71binmode STDERR; 102binmode STDERR;
72 103
73# read virtual server time, if available 104# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
78} 109}
79 110
80mkdir cf::localdir; 111mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 113
86our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
115
116sub cf::map::normalise;
87 117
88############################################################################# 118#############################################################################
89 119
90=head2 GLOBAL VARIABLES 120=head2 GLOBAL VARIABLES
91 121
98=item $cf::RUNTIME 128=item $cf::RUNTIME
99 129
100The time this server has run, starts at 0 and is increased by $cf::TICK on 130The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 131every server tick.
102 132
103=item $cf::LIBDIR 133=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
134$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
135$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 136
105The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 138directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
139unique-items directory, player file directory, random maps directory and
140database environment.
107 141
108=item $cf::NOW 142=item $cf::NOW
109 143
110The time of the last (current) server tick. 144The time of the last (current) server tick.
111 145
112=item $cf::TICK 146=item $cf::TICK
113 147
114The interval between server ticks, in seconds. 148The interval between server ticks, in seconds.
149
150=item $cf::LOADAVG
151
152The current CPU load on the server (alpha-smoothed), as a value between 0
153(none) and 1 (overloaded), indicating how much time is spent on processing
154objects per tick. Healthy values are < 0.5.
155
156=item $cf::LOAD
157
158The raw value load value from the last tick.
115 159
116=item %cf::CFG 160=item %cf::CFG
117 161
118Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 163from wherever your confdir points to.
120 164
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 165=item cf::wait_for_tick, cf::wait_for_tick_begin
122 166
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
124or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 168returns directly I<after> the tick processing (and consequently, can only wake one process
125processing has been done. Call C<< ->wait >> on them to maximise the 169per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
126window of cpu time available, or simply to synchronise to the server tick.
127 170
128=back 171=back
129 172
130=cut 173=cut
131 174
132BEGIN { 175BEGIN {
133 *CORE::GLOBAL::warn = sub { 176 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 177 my $msg = join "", @_;
135 utf8::encode $msg;
136 178
137 $msg .= "\n" 179 $msg .= "\n"
138 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
139 181
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183
184 utf8::encode $msg;
140 LOG llevError, $msg; 185 LOG llevError, $msg;
141 }; 186 };
142} 187}
143 188
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 193@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
194@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 195@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 196
151# we bless all objects into (empty) derived classes to force a method lookup 197# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 198# within the Safe compartment.
153for my $pkg (qw( 199for my $pkg (qw(
154 cf::global cf::attachable 200 cf::global cf::attachable
162} 208}
163 209
164$Event::DIED = sub { 210$Event::DIED = sub {
165 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
166}; 212};
213
214#############################################################################
167 215
168=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
169 217
170=over 4 218=over 4
171 219
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 239 $d
192 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
193} 241}
194 242
195use JSON::Syck (); # TODO# replace by JSON::PC once working
196
197=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
198 244
199Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
200 246
201=cut
202
203sub from_json($) {
204 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
205 JSON::Syck::Load $_[0]
206}
207
208=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
209 248
210Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
211 250
212=cut 251=cut
213 252
214sub to_json($) { 253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 254
216 JSON::Syck::Dump $_[0] 255sub to_json ($) { $json_coder->encode ($_[0]) }
217} 256sub from_json ($) { $json_coder->decode ($_[0]) }
218 257
219=item cf::lock_wait $string 258=item cf::lock_wait $string
220 259
221Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
222 261
228returned. 267returned.
229 268
230Lock names should begin with a unique identifier (for example, cf::map::find 269Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 270uses map_find and cf::map::load uses map_load).
232 271
272=item $locked = cf::lock_active $string
273
274Return true if the lock is currently active, i.e. somebody has locked it.
275
233=cut 276=cut
234 277
235our %LOCK; 278our %LOCK;
236 279
237sub lock_wait($) { 280sub lock_wait($) {
256 # wake up all waiters, to be on the safe side 299 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 300 $_->ready for @{ delete $LOCK{$key} };
258 } 301 }
259} 302}
260 303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
308}
309
261sub freeze_mainloop { 310sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
263 312
264 my $guard = Coro::guard { 313 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 314 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 315 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 316 $TICK_WATCHER->stop;
270 $guard 317 $guard
271} 318}
272 319
273=item cf::async { BLOCK } 320=item cf::async { BLOCK }
280 327
281BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
282 329
283=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
284 331
285The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 333is always able to handle events or runnable, as Crossfire TRT is only
287reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable.
288 336
289If it must be done, put the blocking parts into C<sync_job>. This will run 337If it must be done, put the blocking parts into C<sync_job>. This will run
290the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 339server will be frozen during this time, so the block should either finish
292fast or be very important. 340fast or be very important.
295 343
296sub sync_job(&) { 344sub sync_job(&) {
297 my ($job) = @_; 345 my ($job) = @_;
298 346
299 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
300 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
302 352
303 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 354 # (but this is cancel-safe)
315 365
316 while ($busy) { 366 while ($busy) {
317 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
318 } 368 }
319 369
370 $time = Event::time - $time;
371
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load
376
320 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
321 } else { 378 } else {
322 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
323 380
324 $job->() 381 $job->()
343 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
344 401
345 $coro 402 $coro
346} 403}
347 404
348sub write_runtime { 405=item fork_call { }, $args
349 my $runtime = cf::localdir . "/runtime";
350 406
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 407Executes the given code block with the given arguments in a seperate
352 or return; 408process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling.
353 411
354 my $value = $cf::RUNTIME + 90 + 10; 412=cut
355 # 10 is the runtime save interval, for a monotonic clock
356 # 60 allows for the watchdog to kill the server.
357 413
358 (aio_write $fh, 0, (length $value), $value, 0) <= 0 414sub fork_call(&@) {
359 and return; 415 my ($cb, @args) = @_;
360 416
361 aio_fsync $fh 417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
362 and return; 418# or die "socketpair: $!";
419 pipe my $fh1, my $fh2
420 or die "pipe: $!";
363 421
422 if (my $pid = fork) {
364 close $fh 423 close $fh2;
365 or return;
366 424
367 aio_rename "$runtime~", $runtime 425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
368 and return; 426 $res = Coro::Storable::thaw $res;
369 427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals;
435 local $SIG{__WARN__};
436 local $SIG{__DIE__};
437 eval {
438 close $fh1;
439
440 my @res = eval { $cb->(@args) };
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
442 };
443
444 warn $@ if $@;
445 _exit 0;
370 1 446 }
447}
448
449=item $value = cf::db_get $family => $key
450
451Returns a single value from the environment database.
452
453=item cf::db_put $family => $key => $value
454
455Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457
458=cut
459
460our $DB;
461
462sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job {
467 eval {
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 }
477}
478
479sub db_get($$) {
480 my $key = "$_[0]/$_[1]";
481
482 cf::sync_job {
483 BDB::db_get $DB, undef, $key, my $data;
484
485 $! ? ()
486 : $data
487 }
488}
489
490sub db_put($$$) {
491 BDB::dbreq_pri 4;
492 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
493}
494
495=item cf::cache $id => [$paths...], $processversion => $process
496
497Generic caching function that returns the value of the resource $id,
498caching and regenerating as required.
499
500This function can block.
501
502=cut
503
504sub cache {
505 my ($id, $src, $processversion, $process) = @_;
506
507 my $meta =
508 join "\x00",
509 $processversion,
510 map {
511 aio_stat $_
512 and Carp::croak "$_: $!";
513
514 ($_, (stat _)[7,9])
515 } @$src;
516
517 my $dbmeta = db_get cache => "$id/meta";
518 if ($dbmeta ne $meta) {
519 # changed, we may need to process
520
521 my @data;
522 my $md5;
523
524 for (0 .. $#$src) {
525 0 <= aio_load $src->[$_], $data[$_]
526 or Carp::croak "$src->[$_]: $!";
527 }
528
529 # if processing is expensive, check
530 # checksum first
531 if (1) {
532 $md5 =
533 join "\x00",
534 $processversion,
535 map {
536 Coro::cede;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src;
539
540
541 my $dbmd5 = db_get cache => "$id/md5";
542 if ($dbmd5 eq $md5) {
543 db_put cache => "$id/meta", $meta;
544
545 return db_get cache => "$id/data";
546 }
547 }
548
549 my $t1 = Time::HiRes::time;
550 my $data = $process->(\@data);
551 my $t2 = Time::HiRes::time;
552
553 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
554
555 db_put cache => "$id/data", $data;
556 db_put cache => "$id/md5" , $md5;
557 db_put cache => "$id/meta", $meta;
558
559 return $data;
560 }
561
562 db_get cache => "$id/data"
563}
564
565=item cf::datalog type => key => value, ...
566
567Log a datalog packet of the given type with the given key-value pairs.
568
569=cut
570
571sub datalog($@) {
572 my ($type, %kv) = @_;
573 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
371} 574}
372 575
373=back 576=back
374 577
375=cut 578=cut
382attach callbacks/event handlers (a collection of which is called an "attachment") 585attach callbacks/event handlers (a collection of which is called an "attachment")
383to it. All such attachable objects support the following methods. 586to it. All such attachable objects support the following methods.
384 587
385In the following description, CLASS can be any of C<global>, C<object> 588In the following description, CLASS can be any of C<global>, C<object>
386C<player>, C<client> or C<map> (i.e. the attachable objects in 589C<player>, C<client> or C<map> (i.e. the attachable objects in
387crossfire+). 590Crossfire TRT).
388 591
389=over 4 592=over 4
390 593
391=item $attachable->attach ($attachment, key => $value...) 594=item $attachable->attach ($attachment, key => $value...)
392 595
555 $registry = $CB_TYPE[$object_type] ||= []; 758 $registry = $CB_TYPE[$object_type] ||= [];
556 759
557 } elsif ($type eq "subtype") { 760 } elsif ($type eq "subtype") {
558 defined $object_type or Carp::croak "subtype specified without type"; 761 defined $object_type or Carp::croak "subtype specified without type";
559 my $object_subtype = shift @arg; 762 my $object_subtype = shift @arg;
560 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 763 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
561 764
562 } elsif ($type eq "package") { 765 } elsif ($type eq "package") {
563 my $pkg = shift @arg; 766 my $pkg = shift @arg;
564 767
565 while (my ($name, $id) = each %cb_id) { 768 while (my ($name, $id) = each %cb_id) {
594 _attach $registry, $klass, @attach; 797 _attach $registry, $klass, @attach;
595 } 798 }
596 799
597 $obj->{$name} = \%arg; 800 $obj->{$name} = \%arg;
598 } else { 801 } else {
599 warn "object uses attachment '$name' that is not available, postponing.\n"; 802 warn "object uses attachment '$name' which is not available, postponing.\n";
600 } 803 }
601 804
602 $obj->{_attachment}{$name} = undef; 805 $obj->{_attachment}{$name} = undef;
603} 806}
604 807
606 if (ref $_[0]) { 809 if (ref $_[0]) {
607 _object_attach @_; 810 _object_attach @_;
608 } else { 811 } else {
609 _attach shift->_attach_registry, @_; 812 _attach shift->_attach_registry, @_;
610 } 813 }
814 _recalc_want;
611}; 815};
612 816
613# all those should be optimised 817# all those should be optimised
614sub cf::attachable::detach { 818sub cf::attachable::detach {
615 my ($obj, $name) = @_; 819 my ($obj, $name) = @_;
618 delete $obj->{_attachment}{$name}; 822 delete $obj->{_attachment}{$name};
619 reattach ($obj); 823 reattach ($obj);
620 } else { 824 } else {
621 Carp::croak "cannot, currently, detach class attachments"; 825 Carp::croak "cannot, currently, detach class attachments";
622 } 826 }
827 _recalc_want;
623}; 828};
624 829
625sub cf::attachable::attached { 830sub cf::attachable::attached {
626 my ($obj, $name) = @_; 831 my ($obj, $name) = @_;
627 832
750 $filename, length $$rdata, scalar @$objs; 955 $filename, length $$rdata, scalar @$objs;
751 956
752 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
753 chmod SAVE_MODE, $fh; 958 chmod SAVE_MODE, $fh;
754 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 959 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
755 aio_fsync $fh; 960 aio_fsync $fh if $cf::USE_FSYNC;
756 close $fh; 961 close $fh;
757 962
758 if (@$objs) { 963 if (@$objs) {
759 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
760 chmod SAVE_MODE, $fh; 965 chmod SAVE_MODE, $fh;
761 my $data = Storable::nfreeze { version => 1, objs => $objs }; 966 my $data = Storable::nfreeze { version => 1, objs => $objs };
762 aio_write $fh, 0, (length $data), $data, 0; 967 aio_write $fh, 0, (length $data), $data, 0;
763 aio_fsync $fh; 968 aio_fsync $fh if $cf::USE_FSYNC;
764 close $fh; 969 close $fh;
765 aio_rename "$filename.pst~", "$filename.pst"; 970 aio_rename "$filename.pst~", "$filename.pst";
766 } 971 }
767 } else { 972 } else {
768 aio_unlink "$filename.pst"; 973 aio_unlink "$filename.pst";
800 or return; 1005 or return;
801 $av = eval { (Storable::thaw $av)->{objs} }; 1006 $av = eval { (Storable::thaw $av)->{objs} };
802 } 1007 }
803 1008
804 warn sprintf "loading %s (%d)\n", 1009 warn sprintf "loading %s (%d)\n",
805 $filename, length $data, scalar @{$av || []};#d# 1010 $filename, length $data, scalar @{$av || []};
806 return ($data, $av); 1011 return ($data, $av);
807} 1012}
1013
1014=head2 COMMAND CALLBACKS
1015
1016=over 4
1017
1018=cut
808 1019
809############################################################################# 1020#############################################################################
810# command handling &c 1021# command handling &c
811 1022
812=item cf::register_command $name => \&callback($ob,$args); 1023=item cf::register_command $name => \&callback($ob,$args);
825 push @{ $COMMAND{$name} }, [$caller, $cb]; 1036 push @{ $COMMAND{$name} }, [$caller, $cb];
826} 1037}
827 1038
828=item cf::register_extcmd $name => \&callback($pl,$packet); 1039=item cf::register_extcmd $name => \&callback($pl,$packet);
829 1040
830Register a callbackf ro execution when the client sends an extcmd packet. 1041Register a callback for execution when the client sends an (synchronous)
1042extcmd packet. Ext commands will be processed in the order they are
1043received by the server, like other user commands. The first argument is
1044the logged-in player. Ext commands can only be processed after a player
1045has logged in successfully.
831 1046
832If the callback returns something, it is sent back as if reply was being 1047If the callback returns something, it is sent back as if reply was being
833called. 1048called.
834 1049
1050=item cf::register_exticmd $name => \&callback($ns,$packet);
1051
1052Register a callback for execution when the client sends an (asynchronous)
1053exticmd packet. Exti commands are processed by the server as soon as they
1054are received, i.e. out of order w.r.t. other commands. The first argument
1055is a client socket. Exti commands can be received anytime, even before
1056log-in.
1057
1058If the callback returns something, it is sent back as if reply was being
1059called.
1060
835=cut 1061=cut
836 1062
837sub register_extcmd { 1063sub register_extcmd {
838 my ($name, $cb) = @_; 1064 my ($name, $cb) = @_;
839 1065
840 $EXTCMD{$name} = $cb; 1066 $EXTCMD{$name} = $cb;
1067}
1068
1069sub register_exticmd {
1070 my ($name, $cb) = @_;
1071
1072 $EXTICMD{$name} = $cb;
841} 1073}
842 1074
843cf::player->attach ( 1075cf::player->attach (
844 on_command => sub { 1076 on_command => sub {
845 my ($pl, $name, $params) = @_; 1077 my ($pl, $name, $params) = @_;
870 1102
871 cf::override; 1103 cf::override;
872 }, 1104 },
873); 1105);
874 1106
875sub load_extension {
876 my ($path) = @_;
877
878 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
879 my $base = $1;
880 my $pkg = $1;
881 $pkg =~ s/[^[:word:]]/_/g;
882 $pkg = "ext::$pkg";
883
884 warn "... loading '$path' into '$pkg'\n";
885
886 open my $fh, "<:utf8", $path
887 or die "$path: $!";
888
889 my $source =
890 "package $pkg; use strict; use utf8;\n"
891 . "#line 1 \"$path\"\n{\n"
892 . (do { local $/; <$fh> })
893 . "\n};\n1";
894
895 unless (eval $source) {
896 my $msg = $@ ? "$path: $@\n"
897 : "extension disabled.\n";
898 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
899 warn $@;
900 warn "mandatory extension failed to load, exiting.\n";
901 exit 1;
902 }
903 die $@;
904 }
905
906 push @EXTS, $pkg;
907}
908
909sub load_extensions { 1107sub load_extensions {
1108 cf::sync_job {
1109 my %todo;
1110
910 for my $ext (<$LIBDIR/*.ext>) { 1111 for my $path (<$LIBDIR/*.ext>) {
911 next unless -r $ext; 1112 next unless -r $path;
912 eval { 1113
913 load_extension $ext; 1114 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1115 my $base = $1;
1116 my $pkg = $1;
1117 $pkg =~ s/[^[:word:]]/_/g;
1118 $pkg = "ext::$pkg";
1119
1120 open my $fh, "<:utf8", $path
1121 or die "$path: $!";
1122
1123 my $source = do { local $/; <$fh> };
1124
1125 my %ext = (
1126 path => $path,
1127 base => $base,
1128 pkg => $pkg,
1129 );
1130
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133
1134 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n"
1137 . $source
1138 . "\n};\n1";
1139
1140 $todo{$base} = \%ext;
1141 }
1142
1143 my %done;
1144 while (%todo) {
1145 my $progress;
1146
1147 while (my ($k, $v) = each %todo) {
1148 for (split /,\s*/, $v->{meta}{depends}) {
1149 goto skip
1150 unless exists $done{$_};
1151 }
1152
1153 warn "... loading '$k' into '$v->{pkg}'\n";
1154
1155 unless (eval $v->{source}) {
1156 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n";
1158
1159 if (exists $v->{meta}{mandatory}) {
1160 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n";
1162 exit 1;
1163 }
1164
1165 warn $msg;
1166 }
1167
1168 $done{$k} = delete $todo{$k};
1169 push @EXTS, $v->{pkg};
1170 $progress = 1;
914 1 1171 }
915 } or warn "$ext not loaded: $@"; 1172
1173 skip:
1174 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1175 unless $progress;
1176 }
916 } 1177 };
917} 1178}
918 1179
919############################################################################# 1180#############################################################################
920 1181
1182=back
1183
921=head2 CORE EXTENSIONS 1184=head2 CORE EXTENSIONS
922 1185
923Functions and methods that extend core crossfire objects. 1186Functions and methods that extend core crossfire objects.
924 1187
925=cut 1188=cut
937Returns the given player object, loading it if necessary (might block). 1200Returns the given player object, loading it if necessary (might block).
938 1201
939=cut 1202=cut
940 1203
941sub playerdir($) { 1204sub playerdir($) {
942 cf::localdir 1205 "$PLAYERDIR/"
943 . "/"
944 . cf::playerdir
945 . "/"
946 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1206 . (ref $_[0] ? $_[0]->ob->name : $_[0])
947} 1207}
948 1208
949sub path($) { 1209sub path($) {
950 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1210 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
951 1211
952 (playerdir $login) . "/$login.pl" 1212 (playerdir $login) . "/playerdata"
953} 1213}
954 1214
955sub find_active($) { 1215sub find_active($) {
956 $cf::PLAYER{$_[0]} 1216 $cf::PLAYER{$_[0]}
957 and $cf::PLAYER{$_[0]}->active 1217 and $cf::PLAYER{$_[0]}->active
970 my $login = $_[0]; 1230 my $login = $_[0];
971 1231
972 my $guard = cf::lock_acquire "user_find:$login"; 1232 my $guard = cf::lock_acquire "user_find:$login";
973 1233
974 $cf::PLAYER{$_[0]} || do { 1234 $cf::PLAYER{$_[0]} || do {
1235 # rename old playerfiles to new ones
1236 #TODO: remove when no longer required
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl";
1241
975 my $pl = load_pl path $login 1242 my $pl = load_pl path $login
976 or return; 1243 or return;
977 $cf::PLAYER{$login} = $pl 1244 $cf::PLAYER{$login} = $pl
978 } 1245 }
979 } 1246 }
1016 1283
1017=cut 1284=cut
1018 1285
1019sub quit_character { 1286sub quit_character {
1020 my ($pl) = @_; 1287 my ($pl) = @_;
1288
1289 my $name = $pl->ob->name;
1021 1290
1022 $pl->{deny_save} = 1; 1291 $pl->{deny_save} = 1;
1023 $pl->password ("*"); # this should lock out the player until we nuked the dir 1292 $pl->password ("*"); # this should lock out the player until we nuked the dir
1024 1293
1025 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1030 my $path = playerdir $pl; 1299 my $path = playerdir $pl;
1031 my $temp = "$path~$cf::RUNTIME~deleting~"; 1300 my $temp = "$path~$cf::RUNTIME~deleting~";
1032 aio_rename $path, $temp; 1301 aio_rename $path, $temp;
1033 delete $cf::PLAYER{$pl->ob->name}; 1302 delete $cf::PLAYER{$pl->ob->name};
1034 $pl->destroy; 1303 $pl->destroy;
1304
1305 my $prefix = qr<^~\Q$name\E/>;
1306
1307 # nuke player maps
1308 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1309
1035 IO::AIO::aio_rmtree $temp; 1310 IO::AIO::aio_rmtree $temp;
1311}
1312
1313=item $pl->kick
1314
1315Kicks a player out of the game. This destroys the connection.
1316
1317=cut
1318
1319sub kick {
1320 my ($pl, $kicker) = @_;
1321
1322 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1323 $pl->killer ("kicked");
1324 $pl->ns->destroy;
1036} 1325}
1037 1326
1038=item cf::player::list_logins 1327=item cf::player::list_logins
1039 1328
1040Returns am arrayref of all valid playernames in the system, can take a 1329Returns am arrayref of all valid playernames in the system, can take a
1041while and may block, so not sync_job-capable, ever. 1330while and may block, so not sync_job-capable, ever.
1042 1331
1043=cut 1332=cut
1044 1333
1045sub list_logins { 1334sub list_logins {
1046 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1335 my $dirs = aio_readdir $PLAYERDIR
1047 or return []; 1336 or return [];
1048 1337
1049 my @logins; 1338 my @logins;
1050 1339
1051 for my $login (@$dirs) { 1340 for my $login (@$dirs) {
1068=cut 1357=cut
1069 1358
1070sub maps($) { 1359sub maps($) {
1071 my ($pl) = @_; 1360 my ($pl) = @_;
1072 1361
1362 $pl = ref $pl ? $pl->ob->name : $pl;
1363
1073 my $files = aio_readdir playerdir $pl 1364 my $files = aio_readdir playerdir $pl
1074 or return; 1365 or return;
1075 1366
1076 my @paths; 1367 my @paths;
1077 1368
1078 for (@$files) { 1369 for (@$files) {
1079 utf8::decode $_; 1370 utf8::decode $_;
1080 next if /\.(?:pl|pst)$/; 1371 next if /\.(?:pl|pst)$/;
1081 next unless /^$PATH_SEP/o; 1372 next unless /^$PATH_SEP/o;
1082 1373
1083 s/\.map$//; 1374 push @paths, cf::map::normalise "~$pl/$_";
1084 push @paths, "~" . $pl->ob->name . "/" . $_;
1085 } 1375 }
1086 1376
1087 \@paths 1377 \@paths
1088} 1378}
1089 1379
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1381
1382Expand crossfire pod fragments into protocol xml.
1383
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1413=item $player->ext_reply ($msgid, %msg)
1091 1414
1092Sends an ext reply to the player. 1415Sends an ext reply to the player.
1093 1416
1094=cut 1417=cut
1095 1418
1096sub ext_reply($$$%) { 1419sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1420 my ($self, $id, %msg) = @_;
1098 1421
1099 $msg{msgid} = $id; 1422 $msg{msgid} = $id;
1100
1101 $self->send ("ext " . cf::to_json \%msg); 1423 $self->send ("ext " . cf::to_json \%msg);
1102} 1424}
1103 1425
1104package cf; 1426=item $player->ext_event ($type, %msg)
1427
1428Sends an ext event to the client.
1429
1430=cut
1431
1432sub ext_event($$%) {
1433 my ($self, $type, %msg) = @_;
1434
1435 $self->ns->ext_event ($type, %msg);
1436}
1437
1438=head3 cf::region
1439
1440=over 4
1441
1442=cut
1443
1444package cf::region;
1445
1446=item cf::region::find_by_path $path
1447
1448Tries to decuce the likely region for a map knowing only its path.
1449
1450=cut
1451
1452sub find_by_path($) {
1453 my ($path) = @_;
1454
1455 my ($match, $specificity);
1456
1457 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) {
1459 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity;
1461 }
1462 }
1463
1464 $match
1465}
1105 1466
1106=back 1467=back
1107
1108 1468
1109=head3 cf::map 1469=head3 cf::map
1110 1470
1111=over 4 1471=over 4
1112 1472
1167 my ($self, $merge) = @_; 1527 my ($self, $merge) = @_;
1168 1528
1169 # we have to keep some variables in memory intact 1529 # we have to keep some variables in memory intact
1170 local $self->{path}; 1530 local $self->{path};
1171 local $self->{load_path}; 1531 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174 1532
1175 $self->SUPER::thawer_merge ($merge); 1533 $self->SUPER::thawer_merge ($merge);
1176} 1534}
1177 1535
1178sub normalise { 1536sub normalise {
1179 my ($path, $base) = @_; 1537 my ($path, $base) = @_;
1180 1538
1181 $path = "$path"; # make sure its a string 1539 $path = "$path"; # make sure its a string
1540
1541 $path =~ s/\.map$//;
1182 1542
1183 # map plan: 1543 # map plan:
1184 # 1544 #
1185 # /! non-realised random map exit (special hack!) 1545 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1546 # {... are special paths that are not being touched
1248 1608
1249# the original (read-only) location 1609# the original (read-only) location
1250sub load_path { 1610sub load_path {
1251 my ($self) = @_; 1611 my ($self) = @_;
1252 1612
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1613 "$MAPDIR/$self->{path}.map"
1254} 1614}
1255 1615
1256# the temporary/swap location 1616# the temporary/swap location
1257sub save_path { 1617sub save_path {
1258 my ($self) = @_; 1618 my ($self) = @_;
1259 1619
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1621 "$TMPDIR/$path.map"
1262} 1622}
1263 1623
1264# the unique path, undef == no special unique path 1624# the unique path, undef == no special unique path
1265sub uniq_path { 1625sub uniq_path {
1266 my ($self) = @_; 1626 my ($self) = @_;
1267 1627
1268 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1269 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1629 "$UNIQUEDIR/$path"
1270} 1630}
1271 1631
1272# and all this just because we cannot iterate over 1632# and all this just because we cannot iterate over
1273# all maps in C++... 1633# all maps in C++...
1274sub change_all_map_light { 1634sub change_all_map_light {
1276 1636
1277 $_->change_map_light ($change) 1637 $_->change_map_light ($change)
1278 for grep $_->outdoor, values %cf::MAP; 1638 for grep $_->outdoor, values %cf::MAP;
1279} 1639}
1280 1640
1641sub decay_objects {
1642 my ($self) = @_;
1643
1644 return if $self->{deny_reset};
1645
1646 $self->do_decay_objects;
1647}
1648
1281sub unlink_save { 1649sub unlink_save {
1282 my ($self) = @_; 1650 my ($self) = @_;
1283 1651
1284 utf8::encode (my $save = $self->save_path); 1652 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1653 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1288 1656
1289sub load_header_from($) { 1657sub load_header_from($) {
1290 my ($self, $path) = @_; 1658 my ($self, $path) = @_;
1291 1659
1292 utf8::encode $path; 1660 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1661 #aio_open $path, O_RDONLY, 0
1294 or return; 1662 # or return;
1295 1663
1296 $self->_load_header ($path) 1664 $self->_load_header ($path)
1297 or return; 1665 or return;
1298 1666
1299 $self->{load_path} = $path; 1667 $self->{load_path} = $path;
1341 $self->load_header_orig 1709 $self->load_header_orig
1342 or return; 1710 or return;
1343 $self->prepare_orig; 1711 $self->prepare_orig;
1344 } 1712 }
1345 1713
1714 $self->{deny_reset} = 1
1715 if $self->no_reset;
1716
1717 $self->default_region (cf::region::find_by_path $self->{path})
1718 unless $self->default_region;
1719
1346 1 1720 1
1347} 1721}
1348 1722
1349sub find; 1723sub find;
1350sub find { 1724sub find {
1362 $map->{last_save} = $cf::RUNTIME; 1736 $map->{last_save} = $cf::RUNTIME;
1363 1737
1364 $map->load_header 1738 $map->load_header
1365 or return; 1739 or return;
1366 1740
1367 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1368 # doing this can freeze the server in a sync job, obviously 1742 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait; 1743 #$cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1744 $map->reset;
1371 undef $guard; 1745 undef $guard;
1372 return find $path; 1746 return find $path;
1380sub post_load { } 1754sub post_load { }
1381 1755
1382sub load { 1756sub load {
1383 my ($self) = @_; 1757 my ($self) = @_;
1384 1758
1759 local $self->{deny_reset} = 1; # loading can take a long time
1760
1385 my $path = $self->{path}; 1761 my $path = $self->{path};
1762
1763 {
1386 my $guard = cf::lock_acquire "map_load:$path"; 1764 my $guard = cf::lock_acquire "map_load:$path";
1387 1765
1388 return if $self->in_memory != cf::MAP_SWAPPED; 1766 return if $self->in_memory != cf::MAP_SWAPPED;
1389 1767
1390 $self->in_memory (cf::MAP_LOADING); 1768 $self->in_memory (cf::MAP_LOADING);
1391 1769
1392 $self->alloc; 1770 $self->alloc;
1393 1771
1394 $self->pre_load; 1772 $self->pre_load;
1395
1396 $self->_load_objects ($self->{load_path}, 1)
1397 or return;
1398
1399 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1400 if delete $self->{load_original};
1401
1402 if (my $uniq = $self->uniq_path) {
1403 utf8::encode $uniq;
1404 if (aio_open $uniq, O_RDONLY, 0) {
1405 $self->clear_unique_items;
1406 $self->_load_objects ($uniq, 0);
1407 }
1408 }
1409
1410 Coro::cede;
1411
1412 # now do the right thing for maps
1413 $self->link_multipart_objects;
1414
1415 unless ($self->{deny_activate}) {
1416 $self->decay_objects;
1417 $self->fix_auto_apply;
1418 $self->update_buttons;
1419 Coro::cede; 1773 Coro::cede;
1420 $self->set_darkness_map; 1774
1775 $self->_load_objects ($self->{load_path}, 1)
1776 or return;
1777
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1779 if delete $self->{load_original};
1780
1781 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) {
1784 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0);
1786 }
1787 }
1788
1789 Coro::cede;
1790 # now do the right thing for maps
1791 $self->link_multipart_objects;
1421 $self->difficulty ($self->estimate_difficulty) 1792 $self->difficulty ($self->estimate_difficulty)
1422 unless $self->difficulty; 1793 unless $self->difficulty;
1423 Coro::cede; 1794 Coro::cede;
1795
1796 unless ($self->{deny_activate}) {
1797 $self->decay_objects;
1798 $self->fix_auto_apply;
1799 $self->update_buttons;
1800 Coro::cede;
1801 $self->set_darkness_map;
1802 Coro::cede;
1424 $self->activate; 1803 $self->activate;
1804 }
1805
1806 $self->in_memory (cf::MAP_IN_MEMORY);
1425 } 1807 }
1426 1808
1427 $self->post_load; 1809 $self->post_load;
1428
1429 $self->in_memory (cf::MAP_IN_MEMORY);
1430} 1810}
1431 1811
1432sub customise_for { 1812sub customise_for {
1433 my ($self, $ob) = @_; 1813 my ($self, $ob) = @_;
1434 1814
1435 return find "~" . $ob->name . "/" . $self->{path} 1815 return find "~" . $ob->name . "/" . $self->{path}
1436 if $self->per_player; 1816 if $self->per_player;
1817
1818# return find "?party/" . $ob->name . "/" . $self->{path}
1819# if $self->per_party;
1437 1820
1438 $self 1821 $self
1439} 1822}
1440 1823
1441# find and load all maps in the 3x3 area around a map 1824# find and load all maps in the 3x3 area around a map
1552 1935
1553sub reset_at { 1936sub reset_at {
1554 my ($self) = @_; 1937 my ($self) = @_;
1555 1938
1556 # TODO: safety, remove and allow resettable per-player maps 1939 # TODO: safety, remove and allow resettable per-player maps
1557 return 1e99 if $self->isa ("ext::map_per_player");#d#
1558 return 1e99 if $self->{deny_reset}; 1940 return 1e99 if $self->{deny_reset};
1559 1941
1560 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1942 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1561 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1943 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1562 1944
1573 my ($self) = @_; 1955 my ($self) = @_;
1574 1956
1575 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1957 my $lock = cf::lock_acquire "map_data:$self->{path}";
1576 1958
1577 return if $self->players; 1959 return if $self->players;
1578 return if $self->isa ("ext::map_per_player");#d#
1579 1960
1580 warn "resetting map ", $self->path;#d# 1961 warn "resetting map ", $self->path;
1962
1963 $self->in_memory (cf::MAP_SWAPPED);
1964
1965 # need to save uniques path
1966 unless ($self->{deny_save}) {
1967 my $uniq = $self->uniq_path; utf8::encode $uniq;
1968
1969 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1970 if $uniq;
1971 }
1581 1972
1582 delete $cf::MAP{$self->path}; 1973 delete $cf::MAP{$self->path};
1583 1974
1584 $self->in_memory (cf::MAP_SWAPPED);
1585 $self->clear; 1975 $self->clear;
1586 1976
1587 $_->clear_links_to ($self) for values %cf::MAP; 1977 $_->clear_links_to ($self) for values %cf::MAP;
1588 1978
1589 $self->unlink_save; 1979 $self->unlink_save;
1608 $cf::MAP{$self->path} = $self; 1998 $cf::MAP{$self->path} = $self;
1609 1999
1610 $self->reset; # polite request, might not happen 2000 $self->reset; # polite request, might not happen
1611} 2001}
1612 2002
2003=item $maps = cf::map::tmp_maps
2004
2005Returns an arrayref with all map paths of currently instantiated and saved
2006maps. May block.
2007
2008=cut
2009
2010sub tmp_maps() {
2011 [
2012 map {
2013 utf8::decode $_;
2014 /\.map$/
2015 ? normalise $_
2016 : ()
2017 } @{ aio_readdir $TMPDIR or [] }
2018 ]
2019}
2020
2021=item $maps = cf::map::random_maps
2022
2023Returns an arrayref with all map paths of currently instantiated and saved
2024random maps. May block.
2025
2026=cut
2027
2028sub random_maps() {
2029 [
2030 map {
2031 utf8::decode $_;
2032 /\.map$/
2033 ? normalise "?random/$_"
2034 : ()
2035 } @{ aio_readdir $RANDOMDIR or [] }
2036 ]
2037}
2038
1613=item cf::map::unique_maps 2039=item cf::map::unique_maps
1614 2040
1615Returns an arrayref of paths of all shared maps that have 2041Returns an arrayref of paths of all shared maps that have
1616instantiated unique items. May block. 2042instantiated unique items. May block.
1617 2043
1618=cut 2044=cut
1619 2045
1620sub unique_maps() { 2046sub unique_maps() {
1621 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2047 [
1622 or return; 2048 map {
1623
1624 my @paths;
1625
1626 for (@$files) {
1627 utf8::decode $_; 2049 utf8::decode $_;
1628 next if /\.pst$/;
1629 next unless /^$PATH_SEP/o;
1630
1631 s/\.map$//; 2050 /\.map$/
1632 push @paths, $_; 2051 ? normalise $_
2052 : ()
2053 } @{ aio_readdir $UNIQUEDIR or [] }
1633 } 2054 ]
1634
1635 \@paths
1636} 2055}
1637 2056
1638package cf; 2057package cf;
1639 2058
1640=back 2059=back
1686 2105
1687 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2106 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1688 2107
1689 if ($self->{record_replies}) { 2108 if ($self->{record_replies}) {
1690 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2109 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2110
1691 } else { 2111 } else {
2112 my $pl = $self->contr;
2113
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply (
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122
2123 } else {
1692 $msg = $npc->name . " says: $msg" if $npc; 2124 $msg = $npc->name . " says: $msg" if $npc;
1693 $self->message ($msg, $flags); 2125 $self->message ($msg, $flags);
2126 }
1694 } 2127 }
1695} 2128}
1696 2129
1697=item $player_object->may ("access") 2130=item $player_object->may ("access")
1698 2131
1731=cut 2164=cut
1732 2165
1733sub link_map { 2166sub link_map {
1734 unless ($LINK_MAP) { 2167 unless ($LINK_MAP) {
1735 $LINK_MAP = cf::map::find "{link}" 2168 $LINK_MAP = cf::map::find "{link}"
1736 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2169 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1737 $LINK_MAP->load; 2170 $LINK_MAP->load;
1738 } 2171 }
1739 2172
1740 $LINK_MAP 2173 $LINK_MAP
1741} 2174}
1746 $self->deactivate_recursive; 2179 $self->deactivate_recursive;
1747 2180
1748 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2181 return if UNIVERSAL::isa $self->map, "ext::map_link";
1749 2182
1750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2183 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1751 if $self->map; 2184 if $self->map && $self->map->{path} ne "{link}";
1752 2185
1753 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2186 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1754} 2187}
1755 2188
1756sub cf::object::player::leave_link { 2189sub cf::object::player::leave_link {
1757 my ($self, $map, $x, $y) = @_; 2190 my ($self, $map, $x, $y) = @_;
2191
2192 return unless $self->contr->active;
1758 2193
1759 my $link_pos = delete $self->{_link_pos}; 2194 my $link_pos = delete $self->{_link_pos};
1760 2195
1761 unless ($map) { 2196 unless ($map) {
1762 # restore original map position 2197 # restore original map position
1780 $map->load; 2215 $map->load;
1781 $map->load_diag; 2216 $map->load_diag;
1782 2217
1783 return unless $self->contr->active; 2218 return unless $self->contr->active;
1784 $self->activate_recursive; 2219 $self->activate_recursive;
2220
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1785 $self->enter_map ($map, $x, $y); 2222 $self->enter_map ($map, $x, $y);
1786} 2223}
1787 2224
1788cf::player->attach (
1789 on_logout => sub {
1790 my ($pl) = @_;
1791
1792 # abort map switching before logout
1793 if ($pl->ob->{_link_pos}) {
1794 cf::sync_job {
1795 $pl->ob->leave_link
1796 };
1797 }
1798 },
1799 on_login => sub {
1800 my ($pl) = @_;
1801
1802 # try to abort aborted map switching on player login :)
1803 # should happen only on crashes
1804 if ($pl->ob->{_link_pos}) {
1805 $pl->ob->enter_link;
1806 (async {
1807 # we need this sleep as the login has a concurrent enter_exit running
1808 # and this sleep increases chances of the player not ending up in scorn
1809 $pl->ob->reply (undef,
1810 "There was an internal problem at your last logout, "
1811 . "the server will try to bring you to your intended destination in a second.",
1812 cf::NDI_RED);
1813 Coro::Timer::sleep 1;
1814 $pl->ob->leave_link;
1815 })->prio (2);
1816 }
1817 },
1818);
1819
1820=item $player_object->goto ($path, $x, $y) 2225=item $player_object->goto ($path, $x, $y[, $check->($map)])
1821 2226
2227Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback
2229that has to return the map if sucecssful, and then unfreezes the player on
2230the new (success) or old (failed) map position.
2231
1822=cut 2232=cut
2233
2234our $GOTOGEN;
1823 2235
1824sub cf::object::player::goto { 2236sub cf::object::player::goto {
1825 my ($self, $path, $x, $y) = @_; 2237 my ($self, $path, $x, $y, $check) = @_;
2238
2239 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1826 2241
1827 $self->enter_link; 2242 $self->enter_link;
1828 2243
1829 (async { 2244 (async {
2245 my $map = eval {
1830 my $map = cf::map::find $path; 2246 my $map = cf::map::find $path;
2247
2248 if ($map) {
1831 $map = $map->customise_for ($self) if $map; 2249 $map = $map->customise_for ($self);
1832 2250 $map = $check->($map) if $check && $map;
1833# warn "entering ", $map->path, " at ($x, $y)\n" 2251 } else {
1834# if $map;
1835
1836 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2252 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2253 }
1837 2254
2255 $map
2256 };
2257
2258 if ($@) {
2259 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2260 LOG llevError | logBacktrace, Carp::longmess $@;
2261 }
2262
2263 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation};
1838 $self->leave_link ($map, $x, $y); 2265 $self->leave_link ($map, $x, $y);
2266 }
1839 })->prio (1); 2267 })->prio (1);
1840} 2268}
1841 2269
1842=item $player_object->enter_exit ($exit_object) 2270=item $player_object->enter_exit ($exit_object)
1843 2271
1872 # that depends on the exit object 2300 # that depends on the exit object
1873 2301
1874 my $rmp = parse_random_map_params $exit->msg; 2302 my $rmp = parse_random_map_params $exit->msg;
1875 2303
1876 if ($exit->map) { 2304 if ($exit->map) {
1877 $rmp->{region} = $exit->map->region_name; 2305 $rmp->{region} = $exit->region->name;
1878 $rmp->{origin_map} = $exit->map->path; 2306 $rmp->{origin_map} = $exit->map->path;
1879 $rmp->{origin_x} = $exit->x; 2307 $rmp->{origin_x} = $exit->x;
1880 $rmp->{origin_y} = $exit->y; 2308 $rmp->{origin_y} = $exit->y;
1881 } 2309 }
1882 2310
1883 $rmp->{random_seed} ||= $exit->random_seed; 2311 $rmp->{random_seed} ||= $exit->random_seed;
1884 2312
1885 my $data = cf::to_json $rmp; 2313 my $data = cf::to_json $rmp;
1886 my $md5 = Digest::MD5::md5_hex $data; 2314 my $md5 = Digest::MD5::md5_hex $data;
1887 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2315 my $meta = "$RANDOMDIR/$md5.meta";
1888 2316
1889 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1890 aio_write $fh, 0, (length $data), $data, 0; 2318 aio_write $fh, 0, (length $data), $data, 0;
1891 undef $fh; 2319 undef $fh;
1892 aio_rename "$meta~", $meta; 2320 aio_rename "$meta~", $meta;
1901 2329
1902 return unless $self->type == cf::PLAYER; 2330 return unless $self->type == cf::PLAYER;
1903 2331
1904 if ($exit->slaying eq "/!") { 2332 if ($exit->slaying eq "/!") {
1905 #TODO: this should de-fi-ni-te-ly not be a sync-job 2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
1906 cf::sync_job { prepare_random_map $exit }; 2336 cf::sync_job { prepare_random_map $exit };
1907 } 2337 }
1908 2338
1909 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1910 my $hp = $exit->stats->hp; 2340 my $hp = $exit->stats->hp;
1918 $self->goto ($slaying, $hp, $sp); 2348 $self->goto ($slaying, $hp, $sp);
1919 2349
1920 1; 2350 1;
1921 }) { 2351 }) {
1922 $self->message ("Something went wrong deep within the crossfire server. " 2352 $self->message ("Something went wrong deep within the crossfire server. "
1923 . "I'll try to bring you back to the map you were before. " 2353 . "I'll try to bring you back to the map you were before. "
1924 . "Please report this to the dungeon master!", 2354 . "Please report this to the dungeon master!",
1925 cf::NDI_UNIQUE | cf::NDI_RED); 2355 cf::NDI_UNIQUE | cf::NDI_RED);
1926 2356
1927 warn "ERROR in enter_exit: $@"; 2357 warn "ERROR in enter_exit: $@";
1928 $self->leave_link; 2358 $self->leave_link;
1929 } 2359 }
1930 })->prio (1); 2360 })->prio (1);
1943 2373
1944sub cf::client::send_drawinfo { 2374sub cf::client::send_drawinfo {
1945 my ($self, $text, $flags) = @_; 2375 my ($self, $text, $flags) = @_;
1946 2376
1947 utf8::encode $text; 2377 utf8::encode $text;
1948 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1949} 2379}
1950 2380
2381=item $client->send_msg ($color, $type, $msg, [extra...])
2382
2383Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of
2385the message, with C<log> being the default. If C<$color> is negative, suppress
2386the message unless the client supports the msg packet.
2387
2388=cut
2389
2390sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_;
2392
2393 $msg = $self->pl->expand_cfpod ($msg);
2394
2395 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]);
2397 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 if ($color >= 0) {
2409 if (0 && $msg =~ /\[/) {
2410 $self->send_packet ("drawextinfo $color 4 0 $msg")
2411 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg")
2414 }
2415 }
2416 }
2417}
2418
2419=item $client->ext_event ($type, %msg)
2420
2421Sends an ext event to the client.
2422
2423=cut
2424
2425sub cf::client::ext_event($$%) {
2426 my ($self, $type, %msg) = @_;
2427
2428 $msg{msgtype} = "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%msg);
2430}
1951 2431
1952=item $success = $client->query ($flags, "text", \&cb) 2432=item $success = $client->query ($flags, "text", \&cb)
1953 2433
1954Queues a query to the client, calling the given callback with 2434Queues a query to the client, calling the given callback with
1955the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2435the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1956C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2436C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1957 2437
1958Queries can fail, so check the return code. Or don't, as queries will become 2438Queries can fail, so check the return code. Or don't, as queries will
1959reliable at some point in the future. 2439become reliable at some point in the future.
1960 2440
1961=cut 2441=cut
1962 2442
1963sub cf::client::query { 2443sub cf::client::query {
1964 my ($self, $flags, $text, $cb) = @_; 2444 my ($self, $flags, $text, $cb) = @_;
1972 utf8::encode $text; 2452 utf8::encode $text;
1973 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2453 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1974 2454
1975 $self->send_packet ($self->{query_queue}[0][0]) 2455 $self->send_packet ($self->{query_queue}[0][0])
1976 if @{ $self->{query_queue} } == 1; 2456 if @{ $self->{query_queue} } == 1;
2457
2458 1
1977} 2459}
1978 2460
1979cf::client->attach ( 2461cf::client->attach (
1980 on_reply => sub { 2462 on_reply => sub {
1981 my ($ns, $msg) = @_; 2463 my ($ns, $msg) = @_;
1984 # get handled first 2466 # get handled first
1985 my $queue = delete $ns->{query_queue} 2467 my $queue = delete $ns->{query_queue}
1986 or return; # be conservative, not sure how that can happen, but we saw a crash here 2468 or return; # be conservative, not sure how that can happen, but we saw a crash here
1987 2469
1988 (shift @$queue)->[1]->($msg); 2470 (shift @$queue)->[1]->($msg);
2471 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1989 2472
1990 push @{ $ns->{query_queue} }, @$queue; 2473 push @{ $ns->{query_queue} }, @$queue;
1991 2474
1992 if (@{ $ns->{query_queue} } == @$queue) { 2475 if (@{ $ns->{query_queue} } == @$queue) {
1993 if (@$queue) { 2476 if (@$queue) {
1995 } else { 2478 } else {
1996 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2479 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1997 } 2480 }
1998 } 2481 }
1999 }, 2482 },
2483 on_exticmd => sub {
2484 my ($ns, $buf) = @_;
2485
2486 my $msg = eval { from_json $buf };
2487
2488 if (ref $msg) {
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2490 if (my %reply = $cb->($ns, $msg)) {
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 }
2495 } else {
2496 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2497 }
2498
2499 cf::override;
2500 },
2000); 2501);
2001 2502
2002=item $client->async (\&cb) 2503=item $client->async (\&cb)
2003 2504
2004Create a new coroutine, running the specified callback. The coroutine will 2505Create a new coroutine, running the specified callback. The coroutine will
2051 2552
2052# here we export the classes and methods available to script code 2553# here we export the classes and methods available to script code
2053 2554
2054=pod 2555=pod
2055 2556
2056The following fucntions and emthods are available within a safe environment: 2557The following functions and methods are available within a safe environment:
2057 2558
2058 cf::object contr pay_amount pay_player map 2559 cf::object contr pay_amount pay_player map
2059 cf::object::player player 2560 cf::object::player player
2060 cf::player peaceful 2561 cf::player peaceful
2061 cf::map trigger 2562 cf::map trigger
2142=back 2643=back
2143 2644
2144=cut 2645=cut
2145 2646
2146############################################################################# 2647#############################################################################
2648# the server's init and main functions
2147 2649
2148=head2 EXTENSION DATABASE SUPPORT 2650sub load_facedata($) {
2651 my ($path) = @_;
2149 2652
2150Crossfire maintains a very simple database for extension use. It can 2653 warn "loading facedata from $path\n";
2151currently store anything that can be serialised using Storable, which
2152excludes objects.
2153 2654
2154The parameter C<$family> should best start with the name of the extension 2655 my $facedata;
2155using it, it should be unique. 2656 0 < aio_load $path, $facedata
2657 or die "$path: $!";
2156 2658
2157=over 4 2659 $facedata = Coro::Storable::thaw $facedata;
2158 2660
2159=item $hashref = cf::db_get $family 2661 $facedata->{version} == 2
2662 or cf::cleanup "$path: version mismatch, cannot proceed.";
2160 2663
2161Return a hashref for use by the extension C<$family>, which can be
2162modified. After modifications, you have to call C<cf::db_dirty> or
2163C<cf::db_sync>.
2164
2165=item $value = cf::db_get $family => $key
2166
2167Returns a single value from the database
2168
2169=item cf::db_put $family => $hashref
2170
2171Stores the given family hashref into the database. Updates are delayed, if
2172you want the data to be synced to disk immediately, use C<cf::db_sync>.
2173
2174=item cf::db_put $family => $key => $value
2175
2176Stores the given C<$value> in the family hash. Updates are delayed, if you
2177want the data to be synced to disk immediately, use C<cf::db_sync>.
2178
2179=item cf::db_dirty
2180
2181Marks the database as dirty, to be updated at a later time.
2182
2183=item cf::db_sync
2184
2185Immediately write the database to disk I<if it is dirty>.
2186
2187=cut
2188
2189our $DB;
2190
2191{
2192 my $path = cf::localdir . "/database.pst";
2193
2194 sub db_load() {
2195 $DB = stat $path ? Storable::retrieve $path : { };
2196 } 2664 {
2665 my $faces = $facedata->{faceinfo};
2197 2666
2198 my $pid; 2667 while (my ($face, $info) = each %$faces) {
2199 2668 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2200 sub db_save() { 2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2201 waitpid $pid, 0 if $pid; 2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2202 if (0 == ($pid = fork)) { 2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2203 $DB->{_meta}{version} = 1; 2672 Coro::cede;
2204 Storable::nstore $DB, "$path~";
2205 rename "$path~", $path;
2206 cf::_exit 0 if defined $pid;
2207 }
2208 }
2209
2210 my $dirty;
2211
2212 sub db_sync() {
2213 db_save if $dirty;
2214 undef $dirty;
2215 }
2216
2217 my $idle = Event->idle (
2218 reentrant => 0,
2219 min => 10,
2220 max => 20,
2221 repeat => 0,
2222 data => WF_AUTOCANCEL,
2223 cb => \&db_sync,
2224 );
2225
2226 sub db_dirty() {
2227 $dirty = 1;
2228 $idle->start;
2229 }
2230
2231 sub db_get($;$) {
2232 @_ >= 2
2233 ? $DB->{$_[0]}{$_[1]}
2234 : ($DB->{$_[0]} ||= { })
2235 }
2236
2237 sub db_put($$;$) {
2238 if (@_ >= 3) {
2239 $DB->{$_[0]}{$_[1]} = $_[2];
2240 } else {
2241 $DB->{$_[0]} = $_[1];
2242 }
2243 db_dirty;
2244 }
2245
2246 cf::global->attach (
2247 prio => 10000,
2248 on_cleanup => sub {
2249 db_sync;
2250 }, 2673 }
2251 );
2252}
2253 2674
2254############################################################################# 2675 while (my ($face, $info) = each %$faces) {
2255# the server's main() 2676 next unless $info->{smooth};
2677 my $idx = cf::face::find $face
2678 or next;
2679 if (my $smooth = cf::face::find $info->{smooth}) {
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2681 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 }
2684 Coro::cede;
2685 }
2686 }
2687
2688 {
2689 my $anims = $facedata->{animinfo};
2690
2691 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede;
2694 }
2695
2696 cf::anim::invalidate_all; # d'oh
2697 }
2698
2699 1
2700}
2701
2702sub reload_regions {
2703 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n";
2705}
2706
2707sub reload_facedata {
2708 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n";
2710}
2711
2712sub reload_archetypes {
2713 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n";
2715}
2716
2717sub reload_treasures {
2718 load_resource_file "$DATADIR/treasures"
2719 or die "unable to load treasurelists\n";
2720}
2721
2722sub reload_resources {
2723 warn "reloading resource files...\n";
2724
2725 reload_regions;
2726 reload_facedata;
2727 #reload_archetypes;#d#
2728 reload_archetypes;
2729 reload_treasures;
2730
2731 warn "finished reloading resource files\n";
2732}
2733
2734sub init {
2735 reload_resources;
2736}
2256 2737
2257sub cfg_load { 2738sub cfg_load {
2258 open my $fh, "<:utf8", cf::confdir . "/config" 2739 open my $fh, "<:utf8", "$CONFDIR/config"
2259 or return; 2740 or return;
2260 2741
2261 local $/; 2742 local $/;
2262 *CFG = YAML::Syck::Load <$fh>; 2743 *CFG = YAML::Syck::Load <$fh>;
2263 2744
2283 Event::one_event; 2764 Event::one_event;
2284 })->prio (Coro::PRIO_MAX); 2765 })->prio (Coro::PRIO_MAX);
2285 }; 2766 };
2286 2767
2287 cfg_load; 2768 cfg_load;
2288 db_load; 2769 db_init;
2289 load_extensions; 2770 load_extensions;
2290 2771
2291 $TICK_WATCHER->start; 2772 $TICK_WATCHER->start;
2292 Event::loop; 2773 Event::loop;
2293} 2774}
2308 }, 2789 },
2309 ); 2790 );
2310 } 2791 }
2311} 2792}
2312 2793
2794sub write_runtime {
2795 my $runtime = "$LOCALDIR/runtime";
2796
2797 # first touch the runtime file to show we are still running:
2798 # the fsync below can take a very very long time.
2799
2800 IO::AIO::aio_utime $runtime, undef, undef;
2801
2802 my $guard = cf::lock_acquire "write_runtime";
2803
2804 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2805 or return;
2806
2807 my $value = $cf::RUNTIME + 90 + 10;
2808 # 10 is the runtime save interval, for a monotonic clock
2809 # 60 allows for the watchdog to kill the server.
2810
2811 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2812 and return;
2813
2814 # always fsync - this file is important
2815 aio_fsync $fh
2816 and return;
2817
2818 # touch it again to show we are up-to-date
2819 aio_utime $fh, undef, undef;
2820
2821 close $fh
2822 or return;
2823
2824 aio_rename "$runtime~", $runtime
2825 and return;
2826
2827 warn "runtime file written.\n";
2828
2829 1
2830}
2831
2313sub emergency_save() { 2832sub emergency_save() {
2314 my $freeze_guard = cf::freeze_mainloop; 2833 my $freeze_guard = cf::freeze_mainloop;
2315 2834
2316 warn "enter emergency perl save\n"; 2835 warn "enter emergency perl save\n";
2317 2836
2332 my $map = $cf::MAP{$path} or next; 2851 my $map = $cf::MAP{$path} or next;
2333 $map->valid or next; 2852 $map->valid or next;
2334 $map->save; 2853 $map->save;
2335 } 2854 }
2336 warn "end emergency map save\n"; 2855 warn "end emergency map save\n";
2856
2857 warn "begin emergency database checkpoint\n";
2858 BDB::db_env_txn_checkpoint $DB_ENV;
2859 warn "end emergency database checkpoint\n";
2337 }; 2860 };
2338 2861
2339 warn "leave emergency perl save\n"; 2862 warn "leave emergency perl save\n";
2340} 2863}
2341 2864
2865sub post_cleanup {
2866 my ($make_core) = @_;
2867
2868 warn Carp::longmess "post_cleanup backtrace"
2869 if $make_core;
2870}
2871
2342sub reload() { 2872sub do_reload_perl() {
2343 # can/must only be called in main 2873 # can/must only be called in main
2344 if ($Coro::current != $Coro::main) { 2874 if ($Coro::current != $Coro::main) {
2345 warn "can only reload from main coroutine"; 2875 warn "can only reload from main coroutine";
2346 return; 2876 return;
2347 } 2877 }
2348 2878
2349 warn "reloading..."; 2879 warn "reloading...";
2350 2880
2351 warn "cancelling server ticker"; 2881 warn "entering sync_job";
2352 $TICK_WATCHER->cancel;
2353 2882
2883 cf::sync_job {
2884 cf::write_runtime; # external watchdog should not bark
2354 cf::emergency_save; 2885 cf::emergency_save;
2886 cf::write_runtime; # external watchdog should not bark
2355 2887
2356 eval { 2888 warn "syncing database to disk";
2889 BDB::db_env_txn_checkpoint $DB_ENV;
2890
2357 # if anything goes wrong in here, we should simply crash as we already saved 2891 # if anything goes wrong in here, we should simply crash as we already saved
2358
2359 warn "syncing database to disk";
2360 cf::db_sync;
2361 2892
2362 warn "cancelling all WF_AUTOCANCEL watchers"; 2893 warn "cancelling all WF_AUTOCANCEL watchers";
2363 for (Event::all_watchers) { 2894 for (Event::all_watchers) {
2364 $_->cancel if $_->data & WF_AUTOCANCEL; 2895 $_->cancel if $_->data & WF_AUTOCANCEL;
2365 } 2896 }
2366 2897
2367 warn "flushing outstanding aio requests"; 2898 warn "flushing outstanding aio requests";
2368 for (;;) { 2899 for (;;) {
2900 BDB::flush;
2369 IO::AIO::flush; 2901 IO::AIO::flush;
2370 Coro::cede; 2902 Coro::cede;
2371 last unless IO::AIO::nreqs; 2903 last unless IO::AIO::nreqs || BDB::nreqs;
2372 warn "iterate..."; 2904 warn "iterate...";
2373 } 2905 }
2906
2907 ++$RELOAD;
2374 2908
2375 warn "cancelling all extension coros"; 2909 warn "cancelling all extension coros";
2376 $_->cancel for values %EXT_CORO; 2910 $_->cancel for values %EXT_CORO;
2377 %EXT_CORO = (); 2911 %EXT_CORO = ();
2378 2912
2379 warn "removing commands"; 2913 warn "removing commands";
2380 %COMMAND = (); 2914 %COMMAND = ();
2381 2915
2382 warn "removing ext commands"; 2916 warn "removing ext/exti commands";
2383 %EXTCMD = (); 2917 %EXTCMD = ();
2918 %EXTICMD = ();
2384 2919
2385 warn "unloading/nuking all extensions"; 2920 warn "unloading/nuking all extensions";
2386 for my $pkg (@EXTS) { 2921 for my $pkg (@EXTS) {
2387 warn "... unloading $pkg"; 2922 warn "... unloading $pkg";
2388 2923
2418 Symbol::delete_package "safe::$_" 2953 Symbol::delete_package "safe::$_"
2419 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2954 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2420 2955
2421 warn "unloading cf.pm \"a bit\""; 2956 warn "unloading cf.pm \"a bit\"";
2422 delete $INC{"cf.pm"}; 2957 delete $INC{"cf.pm"};
2958 delete $INC{"cf/pod.pm"};
2423 2959
2424 # don't, removes xs symbols, too, 2960 # don't, removes xs symbols, too,
2425 # and global variables created in xs 2961 # and global variables created in xs
2426 #Symbol::delete_package __PACKAGE__; 2962 #Symbol::delete_package __PACKAGE__;
2427 2963
2431 require cf; 2967 require cf;
2432 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2968 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2433 2969
2434 warn "loading config and database again"; 2970 warn "loading config and database again";
2435 cf::cfg_load; 2971 cf::cfg_load;
2436 cf::db_load;
2437 2972
2438 warn "loading extensions"; 2973 warn "loading extensions";
2439 cf::load_extensions; 2974 cf::load_extensions;
2440 2975
2441 warn "reattaching attachments to objects/players"; 2976 warn "reattaching attachments to objects/players";
2442 _global_reattach; 2977 _global_reattach; # objects, sockets
2443 warn "reattaching attachments to maps"; 2978 warn "reattaching attachments to maps";
2444 reattach $_ for values %MAP; 2979 reattach $_ for values %MAP;
2980 warn "reattaching attachments to players";
2981 reattach $_ for values %PLAYER;
2445 2982
2446 warn "restarting server ticker"; 2983 warn "leaving sync_job";
2447 2984
2448 $TICK_WATCHER->start; 2985 1
2449 }; 2986 } or do {
2450
2451 if ($@) {
2452 warn $@; 2987 warn $@;
2453 warn "error while reloading, exiting."; 2988 warn "error while reloading, exiting.";
2454 exit 1; 2989 exit 1;
2455 } 2990 };
2456 2991
2457 warn "reloaded"; 2992 warn "reloaded";
2458}; 2993};
2459 2994
2460our $RELOAD_WATCHER; # used only during reload 2995our $RELOAD_WATCHER; # used only during reload
2461 2996
2997sub reload_perl() {
2998 # doing reload synchronously and two reloads happen back-to-back,
2999 # coro crashes during coro_state_free->destroy here.
3000
3001 $RELOAD_WATCHER ||= Event->timer (
3002 reentrant => 0,
3003 after => 0,
3004 data => WF_AUTOCANCEL,
3005 cb => sub {
3006 do_reload_perl;
3007 undef $RELOAD_WATCHER;
3008 },
3009 );
3010}
3011
2462register_command "reload" => sub { 3012register_command "reload" => sub {
2463 my ($who, $arg) = @_; 3013 my ($who, $arg) = @_;
2464 3014
2465 if ($who->flag (FLAG_WIZ)) { 3015 if ($who->flag (FLAG_WIZ)) {
2466 $who->message ("reloading server."); 3016 $who->message ("reloading server.");
2467 3017 async { reload_perl };
2468 # doing reload synchronously and two reloads happen back-to-back,
2469 # coro crashes during coro_state_free->destroy here.
2470
2471 $RELOAD_WATCHER ||= Event->timer (
2472 reentrant => 0,
2473 after => 0,
2474 data => WF_AUTOCANCEL,
2475 cb => sub {
2476 reload;
2477 undef $RELOAD_WATCHER;
2478 },
2479 );
2480 } 3018 }
2481}; 3019};
2482 3020
2483unshift @INC, $LIBDIR; 3021unshift @INC, $LIBDIR;
2484 3022
2485my $bug_warning = 0; 3023my $bug_warning = 0;
2486 3024
3025our @WAIT_FOR_TICK;
3026our @WAIT_FOR_TICK_BEGIN;
3027
3028sub wait_for_tick {
3029 return unless $TICK_WATCHER->is_active;
3030 return if $Coro::current == $Coro::main;
3031
3032 my $signal = new Coro::Signal;
3033 push @WAIT_FOR_TICK, $signal;
3034 $signal->wait;
3035}
3036
3037sub wait_for_tick_begin {
3038 return unless $TICK_WATCHER->is_active;
3039 return if $Coro::current == $Coro::main;
3040
3041 my $signal = new Coro::Signal;
3042 push @WAIT_FOR_TICK_BEGIN, $signal;
3043 $signal->wait;
3044}
3045
3046 my $min = 1e6;#d#
3047 my $avg = 10;
2487$TICK_WATCHER = Event->timer ( 3048$TICK_WATCHER = Event->timer (
2488 reentrant => 0, 3049 reentrant => 0,
2489 parked => 1, 3050 parked => 1,
2490 prio => 0, 3051 prio => 0,
2491 at => $NEXT_TICK || $TICK, 3052 at => $NEXT_TICK || $TICK,
2495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3056 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2496 unless ++$bug_warning > 10; 3057 unless ++$bug_warning > 10;
2497 return; 3058 return;
2498 } 3059 }
2499 3060
2500 $NOW = Event::time; 3061 $NOW = $tick_start = Event::time;
2501 3062
2502 cf::server_tick; # one server iteration 3063 cf::server_tick; # one server iteration
3064
3065 0 && sync_job {#d#
3066 for(1..10) {
3067 my $t = Event::time;
3068 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3069 or die;
3070
3071 $map->width (50);
3072 $map->height (50);
3073 $map->alloc;
3074 $map->_load_objects ("/tmp/x.map", 1);
3075 my $t = Event::time - $t;
3076
3077 #next unless $t < 0.0013;#d#
3078 if ($t < $min) {
3079 $min = $t;
3080 }
3081 $avg = $avg * 0.99 + $t * 0.01;
3082 }
3083 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3084 exit 0;
3085 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3086 };
3087
2503 $RUNTIME += $TICK; 3088 $RUNTIME += $TICK;
2504 $NEXT_TICK += $TICK; 3089 $NEXT_TICK += $TICK;
2505 3090
2506 $WAIT_FOR_TICK->broadcast; 3091 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2507 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3092 $NEXT_RUNTIME_WRITE = $NOW + 10;
2508 3093 Coro::async_pool {
2509 Event::sweep; 3094 write_runtime
2510 Coro::cede_notself; 3095 or warn "ERROR: unable to write runtime file: $!";
3096 };
2511 3097 }
3098
2512# my $AFTER = Event::time; 3099# my $AFTER = Event::time;
2513# warn $AFTER - $NOW;#d# 3100# warn $AFTER - $NOW;#d#
2514 3101
3102 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3103 $sig->send;
3104 }
3105 while (my $sig = shift @WAIT_FOR_TICK) {
3106 $sig->send;
3107 }
3108
3109 $NOW = Event::time;
3110
2515 # if we are delayed by four ticks or more, skip them all 3111 # if we are delayed by four ticks or more, skip them all
2516 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3112 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2517 3113
2518 $TICK_WATCHER->at ($NEXT_TICK); 3114 $TICK_WATCHER->at ($NEXT_TICK);
2519 $TICK_WATCHER->start; 3115 $TICK_WATCHER->start;
3116
3117 $LOAD = ($NOW - $tick_start) / $TICK;
3118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3119
3120 _post_tick;
3121
3122
2520 }, 3123 },
2521); 3124);
2522 3125
3126{
3127 BDB::max_poll_time $TICK * 0.1;
3128 $BDB_POLL_WATCHER = Event->io (
3129 reentrant => 0,
3130 fd => BDB::poll_fileno,
3131 poll => 'r',
3132 prio => 0,
3133 data => WF_AUTOCANCEL,
3134 cb => \&BDB::poll_cb,
3135 );
3136 BDB::min_parallel 8;
3137
3138 BDB::set_sync_prepare {
3139 my $status;
3140 my $current = $Coro::current;
3141 (
3142 sub {
3143 $status = $!;
3144 $current->ready; undef $current;
3145 },
3146 sub {
3147 Coro::schedule while defined $current;
3148 $! = $status;
3149 },
3150 )
3151 };
3152
3153 unless ($DB_ENV) {
3154 $DB_ENV = BDB::db_env_create;
3155
3156 cf::sync_job {
3157 eval {
3158 BDB::db_env_open
3159 $DB_ENV,
3160 $BDBDIR,
3161 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3162 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3163 0666;
3164
3165 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3166
3167 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3168 $DB_ENV->set_lk_detect;
3169 };
3170
3171 cf::cleanup "db_env_open(db): $@" if $@;
3172 };
3173 }
3174}
3175
3176{
3177 IO::AIO::min_parallel 8;
3178
3179 undef $Coro::AIO::WATCHER;
2523IO::AIO::max_poll_time $TICK * 0.1; 3180 IO::AIO::max_poll_time $TICK * 0.1;
2524
2525undef $Coro::AIO::WATCHER;
2526$AIO_POLL_WATCHER = Event->io ( 3181 $AIO_POLL_WATCHER = Event->io (
2527 reentrant => 0, 3182 reentrant => 0,
3183 data => WF_AUTOCANCEL,
2528 fd => IO::AIO::poll_fileno, 3184 fd => IO::AIO::poll_fileno,
2529 poll => 'r', 3185 poll => 'r',
2530 prio => 6, 3186 prio => 6,
2531 data => WF_AUTOCANCEL,
2532 cb => \&IO::AIO::poll_cb, 3187 cb => \&IO::AIO::poll_cb,
2533); 3188 );
3189}
2534 3190
2535$WRITE_RUNTIME_WATCHER = Event->timer ( 3191my $_log_backtrace;
2536 reentrant => 0, 3192
2537 data => WF_AUTOCANCEL, 3193sub _log_backtrace {
2538 after => 1, 3194 my ($msg, @addr) = @_;
2539 interval => 10, 3195
2540 prio => 6, # keep it lowest so it acts like a watchdog 3196 $msg =~ s/\n//;
2541 cb => Coro::unblock_sub { 3197
2542 write_runtime 3198 # limit the # of concurrent backtraces
2543 or warn "ERROR: unable to write runtime file: $!"; 3199 if ($_log_backtrace < 2) {
3200 ++$_log_backtrace;
3201 async {
3202 my @bt = fork_call {
3203 @addr = map { sprintf "%x", $_ } @addr;
3204 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3205 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3206 or die "addr2line: $!";
3207
3208 my @funcs;
3209 my @res = <$fh>;
3210 chomp for @res;
3211 while (@res) {
3212 my ($func, $line) = splice @res, 0, 2, ();
3213 push @funcs, "[$func] $line";
3214 }
3215
3216 @funcs
3217 };
3218
3219 LOG llevInfo, "[ABT] $msg\n";
3220 LOG llevInfo, "[ABT] $_\n" for @bt;
3221 --$_log_backtrace;
3222 };
3223 } else {
3224 LOG llevInfo, "[ABT] $msg\n";
3225 LOG llevInfo, "[ABT] [suppressed]\n";
2544 }, 3226 }
2545); 3227}
3228
3229# load additional modules
3230use cf::pod;
2546 3231
2547END { cf::emergency_save } 3232END { cf::emergency_save }
2548 3233
25491 32341
2550 3235

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines