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.214 by root, Wed Feb 14 00:40:05 2007 UTC vs.
Revision 1.312 by root, Sat Jul 21 18:01:26 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 ();
20use BDB (); 26use BDB ();
21use Data::Dumper; 27use Data::Dumper;
22use Digest::MD5; 28use Digest::MD5;
23use Fcntl; 29use Fcntl;
30use YAML::Syck ();
24use IO::AIO 2.32 (); 31use IO::AIO 2.32 ();
25use YAML::Syck ();
26use Time::HiRes; 32use Time::HiRes;
27use Compress::LZF; 33use Compress::LZF;
34use Digest::MD5 ();
28 35
36# configure various modules to our taste
37#
38$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 41
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 42$Event::Eval = 1; # no idea why this is required, but it is
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 43
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1; 45$YAML::Syck::ImplicitUnicode = 1;
37 46
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
39 48
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50
40our %COMMAND = (); 51our %COMMAND = ();
41our %COMMAND_TIME = (); 52our %COMMAND_TIME = ();
42 53
43our @EXTS = (); # list of extension package names 54our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 55our %EXTCMD = ();
56our %EXTICMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 57our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 58our %EXT_MAP = (); # pluggable maps
47 59
60our $RELOAD; # number of reloads so far
48our @EVENT; 61our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 62
51our $TICK = MAX_TIME * 1e-6; 63our $CONFDIR = confdir;
64our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db";
74
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
52our $TICK_WATCHER; 76our $TICK_WATCHER;
53our $AIO_POLL_WATCHER; 77our $AIO_POLL_WATCHER;
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 79our $NEXT_TICK;
56our $NOW; 80our $NOW;
65our $RUNTIME; 89our $RUNTIME;
66 90
67our %PLAYER; # all users 91our %PLAYER; # all users
68our %MAP; # all maps 92our %MAP; # all maps
69our $LINK_MAP; # the special {link} map, which is always available 93our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 94
76# used to convert map paths into valid unix filenames by replacing / by ∕ 95# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 97
98our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing
100our $tick_start; # for load detecting purposes
101
79binmode STDOUT; 102binmode STDOUT;
80binmode STDERR; 103binmode STDERR;
81 104
82# read virtual server time, if available 105# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 106unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 107 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 108 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 109 $RUNTIME = <$fh> + 0.;
87} 110}
88 111
89mkdir cf::localdir; 112mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 114
96our $EMERGENCY_POSITION; 115our $EMERGENCY_POSITION;
97 116
98sub cf::map::normalise; 117sub cf::map::normalise;
99 118
110=item $cf::RUNTIME 129=item $cf::RUNTIME
111 130
112The time this server has run, starts at 0 and is increased by $cf::TICK on 131The time this server has run, starts at 0 and is increased by $cf::TICK on
113every server tick. 132every server tick.
114 133
115=item $cf::LIBDIR 134=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
135$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
136$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116 137
117The perl library directory, where extensions and cf-specific modules can 138Various directories - "/etc", read-only install directory, perl-library
118be found. It will be added to C<@INC> automatically. 139directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
140unique-items directory, player file directory, random maps directory and
141database environment.
119 142
120=item $cf::NOW 143=item $cf::NOW
121 144
122The time of the last (current) server tick. 145The time of the last (current) server tick.
123 146
124=item $cf::TICK 147=item $cf::TICK
125 148
126The interval between server ticks, in seconds. 149The interval between server ticks, in seconds.
150
151=item $cf::LOADAVG
152
153The current CPU load on the server (alpha-smoothed), as a value between 0
154(none) and 1 (overloaded), indicating how much time is spent on processing
155objects per tick. Healthy values are < 0.5.
156
157=item $cf::LOAD
158
159The raw value load value from the last tick.
127 160
128=item %cf::CFG 161=item %cf::CFG
129 162
130Configuration for the server, loaded from C</etc/crossfire/config>, or 163Configuration for the server, loaded from C</etc/crossfire/config>, or
131from wherever your confdir points to. 164from wherever your confdir points to.
132 165
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 166=item cf::wait_for_tick, cf::wait_for_tick_begin
134 167
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 169returns directly I<after> the tick processing (and consequently, can only wake one process
137processing has been done. Call C<< ->wait >> on them to maximise the 170per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138window of cpu time available, or simply to synchronise to the server tick. 171
172=item @cf::INVOKE_RESULTS
173
174This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call.
139 177
140=back 178=back
141 179
142=cut 180=cut
143 181
144BEGIN { 182BEGIN {
145 *CORE::GLOBAL::warn = sub { 183 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 184 my $msg = join "", @_;
147 utf8::encode $msg;
148 185
149 $msg .= "\n" 186 $msg .= "\n"
150 unless $msg =~ /\n$/; 187 unless $msg =~ /\n$/;
151 188
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190
191 utf8::encode $msg;
152 LOG llevError, $msg; 192 LOG llevError, $msg;
153 }; 193 };
154} 194}
155 195
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 200@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
201@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
161@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 202@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
162 203
163# we bless all objects into (empty) derived classes to force a method lookup 204# we bless all objects into (empty) derived classes to force a method lookup
164# within the Safe compartment. 205# within the Safe compartment.
165for my $pkg (qw( 206for my $pkg (qw(
166 cf::global cf::attachable 207 cf::global cf::attachable
174} 215}
175 216
176$Event::DIED = sub { 217$Event::DIED = sub {
177 warn "error in event callback: @_"; 218 warn "error in event callback: @_";
178}; 219};
220
221#############################################################################
179 222
180=head2 UTILITY FUNCTIONS 223=head2 UTILITY FUNCTIONS
181 224
182=over 4 225=over 4
183 226
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 246 $d
204 } || "[unable to dump $_[0]: '$@']"; 247 } || "[unable to dump $_[0]: '$@']";
205} 248}
206 249
207use JSON::Syck (); # TODO# replace by JSON::PC once working
208
209=item $ref = cf::from_json $json 250=item $ref = cf::from_json $json
210 251
211Converts a JSON string into the corresponding perl data structure. 252Converts a JSON string into the corresponding perl data structure.
212 253
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 254=item $json = cf::to_json $ref
221 255
222Converts a perl data structure into its JSON representation. 256Converts a perl data structure into its JSON representation.
223 257
224=cut 258=cut
225 259
226sub to_json($) { 260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 261
228 JSON::Syck::Dump $_[0] 262sub to_json ($) { $json_coder->encode ($_[0]) }
229} 263sub from_json ($) { $json_coder->decode ($_[0]) }
230 264
231=item cf::lock_wait $string 265=item cf::lock_wait $string
232 266
233Wait until the given lock is available. See cf::lock_acquire. 267Wait until the given lock is available. See cf::lock_acquire.
234 268
240returned. 274returned.
241 275
242Lock names should begin with a unique identifier (for example, cf::map::find 276Lock names should begin with a unique identifier (for example, cf::map::find
243uses map_find and cf::map::load uses map_load). 277uses map_find and cf::map::load uses map_load).
244 278
279=item $locked = cf::lock_active $string
280
281Return true if the lock is currently active, i.e. somebody has locked it.
282
245=cut 283=cut
246 284
247our %LOCK; 285our %LOCK;
248 286
249sub lock_wait($) { 287sub lock_wait($) {
266 304
267 Coro::guard { 305 Coro::guard {
268 # wake up all waiters, to be on the safe side 306 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 307 $_->ready for @{ delete $LOCK{$key} };
270 } 308 }
309}
310
311sub lock_active($) {
312 my ($key) = @_;
313
314 ! ! $LOCK{$key}
271} 315}
272 316
273sub freeze_mainloop { 317sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 318 return unless $TICK_WATCHER->is_active;
275 319
290 334
291BEGIN { *async = \&Coro::async_pool } 335BEGIN { *async = \&Coro::async_pool }
292 336
293=item cf::sync_job { BLOCK } 337=item cf::sync_job { BLOCK }
294 338
295The design of crossfire+ requires that the main coro ($Coro::main) is 339The design of Crossfire TRT requires that the main coroutine ($Coro::main)
296always able to handle events or runnable, as crossfire+ is only partly 340is always able to handle events or runnable, as Crossfire TRT is only
297reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 341partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
342acceptable.
298 343
299If it must be done, put the blocking parts into C<sync_job>. This will run 344If it must be done, put the blocking parts into C<sync_job>. This will run
300the given BLOCK in another coroutine while waiting for the result. The 345the given BLOCK in another coroutine while waiting for the result. The
301server will be frozen during this time, so the block should either finish 346server will be frozen during this time, so the block should either finish
302fast or be very important. 347fast or be very important.
305 350
306sub sync_job(&) { 351sub sync_job(&) {
307 my ($job) = @_; 352 my ($job) = @_;
308 353
309 if ($Coro::current == $Coro::main) { 354 if ($Coro::current == $Coro::main) {
355 my $time = Event::time;
356
310 # this is the main coro, too bad, we have to block 357 # this is the main coro, too bad, we have to block
311 # till the operation succeeds, freezing the server :/ 358 # till the operation succeeds, freezing the server :/
312 359
313 # TODO: use suspend/resume instead 360 # TODO: use suspend/resume instead
314 # (but this is cancel-safe) 361 # (but this is cancel-safe)
325 372
326 while ($busy) { 373 while ($busy) {
327 Coro::cede or Event::one_event; 374 Coro::cede or Event::one_event;
328 } 375 }
329 376
377 $time = Event::time - $time;
378
379 LOG llevError | logBacktrace, Carp::longmess "long sync job"
380 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
381
382 $tick_start += $time; # do not account sync jobs to server load
383
330 wantarray ? @res : $res[0] 384 wantarray ? @res : $res[0]
331 } else { 385 } else {
332 # we are in another coroutine, how wonderful, everything just works 386 # we are in another coroutine, how wonderful, everything just works
333 387
334 $job->() 388 $job->()
353 $EXT_CORO{$coro+0} = $coro; 407 $EXT_CORO{$coro+0} = $coro;
354 408
355 $coro 409 $coro
356} 410}
357 411
358sub write_runtime { 412=item fork_call { }, $args
359 my $runtime = cf::localdir . "/runtime";
360 413
361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 414Executes the given code block with the given arguments in a seperate
362 or return; 415process, returning the results. Everything must be serialisable with
416Coro::Storable. May, of course, block. Note that the executed sub may
417never block itself or use any form of Event handling.
363 418
364 my $value = $cf::RUNTIME + 90 + 10; 419=cut
365 # 10 is the runtime save interval, for a monotonic clock
366 # 60 allows for the watchdog to kill the server.
367 420
368 (aio_write $fh, 0, (length $value), $value, 0) <= 0 421sub _store_scalar {
369 and return; 422 open my $fh, ">", \my $buf
370 423 or die "fork_call: cannot open fh-to-buf in child : $!";
371 # always fsync - this file is important 424 Storable::store_fd $_[0], $fh;
372 aio_fsync $fh
373 and return;
374
375 close $fh 425 close $fh;
376 or return;
377 426
378 aio_rename "$runtime~", $runtime 427 $buf
379 and return; 428}
380 429
430sub fork_call(&@) {
431 my ($cb, @args) = @_;
432
433# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
434# or die "socketpair: $!";
435 pipe my $fh1, my $fh2
436 or die "pipe: $!";
437
438 if (my $pid = fork) {
439 close $fh2;
440
441 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
442 warn "pst<$res>" unless $res =~ /^pst/;
443 $res = Coro::Storable::thaw $res;
444
445 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
446
447 Carp::confess $$res unless "ARRAY" eq ref $res;
448
449 return wantarray ? @$res : $res->[-1];
450 } else {
451 reset_signals;
452 local $SIG{__WARN__};
453 local $SIG{__DIE__};
454 # just in case, this hack effectively disables event
455 # in the child. cleaner and slower would be canceling all watchers,
456 # but this works for the time being.
457 local $Coro::idle;
458 $Coro::current->prio (Coro::PRIO_MAX);
459
460 eval {
461 close $fh1;
462
463 my @res = eval { $cb->(@args) };
464
465 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
466 close $fh2;
467 };
468
469 warn $@ if $@;
470 _exit 0;
381 1 471 }
472}
473
474=item $value = cf::db_get $family => $key
475
476Returns a single value from the environment database.
477
478=item cf::db_put $family => $key => $value
479
480Stores the given C<$value> in the family. It can currently store binary
481data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
482
483=cut
484
485our $DB;
486
487sub db_init {
488 unless ($DB) {
489 $DB = BDB::db_create $DB_ENV;
490
491 cf::sync_job {
492 eval {
493 $DB->set_flags (BDB::CHKSUM);
494
495 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
496 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
497 cf::cleanup "db_open(db): $!" if $!;
498 };
499 cf::cleanup "db_open(db): $@" if $@;
500 };
501 }
502}
503
504sub db_get($$) {
505 my $key = "$_[0]/$_[1]";
506
507 cf::sync_job {
508 BDB::db_get $DB, undef, $key, my $data;
509
510 $! ? ()
511 : $data
512 }
513}
514
515sub db_put($$$) {
516 BDB::dbreq_pri 4;
517 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
518}
519
520=item cf::cache $id => [$paths...], $processversion => $process
521
522Generic caching function that returns the value of the resource $id,
523caching and regenerating as required.
524
525This function can block.
526
527=cut
528
529sub cache {
530 my ($id, $src, $processversion, $process) = @_;
531
532 my $meta =
533 join "\x00",
534 $processversion,
535 map {
536 aio_stat $_
537 and Carp::croak "$_: $!";
538
539 ($_, (stat _)[7,9])
540 } @$src;
541
542 my $dbmeta = db_get cache => "$id/meta";
543 if ($dbmeta ne $meta) {
544 # changed, we may need to process
545
546 my @data;
547 my $md5;
548
549 for (0 .. $#$src) {
550 0 <= aio_load $src->[$_], $data[$_]
551 or Carp::croak "$src->[$_]: $!";
552 }
553
554 # if processing is expensive, check
555 # checksum first
556 if (1) {
557 $md5 =
558 join "\x00",
559 $processversion,
560 map {
561 Coro::cede;
562 ($src->[$_], Digest::MD5::md5_hex $data[$_])
563 } 0.. $#$src;
564
565
566 my $dbmd5 = db_get cache => "$id/md5";
567 if ($dbmd5 eq $md5) {
568 db_put cache => "$id/meta", $meta;
569
570 return db_get cache => "$id/data";
571 }
572 }
573
574 my $t1 = Time::HiRes::time;
575 my $data = $process->(\@data);
576 my $t2 = Time::HiRes::time;
577
578 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
579
580 db_put cache => "$id/data", $data;
581 db_put cache => "$id/md5" , $md5;
582 db_put cache => "$id/meta", $meta;
583
584 return $data;
585 }
586
587 db_get cache => "$id/data"
588}
589
590=item cf::datalog type => key => value, ...
591
592Log a datalog packet of the given type with the given key-value pairs.
593
594=cut
595
596sub datalog($@) {
597 my ($type, %kv) = @_;
598 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
382} 599}
383 600
384=back 601=back
385 602
386=cut 603=cut
393attach callbacks/event handlers (a collection of which is called an "attachment") 610attach callbacks/event handlers (a collection of which is called an "attachment")
394to it. All such attachable objects support the following methods. 611to it. All such attachable objects support the following methods.
395 612
396In the following description, CLASS can be any of C<global>, C<object> 613In the following description, CLASS can be any of C<global>, C<object>
397C<player>, C<client> or C<map> (i.e. the attachable objects in 614C<player>, C<client> or C<map> (i.e. the attachable objects in
398crossfire+). 615Crossfire TRT).
399 616
400=over 4 617=over 4
401 618
402=item $attachable->attach ($attachment, key => $value...) 619=item $attachable->attach ($attachment, key => $value...)
403 620
566 $registry = $CB_TYPE[$object_type] ||= []; 783 $registry = $CB_TYPE[$object_type] ||= [];
567 784
568 } elsif ($type eq "subtype") { 785 } elsif ($type eq "subtype") {
569 defined $object_type or Carp::croak "subtype specified without type"; 786 defined $object_type or Carp::croak "subtype specified without type";
570 my $object_subtype = shift @arg; 787 my $object_subtype = shift @arg;
571 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 788 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
572 789
573 } elsif ($type eq "package") { 790 } elsif ($type eq "package") {
574 my $pkg = shift @arg; 791 my $pkg = shift @arg;
575 792
576 while (my ($name, $id) = each %cb_id) { 793 while (my ($name, $id) = each %cb_id) {
605 _attach $registry, $klass, @attach; 822 _attach $registry, $klass, @attach;
606 } 823 }
607 824
608 $obj->{$name} = \%arg; 825 $obj->{$name} = \%arg;
609 } else { 826 } else {
610 warn "object uses attachment '$name' that is not available, postponing.\n"; 827 warn "object uses attachment '$name' which is not available, postponing.\n";
611 } 828 }
612 829
613 $obj->{_attachment}{$name} = undef; 830 $obj->{_attachment}{$name} = undef;
614} 831}
615 832
617 if (ref $_[0]) { 834 if (ref $_[0]) {
618 _object_attach @_; 835 _object_attach @_;
619 } else { 836 } else {
620 _attach shift->_attach_registry, @_; 837 _attach shift->_attach_registry, @_;
621 } 838 }
839 _recalc_want;
622}; 840};
623 841
624# all those should be optimised 842# all those should be optimised
625sub cf::attachable::detach { 843sub cf::attachable::detach {
626 my ($obj, $name) = @_; 844 my ($obj, $name) = @_;
629 delete $obj->{_attachment}{$name}; 847 delete $obj->{_attachment}{$name};
630 reattach ($obj); 848 reattach ($obj);
631 } else { 849 } else {
632 Carp::croak "cannot, currently, detach class attachments"; 850 Carp::croak "cannot, currently, detach class attachments";
633 } 851 }
852 _recalc_want;
634}; 853};
635 854
636sub cf::attachable::attached { 855sub cf::attachable::attached {
637 my ($obj, $name) = @_; 856 my ($obj, $name) = @_;
638 857
653 "; 872 ";
654 die if $@; 873 die if $@;
655} 874}
656 875
657our $override; 876our $override;
658our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 877our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
659 878
660sub override { 879sub override {
661 $override = 1; 880 $override = 1;
662 @invoke_results = (); 881 @INVOKE_RESULTS = (@_);
663} 882}
664 883
665sub do_invoke { 884sub do_invoke {
666 my $event = shift; 885 my $event = shift;
667 my $callbacks = shift; 886 my $callbacks = shift;
668 887
669 @invoke_results = (); 888 @INVOKE_RESULTS = ();
670 889
671 local $override; 890 local $override;
672 891
673 for (@$callbacks) { 892 for (@$callbacks) {
674 eval { &{$_->[1]} }; 893 eval { &{$_->[1]} };
691 910
692Generate an object-specific event with the given arguments. 911Generate an object-specific event with the given arguments.
693 912
694This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 913This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
695removed in future versions), and there is no public API to access override 914removed in future versions), and there is no public API to access override
696results (if you must, access C<@cf::invoke_results> directly). 915results (if you must, access C<@cf::INVOKE_RESULTS> directly).
697 916
698=back 917=back
699 918
700=cut 919=cut
701 920
702############################################################################# 921#############################################################################
703# object support 922# object support
923#
924
925sub _can_merge {
926 my ($ob1, $ob2) = @_;
927
928 local $Storable::canonical = 1;
929 my $fob1 = Storable::freeze $ob1;
930 my $fob2 = Storable::freeze $ob2;
931
932 $fob1 eq $fob2
933}
704 934
705sub reattach { 935sub reattach {
706 # basically do the same as instantiate, without calling instantiate 936 # basically do the same as instantiate, without calling instantiate
707 my ($obj) = @_; 937 my ($obj) = @_;
708 938
785 } 1015 }
786 } else { 1016 } else {
787 aio_unlink $filename; 1017 aio_unlink $filename;
788 aio_unlink "$filename.pst"; 1018 aio_unlink "$filename.pst";
789 } 1019 }
790
791 #d##TODO# nuke non .map-files if exist
792 if ($filename =~ s/\.map$//) {
793 aio_unlink $filename;
794 aio_unlink "$filename.pst";
795 }
796 } 1020 }
797} 1021}
798 1022
799sub object_freezer_as_string { 1023sub object_freezer_as_string {
800 my ($rdata, $objs) = @_; 1024 my ($rdata, $objs) = @_;
806 1030
807sub object_thawer_load { 1031sub object_thawer_load {
808 my ($filename) = @_; 1032 my ($filename) = @_;
809 1033
810 my ($data, $av); 1034 my ($data, $av);
811
812 #d#TODO remove .map if file does not exist
813 aio_stat $filename and $filename =~ s/\.map$//;
814 1035
815 (aio_load $filename, $data) >= 0 1036 (aio_load $filename, $data) >= 0
816 or return; 1037 or return;
817 1038
818 unless (aio_stat "$filename.pst") { 1039 unless (aio_stat "$filename.pst") {
820 or return; 1041 or return;
821 $av = eval { (Storable::thaw $av)->{objs} }; 1042 $av = eval { (Storable::thaw $av)->{objs} };
822 } 1043 }
823 1044
824 warn sprintf "loading %s (%d)\n", 1045 warn sprintf "loading %s (%d)\n",
825 $filename, length $data, scalar @{$av || []};#d# 1046 $filename, length $data, scalar @{$av || []};
826 return ($data, $av); 1047 return ($data, $av);
827} 1048}
1049
1050=head2 COMMAND CALLBACKS
1051
1052=over 4
1053
1054=cut
828 1055
829############################################################################# 1056#############################################################################
830# command handling &c 1057# command handling &c
831 1058
832=item cf::register_command $name => \&callback($ob,$args); 1059=item cf::register_command $name => \&callback($ob,$args);
845 push @{ $COMMAND{$name} }, [$caller, $cb]; 1072 push @{ $COMMAND{$name} }, [$caller, $cb];
846} 1073}
847 1074
848=item cf::register_extcmd $name => \&callback($pl,$packet); 1075=item cf::register_extcmd $name => \&callback($pl,$packet);
849 1076
850Register a callbackf ro execution when the client sends an extcmd packet. 1077Register a callback for execution when the client sends an (synchronous)
1078extcmd packet. Ext commands will be processed in the order they are
1079received by the server, like other user commands. The first argument is
1080the logged-in player. Ext commands can only be processed after a player
1081has logged in successfully.
851 1082
852If the callback returns something, it is sent back as if reply was being 1083If the callback returns something, it is sent back as if reply was being
853called. 1084called.
854 1085
1086=item cf::register_exticmd $name => \&callback($ns,$packet);
1087
1088Register a callback for execution when the client sends an (asynchronous)
1089exticmd packet. Exti commands are processed by the server as soon as they
1090are received, i.e. out of order w.r.t. other commands. The first argument
1091is a client socket. Exti commands can be received anytime, even before
1092log-in.
1093
1094If the callback returns something, it is sent back as if reply was being
1095called.
1096
855=cut 1097=cut
856 1098
857sub register_extcmd { 1099sub register_extcmd {
858 my ($name, $cb) = @_; 1100 my ($name, $cb) = @_;
859 1101
860 $EXTCMD{$name} = $cb; 1102 $EXTCMD{$name} = $cb;
1103}
1104
1105sub register_exticmd {
1106 my ($name, $cb) = @_;
1107
1108 $EXTICMD{$name} = $cb;
861} 1109}
862 1110
863cf::player->attach ( 1111cf::player->attach (
864 on_command => sub { 1112 on_command => sub {
865 my ($pl, $name, $params) = @_; 1113 my ($pl, $name, $params) = @_;
874 cf::override; 1122 cf::override;
875 }, 1123 },
876 on_extcmd => sub { 1124 on_extcmd => sub {
877 my ($pl, $buf) = @_; 1125 my ($pl, $buf) = @_;
878 1126
879 my $msg = eval { from_json $buf }; 1127 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
880 1128
881 if (ref $msg) { 1129 if (ref $msg) {
882 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1130 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
883 if (my %reply = $cb->($pl, $msg)) { 1131 if (my %reply = $cb->($pl, $msg)) {
884 $pl->ext_reply ($msg->{msgid}, %reply); 1132 $pl->ext_reply ($msg->{msgid}, %reply);
890 1138
891 cf::override; 1139 cf::override;
892 }, 1140 },
893); 1141);
894 1142
895sub load_extension {
896 my ($path) = @_;
897
898 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
899 my $base = $1;
900 my $pkg = $1;
901 $pkg =~ s/[^[:word:]]/_/g;
902 $pkg = "ext::$pkg";
903
904 warn "... loading '$path' into '$pkg'\n";
905
906 open my $fh, "<:utf8", $path
907 or die "$path: $!";
908
909 my $source =
910 "package $pkg; use strict; use utf8;\n"
911 . "#line 1 \"$path\"\n{\n"
912 . (do { local $/; <$fh> })
913 . "\n};\n1";
914
915 unless (eval $source) {
916 my $msg = $@ ? "$path: $@\n"
917 : "extension disabled.\n";
918 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
919 warn $@;
920 warn "mandatory extension failed to load, exiting.\n";
921 exit 1;
922 }
923 die $@;
924 }
925
926 push @EXTS, $pkg;
927}
928
929sub load_extensions { 1143sub load_extensions {
1144 cf::sync_job {
1145 my %todo;
1146
930 for my $ext (<$LIBDIR/*.ext>) { 1147 for my $path (<$LIBDIR/*.ext>) {
931 next unless -r $ext; 1148 next unless -r $path;
932 eval { 1149
933 load_extension $ext; 1150 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1151 my $base = $1;
1152 my $pkg = $1;
1153 $pkg =~ s/[^[:word:]]/_/g;
1154 $pkg = "ext::$pkg";
1155
1156 open my $fh, "<:utf8", $path
1157 or die "$path: $!";
1158
1159 my $source = do { local $/; <$fh> };
1160
1161 my %ext = (
1162 path => $path,
1163 base => $base,
1164 pkg => $pkg,
1165 );
1166
1167 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1168 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1169
1170 $ext{source} =
1171 "package $pkg; use strict; use utf8;\n"
1172 . "#line 1 \"$path\"\n{\n"
1173 . $source
1174 . "\n};\n1";
1175
1176 $todo{$base} = \%ext;
1177 }
1178
1179 my %done;
1180 while (%todo) {
1181 my $progress;
1182
1183 while (my ($k, $v) = each %todo) {
1184 for (split /,\s*/, $v->{meta}{depends}) {
1185 goto skip
1186 unless exists $done{$_};
1187 }
1188
1189 warn "... loading '$k' into '$v->{pkg}'\n";
1190
1191 unless (eval $v->{source}) {
1192 my $msg = $@ ? "$v->{path}: $@\n"
1193 : "$v->{base}: extension inactive.\n";
1194
1195 if (exists $v->{meta}{mandatory}) {
1196 warn $msg;
1197 warn "mandatory extension failed to load, exiting.\n";
1198 exit 1;
1199 }
1200
1201 warn $msg;
1202 }
1203
1204 $done{$k} = delete $todo{$k};
1205 push @EXTS, $v->{pkg};
1206 $progress = 1;
934 1 1207 }
935 } or warn "$ext not loaded: $@"; 1208
1209 skip:
1210 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1211 unless $progress;
1212 }
936 } 1213 };
937} 1214}
938 1215
939############################################################################# 1216#############################################################################
940 1217
1218=back
1219
941=head2 CORE EXTENSIONS 1220=head2 CORE EXTENSIONS
942 1221
943Functions and methods that extend core crossfire objects. 1222Functions and methods that extend core crossfire objects.
944 1223
945=cut 1224=cut
957Returns the given player object, loading it if necessary (might block). 1236Returns the given player object, loading it if necessary (might block).
958 1237
959=cut 1238=cut
960 1239
961sub playerdir($) { 1240sub playerdir($) {
962 cf::localdir 1241 "$PLAYERDIR/"
963 . "/"
964 . cf::playerdir
965 . "/"
966 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1242 . (ref $_[0] ? $_[0]->ob->name : $_[0])
967} 1243}
968 1244
969sub path($) { 1245sub path($) {
970 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1246 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
971 1247
972 (playerdir $login) . "/$login.pl" 1248 (playerdir $login) . "/playerdata"
973} 1249}
974 1250
975sub find_active($) { 1251sub find_active($) {
976 $cf::PLAYER{$_[0]} 1252 $cf::PLAYER{$_[0]}
977 and $cf::PLAYER{$_[0]}->active 1253 and $cf::PLAYER{$_[0]}->active
990 my $login = $_[0]; 1266 my $login = $_[0];
991 1267
992 my $guard = cf::lock_acquire "user_find:$login"; 1268 my $guard = cf::lock_acquire "user_find:$login";
993 1269
994 $cf::PLAYER{$_[0]} || do { 1270 $cf::PLAYER{$_[0]} || do {
1271 # rename old playerfiles to new ones
1272 #TODO: remove when no longer required
1273 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1274 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1275 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1276 aio_unlink +(playerdir $login) . "/$login.pl";
1277
995 my $pl = load_pl path $login 1278 my $pl = load_pl path $login
996 or return; 1279 or return;
997 $cf::PLAYER{$login} = $pl 1280 $cf::PLAYER{$login} = $pl
998 } 1281 }
999 } 1282 }
1036 1319
1037=cut 1320=cut
1038 1321
1039sub quit_character { 1322sub quit_character {
1040 my ($pl) = @_; 1323 my ($pl) = @_;
1324
1325 my $name = $pl->ob->name;
1041 1326
1042 $pl->{deny_save} = 1; 1327 $pl->{deny_save} = 1;
1043 $pl->password ("*"); # this should lock out the player until we nuked the dir 1328 $pl->password ("*"); # this should lock out the player until we nuked the dir
1044 1329
1045 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1330 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1050 my $path = playerdir $pl; 1335 my $path = playerdir $pl;
1051 my $temp = "$path~$cf::RUNTIME~deleting~"; 1336 my $temp = "$path~$cf::RUNTIME~deleting~";
1052 aio_rename $path, $temp; 1337 aio_rename $path, $temp;
1053 delete $cf::PLAYER{$pl->ob->name}; 1338 delete $cf::PLAYER{$pl->ob->name};
1054 $pl->destroy; 1339 $pl->destroy;
1340
1341 my $prefix = qr<^~\Q$name\E/>;
1342
1343 # nuke player maps
1344 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1345
1055 IO::AIO::aio_rmtree $temp; 1346 IO::AIO::aio_rmtree $temp;
1347}
1348
1349=item $pl->kick
1350
1351Kicks a player out of the game. This destroys the connection.
1352
1353=cut
1354
1355sub kick {
1356 my ($pl, $kicker) = @_;
1357
1358 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1359 $pl->killer ("kicked");
1360 $pl->ns->destroy;
1056} 1361}
1057 1362
1058=item cf::player::list_logins 1363=item cf::player::list_logins
1059 1364
1060Returns am arrayref of all valid playernames in the system, can take a 1365Returns am arrayref of all valid playernames in the system, can take a
1061while and may block, so not sync_job-capable, ever. 1366while and may block, so not sync_job-capable, ever.
1062 1367
1063=cut 1368=cut
1064 1369
1065sub list_logins { 1370sub list_logins {
1066 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1371 my $dirs = aio_readdir $PLAYERDIR
1067 or return []; 1372 or return [];
1068 1373
1069 my @logins; 1374 my @logins;
1070 1375
1071 for my $login (@$dirs) { 1376 for my $login (@$dirs) {
1106 } 1411 }
1107 1412
1108 \@paths 1413 \@paths
1109} 1414}
1110 1415
1416=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1417
1418Expand crossfire pod fragments into protocol xml.
1419
1420=cut
1421
1422sub expand_cfpod {
1423 ((my $self), (local $_)) = @_;
1424
1425 # escape & and <
1426 s/&/&amp;/g;
1427 s/(?<![BIUGH])</&lt;/g;
1428
1429 # this is buggy, it needs to properly take care of nested <'s
1430
1431 1 while
1432 # replace B<>, I<>, U<> etc.
1433 s/B<([^\>]*)>/<b>$1<\/b>/
1434 || s/I<([^\>]*)>/<i>$1<\/i>/
1435 || s/U<([^\>]*)>/<u>$1<\/u>/
1436 # replace G<male|female> tags
1437 || s{G<([^>|]*)\|([^>]*)>}{
1438 $self->gender ? $2 : $1
1439 }ge
1440 # replace H<hint text>
1441 || s{H<([^\>]*)>}
1442 {
1443 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1444 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1445 "")
1446 [$self->{hintmode}]
1447 }ge;
1448
1449 # create single paragraphs (very hackish)
1450 s/(?<=\S)\n(?=\w)/ /g;
1451
1452 # compress some whitespace
1453 s/\s+\n/\n/g; # ws line-ends
1454 s/\n\n+/\n/g; # double lines
1455 s/^\n+//; # beginning lines
1456 s/\n+$//; # ending lines
1457
1458 $_
1459}
1460
1461sub hintmode {
1462 $_[0]{hintmode} = $_[1] if @_ > 1;
1463 $_[0]{hintmode}
1464}
1465
1111=item $player->ext_reply ($msgid, $msgtype, %msg) 1466=item $player->ext_reply ($msgid, %msg)
1112 1467
1113Sends an ext reply to the player. 1468Sends an ext reply to the player.
1114 1469
1115=cut 1470=cut
1116 1471
1117sub ext_reply($$$%) { 1472sub ext_reply($$%) {
1118 my ($self, $id, %msg) = @_; 1473 my ($self, $id, %msg) = @_;
1119 1474
1120 $msg{msgid} = $id; 1475 $msg{msgid} = $id;
1121 1476 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1122 $self->send ("ext " . cf::to_json \%msg);
1123} 1477}
1124 1478
1125package cf; 1479=item $player->ext_event ($type, %msg)
1480
1481Sends an ext event to the client.
1482
1483=cut
1484
1485sub ext_event($$%) {
1486 my ($self, $type, %msg) = @_;
1487
1488 $self->ns->ext_event ($type, %msg);
1489}
1490
1491=head3 cf::region
1492
1493=over 4
1494
1495=cut
1496
1497package cf::region;
1498
1499=item cf::region::find_by_path $path
1500
1501Tries to decuce the likely region for a map knowing only its path.
1502
1503=cut
1504
1505sub find_by_path($) {
1506 my ($path) = @_;
1507
1508 my ($match, $specificity);
1509
1510 for my $region (list) {
1511 if ($region->{match} && $path =~ $region->{match}) {
1512 ($match, $specificity) = ($region, $region->specificity)
1513 if $region->specificity > $specificity;
1514 }
1515 }
1516
1517 $match
1518}
1126 1519
1127=back 1520=back
1128
1129 1521
1130=head3 cf::map 1522=head3 cf::map
1131 1523
1132=over 4 1524=over 4
1133 1525
1188 my ($self, $merge) = @_; 1580 my ($self, $merge) = @_;
1189 1581
1190 # we have to keep some variables in memory intact 1582 # we have to keep some variables in memory intact
1191 local $self->{path}; 1583 local $self->{path};
1192 local $self->{load_path}; 1584 local $self->{load_path};
1193 local $self->{deny_save};
1194 local $self->{deny_reset};
1195 1585
1196 $self->SUPER::thawer_merge ($merge); 1586 $self->SUPER::thawer_merge ($merge);
1197} 1587}
1198 1588
1199sub normalise { 1589sub normalise {
1246 $self->init; # pass $1 etc. 1636 $self->init; # pass $1 etc.
1247 return $self; 1637 return $self;
1248 } 1638 }
1249 } 1639 }
1250 1640
1251 Carp::carp "unable to resolve path '$path' (base '$base')."; 1641 Carp::cluck "unable to resolve path '$path' (base '$base').";
1252 () 1642 ()
1253} 1643}
1254 1644
1255sub init { 1645sub init {
1256 my ($self) = @_; 1646 my ($self) = @_;
1271 1661
1272# the original (read-only) location 1662# the original (read-only) location
1273sub load_path { 1663sub load_path {
1274 my ($self) = @_; 1664 my ($self) = @_;
1275 1665
1276 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1666 "$MAPDIR/$self->{path}.map"
1277} 1667}
1278 1668
1279# the temporary/swap location 1669# the temporary/swap location
1280sub save_path { 1670sub save_path {
1281 my ($self) = @_; 1671 my ($self) = @_;
1282 1672
1283 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1673 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1284 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1674 "$TMPDIR/$path.map"
1285} 1675}
1286 1676
1287# the unique path, undef == no special unique path 1677# the unique path, undef == no special unique path
1288sub uniq_path { 1678sub uniq_path {
1289 my ($self) = @_; 1679 my ($self) = @_;
1290 1680
1291 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1681 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1292 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1682 "$UNIQUEDIR/$path"
1293} 1683}
1294 1684
1295# and all this just because we cannot iterate over 1685# and all this just because we cannot iterate over
1296# all maps in C++... 1686# all maps in C++...
1297sub change_all_map_light { 1687sub change_all_map_light {
1299 1689
1300 $_->change_map_light ($change) 1690 $_->change_map_light ($change)
1301 for grep $_->outdoor, values %cf::MAP; 1691 for grep $_->outdoor, values %cf::MAP;
1302} 1692}
1303 1693
1694sub decay_objects {
1695 my ($self) = @_;
1696
1697 return if $self->{deny_reset};
1698
1699 $self->do_decay_objects;
1700}
1701
1304sub unlink_save { 1702sub unlink_save {
1305 my ($self) = @_; 1703 my ($self) = @_;
1306 1704
1307 utf8::encode (my $save = $self->save_path); 1705 utf8::encode (my $save = $self->save_path);
1308 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1706 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1707 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1310
1311 #d#TODO remove .map and also nuke
1312 $save =~ s/\.map// or return;#d#
1313 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1314 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1315} 1708}
1316 1709
1317sub load_header_from($) { 1710sub load_header_from($) {
1318 my ($self, $path) = @_; 1711 my ($self, $path) = @_;
1319 1712
1369 $self->load_header_orig 1762 $self->load_header_orig
1370 or return; 1763 or return;
1371 $self->prepare_orig; 1764 $self->prepare_orig;
1372 } 1765 }
1373 1766
1767 $self->{deny_reset} = 1
1768 if $self->no_reset;
1769
1770 $self->default_region (cf::region::find_by_path $self->{path})
1771 unless $self->default_region;
1772
1374 1 1773 1
1375} 1774}
1376 1775
1377sub find; 1776sub find;
1378sub find { 1777sub find {
1390 $map->{last_save} = $cf::RUNTIME; 1789 $map->{last_save} = $cf::RUNTIME;
1391 1790
1392 $map->load_header 1791 $map->load_header
1393 or return; 1792 or return;
1394 1793
1395 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1794 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1396 # doing this can freeze the server in a sync job, obviously 1795 # doing this can freeze the server in a sync job, obviously
1397 #$cf::WAIT_FOR_TICK->wait; 1796 #$cf::WAIT_FOR_TICK->wait;
1398 $map->reset; 1797 $map->reset;
1399 undef $guard; 1798 undef $guard;
1400 return find $path; 1799 return find $path;
1411 my ($self) = @_; 1810 my ($self) = @_;
1412 1811
1413 local $self->{deny_reset} = 1; # loading can take a long time 1812 local $self->{deny_reset} = 1; # loading can take a long time
1414 1813
1415 my $path = $self->{path}; 1814 my $path = $self->{path};
1815
1816 {
1416 my $guard = cf::lock_acquire "map_load:$path"; 1817 my $guard = cf::lock_acquire "map_load:$path";
1417 1818
1418 return if $self->in_memory != cf::MAP_SWAPPED; 1819 return if $self->in_memory != cf::MAP_SWAPPED;
1419 1820
1420 $self->in_memory (cf::MAP_LOADING); 1821 $self->in_memory (cf::MAP_LOADING);
1421 1822
1422 $self->alloc; 1823 $self->alloc;
1423 1824
1424 $self->pre_load; 1825 $self->pre_load;
1425
1426 $self->_load_objects ($self->{load_path}, 1)
1427 or return;
1428
1429 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1430 if delete $self->{load_original};
1431
1432 if (my $uniq = $self->uniq_path) {
1433 utf8::encode $uniq;
1434 if (aio_open $uniq, O_RDONLY, 0) {
1435 $self->clear_unique_items;
1436 $self->_load_objects ($uniq, 0);
1437 }
1438 }
1439
1440 Coro::cede;
1441
1442 # now do the right thing for maps
1443 $self->link_multipart_objects;
1444
1445 unless ($self->{deny_activate}) {
1446 $self->decay_objects;
1447 $self->fix_auto_apply;
1448 $self->update_buttons;
1449 Coro::cede; 1826 Coro::cede;
1450 $self->set_darkness_map; 1827
1828 $self->_load_objects ($self->{load_path}, 1)
1829 or return;
1830
1831 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1832 if delete $self->{load_original};
1833
1834 if (my $uniq = $self->uniq_path) {
1835 utf8::encode $uniq;
1836 if (aio_open $uniq, O_RDONLY, 0) {
1837 $self->clear_unique_items;
1838 $self->_load_objects ($uniq, 0);
1839 }
1840 }
1841
1842 Coro::cede;
1843 # now do the right thing for maps
1844 $self->link_multipart_objects;
1451 $self->difficulty ($self->estimate_difficulty) 1845 $self->difficulty ($self->estimate_difficulty)
1452 unless $self->difficulty; 1846 unless $self->difficulty;
1453 Coro::cede; 1847 Coro::cede;
1848
1849 unless ($self->{deny_activate}) {
1850 $self->decay_objects;
1851 $self->fix_auto_apply;
1852 $self->update_buttons;
1853 Coro::cede;
1854 $self->set_darkness_map;
1855 Coro::cede;
1454 $self->activate; 1856 $self->activate;
1857 }
1858
1859 $self->in_memory (cf::MAP_IN_MEMORY);
1455 } 1860 }
1456 1861
1457 $self->post_load; 1862 $self->post_load;
1458
1459 $self->in_memory (cf::MAP_IN_MEMORY);
1460} 1863}
1461 1864
1462sub customise_for { 1865sub customise_for {
1463 my ($self, $ob) = @_; 1866 my ($self, $ob) = @_;
1464 1867
1465 return find "~" . $ob->name . "/" . $self->{path} 1868 return find "~" . $ob->name . "/" . $self->{path}
1466 if $self->per_player; 1869 if $self->per_player;
1870
1871# return find "?party/" . $ob->name . "/" . $self->{path}
1872# if $self->per_party;
1467 1873
1468 $self 1874 $self
1469} 1875}
1470 1876
1471# find and load all maps in the 3x3 area around a map 1877# find and load all maps in the 3x3 area around a map
1518 1924
1519 undef $MAP_PREFETCH{$path}; 1925 undef $MAP_PREFETCH{$path};
1520 $MAP_PREFETCHER ||= cf::async { 1926 $MAP_PREFETCHER ||= cf::async {
1521 while (%MAP_PREFETCH) { 1927 while (%MAP_PREFETCH) {
1522 for my $path (keys %MAP_PREFETCH) { 1928 for my $path (keys %MAP_PREFETCH) {
1523 my $map = find $path 1929 if (my $map = find $path) {
1524 or next;
1525 $map->load; 1930 $map->load;
1931 }
1526 1932
1527 delete $MAP_PREFETCH{$path}; 1933 delete $MAP_PREFETCH{$path};
1528 } 1934 }
1529 } 1935 }
1530 undef $MAP_PREFETCHER; 1936 undef $MAP_PREFETCHER;
1582 1988
1583sub reset_at { 1989sub reset_at {
1584 my ($self) = @_; 1990 my ($self) = @_;
1585 1991
1586 # TODO: safety, remove and allow resettable per-player maps 1992 # TODO: safety, remove and allow resettable per-player maps
1587 return 1e99 if $self->isa ("ext::map_per_player");#d#
1588 return 1e99 if $self->{deny_reset}; 1993 return 1e99 if $self->{deny_reset};
1589 1994
1590 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1995 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1591 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1996 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1592 1997
1603 my ($self) = @_; 2008 my ($self) = @_;
1604 2009
1605 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2010 my $lock = cf::lock_acquire "map_data:$self->{path}";
1606 2011
1607 return if $self->players; 2012 return if $self->players;
1608 return if $self->isa ("ext::map_per_player");#d#
1609 2013
1610 warn "resetting map ", $self->path;#d# 2014 warn "resetting map ", $self->path;
1611 2015
1612 $self->in_memory (cf::MAP_SWAPPED); 2016 $self->in_memory (cf::MAP_SWAPPED);
1613 2017
1614 # need to save uniques path 2018 # need to save uniques path
1615 unless ($self->{deny_save}) { 2019 unless ($self->{deny_save}) {
1647 $cf::MAP{$self->path} = $self; 2051 $cf::MAP{$self->path} = $self;
1648 2052
1649 $self->reset; # polite request, might not happen 2053 $self->reset; # polite request, might not happen
1650} 2054}
1651 2055
2056=item $maps = cf::map::tmp_maps
2057
2058Returns an arrayref with all map paths of currently instantiated and saved
2059maps. May block.
2060
2061=cut
2062
2063sub tmp_maps() {
2064 [
2065 map {
2066 utf8::decode $_;
2067 /\.map$/
2068 ? normalise $_
2069 : ()
2070 } @{ aio_readdir $TMPDIR or [] }
2071 ]
2072}
2073
2074=item $maps = cf::map::random_maps
2075
2076Returns an arrayref with all map paths of currently instantiated and saved
2077random maps. May block.
2078
2079=cut
2080
2081sub random_maps() {
2082 [
2083 map {
2084 utf8::decode $_;
2085 /\.map$/
2086 ? normalise "?random/$_"
2087 : ()
2088 } @{ aio_readdir $RANDOMDIR or [] }
2089 ]
2090}
2091
1652=item cf::map::unique_maps 2092=item cf::map::unique_maps
1653 2093
1654Returns an arrayref of paths of all shared maps that have 2094Returns an arrayref of paths of all shared maps that have
1655instantiated unique items. May block. 2095instantiated unique items. May block.
1656 2096
1657=cut 2097=cut
1658 2098
1659sub unique_maps() { 2099sub unique_maps() {
1660 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2100 [
1661 or return; 2101 map {
1662
1663 my @paths;
1664
1665 for (@$files) {
1666 utf8::decode $_; 2102 utf8::decode $_;
1667 next if /\.pst$/; 2103 /\.map$/
1668 next unless /^$PATH_SEP/o; 2104 ? normalise $_
1669 2105 : ()
1670 push @paths, cf::map::normalise $_; 2106 } @{ aio_readdir $UNIQUEDIR or [] }
1671 } 2107 ]
1672
1673 \@paths
1674} 2108}
1675 2109
1676package cf; 2110package cf;
1677 2111
1678=back 2112=back
1724 2158
1725 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2159 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1726 2160
1727 if ($self->{record_replies}) { 2161 if ($self->{record_replies}) {
1728 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2162 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2163
1729 } else { 2164 } else {
2165 my $pl = $self->contr;
2166
2167 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2168 my $diag = $pl->{npc_dialog};
2169 $diag->{pl}->ext_reply (
2170 $diag->{id},
2171 msgtype => "reply",
2172 msg => $diag->{pl}->expand_cfpod ($msg),
2173 add_topics => []
2174 );
2175
2176 } else {
1730 $msg = $npc->name . " says: $msg" if $npc; 2177 $msg = $npc->name . " says: $msg" if $npc;
1731 $self->message ($msg, $flags); 2178 $self->message ($msg, $flags);
2179 }
1732 } 2180 }
1733} 2181}
1734 2182
1735=item $player_object->may ("access") 2183=item $player_object->may ("access")
1736 2184
1784 $self->deactivate_recursive; 2232 $self->deactivate_recursive;
1785 2233
1786 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2234 return if UNIVERSAL::isa $self->map, "ext::map_link";
1787 2235
1788 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2236 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1789 if $self->map; 2237 if $self->map && $self->map->{path} ne "{link}";
1790 2238
1791 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2239 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1792} 2240}
1793 2241
1794sub cf::object::player::leave_link { 2242sub cf::object::player::leave_link {
1795 my ($self, $map, $x, $y) = @_; 2243 my ($self, $map, $x, $y) = @_;
2244
2245 return unless $self->contr->active;
1796 2246
1797 my $link_pos = delete $self->{_link_pos}; 2247 my $link_pos = delete $self->{_link_pos};
1798 2248
1799 unless ($map) { 2249 unless ($map) {
1800 # restore original map position 2250 # restore original map position
1818 $map->load; 2268 $map->load;
1819 $map->load_diag; 2269 $map->load_diag;
1820 2270
1821 return unless $self->contr->active; 2271 return unless $self->contr->active;
1822 $self->activate_recursive; 2272 $self->activate_recursive;
2273
2274 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1823 $self->enter_map ($map, $x, $y); 2275 $self->enter_map ($map, $x, $y);
1824} 2276}
1825 2277
1826cf::player->attach ( 2278=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1827 on_logout => sub {
1828 my ($pl) = @_;
1829 2279
1830 # abort map switching before logout 2280Moves the player to the given map-path and coordinates by first freezing
1831 if ($pl->ob->{_link_pos}) { 2281her, loading and preparing them map, calling the provided $check callback
1832 cf::sync_job { 2282that has to return the map if sucecssful, and then unfreezes the player on
1833 $pl->ob->leave_link 2283the new (success) or old (failed) map position. In either case, $done will
1834 }; 2284be called at the end of this process.
1835 }
1836 },
1837 on_login => sub {
1838 my ($pl) = @_;
1839 2285
1840 # try to abort aborted map switching on player login :)
1841 # should happen only on crashes
1842 if ($pl->ob->{_link_pos}) {
1843 $pl->ob->enter_link;
1844 (async {
1845 # we need this sleep as the login has a concurrent enter_exit running
1846 # and this sleep increases chances of the player not ending up in scorn
1847 $pl->ob->reply (undef,
1848 "There was an internal problem at your last logout, "
1849 . "the server will try to bring you to your intended destination in a second.",
1850 cf::NDI_RED);
1851 Coro::Timer::sleep 1;
1852 $pl->ob->leave_link;
1853 })->prio (2);
1854 }
1855 },
1856);
1857
1858=item $player_object->goto ($path, $x, $y)
1859
1860=cut 2286=cut
2287
2288our $GOTOGEN;
1861 2289
1862sub cf::object::player::goto { 2290sub cf::object::player::goto {
1863 my ($self, $path, $x, $y) = @_; 2291 my ($self, $path, $x, $y, $check, $done) = @_;
2292
2293 # do generation counting so two concurrent goto's will be executed in-order
2294 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1864 2295
1865 $self->enter_link; 2296 $self->enter_link;
1866 2297
1867 (async { 2298 (async {
1868 my $map = eval { 2299 my $map = eval {
1869 my $map = cf::map::find $path; 2300 my $map = cf::map::find $path;
2301
2302 if ($map) {
1870 $map = $map->customise_for ($self) if $map; 2303 $map = $map->customise_for ($self);
2304 $map = $check->($map) if $check && $map;
2305 } else {
2306 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2307 }
2308
1871 $map 2309 $map
2310 };
2311
2312 if ($@) {
2313 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2314 LOG llevError | logBacktrace, Carp::longmess $@;
1872 } or 2315 }
1873 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1874 2316
2317 if ($gen == $self->{_goto_generation}) {
2318 delete $self->{_goto_generation};
1875 $self->leave_link ($map, $x, $y); 2319 $self->leave_link ($map, $x, $y);
2320 }
2321
2322 $done->() if $done;
1876 })->prio (1); 2323 })->prio (1);
1877} 2324}
1878 2325
1879=item $player_object->enter_exit ($exit_object) 2326=item $player_object->enter_exit ($exit_object)
1880 2327
1919 2366
1920 $rmp->{random_seed} ||= $exit->random_seed; 2367 $rmp->{random_seed} ||= $exit->random_seed;
1921 2368
1922 my $data = cf::to_json $rmp; 2369 my $data = cf::to_json $rmp;
1923 my $md5 = Digest::MD5::md5_hex $data; 2370 my $md5 = Digest::MD5::md5_hex $data;
1924 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2371 my $meta = "$RANDOMDIR/$md5.meta";
1925 2372
1926 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2373 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1927 aio_write $fh, 0, (length $data), $data, 0; 2374 aio_write $fh, 0, (length $data), $data, 0;
1928 undef $fh; 2375 undef $fh;
1929 aio_rename "$meta~", $meta; 2376 aio_rename "$meta~", $meta;
1938 2385
1939 return unless $self->type == cf::PLAYER; 2386 return unless $self->type == cf::PLAYER;
1940 2387
1941 if ($exit->slaying eq "/!") { 2388 if ($exit->slaying eq "/!") {
1942 #TODO: this should de-fi-ni-te-ly not be a sync-job 2389 #TODO: this should de-fi-ni-te-ly not be a sync-job
2390 # the problem is that $exit might not survive long enough
2391 # so it needs to be done right now, right here
1943 cf::sync_job { prepare_random_map $exit }; 2392 cf::sync_job { prepare_random_map $exit };
1944 } 2393 }
1945 2394
1946 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2395 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1947 my $hp = $exit->stats->hp; 2396 my $hp = $exit->stats->hp;
1948 my $sp = $exit->stats->sp; 2397 my $sp = $exit->stats->sp;
1949 2398
1950 $self->enter_link; 2399 $self->enter_link;
2400
2401 # if exit is damned, update players death & WoR home-position
2402 $self->contr->savebed ($slaying, $hp, $sp)
2403 if $exit->flag (FLAG_DAMNED);
1951 2404
1952 (async { 2405 (async {
1953 $self->deactivate_recursive; # just to be sure 2406 $self->deactivate_recursive; # just to be sure
1954 unless (eval { 2407 unless (eval {
1955 $self->goto ($slaying, $hp, $sp); 2408 $self->goto ($slaying, $hp, $sp);
1956 2409
1957 1; 2410 1;
1958 }) { 2411 }) {
1959 $self->message ("Something went wrong deep within the crossfire server. " 2412 $self->message ("Something went wrong deep within the crossfire server. "
1960 . "I'll try to bring you back to the map you were before. " 2413 . "I'll try to bring you back to the map you were before. "
1961 . "Please report this to the dungeon master!", 2414 . "Please report this to the dungeon master!",
1962 cf::NDI_UNIQUE | cf::NDI_RED); 2415 cf::NDI_UNIQUE | cf::NDI_RED);
1963 2416
1964 warn "ERROR in enter_exit: $@"; 2417 warn "ERROR in enter_exit: $@";
1965 $self->leave_link; 2418 $self->leave_link;
1966 } 2419 }
1967 })->prio (1); 2420 })->prio (1);
1980 2433
1981sub cf::client::send_drawinfo { 2434sub cf::client::send_drawinfo {
1982 my ($self, $text, $flags) = @_; 2435 my ($self, $text, $flags) = @_;
1983 2436
1984 utf8::encode $text; 2437 utf8::encode $text;
1985 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2438 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1986} 2439}
1987 2440
2441=item $client->send_msg ($channel, $msg, $color, [extra...])
2442
2443Send a drawinfo or msg packet to the client, formatting the msg for the
2444client if neccessary. C<$type> should be a string identifying the type of
2445the message, with C<log> being the default. If C<$color> is negative, suppress
2446the message unless the client supports the msg packet.
2447
2448=cut
2449
2450sub cf::client::send_msg {
2451 my ($self, $channel, $msg, $color, @extra) = @_;
2452
2453 $msg = $self->pl->expand_cfpod ($msg);
2454
2455 return unless @extra || length $msg;
2456
2457 $color &= ~cf::NDI_UNIQUE; # just in case...
2458
2459 if (ref $channel) {
2460 # send meta info to client, if not yet sent
2461 unless (exists $self->{channel}{$channel->{id}}) {
2462 $self->{channel}{$channel->{id}} = $channel;
2463 $self->ext_event (channel_info => %$channel);
2464 }
2465
2466 $channel = $channel->{id};
2467 }
2468
2469 if ($self->can_msg) {
2470 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra]));
2471 } else {
2472 # replace some tags by gcfclient-compatible ones
2473 for ($msg) {
2474 1 while
2475 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2476 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2477 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2478 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2479 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2480 }
2481
2482 if ($color >= 0) {
2483 if (0 && $msg =~ /\[/) {
2484 $self->send_packet ("drawextinfo $color 4 0 $msg")
2485 } else {
2486 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2487 $self->send_packet ("drawinfo $color $msg")
2488 }
2489 }
2490 }
2491}
2492
2493=item $client->ext_event ($type, %msg)
2494
2495Sends an ext event to the client.
2496
2497=cut
2498
2499sub cf::client::ext_event($$%) {
2500 my ($self, $type, %msg) = @_;
2501
2502 return unless $self->extcmd;
2503
2504 $msg{msgtype} = "event_$type";
2505 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2506}
1988 2507
1989=item $success = $client->query ($flags, "text", \&cb) 2508=item $success = $client->query ($flags, "text", \&cb)
1990 2509
1991Queues a query to the client, calling the given callback with 2510Queues a query to the client, calling the given callback with
1992the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2511the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1993C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2512C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1994 2513
1995Queries can fail, so check the return code. Or don't, as queries will become 2514Queries can fail, so check the return code. Or don't, as queries will
1996reliable at some point in the future. 2515become reliable at some point in the future.
1997 2516
1998=cut 2517=cut
1999 2518
2000sub cf::client::query { 2519sub cf::client::query {
2001 my ($self, $flags, $text, $cb) = @_; 2520 my ($self, $flags, $text, $cb) = @_;
2009 utf8::encode $text; 2528 utf8::encode $text;
2010 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2529 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2011 2530
2012 $self->send_packet ($self->{query_queue}[0][0]) 2531 $self->send_packet ($self->{query_queue}[0][0])
2013 if @{ $self->{query_queue} } == 1; 2532 if @{ $self->{query_queue} } == 1;
2533
2534 1
2014} 2535}
2015 2536
2016cf::client->attach ( 2537cf::client->attach (
2538 on_connect => sub {
2539 my ($ns) = @_;
2540
2541 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2542 },
2017 on_reply => sub { 2543 on_reply => sub {
2018 my ($ns, $msg) = @_; 2544 my ($ns, $msg) = @_;
2019 2545
2020 # this weird shuffling is so that direct followup queries 2546 # this weird shuffling is so that direct followup queries
2021 # get handled first 2547 # get handled first
2033 } else { 2559 } else {
2034 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2560 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2035 } 2561 }
2036 } 2562 }
2037 }, 2563 },
2564 on_exticmd => sub {
2565 my ($ns, $buf) = @_;
2566
2567 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2568
2569 if (ref $msg) {
2570 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2571 if (my %reply = $cb->($ns, $msg)) {
2572 $reply{msgid} = $msg->{msgid};
2573 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2574 }
2575 }
2576 } else {
2577 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2578 }
2579
2580 cf::override;
2581 },
2038); 2582);
2039 2583
2040=item $client->async (\&cb) 2584=item $client->async (\&cb)
2041 2585
2042Create a new coroutine, running the specified callback. The coroutine will 2586Create a new coroutine, running the specified callback. The coroutine will
2089 2633
2090# here we export the classes and methods available to script code 2634# here we export the classes and methods available to script code
2091 2635
2092=pod 2636=pod
2093 2637
2094The following fucntions and emthods are available within a safe environment: 2638The following functions and methods are available within a safe environment:
2095 2639
2096 cf::object contr pay_amount pay_player map 2640 cf::object
2641 contr pay_amount pay_player map x y force_find force_add
2642 insert remove
2643
2097 cf::object::player player 2644 cf::object::player
2098 cf::player peaceful 2645 player
2099 cf::map trigger 2646
2647 cf::player
2648 peaceful
2649
2650 cf::map
2651 trigger
2100 2652
2101=cut 2653=cut
2102 2654
2103for ( 2655for (
2104 ["cf::object" => qw(contr pay_amount pay_player map)], 2656 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2657 insert remove)],
2105 ["cf::object::player" => qw(player)], 2658 ["cf::object::player" => qw(player)],
2106 ["cf::player" => qw(peaceful)], 2659 ["cf::player" => qw(peaceful)],
2107 ["cf::map" => qw(trigger)], 2660 ["cf::map" => qw(trigger)],
2108) { 2661) {
2109 no strict 'refs'; 2662 no strict 'refs';
2180=back 2733=back
2181 2734
2182=cut 2735=cut
2183 2736
2184############################################################################# 2737#############################################################################
2185
2186=head2 EXTENSION DATABASE SUPPORT
2187
2188Crossfire maintains a very simple database for extension use. It can
2189currently store anything that can be serialised using Storable, which
2190excludes objects.
2191
2192The parameter C<$family> should best start with the name of the extension
2193using it, it should be unique.
2194
2195=over 4
2196
2197=item $value = cf::db_get $family => $key
2198
2199Returns a single value from the database.
2200
2201=item cf::db_put $family => $key => $value
2202
2203Stores the given C<$value> in the family.
2204
2205=cut
2206
2207our $DB;
2208
2209sub db_init {
2210 unless ($DB) {
2211 $DB = BDB::db_create $DB_ENV;
2212
2213 cf::sync_job {
2214 eval {
2215 $DB->set_flags (BDB::CHKSUM);
2216
2217 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2218 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2219 cf::cleanup "db_open(db): $!" if $!;
2220 };
2221 cf::cleanup "db_open(db): $@" if $@;
2222 };
2223
2224 my $path = cf::localdir . "/database.pst";
2225 if (stat $path) {
2226 cf::sync_job {
2227 my $pst = Storable::retrieve $path;
2228
2229 cf::db_put (board => data => $pst->{board});
2230 cf::db_put (guildrules => data => $pst->{guildrules});
2231 cf::db_put (rent => balance => $pst->{rent}{balance});
2232 BDB::db_env_txn_checkpoint $DB_ENV;
2233
2234 unlink $path;
2235 };
2236 }
2237 }
2238}
2239
2240sub db_get($$) {
2241 my $key = "$_[0]/$_[1]";
2242
2243 cf::sync_job {
2244 BDB::db_get $DB, undef, $key, my $data;
2245
2246 $! ? ()
2247 : Compress::LZF::sthaw $data
2248 }
2249}
2250
2251sub db_put($$$) {
2252 BDB::dbreq_pri 4;
2253 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2254}
2255
2256#############################################################################
2257# the server's init and main functions 2738# the server's init and main functions
2258 2739
2259sub load_resources { 2740sub load_facedata($) {
2260 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2741 my ($path) = @_;
2742
2743 warn "loading facedata from $path\n";
2744
2745 my $facedata;
2746 0 < aio_load $path, $facedata
2747 or die "$path: $!";
2748
2749 $facedata = Coro::Storable::thaw $facedata;
2750
2751 $facedata->{version} == 2
2752 or cf::cleanup "$path: version mismatch, cannot proceed.";
2753
2754 {
2755 my $faces = $facedata->{faceinfo};
2756
2757 while (my ($face, $info) = each %$faces) {
2758 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2759 cf::face::set_visibility $idx, $info->{visibility};
2760 cf::face::set_magicmap $idx, $info->{magicmap};
2761 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2762 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2763
2764 cf::cede_to_tick;
2765 }
2766
2767 while (my ($face, $info) = each %$faces) {
2768 next unless $info->{smooth};
2769 my $idx = cf::face::find $face
2770 or next;
2771 if (my $smooth = cf::face::find $info->{smooth}) {
2772 cf::face::set_smooth $idx, $smooth;
2773 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2774 } else {
2775 warn "smooth face '$info->{smooth}' not found for face '$face'";
2776 }
2777
2778 cf::cede_to_tick;
2779 }
2780 }
2781
2782 {
2783 my $anims = $facedata->{animinfo};
2784
2785 while (my ($anim, $info) = each %$anims) {
2786 cf::anim::set $anim, $info->{frames}, $info->{facings};
2787 cf::cede_to_tick;
2788 }
2789
2790 cf::anim::invalidate_all; # d'oh
2791 }
2792
2793 {
2794 # TODO: for gcfclient pleasure, we should give resources
2795 # that gcfclient doesn't grok a >10000 face index.
2796 my $res = $facedata->{resource};
2797 my $enc = JSON::XS->new->utf8->canonical;
2798
2799 while (my ($name, $info) = each %$res) {
2800 my $meta = $enc->encode ({
2801 name => $name,
2802 type => $info->{type},
2803 copyright => $info->{copyright}, #TODO#
2804 });
2805
2806 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2807
2808 if ($name =~ /\.jpg$/) {
2809 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2810 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2811 } else {
2812 my $data = pack "(w/a*)*", $meta, $info->{data};
2813 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2814
2815 cf::face::set_type $idx, 1;
2816 cf::face::set_data $idx, 0, $data, $chk;
2817 }
2818
2819 cf::cede_to_tick;
2820 }
2821 }
2822
2823 1
2824}
2825
2826sub reload_regions {
2827 load_resource_file "$MAPDIR/regions"
2261 or die "unable to load regions file\n";#d# 2828 or die "unable to load regions file\n";
2829
2830 for (cf::region::list) {
2831 $_->{match} = qr/$_->{match}/
2832 if exists $_->{match};
2833 }
2834}
2835
2836sub reload_facedata {
2837 load_facedata "$DATADIR/facedata"
2838 or die "unable to load facedata\n";
2839}
2840
2841sub reload_archetypes {
2842 load_resource_file "$DATADIR/archetypes"
2843 or die "unable to load archetypes\n";
2844 #d# NEED to laod twice to resolve forward references
2845 # this really needs to be done in an extra post-pass
2846 # (which needs to be synchronous, so solve it differently)
2847 load_resource_file "$DATADIR/archetypes"
2848 or die "unable to load archetypes\n";
2849}
2850
2851sub reload_treasures {
2852 load_resource_file "$DATADIR/treasures"
2853 or die "unable to load treasurelists\n";
2854}
2855
2856sub reload_resources {
2857 warn "reloading resource files...\n";
2858
2859 reload_regions;
2860 reload_facedata;
2861 #reload_archetypes;#d#
2862 reload_archetypes;
2863 reload_treasures;
2864
2865 warn "finished reloading resource files\n";
2866}
2867
2868sub init {
2869 reload_resources;
2262} 2870}
2263 2871
2264sub cfg_load { 2872sub cfg_load {
2265 open my $fh, "<:utf8", cf::confdir . "/config" 2873 open my $fh, "<:utf8", "$CONFDIR/config"
2266 or return; 2874 or return;
2267 2875
2268 local $/; 2876 local $/;
2269 *CFG = YAML::Syck::Load <$fh>; 2877 *CFG = YAML::Syck::Load <$fh>;
2270 2878
2278 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2886 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2279 and die "WARNING: m(un)lockall failed: $!\n"; 2887 and die "WARNING: m(un)lockall failed: $!\n";
2280 }; 2888 };
2281 warn $@ if $@; 2889 warn $@ if $@;
2282 } 2890 }
2283}
2284
2285sub init {
2286 load_resources;
2287} 2891}
2288 2892
2289sub main { 2893sub main {
2290 # we must not ever block the main coroutine 2894 # we must not ever block the main coroutine
2291 local $Coro::idle = sub { 2895 local $Coro::idle = sub {
2319 }, 2923 },
2320 ); 2924 );
2321 } 2925 }
2322} 2926}
2323 2927
2928sub write_runtime {
2929 my $runtime = "$LOCALDIR/runtime";
2930
2931 # first touch the runtime file to show we are still running:
2932 # the fsync below can take a very very long time.
2933
2934 IO::AIO::aio_utime $runtime, undef, undef;
2935
2936 my $guard = cf::lock_acquire "write_runtime";
2937
2938 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2939 or return;
2940
2941 my $value = $cf::RUNTIME + 90 + 10;
2942 # 10 is the runtime save interval, for a monotonic clock
2943 # 60 allows for the watchdog to kill the server.
2944
2945 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2946 and return;
2947
2948 # always fsync - this file is important
2949 aio_fsync $fh
2950 and return;
2951
2952 # touch it again to show we are up-to-date
2953 aio_utime $fh, undef, undef;
2954
2955 close $fh
2956 or return;
2957
2958 aio_rename "$runtime~", $runtime
2959 and return;
2960
2961 warn "runtime file written.\n";
2962
2963 1
2964}
2965
2324sub emergency_save() { 2966sub emergency_save() {
2325 my $freeze_guard = cf::freeze_mainloop; 2967 my $freeze_guard = cf::freeze_mainloop;
2326 2968
2327 warn "enter emergency perl save\n"; 2969 warn "enter emergency perl save\n";
2328 2970
2359 3001
2360 warn Carp::longmess "post_cleanup backtrace" 3002 warn Carp::longmess "post_cleanup backtrace"
2361 if $make_core; 3003 if $make_core;
2362} 3004}
2363 3005
2364sub reload() { 3006sub do_reload_perl() {
2365 # can/must only be called in main 3007 # can/must only be called in main
2366 if ($Coro::current != $Coro::main) { 3008 if ($Coro::current != $Coro::main) {
2367 warn "can only reload from main coroutine"; 3009 warn "can only reload from main coroutine";
2368 return; 3010 return;
2369 } 3011 }
2394 Coro::cede; 3036 Coro::cede;
2395 last unless IO::AIO::nreqs || BDB::nreqs; 3037 last unless IO::AIO::nreqs || BDB::nreqs;
2396 warn "iterate..."; 3038 warn "iterate...";
2397 } 3039 }
2398 3040
3041 ++$RELOAD;
3042
2399 warn "cancelling all extension coros"; 3043 warn "cancelling all extension coros";
2400 $_->cancel for values %EXT_CORO; 3044 $_->cancel for values %EXT_CORO;
2401 %EXT_CORO = (); 3045 %EXT_CORO = ();
2402 3046
2403 warn "removing commands"; 3047 warn "removing commands";
2404 %COMMAND = (); 3048 %COMMAND = ();
2405 3049
2406 warn "removing ext commands"; 3050 warn "removing ext/exti commands";
2407 %EXTCMD = (); 3051 %EXTCMD = ();
3052 %EXTICMD = ();
2408 3053
2409 warn "unloading/nuking all extensions"; 3054 warn "unloading/nuking all extensions";
2410 for my $pkg (@EXTS) { 3055 for my $pkg (@EXTS) {
2411 warn "... unloading $pkg"; 3056 warn "... unloading $pkg";
2412 3057
2442 Symbol::delete_package "safe::$_" 3087 Symbol::delete_package "safe::$_"
2443 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3088 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2444 3089
2445 warn "unloading cf.pm \"a bit\""; 3090 warn "unloading cf.pm \"a bit\"";
2446 delete $INC{"cf.pm"}; 3091 delete $INC{"cf.pm"};
3092 delete $INC{"cf/pod.pm"};
2447 3093
2448 # don't, removes xs symbols, too, 3094 # don't, removes xs symbols, too,
2449 # and global variables created in xs 3095 # and global variables created in xs
2450 #Symbol::delete_package __PACKAGE__; 3096 #Symbol::delete_package __PACKAGE__;
2451 3097
2460 3106
2461 warn "loading extensions"; 3107 warn "loading extensions";
2462 cf::load_extensions; 3108 cf::load_extensions;
2463 3109
2464 warn "reattaching attachments to objects/players"; 3110 warn "reattaching attachments to objects/players";
2465 _global_reattach; 3111 _global_reattach; # objects, sockets
2466 warn "reattaching attachments to maps"; 3112 warn "reattaching attachments to maps";
2467 reattach $_ for values %MAP; 3113 reattach $_ for values %MAP;
2468 3114 warn "reattaching attachments to players";
2469 warn "loading reloadable resources"; 3115 reattach $_ for values %PLAYER;
2470 load_resources;
2471 3116
2472 warn "leaving sync_job"; 3117 warn "leaving sync_job";
2473 3118
2474 1 3119 1
2475 } or do { 3120 } or do {
2481 warn "reloaded"; 3126 warn "reloaded";
2482}; 3127};
2483 3128
2484our $RELOAD_WATCHER; # used only during reload 3129our $RELOAD_WATCHER; # used only during reload
2485 3130
3131sub reload_perl() {
3132 # doing reload synchronously and two reloads happen back-to-back,
3133 # coro crashes during coro_state_free->destroy here.
3134
3135 $RELOAD_WATCHER ||= Event->timer (
3136 reentrant => 0,
3137 after => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => sub {
3140 do_reload_perl;
3141 undef $RELOAD_WATCHER;
3142 },
3143 );
3144}
3145
2486register_command "reload" => sub { 3146register_command "reload" => sub {
2487 my ($who, $arg) = @_; 3147 my ($who, $arg) = @_;
2488 3148
2489 if ($who->flag (FLAG_WIZ)) { 3149 if ($who->flag (FLAG_WIZ)) {
2490 $who->message ("reloading server."); 3150 $who->message ("reloading server.");
2491 3151 async { reload_perl };
2492 # doing reload synchronously and two reloads happen back-to-back,
2493 # coro crashes during coro_state_free->destroy here.
2494
2495 $RELOAD_WATCHER ||= Event->timer (
2496 reentrant => 0,
2497 after => 0,
2498 data => WF_AUTOCANCEL,
2499 cb => sub {
2500 reload;
2501 undef $RELOAD_WATCHER;
2502 },
2503 );
2504 } 3152 }
2505}; 3153};
2506 3154
2507unshift @INC, $LIBDIR; 3155unshift @INC, $LIBDIR;
2508 3156
2509my $bug_warning = 0; 3157my $bug_warning = 0;
2510 3158
3159our @WAIT_FOR_TICK;
3160our @WAIT_FOR_TICK_BEGIN;
3161
3162sub wait_for_tick {
3163 return unless $TICK_WATCHER->is_active;
3164 return if $Coro::current == $Coro::main;
3165
3166 my $signal = new Coro::Signal;
3167 push @WAIT_FOR_TICK, $signal;
3168 $signal->wait;
3169}
3170
3171sub wait_for_tick_begin {
3172 return unless $TICK_WATCHER->is_active;
3173 return if $Coro::current == $Coro::main;
3174
3175 my $signal = new Coro::Signal;
3176 push @WAIT_FOR_TICK_BEGIN, $signal;
3177 $signal->wait;
3178}
3179
3180 my $min = 1e6;#d#
3181 my $avg = 10;
2511$TICK_WATCHER = Event->timer ( 3182$TICK_WATCHER = Event->timer (
2512 reentrant => 0, 3183 reentrant => 0,
2513 parked => 1, 3184 parked => 1,
2514 prio => 0, 3185 prio => 0,
2515 at => $NEXT_TICK || $TICK, 3186 at => $NEXT_TICK || $TICK,
2519 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3190 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2520 unless ++$bug_warning > 10; 3191 unless ++$bug_warning > 10;
2521 return; 3192 return;
2522 } 3193 }
2523 3194
2524 $NOW = Event::time; 3195 $NOW = $tick_start = Event::time;
2525 3196
2526 cf::server_tick; # one server iteration 3197 cf::server_tick; # one server iteration
3198
3199 0 && sync_job {#d#
3200 for(1..10) {
3201 my $t = Event::time;
3202 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3203 or die;
3204
3205 $map->width (50);
3206 $map->height (50);
3207 $map->alloc;
3208 $map->_load_objects ("/tmp/x.map", 1);
3209 my $t = Event::time - $t;
3210
3211 #next unless $t < 0.0013;#d#
3212 if ($t < $min) {
3213 $min = $t;
3214 }
3215 $avg = $avg * 0.99 + $t * 0.01;
3216 }
3217 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3218 exit 0;
3219 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3220 };
3221
2527 $RUNTIME += $TICK; 3222 $RUNTIME += $TICK;
2528 $NEXT_TICK += $TICK; 3223 $NEXT_TICK += $TICK;
2529 3224
2530 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3225 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2531 $NEXT_RUNTIME_WRITE = $NOW + 10; 3226 $NEXT_RUNTIME_WRITE = $NOW + 10;
2533 write_runtime 3228 write_runtime
2534 or warn "ERROR: unable to write runtime file: $!"; 3229 or warn "ERROR: unable to write runtime file: $!";
2535 }; 3230 };
2536 } 3231 }
2537 3232
2538
2539 $WAIT_FOR_TICK->broadcast;
2540 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2541
2542# my $AFTER = Event::time; 3233# my $AFTER = Event::time;
2543# warn $AFTER - $NOW;#d# 3234# warn $AFTER - $NOW;#d#
2544 3235
3236 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3237 $sig->send;
3238 }
3239 while (my $sig = shift @WAIT_FOR_TICK) {
3240 $sig->send;
3241 }
3242
3243 $NOW = Event::time;
3244
2545 # if we are delayed by four ticks or more, skip them all 3245 # if we are delayed by four ticks or more, skip them all
2546 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3246 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2547 3247
2548 $TICK_WATCHER->at ($NEXT_TICK); 3248 $TICK_WATCHER->at ($NEXT_TICK);
2549 $TICK_WATCHER->start; 3249 $TICK_WATCHER->start;
3250
3251 $LOAD = ($NOW - $tick_start) / $TICK;
3252 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3253
3254 _post_tick;
3255
3256
2550 }, 3257 },
2551); 3258);
2552 3259
2553{ 3260{
2554 BDB::max_poll_time $TICK * 0.1; 3261 BDB::max_poll_time $TICK * 0.1;
2582 3289
2583 cf::sync_job { 3290 cf::sync_job {
2584 eval { 3291 eval {
2585 BDB::db_env_open 3292 BDB::db_env_open
2586 $DB_ENV, 3293 $DB_ENV,
2587 $BDB_ENV_DIR, 3294 $BDBDIR,
2588 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3295 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2589 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3296 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2590 0666; 3297 0666;
2591 3298
2592 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3299 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2593 3300
2594 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1); 3301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2595 $DB_ENV->set_lk_detect; 3302 $DB_ENV->set_lk_detect;
2596 }; 3303 };
2597 3304
2613 prio => 6, 3320 prio => 6,
2614 cb => \&IO::AIO::poll_cb, 3321 cb => \&IO::AIO::poll_cb,
2615 ); 3322 );
2616} 3323}
2617 3324
3325my $_log_backtrace;
3326
3327sub _log_backtrace {
3328 my ($msg, @addr) = @_;
3329
3330 $msg =~ s/\n//;
3331
3332 # limit the # of concurrent backtraces
3333 if ($_log_backtrace < 2) {
3334 ++$_log_backtrace;
3335 async {
3336 my @bt = fork_call {
3337 @addr = map { sprintf "%x", $_ } @addr;
3338 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3339 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3340 or die "addr2line: $!";
3341
3342 my @funcs;
3343 my @res = <$fh>;
3344 chomp for @res;
3345 while (@res) {
3346 my ($func, $line) = splice @res, 0, 2, ();
3347 push @funcs, "[$func] $line";
3348 }
3349
3350 @funcs
3351 };
3352
3353 LOG llevInfo, "[ABT] $msg\n";
3354 LOG llevInfo, "[ABT] $_\n" for @bt;
3355 --$_log_backtrace;
3356 };
3357 } else {
3358 LOG llevInfo, "[ABT] $msg\n";
3359 LOG llevInfo, "[ABT] [suppressed]\n";
3360 }
3361}
3362
3363# load additional modules
3364use cf::pod;
3365
2618END { cf::emergency_save } 3366END { cf::emergency_save }
2619 3367
26201 33681
2621 3369

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines