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.198 by root, Sun Jan 28 01:58:37 2007 UTC vs.
Revision 1.294 by root, Tue Jul 3 06:00:48 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->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) = @_;
854 cf::override; 1086 cf::override;
855 }, 1087 },
856 on_extcmd => sub { 1088 on_extcmd => sub {
857 my ($pl, $buf) = @_; 1089 my ($pl, $buf) = @_;
858 1090
859 my $msg = eval { from_json $buf }; 1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
860 1092
861 if (ref $msg) { 1093 if (ref $msg) {
862 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
863 if (my %reply = $cb->($pl, $msg)) { 1095 if (my %reply = $cb->($pl, $msg)) {
864 $pl->ext_reply ($msg->{msgid}, %reply); 1096 $pl->ext_reply ($msg->{msgid}, %reply);
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<([^\>]*)>}
1406 {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "")
1410 [$self->{hintmode}]
1411 }ge;
1412
1413 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g;
1415
1416 # compress some whitespace
1417 1 while s/\s*\n\s*\n\s*/\n/;
1418
1419 s/^\s+//;
1420 s/\s+$//;
1421
1422 $_
1423}
1424
1425sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode}
1428}
1429
1090=item $player->ext_reply ($msgid, $msgtype, %msg) 1430=item $player->ext_reply ($msgid, %msg)
1091 1431
1092Sends an ext reply to the player. 1432Sends an ext reply to the player.
1093 1433
1094=cut 1434=cut
1095 1435
1096sub ext_reply($$$%) { 1436sub ext_reply($$%) {
1097 my ($self, $id, %msg) = @_; 1437 my ($self, $id, %msg) = @_;
1098 1438
1099 $msg{msgid} = $id; 1439 $msg{msgid} = $id;
1100 1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1101 $self->send ("ext " . cf::to_json \%msg);
1102} 1441}
1103 1442
1104package cf; 1443=item $player->ext_event ($type, %msg)
1444
1445Sends an ext event to the client.
1446
1447=cut
1448
1449sub ext_event($$%) {
1450 my ($self, $type, %msg) = @_;
1451
1452 $self->ns->ext_event ($type, %msg);
1453}
1454
1455=head3 cf::region
1456
1457=over 4
1458
1459=cut
1460
1461package cf::region;
1462
1463=item cf::region::find_by_path $path
1464
1465Tries to decuce the likely region for a map knowing only its path.
1466
1467=cut
1468
1469sub find_by_path($) {
1470 my ($path) = @_;
1471
1472 my ($match, $specificity);
1473
1474 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) {
1476 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity;
1478 }
1479 }
1480
1481 $match
1482}
1105 1483
1106=back 1484=back
1107
1108 1485
1109=head3 cf::map 1486=head3 cf::map
1110 1487
1111=over 4 1488=over 4
1112 1489
1167 my ($self, $merge) = @_; 1544 my ($self, $merge) = @_;
1168 1545
1169 # we have to keep some variables in memory intact 1546 # we have to keep some variables in memory intact
1170 local $self->{path}; 1547 local $self->{path};
1171 local $self->{load_path}; 1548 local $self->{load_path};
1172 local $self->{deny_save};
1173 local $self->{deny_reset};
1174 1549
1175 $self->SUPER::thawer_merge ($merge); 1550 $self->SUPER::thawer_merge ($merge);
1176} 1551}
1177 1552
1178sub normalise { 1553sub normalise {
1179 my ($path, $base) = @_; 1554 my ($path, $base) = @_;
1180 1555
1181 $path = "$path"; # make sure its a string 1556 $path = "$path"; # make sure its a string
1557
1558 $path =~ s/\.map$//;
1182 1559
1183 # map plan: 1560 # map plan:
1184 # 1561 #
1185 # /! non-realised random map exit (special hack!) 1562 # /! non-realised random map exit (special hack!)
1186 # {... are special paths that are not being touched 1563 # {... are special paths that are not being touched
1248 1625
1249# the original (read-only) location 1626# the original (read-only) location
1250sub load_path { 1627sub load_path {
1251 my ($self) = @_; 1628 my ($self) = @_;
1252 1629
1253 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1630 "$MAPDIR/$self->{path}.map"
1254} 1631}
1255 1632
1256# the temporary/swap location 1633# the temporary/swap location
1257sub save_path { 1634sub save_path {
1258 my ($self) = @_; 1635 my ($self) = @_;
1259 1636
1260 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1637 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1261 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1638 "$TMPDIR/$path.map"
1262} 1639}
1263 1640
1264# the unique path, undef == no special unique path 1641# the unique path, undef == no special unique path
1265sub uniq_path { 1642sub uniq_path {
1266 my ($self) = @_; 1643 my ($self) = @_;
1267 1644
1268 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1645 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1269 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1646 "$UNIQUEDIR/$path"
1270} 1647}
1271 1648
1272# and all this just because we cannot iterate over 1649# and all this just because we cannot iterate over
1273# all maps in C++... 1650# all maps in C++...
1274sub change_all_map_light { 1651sub change_all_map_light {
1276 1653
1277 $_->change_map_light ($change) 1654 $_->change_map_light ($change)
1278 for grep $_->outdoor, values %cf::MAP; 1655 for grep $_->outdoor, values %cf::MAP;
1279} 1656}
1280 1657
1658sub decay_objects {
1659 my ($self) = @_;
1660
1661 return if $self->{deny_reset};
1662
1663 $self->do_decay_objects;
1664}
1665
1281sub unlink_save { 1666sub unlink_save {
1282 my ($self) = @_; 1667 my ($self) = @_;
1283 1668
1284 utf8::encode (my $save = $self->save_path); 1669 utf8::encode (my $save = $self->save_path);
1285 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1670 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1288 1673
1289sub load_header_from($) { 1674sub load_header_from($) {
1290 my ($self, $path) = @_; 1675 my ($self, $path) = @_;
1291 1676
1292 utf8::encode $path; 1677 utf8::encode $path;
1293 aio_open $path, O_RDONLY, 0 1678 #aio_open $path, O_RDONLY, 0
1294 or return; 1679 # or return;
1295 1680
1296 $self->_load_header ($path) 1681 $self->_load_header ($path)
1297 or return; 1682 or return;
1298 1683
1299 $self->{load_path} = $path; 1684 $self->{load_path} = $path;
1341 $self->load_header_orig 1726 $self->load_header_orig
1342 or return; 1727 or return;
1343 $self->prepare_orig; 1728 $self->prepare_orig;
1344 } 1729 }
1345 1730
1731 $self->{deny_reset} = 1
1732 if $self->no_reset;
1733
1734 $self->default_region (cf::region::find_by_path $self->{path})
1735 unless $self->default_region;
1736
1346 1 1737 1
1347} 1738}
1348 1739
1349sub find; 1740sub find;
1350sub find { 1741sub find {
1362 $map->{last_save} = $cf::RUNTIME; 1753 $map->{last_save} = $cf::RUNTIME;
1363 1754
1364 $map->load_header 1755 $map->load_header
1365 or return; 1756 or return;
1366 1757
1367 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1758 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1368 # doing this can freeze the server in a sync job, obviously 1759 # doing this can freeze the server in a sync job, obviously
1369 #$cf::WAIT_FOR_TICK->wait; 1760 #$cf::WAIT_FOR_TICK->wait;
1370 $map->reset; 1761 $map->reset;
1371 undef $guard; 1762 undef $guard;
1372 return find $path; 1763 return find $path;
1383 my ($self) = @_; 1774 my ($self) = @_;
1384 1775
1385 local $self->{deny_reset} = 1; # loading can take a long time 1776 local $self->{deny_reset} = 1; # loading can take a long time
1386 1777
1387 my $path = $self->{path}; 1778 my $path = $self->{path};
1779
1780 {
1388 my $guard = cf::lock_acquire "map_load:$path"; 1781 my $guard = cf::lock_acquire "map_load:$path";
1389 1782
1390 return if $self->in_memory != cf::MAP_SWAPPED; 1783 return if $self->in_memory != cf::MAP_SWAPPED;
1391 1784
1392 $self->in_memory (cf::MAP_LOADING); 1785 $self->in_memory (cf::MAP_LOADING);
1393 1786
1394 $self->alloc; 1787 $self->alloc;
1395 1788
1396 $self->pre_load; 1789 $self->pre_load;
1397
1398 $self->_load_objects ($self->{load_path}, 1)
1399 or return;
1400
1401 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1402 if delete $self->{load_original};
1403
1404 if (my $uniq = $self->uniq_path) {
1405 utf8::encode $uniq;
1406 if (aio_open $uniq, O_RDONLY, 0) {
1407 $self->clear_unique_items;
1408 $self->_load_objects ($uniq, 0);
1409 }
1410 }
1411
1412 Coro::cede;
1413
1414 # now do the right thing for maps
1415 $self->link_multipart_objects;
1416
1417 unless ($self->{deny_activate}) {
1418 $self->decay_objects;
1419 $self->fix_auto_apply;
1420 $self->update_buttons;
1421 Coro::cede; 1790 Coro::cede;
1422 $self->set_darkness_map; 1791
1792 $self->_load_objects ($self->{load_path}, 1)
1793 or return;
1794
1795 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796 if delete $self->{load_original};
1797
1798 if (my $uniq = $self->uniq_path) {
1799 utf8::encode $uniq;
1800 if (aio_open $uniq, O_RDONLY, 0) {
1801 $self->clear_unique_items;
1802 $self->_load_objects ($uniq, 0);
1803 }
1804 }
1805
1806 Coro::cede;
1807 # now do the right thing for maps
1808 $self->link_multipart_objects;
1423 $self->difficulty ($self->estimate_difficulty) 1809 $self->difficulty ($self->estimate_difficulty)
1424 unless $self->difficulty; 1810 unless $self->difficulty;
1425 Coro::cede; 1811 Coro::cede;
1812
1813 unless ($self->{deny_activate}) {
1814 $self->decay_objects;
1815 $self->fix_auto_apply;
1816 $self->update_buttons;
1817 Coro::cede;
1818 $self->set_darkness_map;
1819 Coro::cede;
1426 $self->activate; 1820 $self->activate;
1821 }
1822
1823 $self->in_memory (cf::MAP_IN_MEMORY);
1427 } 1824 }
1428 1825
1429 $self->post_load; 1826 $self->post_load;
1430
1431 $self->in_memory (cf::MAP_IN_MEMORY);
1432} 1827}
1433 1828
1434sub customise_for { 1829sub customise_for {
1435 my ($self, $ob) = @_; 1830 my ($self, $ob) = @_;
1436 1831
1437 return find "~" . $ob->name . "/" . $self->{path} 1832 return find "~" . $ob->name . "/" . $self->{path}
1438 if $self->per_player; 1833 if $self->per_player;
1834
1835# return find "?party/" . $ob->name . "/" . $self->{path}
1836# if $self->per_party;
1439 1837
1440 $self 1838 $self
1441} 1839}
1442 1840
1443# find and load all maps in the 3x3 area around a map 1841# find and load all maps in the 3x3 area around a map
1554 1952
1555sub reset_at { 1953sub reset_at {
1556 my ($self) = @_; 1954 my ($self) = @_;
1557 1955
1558 # TODO: safety, remove and allow resettable per-player maps 1956 # TODO: safety, remove and allow resettable per-player maps
1559 return 1e99 if $self->isa ("ext::map_per_player");#d#
1560 return 1e99 if $self->{deny_reset}; 1957 return 1e99 if $self->{deny_reset};
1561 1958
1562 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1959 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1563 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1960 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1564 1961
1575 my ($self) = @_; 1972 my ($self) = @_;
1576 1973
1577 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1974 my $lock = cf::lock_acquire "map_data:$self->{path}";
1578 1975
1579 return if $self->players; 1976 return if $self->players;
1580 return if $self->isa ("ext::map_per_player");#d#
1581 1977
1582 warn "resetting map ", $self->path;#d# 1978 warn "resetting map ", $self->path;
1979
1980 $self->in_memory (cf::MAP_SWAPPED);
1981
1982 # need to save uniques path
1983 unless ($self->{deny_save}) {
1984 my $uniq = $self->uniq_path; utf8::encode $uniq;
1985
1986 $self->_save_objects ($uniq, cf::IO_UNIQUES)
1987 if $uniq;
1988 }
1583 1989
1584 delete $cf::MAP{$self->path}; 1990 delete $cf::MAP{$self->path};
1585 1991
1586 $self->in_memory (cf::MAP_SWAPPED);
1587 $self->clear; 1992 $self->clear;
1588 1993
1589 $_->clear_links_to ($self) for values %cf::MAP; 1994 $_->clear_links_to ($self) for values %cf::MAP;
1590 1995
1591 $self->unlink_save; 1996 $self->unlink_save;
1610 $cf::MAP{$self->path} = $self; 2015 $cf::MAP{$self->path} = $self;
1611 2016
1612 $self->reset; # polite request, might not happen 2017 $self->reset; # polite request, might not happen
1613} 2018}
1614 2019
2020=item $maps = cf::map::tmp_maps
2021
2022Returns an arrayref with all map paths of currently instantiated and saved
2023maps. May block.
2024
2025=cut
2026
2027sub tmp_maps() {
2028 [
2029 map {
2030 utf8::decode $_;
2031 /\.map$/
2032 ? normalise $_
2033 : ()
2034 } @{ aio_readdir $TMPDIR or [] }
2035 ]
2036}
2037
2038=item $maps = cf::map::random_maps
2039
2040Returns an arrayref with all map paths of currently instantiated and saved
2041random maps. May block.
2042
2043=cut
2044
2045sub random_maps() {
2046 [
2047 map {
2048 utf8::decode $_;
2049 /\.map$/
2050 ? normalise "?random/$_"
2051 : ()
2052 } @{ aio_readdir $RANDOMDIR or [] }
2053 ]
2054}
2055
1615=item cf::map::unique_maps 2056=item cf::map::unique_maps
1616 2057
1617Returns an arrayref of paths of all shared maps that have 2058Returns an arrayref of paths of all shared maps that have
1618instantiated unique items. May block. 2059instantiated unique items. May block.
1619 2060
1620=cut 2061=cut
1621 2062
1622sub unique_maps() { 2063sub unique_maps() {
1623 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2064 [
1624 or return; 2065 map {
1625
1626 my @paths;
1627
1628 for (@$files) {
1629 utf8::decode $_; 2066 utf8::decode $_;
1630 next if /\.pst$/;
1631 next unless /^$PATH_SEP/o;
1632
1633 s/\.map$//; 2067 /\.map$/
1634 push @paths, $_; 2068 ? normalise $_
2069 : ()
2070 } @{ aio_readdir $UNIQUEDIR or [] }
1635 } 2071 ]
1636
1637 \@paths
1638} 2072}
1639 2073
1640package cf; 2074package cf;
1641 2075
1642=back 2076=back
1688 2122
1689 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2123 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1690 2124
1691 if ($self->{record_replies}) { 2125 if ($self->{record_replies}) {
1692 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2126 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2127
1693 } else { 2128 } else {
2129 my $pl = $self->contr;
2130
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply (
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139
2140 } else {
1694 $msg = $npc->name . " says: $msg" if $npc; 2141 $msg = $npc->name . " says: $msg" if $npc;
1695 $self->message ($msg, $flags); 2142 $self->message ($msg, $flags);
2143 }
1696 } 2144 }
1697} 2145}
1698 2146
1699=item $player_object->may ("access") 2147=item $player_object->may ("access")
1700 2148
1748 $self->deactivate_recursive; 2196 $self->deactivate_recursive;
1749 2197
1750 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2198 return if UNIVERSAL::isa $self->map, "ext::map_link";
1751 2199
1752 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2200 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1753 if $self->map; 2201 if $self->map && $self->map->{path} ne "{link}";
1754 2202
1755 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2203 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1756} 2204}
1757 2205
1758sub cf::object::player::leave_link { 2206sub cf::object::player::leave_link {
1759 my ($self, $map, $x, $y) = @_; 2207 my ($self, $map, $x, $y) = @_;
2208
2209 return unless $self->contr->active;
1760 2210
1761 my $link_pos = delete $self->{_link_pos}; 2211 my $link_pos = delete $self->{_link_pos};
1762 2212
1763 unless ($map) { 2213 unless ($map) {
1764 # restore original map position 2214 # restore original map position
1782 $map->load; 2232 $map->load;
1783 $map->load_diag; 2233 $map->load_diag;
1784 2234
1785 return unless $self->contr->active; 2235 return unless $self->contr->active;
1786 $self->activate_recursive; 2236 $self->activate_recursive;
2237
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1787 $self->enter_map ($map, $x, $y); 2239 $self->enter_map ($map, $x, $y);
1788} 2240}
1789 2241
1790cf::player->attach (
1791 on_logout => sub {
1792 my ($pl) = @_;
1793
1794 # abort map switching before logout
1795 if ($pl->ob->{_link_pos}) {
1796 cf::sync_job {
1797 $pl->ob->leave_link
1798 };
1799 }
1800 },
1801 on_login => sub {
1802 my ($pl) = @_;
1803
1804 # try to abort aborted map switching on player login :)
1805 # should happen only on crashes
1806 if ($pl->ob->{_link_pos}) {
1807 $pl->ob->enter_link;
1808 (async {
1809 # we need this sleep as the login has a concurrent enter_exit running
1810 # and this sleep increases chances of the player not ending up in scorn
1811 $pl->ob->reply (undef,
1812 "There was an internal problem at your last logout, "
1813 . "the server will try to bring you to your intended destination in a second.",
1814 cf::NDI_RED);
1815 Coro::Timer::sleep 1;
1816 $pl->ob->leave_link;
1817 })->prio (2);
1818 }
1819 },
1820);
1821
1822=item $player_object->goto ($path, $x, $y) 2242=item $player_object->goto ($path, $x, $y[, $check->($map)])
1823 2243
2244Moves the player to the given map-path and coordinates by first freezing
2245her, loading and preparing them map, calling the provided $check callback
2246that has to return the map if sucecssful, and then unfreezes the player on
2247the new (success) or old (failed) map position.
2248
1824=cut 2249=cut
2250
2251our $GOTOGEN;
1825 2252
1826sub cf::object::player::goto { 2253sub cf::object::player::goto {
1827 my ($self, $path, $x, $y) = @_; 2254 my ($self, $path, $x, $y, $check) = @_;
2255
2256 # do generation counting so two concurrent goto's will be executed in-order
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1828 2258
1829 $self->enter_link; 2259 $self->enter_link;
1830 2260
1831 (async { 2261 (async {
1832 my $map = eval { 2262 my $map = eval {
1833 my $map = cf::map::find $path; 2263 my $map = cf::map::find $path;
2264
2265 if ($map) {
1834 $map = $map->customise_for ($self) if $map; 2266 $map = $map->customise_for ($self);
2267 $map = $check->($map) if $check && $map;
2268 } else {
2269 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2270 }
2271
1835 $map 2272 $map
2273 };
2274
2275 if ($@) {
2276 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2277 LOG llevError | logBacktrace, Carp::longmess $@;
1836 } or 2278 }
1837 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1838 2279
2280 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation};
1839 $self->leave_link ($map, $x, $y); 2282 $self->leave_link ($map, $x, $y);
2283 }
1840 })->prio (1); 2284 })->prio (1);
1841} 2285}
1842 2286
1843=item $player_object->enter_exit ($exit_object) 2287=item $player_object->enter_exit ($exit_object)
1844 2288
1883 2327
1884 $rmp->{random_seed} ||= $exit->random_seed; 2328 $rmp->{random_seed} ||= $exit->random_seed;
1885 2329
1886 my $data = cf::to_json $rmp; 2330 my $data = cf::to_json $rmp;
1887 my $md5 = Digest::MD5::md5_hex $data; 2331 my $md5 = Digest::MD5::md5_hex $data;
1888 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2332 my $meta = "$RANDOMDIR/$md5.meta";
1889 2333
1890 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2334 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1891 aio_write $fh, 0, (length $data), $data, 0; 2335 aio_write $fh, 0, (length $data), $data, 0;
1892 undef $fh; 2336 undef $fh;
1893 aio_rename "$meta~", $meta; 2337 aio_rename "$meta~", $meta;
1902 2346
1903 return unless $self->type == cf::PLAYER; 2347 return unless $self->type == cf::PLAYER;
1904 2348
1905 if ($exit->slaying eq "/!") { 2349 if ($exit->slaying eq "/!") {
1906 #TODO: this should de-fi-ni-te-ly not be a sync-job 2350 #TODO: this should de-fi-ni-te-ly not be a sync-job
2351 # the problem is that $exit might not survive long enough
2352 # so it needs to be done right now, right here
1907 cf::sync_job { prepare_random_map $exit }; 2353 cf::sync_job { prepare_random_map $exit };
1908 } 2354 }
1909 2355
1910 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2356 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1911 my $hp = $exit->stats->hp; 2357 my $hp = $exit->stats->hp;
1919 $self->goto ($slaying, $hp, $sp); 2365 $self->goto ($slaying, $hp, $sp);
1920 2366
1921 1; 2367 1;
1922 }) { 2368 }) {
1923 $self->message ("Something went wrong deep within the crossfire server. " 2369 $self->message ("Something went wrong deep within the crossfire server. "
1924 . "I'll try to bring you back to the map you were before. " 2370 . "I'll try to bring you back to the map you were before. "
1925 . "Please report this to the dungeon master!", 2371 . "Please report this to the dungeon master!",
1926 cf::NDI_UNIQUE | cf::NDI_RED); 2372 cf::NDI_UNIQUE | cf::NDI_RED);
1927 2373
1928 warn "ERROR in enter_exit: $@"; 2374 warn "ERROR in enter_exit: $@";
1929 $self->leave_link; 2375 $self->leave_link;
1930 } 2376 }
1931 })->prio (1); 2377 })->prio (1);
1944 2390
1945sub cf::client::send_drawinfo { 2391sub cf::client::send_drawinfo {
1946 my ($self, $text, $flags) = @_; 2392 my ($self, $text, $flags) = @_;
1947 2393
1948 utf8::encode $text; 2394 utf8::encode $text;
1949 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2395 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1950} 2396}
1951 2397
2398=item $client->send_msg ($color, $type, $msg, [extra...])
2399
2400Send a drawinfo or msg packet to the client, formatting the msg for the
2401client if neccessary. C<$type> should be a string identifying the type of
2402the message, with C<log> being the default. If C<$color> is negative, suppress
2403the message unless the client supports the msg packet.
2404
2405=cut
2406
2407sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_;
2409
2410 $msg = $self->pl->expand_cfpod ($msg);
2411
2412 return unless @extra || length $msg;
2413
2414 if ($self->can_msg) {
2415 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2416 } else {
2417 # replace some tags by gcfclient-compatible ones
2418 for ($msg) {
2419 1 while
2420 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2421 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2422 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2423 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2424 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2425 }
2426
2427 if ($color >= 0) {
2428 if (0 && $msg =~ /\[/) {
2429 $self->send_packet ("drawextinfo $color 4 0 $msg")
2430 } else {
2431 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2432 $self->send_packet ("drawinfo $color $msg")
2433 }
2434 }
2435 }
2436}
2437
2438=item $client->ext_event ($type, %msg)
2439
2440Sends an ext event to the client.
2441
2442=cut
2443
2444sub cf::client::ext_event($$%) {
2445 my ($self, $type, %msg) = @_;
2446
2447 $msg{msgtype} = "event_$type";
2448 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2449}
1952 2450
1953=item $success = $client->query ($flags, "text", \&cb) 2451=item $success = $client->query ($flags, "text", \&cb)
1954 2452
1955Queues a query to the client, calling the given callback with 2453Queues a query to the client, calling the given callback with
1956the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2454the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1957C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2455C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1958 2456
1959Queries can fail, so check the return code. Or don't, as queries will become 2457Queries can fail, so check the return code. Or don't, as queries will
1960reliable at some point in the future. 2458become reliable at some point in the future.
1961 2459
1962=cut 2460=cut
1963 2461
1964sub cf::client::query { 2462sub cf::client::query {
1965 my ($self, $flags, $text, $cb) = @_; 2463 my ($self, $flags, $text, $cb) = @_;
1973 utf8::encode $text; 2471 utf8::encode $text;
1974 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2472 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1975 2473
1976 $self->send_packet ($self->{query_queue}[0][0]) 2474 $self->send_packet ($self->{query_queue}[0][0])
1977 if @{ $self->{query_queue} } == 1; 2475 if @{ $self->{query_queue} } == 1;
2476
2477 1
1978} 2478}
1979 2479
1980cf::client->attach ( 2480cf::client->attach (
2481 on_connect => sub {
2482 my ($ns) = @_;
2483
2484 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2485 },
1981 on_reply => sub { 2486 on_reply => sub {
1982 my ($ns, $msg) = @_; 2487 my ($ns, $msg) = @_;
1983 2488
1984 # this weird shuffling is so that direct followup queries 2489 # this weird shuffling is so that direct followup queries
1985 # get handled first 2490 # get handled first
1986 my $queue = delete $ns->{query_queue} 2491 my $queue = delete $ns->{query_queue}
1987 or return; # be conservative, not sure how that can happen, but we saw a crash here 2492 or return; # be conservative, not sure how that can happen, but we saw a crash here
1988 2493
1989 (shift @$queue)->[1]->($msg); 2494 (shift @$queue)->[1]->($msg);
2495 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1990 2496
1991 push @{ $ns->{query_queue} }, @$queue; 2497 push @{ $ns->{query_queue} }, @$queue;
1992 2498
1993 if (@{ $ns->{query_queue} } == @$queue) { 2499 if (@{ $ns->{query_queue} } == @$queue) {
1994 if (@$queue) { 2500 if (@$queue) {
1996 } else { 2502 } else {
1997 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2503 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1998 } 2504 }
1999 } 2505 }
2000 }, 2506 },
2507 on_exticmd => sub {
2508 my ($ns, $buf) = @_;
2509
2510 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2511
2512 if (ref $msg) {
2513 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2514 if (my %reply = $cb->($ns, $msg)) {
2515 $reply{msgid} = $msg->{msgid};
2516 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2517 }
2518 }
2519 } else {
2520 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2521 }
2522
2523 cf::override;
2524 },
2001); 2525);
2002 2526
2003=item $client->async (\&cb) 2527=item $client->async (\&cb)
2004 2528
2005Create a new coroutine, running the specified callback. The coroutine will 2529Create a new coroutine, running the specified callback. The coroutine will
2052 2576
2053# here we export the classes and methods available to script code 2577# here we export the classes and methods available to script code
2054 2578
2055=pod 2579=pod
2056 2580
2057The following fucntions and emthods are available within a safe environment: 2581The following functions and methods are available within a safe environment:
2058 2582
2059 cf::object contr pay_amount pay_player map 2583 cf::object contr pay_amount pay_player map
2060 cf::object::player player 2584 cf::object::player player
2061 cf::player peaceful 2585 cf::player peaceful
2062 cf::map trigger 2586 cf::map trigger
2143=back 2667=back
2144 2668
2145=cut 2669=cut
2146 2670
2147############################################################################# 2671#############################################################################
2672# the server's init and main functions
2148 2673
2149=head2 EXTENSION DATABASE SUPPORT 2674sub load_facedata($) {
2675 my ($path) = @_;
2150 2676
2151Crossfire maintains a very simple database for extension use. It can 2677 warn "loading facedata from $path\n";
2152currently store anything that can be serialised using Storable, which
2153excludes objects.
2154 2678
2155The parameter C<$family> should best start with the name of the extension 2679 my $facedata;
2156using it, it should be unique. 2680 0 < aio_load $path, $facedata
2681 or die "$path: $!";
2157 2682
2158=over 4 2683 $facedata = Coro::Storable::thaw $facedata;
2159 2684
2160=item $hashref = cf::db_get $family 2685 $facedata->{version} == 2
2686 or cf::cleanup "$path: version mismatch, cannot proceed.";
2161 2687
2162Return a hashref for use by the extension C<$family>, which can be
2163modified. After modifications, you have to call C<cf::db_dirty> or
2164C<cf::db_sync>.
2165
2166=item $value = cf::db_get $family => $key
2167
2168Returns a single value from the database
2169
2170=item cf::db_put $family => $hashref
2171
2172Stores the given family hashref into the database. Updates are delayed, if
2173you want the data to be synced to disk immediately, use C<cf::db_sync>.
2174
2175=item cf::db_put $family => $key => $value
2176
2177Stores the given C<$value> in the family hash. Updates are delayed, if you
2178want the data to be synced to disk immediately, use C<cf::db_sync>.
2179
2180=item cf::db_dirty
2181
2182Marks the database as dirty, to be updated at a later time.
2183
2184=item cf::db_sync
2185
2186Immediately write the database to disk I<if it is dirty>.
2187
2188=cut
2189
2190our $DB;
2191
2192{
2193 my $path = cf::localdir . "/database.pst";
2194
2195 sub db_load() {
2196 $DB = stat $path ? Storable::retrieve $path : { };
2197 } 2688 {
2689 my $faces = $facedata->{faceinfo};
2198 2690
2199 my $pid; 2691 while (my ($face, $info) = each %$faces) {
2200 2692 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2201 sub db_save() { 2693 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2202 waitpid $pid, 0 if $pid; 2694 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2203 if (0 == ($pid = fork)) { 2695 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2204 $DB->{_meta}{version} = 1; 2696 Coro::cede;
2205 Storable::nstore $DB, "$path~";
2206 rename "$path~", $path;
2207 cf::_exit 0 if defined $pid;
2208 }
2209 }
2210
2211 my $dirty;
2212
2213 sub db_sync() {
2214 db_save if $dirty;
2215 undef $dirty;
2216 }
2217
2218 my $idle = Event->idle (
2219 reentrant => 0,
2220 min => 10,
2221 max => 20,
2222 repeat => 0,
2223 data => WF_AUTOCANCEL,
2224 cb => \&db_sync,
2225 );
2226
2227 sub db_dirty() {
2228 $dirty = 1;
2229 $idle->start;
2230 }
2231
2232 sub db_get($;$) {
2233 @_ >= 2
2234 ? $DB->{$_[0]}{$_[1]}
2235 : ($DB->{$_[0]} ||= { })
2236 }
2237
2238 sub db_put($$;$) {
2239 if (@_ >= 3) {
2240 $DB->{$_[0]}{$_[1]} = $_[2];
2241 } else {
2242 $DB->{$_[0]} = $_[1];
2243 }
2244 db_dirty;
2245 }
2246
2247 cf::global->attach (
2248 prio => 10000,
2249 on_cleanup => sub {
2250 db_sync;
2251 }, 2697 }
2252 );
2253}
2254 2698
2255############################################################################# 2699 while (my ($face, $info) = each %$faces) {
2256# the server's main() 2700 next unless $info->{smooth};
2701 my $idx = cf::face::find $face
2702 or next;
2703 if (my $smooth = cf::face::find $info->{smooth}) {
2704 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2705 } else {
2706 warn "smooth face '$info->{smooth}' not found for face '$face'";
2707 }
2708 Coro::cede;
2709 }
2710 }
2711
2712 {
2713 my $anims = $facedata->{animinfo};
2714
2715 while (my ($anim, $info) = each %$anims) {
2716 cf::anim::set $anim, $info->{frames}, $info->{facings};
2717 Coro::cede;
2718 }
2719
2720 cf::anim::invalidate_all; # d'oh
2721 }
2722
2723 1
2724}
2725
2726sub reload_regions {
2727 load_resource_file "$MAPDIR/regions"
2728 or die "unable to load regions file\n";
2729}
2730
2731sub reload_facedata {
2732 load_facedata "$DATADIR/facedata"
2733 or die "unable to load facedata\n";
2734}
2735
2736sub reload_archetypes {
2737 load_resource_file "$DATADIR/archetypes"
2738 or die "unable to load archetypes\n";
2739 #d# NEED to laod twice to resolve forward references
2740 # this really needs to be done in an extra post-pass
2741 # (which needs to be synchronous, so solve it differently)
2742 load_resource_file "$DATADIR/archetypes"
2743 or die "unable to load archetypes\n";
2744}
2745
2746sub reload_treasures {
2747 load_resource_file "$DATADIR/treasures"
2748 or die "unable to load treasurelists\n";
2749}
2750
2751sub reload_resources {
2752 warn "reloading resource files...\n";
2753
2754 reload_regions;
2755 reload_facedata;
2756 #reload_archetypes;#d#
2757 reload_archetypes;
2758 reload_treasures;
2759
2760 warn "finished reloading resource files\n";
2761}
2762
2763sub init {
2764 reload_resources;
2765}
2257 2766
2258sub cfg_load { 2767sub cfg_load {
2259 open my $fh, "<:utf8", cf::confdir . "/config" 2768 open my $fh, "<:utf8", "$CONFDIR/config"
2260 or return; 2769 or return;
2261 2770
2262 local $/; 2771 local $/;
2263 *CFG = YAML::Syck::Load <$fh>; 2772 *CFG = YAML::Syck::Load <$fh>;
2264 2773
2284 Event::one_event; 2793 Event::one_event;
2285 })->prio (Coro::PRIO_MAX); 2794 })->prio (Coro::PRIO_MAX);
2286 }; 2795 };
2287 2796
2288 cfg_load; 2797 cfg_load;
2289 db_load; 2798 db_init;
2290 load_extensions; 2799 load_extensions;
2291 2800
2292 $TICK_WATCHER->start; 2801 $TICK_WATCHER->start;
2293 Event::loop; 2802 Event::loop;
2294} 2803}
2309 }, 2818 },
2310 ); 2819 );
2311 } 2820 }
2312} 2821}
2313 2822
2823sub write_runtime {
2824 my $runtime = "$LOCALDIR/runtime";
2825
2826 # first touch the runtime file to show we are still running:
2827 # the fsync below can take a very very long time.
2828
2829 IO::AIO::aio_utime $runtime, undef, undef;
2830
2831 my $guard = cf::lock_acquire "write_runtime";
2832
2833 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2834 or return;
2835
2836 my $value = $cf::RUNTIME + 90 + 10;
2837 # 10 is the runtime save interval, for a monotonic clock
2838 # 60 allows for the watchdog to kill the server.
2839
2840 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2841 and return;
2842
2843 # always fsync - this file is important
2844 aio_fsync $fh
2845 and return;
2846
2847 # touch it again to show we are up-to-date
2848 aio_utime $fh, undef, undef;
2849
2850 close $fh
2851 or return;
2852
2853 aio_rename "$runtime~", $runtime
2854 and return;
2855
2856 warn "runtime file written.\n";
2857
2858 1
2859}
2860
2314sub emergency_save() { 2861sub emergency_save() {
2315 my $freeze_guard = cf::freeze_mainloop; 2862 my $freeze_guard = cf::freeze_mainloop;
2316 2863
2317 warn "enter emergency perl save\n"; 2864 warn "enter emergency perl save\n";
2318 2865
2333 my $map = $cf::MAP{$path} or next; 2880 my $map = $cf::MAP{$path} or next;
2334 $map->valid or next; 2881 $map->valid or next;
2335 $map->save; 2882 $map->save;
2336 } 2883 }
2337 warn "end emergency map save\n"; 2884 warn "end emergency map save\n";
2885
2886 warn "begin emergency database checkpoint\n";
2887 BDB::db_env_txn_checkpoint $DB_ENV;
2888 warn "end emergency database checkpoint\n";
2338 }; 2889 };
2339 2890
2340 warn "leave emergency perl save\n"; 2891 warn "leave emergency perl save\n";
2341} 2892}
2342 2893
2894sub post_cleanup {
2895 my ($make_core) = @_;
2896
2897 warn Carp::longmess "post_cleanup backtrace"
2898 if $make_core;
2899}
2900
2343sub reload() { 2901sub do_reload_perl() {
2344 # can/must only be called in main 2902 # can/must only be called in main
2345 if ($Coro::current != $Coro::main) { 2903 if ($Coro::current != $Coro::main) {
2346 warn "can only reload from main coroutine"; 2904 warn "can only reload from main coroutine";
2347 return; 2905 return;
2348 } 2906 }
2349 2907
2350 warn "reloading..."; 2908 warn "reloading...";
2351 2909
2352 warn "cancelling server ticker"; 2910 warn "entering sync_job";
2353 $TICK_WATCHER->cancel;
2354 2911
2912 cf::sync_job {
2913 cf::write_runtime; # external watchdog should not bark
2355 cf::emergency_save; 2914 cf::emergency_save;
2915 cf::write_runtime; # external watchdog should not bark
2356 2916
2357 eval { 2917 warn "syncing database to disk";
2918 BDB::db_env_txn_checkpoint $DB_ENV;
2919
2358 # if anything goes wrong in here, we should simply crash as we already saved 2920 # if anything goes wrong in here, we should simply crash as we already saved
2359
2360 warn "syncing database to disk";
2361 cf::db_sync;
2362 2921
2363 warn "cancelling all WF_AUTOCANCEL watchers"; 2922 warn "cancelling all WF_AUTOCANCEL watchers";
2364 for (Event::all_watchers) { 2923 for (Event::all_watchers) {
2365 $_->cancel if $_->data & WF_AUTOCANCEL; 2924 $_->cancel if $_->data & WF_AUTOCANCEL;
2366 } 2925 }
2367 2926
2368 warn "flushing outstanding aio requests"; 2927 warn "flushing outstanding aio requests";
2369 for (;;) { 2928 for (;;) {
2929 BDB::flush;
2370 IO::AIO::flush; 2930 IO::AIO::flush;
2371 Coro::cede; 2931 Coro::cede;
2372 last unless IO::AIO::nreqs; 2932 last unless IO::AIO::nreqs || BDB::nreqs;
2373 warn "iterate..."; 2933 warn "iterate...";
2374 } 2934 }
2935
2936 ++$RELOAD;
2375 2937
2376 warn "cancelling all extension coros"; 2938 warn "cancelling all extension coros";
2377 $_->cancel for values %EXT_CORO; 2939 $_->cancel for values %EXT_CORO;
2378 %EXT_CORO = (); 2940 %EXT_CORO = ();
2379 2941
2380 warn "removing commands"; 2942 warn "removing commands";
2381 %COMMAND = (); 2943 %COMMAND = ();
2382 2944
2383 warn "removing ext commands"; 2945 warn "removing ext/exti commands";
2384 %EXTCMD = (); 2946 %EXTCMD = ();
2947 %EXTICMD = ();
2385 2948
2386 warn "unloading/nuking all extensions"; 2949 warn "unloading/nuking all extensions";
2387 for my $pkg (@EXTS) { 2950 for my $pkg (@EXTS) {
2388 warn "... unloading $pkg"; 2951 warn "... unloading $pkg";
2389 2952
2419 Symbol::delete_package "safe::$_" 2982 Symbol::delete_package "safe::$_"
2420 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 2983 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2421 2984
2422 warn "unloading cf.pm \"a bit\""; 2985 warn "unloading cf.pm \"a bit\"";
2423 delete $INC{"cf.pm"}; 2986 delete $INC{"cf.pm"};
2987 delete $INC{"cf/pod.pm"};
2424 2988
2425 # don't, removes xs symbols, too, 2989 # don't, removes xs symbols, too,
2426 # and global variables created in xs 2990 # and global variables created in xs
2427 #Symbol::delete_package __PACKAGE__; 2991 #Symbol::delete_package __PACKAGE__;
2428 2992
2432 require cf; 2996 require cf;
2433 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 2997 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2434 2998
2435 warn "loading config and database again"; 2999 warn "loading config and database again";
2436 cf::cfg_load; 3000 cf::cfg_load;
2437 cf::db_load;
2438 3001
2439 warn "loading extensions"; 3002 warn "loading extensions";
2440 cf::load_extensions; 3003 cf::load_extensions;
2441 3004
2442 warn "reattaching attachments to objects/players"; 3005 warn "reattaching attachments to objects/players";
2443 _global_reattach; 3006 _global_reattach; # objects, sockets
2444 warn "reattaching attachments to maps"; 3007 warn "reattaching attachments to maps";
2445 reattach $_ for values %MAP; 3008 reattach $_ for values %MAP;
3009 warn "reattaching attachments to players";
3010 reattach $_ for values %PLAYER;
2446 3011
2447 warn "restarting server ticker"; 3012 warn "leaving sync_job";
2448 3013
2449 $TICK_WATCHER->start; 3014 1
2450 }; 3015 } or do {
2451
2452 if ($@) {
2453 warn $@; 3016 warn $@;
2454 warn "error while reloading, exiting."; 3017 warn "error while reloading, exiting.";
2455 exit 1; 3018 exit 1;
2456 } 3019 };
2457 3020
2458 warn "reloaded"; 3021 warn "reloaded";
2459}; 3022};
2460 3023
2461our $RELOAD_WATCHER; # used only during reload 3024our $RELOAD_WATCHER; # used only during reload
2462 3025
3026sub reload_perl() {
3027 # doing reload synchronously and two reloads happen back-to-back,
3028 # coro crashes during coro_state_free->destroy here.
3029
3030 $RELOAD_WATCHER ||= Event->timer (
3031 reentrant => 0,
3032 after => 0,
3033 data => WF_AUTOCANCEL,
3034 cb => sub {
3035 do_reload_perl;
3036 undef $RELOAD_WATCHER;
3037 },
3038 );
3039}
3040
2463register_command "reload" => sub { 3041register_command "reload" => sub {
2464 my ($who, $arg) = @_; 3042 my ($who, $arg) = @_;
2465 3043
2466 if ($who->flag (FLAG_WIZ)) { 3044 if ($who->flag (FLAG_WIZ)) {
2467 $who->message ("reloading server."); 3045 $who->message ("reloading server.");
2468 3046 async { reload_perl };
2469 # doing reload synchronously and two reloads happen back-to-back,
2470 # coro crashes during coro_state_free->destroy here.
2471
2472 $RELOAD_WATCHER ||= Event->timer (
2473 reentrant => 0,
2474 after => 0,
2475 data => WF_AUTOCANCEL,
2476 cb => sub {
2477 reload;
2478 undef $RELOAD_WATCHER;
2479 },
2480 );
2481 } 3047 }
2482}; 3048};
2483 3049
2484unshift @INC, $LIBDIR; 3050unshift @INC, $LIBDIR;
2485 3051
2486my $bug_warning = 0; 3052my $bug_warning = 0;
2487 3053
3054our @WAIT_FOR_TICK;
3055our @WAIT_FOR_TICK_BEGIN;
3056
3057sub wait_for_tick {
3058 return unless $TICK_WATCHER->is_active;
3059 return if $Coro::current == $Coro::main;
3060
3061 my $signal = new Coro::Signal;
3062 push @WAIT_FOR_TICK, $signal;
3063 $signal->wait;
3064}
3065
3066sub wait_for_tick_begin {
3067 return unless $TICK_WATCHER->is_active;
3068 return if $Coro::current == $Coro::main;
3069
3070 my $signal = new Coro::Signal;
3071 push @WAIT_FOR_TICK_BEGIN, $signal;
3072 $signal->wait;
3073}
3074
3075 my $min = 1e6;#d#
3076 my $avg = 10;
2488$TICK_WATCHER = Event->timer ( 3077$TICK_WATCHER = Event->timer (
2489 reentrant => 0, 3078 reentrant => 0,
2490 parked => 1, 3079 parked => 1,
2491 prio => 0, 3080 prio => 0,
2492 at => $NEXT_TICK || $TICK, 3081 at => $NEXT_TICK || $TICK,
2496 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3085 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2497 unless ++$bug_warning > 10; 3086 unless ++$bug_warning > 10;
2498 return; 3087 return;
2499 } 3088 }
2500 3089
2501 $NOW = Event::time; 3090 $NOW = $tick_start = Event::time;
2502 3091
2503 cf::server_tick; # one server iteration 3092 cf::server_tick; # one server iteration
3093
3094 0 && sync_job {#d#
3095 for(1..10) {
3096 my $t = Event::time;
3097 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3098 or die;
3099
3100 $map->width (50);
3101 $map->height (50);
3102 $map->alloc;
3103 $map->_load_objects ("/tmp/x.map", 1);
3104 my $t = Event::time - $t;
3105
3106 #next unless $t < 0.0013;#d#
3107 if ($t < $min) {
3108 $min = $t;
3109 }
3110 $avg = $avg * 0.99 + $t * 0.01;
3111 }
3112 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3113 exit 0;
3114 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3115 };
3116
2504 $RUNTIME += $TICK; 3117 $RUNTIME += $TICK;
2505 $NEXT_TICK += $TICK; 3118 $NEXT_TICK += $TICK;
2506 3119
2507 $WAIT_FOR_TICK->broadcast; 3120 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2508 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3121 $NEXT_RUNTIME_WRITE = $NOW + 10;
2509 3122 Coro::async_pool {
2510 Event::sweep; 3123 write_runtime
2511 Coro::cede_notself; 3124 or warn "ERROR: unable to write runtime file: $!";
3125 };
2512 3126 }
3127
2513# my $AFTER = Event::time; 3128# my $AFTER = Event::time;
2514# warn $AFTER - $NOW;#d# 3129# warn $AFTER - $NOW;#d#
2515 3130
3131 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3132 $sig->send;
3133 }
3134 while (my $sig = shift @WAIT_FOR_TICK) {
3135 $sig->send;
3136 }
3137
3138 $NOW = Event::time;
3139
2516 # if we are delayed by four ticks or more, skip them all 3140 # if we are delayed by four ticks or more, skip them all
2517 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3141 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2518 3142
2519 $TICK_WATCHER->at ($NEXT_TICK); 3143 $TICK_WATCHER->at ($NEXT_TICK);
2520 $TICK_WATCHER->start; 3144 $TICK_WATCHER->start;
3145
3146 $LOAD = ($NOW - $tick_start) / $TICK;
3147 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3148
3149 _post_tick;
3150
3151
2521 }, 3152 },
2522); 3153);
2523 3154
3155{
3156 BDB::max_poll_time $TICK * 0.1;
3157 $BDB_POLL_WATCHER = Event->io (
3158 reentrant => 0,
3159 fd => BDB::poll_fileno,
3160 poll => 'r',
3161 prio => 0,
3162 data => WF_AUTOCANCEL,
3163 cb => \&BDB::poll_cb,
3164 );
3165 BDB::min_parallel 8;
3166
3167 BDB::set_sync_prepare {
3168 my $status;
3169 my $current = $Coro::current;
3170 (
3171 sub {
3172 $status = $!;
3173 $current->ready; undef $current;
3174 },
3175 sub {
3176 Coro::schedule while defined $current;
3177 $! = $status;
3178 },
3179 )
3180 };
3181
3182 unless ($DB_ENV) {
3183 $DB_ENV = BDB::db_env_create;
3184
3185 cf::sync_job {
3186 eval {
3187 BDB::db_env_open
3188 $DB_ENV,
3189 $BDBDIR,
3190 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3191 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3192 0666;
3193
3194 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3195
3196 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3197 $DB_ENV->set_lk_detect;
3198 };
3199
3200 cf::cleanup "db_env_open(db): $@" if $@;
3201 };
3202 }
3203}
3204
3205{
3206 IO::AIO::min_parallel 8;
3207
3208 undef $Coro::AIO::WATCHER;
2524IO::AIO::max_poll_time $TICK * 0.1; 3209 IO::AIO::max_poll_time $TICK * 0.1;
2525
2526undef $Coro::AIO::WATCHER;
2527$AIO_POLL_WATCHER = Event->io ( 3210 $AIO_POLL_WATCHER = Event->io (
2528 reentrant => 0, 3211 reentrant => 0,
3212 data => WF_AUTOCANCEL,
2529 fd => IO::AIO::poll_fileno, 3213 fd => IO::AIO::poll_fileno,
2530 poll => 'r', 3214 poll => 'r',
2531 prio => 6, 3215 prio => 6,
2532 data => WF_AUTOCANCEL,
2533 cb => \&IO::AIO::poll_cb, 3216 cb => \&IO::AIO::poll_cb,
2534); 3217 );
3218}
2535 3219
2536$WRITE_RUNTIME_WATCHER = Event->timer ( 3220my $_log_backtrace;
2537 reentrant => 0, 3221
2538 data => WF_AUTOCANCEL, 3222sub _log_backtrace {
2539 after => 1, 3223 my ($msg, @addr) = @_;
2540 interval => 10, 3224
2541 prio => 6, # keep it lowest so it acts like a watchdog 3225 $msg =~ s/\n//;
2542 cb => Coro::unblock_sub { 3226
2543 write_runtime 3227 # limit the # of concurrent backtraces
2544 or warn "ERROR: unable to write runtime file: $!"; 3228 if ($_log_backtrace < 2) {
3229 ++$_log_backtrace;
3230 async {
3231 my @bt = fork_call {
3232 @addr = map { sprintf "%x", $_ } @addr;
3233 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3234 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3235 or die "addr2line: $!";
3236
3237 my @funcs;
3238 my @res = <$fh>;
3239 chomp for @res;
3240 while (@res) {
3241 my ($func, $line) = splice @res, 0, 2, ();
3242 push @funcs, "[$func] $line";
3243 }
3244
3245 @funcs
3246 };
3247
3248 LOG llevInfo, "[ABT] $msg\n";
3249 LOG llevInfo, "[ABT] $_\n" for @bt;
3250 --$_log_backtrace;
3251 };
3252 } else {
3253 LOG llevInfo, "[ABT] $msg\n";
3254 LOG llevInfo, "[ABT] [suppressed]\n";
2545 }, 3255 }
2546); 3256}
3257
3258# load additional modules
3259use cf::pod;
2547 3260
2548END { cf::emergency_save } 3261END { cf::emergency_save }
2549 3262
25501 32631
2551 3264

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines