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

Comparing cf.schmorp.de/server/lib/cf.pm (file contents):
Revision 1.205 by root, Mon Feb 5 18:29:20 2007 UTC vs.
Revision 1.301 by root, Tue Jul 10 07:01:51 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;
53our $USE_FSYNC = 1; # use fsync to write maps - default off 80our $USE_FSYNC = 1; # use fsync to write maps - default off
54 81
82our $BDB_POLL_WATCHER;
83our $DB_ENV;
84
55our %CFG; 85our %CFG;
56 86
57our $UPTIME; $UPTIME ||= time; 87our $UPTIME; $UPTIME ||= time;
58our $RUNTIME; 88our $RUNTIME;
59 89
60our %PLAYER; # all users 90our %PLAYER; # all users
61our %MAP; # all maps 91our %MAP; # all maps
62our $LINK_MAP; # the special {link} map, which is always available 92our $LINK_MAP; # the special {link} map, which is always available
63our $RANDOM_MAPS = cf::localdir . "/random";
64
65our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
66our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
67 93
68# 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 ∕
69our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
70 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
71binmode STDOUT; 101binmode STDOUT;
72binmode STDERR; 102binmode STDERR;
73 103
74# read virtual server time, if available 104# read virtual server time, if available
75unless ($RUNTIME || !-e cf::localdir . "/runtime") { 105unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
76 open my $fh, "<", cf::localdir . "/runtime" 106 open my $fh, "<", "$LOCALDIR/runtime"
77 or die "unable to read runtime file: $!"; 107 or die "unable to read runtime file: $!";
78 $RUNTIME = <$fh> + 0.; 108 $RUNTIME = <$fh> + 0.;
79} 109}
80 110
81mkdir cf::localdir; 111mkdir $_
82mkdir cf::localdir . "/" . cf::playerdir; 112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
83mkdir cf::localdir . "/" . cf::tmpdir;
84mkdir cf::localdir . "/" . cf::uniquedir;
85mkdir $RANDOM_MAPS;
86 113
87our $EMERGENCY_POSITION; 114our $EMERGENCY_POSITION;
88 115
89sub cf::map::normalise; 116sub cf::map::normalise;
90 117
101=item $cf::RUNTIME 128=item $cf::RUNTIME
102 129
103The 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
104every server tick. 131every server tick.
105 132
106=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
107 136
108The perl library directory, where extensions and cf-specific modules can 137Various directories - "/etc", read-only install directory, perl-library
109be 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.
110 141
111=item $cf::NOW 142=item $cf::NOW
112 143
113The time of the last (current) server tick. 144The time of the last (current) server tick.
114 145
115=item $cf::TICK 146=item $cf::TICK
116 147
117The 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.
118 159
119=item %cf::CFG 160=item %cf::CFG
120 161
121Configuration for the server, loaded from C</etc/crossfire/config>, or 162Configuration for the server, loaded from C</etc/crossfire/config>, or
122from wherever your confdir points to. 163from wherever your confdir points to.
123 164
124=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 165=item cf::wait_for_tick, cf::wait_for_tick_begin
125 166
126These 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
127or 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
128processing 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.
129window of cpu time available, or simply to synchronise to the server tick.
130 170
131=back 171=back
132 172
133=cut 173=cut
134 174
135BEGIN { 175BEGIN {
136 *CORE::GLOBAL::warn = sub { 176 *CORE::GLOBAL::warn = sub {
137 my $msg = join "", @_; 177 my $msg = join "", @_;
138 utf8::encode $msg;
139 178
140 $msg .= "\n" 179 $msg .= "\n"
141 unless $msg =~ /\n$/; 180 unless $msg =~ /\n$/;
142 181
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183
184 utf8::encode $msg;
143 LOG llevError, $msg; 185 LOG llevError, $msg;
144 }; 186 };
145} 187}
146 188
147@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
148@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
149@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
150@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
151@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';
152@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)
153 196
154# 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
155# within the Safe compartment. 198# within the Safe compartment.
156for my $pkg (qw( 199for my $pkg (qw(
157 cf::global cf::attachable 200 cf::global cf::attachable
165} 208}
166 209
167$Event::DIED = sub { 210$Event::DIED = sub {
168 warn "error in event callback: @_"; 211 warn "error in event callback: @_";
169}; 212};
213
214#############################################################################
170 215
171=head2 UTILITY FUNCTIONS 216=head2 UTILITY FUNCTIONS
172 217
173=over 4 218=over 4
174 219
193 $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;
194 $d 239 $d
195 } || "[unable to dump $_[0]: '$@']"; 240 } || "[unable to dump $_[0]: '$@']";
196} 241}
197 242
198use JSON::Syck (); # TODO# replace by JSON::PC once working
199
200=item $ref = cf::from_json $json 243=item $ref = cf::from_json $json
201 244
202Converts a JSON string into the corresponding perl data structure. 245Converts a JSON string into the corresponding perl data structure.
203 246
204=cut
205
206sub from_json($) {
207 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
208 JSON::Syck::Load $_[0]
209}
210
211=item $json = cf::to_json $ref 247=item $json = cf::to_json $ref
212 248
213Converts a perl data structure into its JSON representation. 249Converts a perl data structure into its JSON representation.
214 250
215=cut 251=cut
216 252
217sub to_json($) { 253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
218 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 254
219 JSON::Syck::Dump $_[0] 255sub to_json ($) { $json_coder->encode ($_[0]) }
220} 256sub from_json ($) { $json_coder->decode ($_[0]) }
221 257
222=item cf::lock_wait $string 258=item cf::lock_wait $string
223 259
224Wait until the given lock is available. See cf::lock_acquire. 260Wait until the given lock is available. See cf::lock_acquire.
225 261
231returned. 267returned.
232 268
233Lock 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
234uses map_find and cf::map::load uses map_load). 270uses map_find and cf::map::load uses map_load).
235 271
272=item $locked = cf::lock_active $string
273
274Return true if the lock is currently active, i.e. somebody has locked it.
275
236=cut 276=cut
237 277
238our %LOCK; 278our %LOCK;
239 279
240sub lock_wait($) { 280sub lock_wait($) {
259 # wake up all waiters, to be on the safe side 299 # wake up all waiters, to be on the safe side
260 $_->ready for @{ delete $LOCK{$key} }; 300 $_->ready for @{ delete $LOCK{$key} };
261 } 301 }
262} 302}
263 303
304sub lock_active($) {
305 my ($key) = @_;
306
307 ! ! $LOCK{$key}
308}
309
264sub freeze_mainloop { 310sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 311 return unless $TICK_WATCHER->is_active;
266 312
267 my $guard = Coro::guard { 313 my $guard = Coro::guard {
268 $TICK_WATCHER->start; 314 $TICK_WATCHER->start;
269 $WRITE_RUNTIME_WATCHER->start;
270 }; 315 };
271 $WRITE_RUNTIME_WATCHER->stop;
272 $TICK_WATCHER->stop; 316 $TICK_WATCHER->stop;
273 $guard 317 $guard
274} 318}
275 319
276=item cf::async { BLOCK } 320=item cf::async { BLOCK }
283 327
284BEGIN { *async = \&Coro::async_pool } 328BEGIN { *async = \&Coro::async_pool }
285 329
286=item cf::sync_job { BLOCK } 330=item cf::sync_job { BLOCK }
287 331
288The design of crossfire+ requires that the main coro ($Coro::main) is 332The design of Crossfire TRT requires that the main coroutine ($Coro::main)
289always able to handle events or runnable, as crossfire+ is only partly 333is always able to handle events or runnable, as Crossfire TRT is only
290reentrant. 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.
291 336
292If 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
293the given BLOCK in another coroutine while waiting for the result. The 338the given BLOCK in another coroutine while waiting for the result. The
294server 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
295fast or be very important. 340fast or be very important.
298 343
299sub sync_job(&) { 344sub sync_job(&) {
300 my ($job) = @_; 345 my ($job) = @_;
301 346
302 if ($Coro::current == $Coro::main) { 347 if ($Coro::current == $Coro::main) {
348 my $time = Event::time;
349
303 # this is the main coro, too bad, we have to block 350 # this is the main coro, too bad, we have to block
304 # till the operation succeeds, freezing the server :/ 351 # till the operation succeeds, freezing the server :/
305 352
306 # TODO: use suspend/resume instead 353 # TODO: use suspend/resume instead
307 # (but this is cancel-safe) 354 # (but this is cancel-safe)
318 365
319 while ($busy) { 366 while ($busy) {
320 Coro::cede or Event::one_event; 367 Coro::cede or Event::one_event;
321 } 368 }
322 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
323 wantarray ? @res : $res[0] 377 wantarray ? @res : $res[0]
324 } else { 378 } else {
325 # we are in another coroutine, how wonderful, everything just works 379 # we are in another coroutine, how wonderful, everything just works
326 380
327 $job->() 381 $job->()
346 $EXT_CORO{$coro+0} = $coro; 400 $EXT_CORO{$coro+0} = $coro;
347 401
348 $coro 402 $coro
349} 403}
350 404
351sub write_runtime { 405=item fork_call { }, $args
352 my $runtime = cf::localdir . "/runtime";
353 406
354 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 407Executes the given code block with the given arguments in a seperate
355 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.
356 411
357 my $value = $cf::RUNTIME + 90 + 10; 412=cut
358 # 10 is the runtime save interval, for a monotonic clock
359 # 60 allows for the watchdog to kill the server.
360 413
361 (aio_write $fh, 0, (length $value), $value, 0) <= 0 414sub _store_scalar {
362 and return; 415 open my $fh, ">", \my $buf
363 416 or die "fork_call: cannot open fh-to-buf in child : $!";
364 # always fsync - this file is important 417 Storable::store_fd $_[0], $fh;
365 aio_fsync $fh
366 and return;
367
368 close $fh 418 close $fh;
369 or return;
370 419
371 aio_rename "$runtime~", $runtime 420 $buf
372 and return; 421}
373 422
423sub fork_call(&@) {
424 my ($cb, @args) = @_;
425
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
427# or die "socketpair: $!";
428 pipe my $fh1, my $fh2
429 or die "pipe: $!";
430
431 if (my $pid = fork) {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals;
445 local $SIG{__WARN__};
446 local $SIG{__DIE__};
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452
453 eval {
454 close $fh1;
455
456 my @res = eval { $cb->(@args) };
457
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
459 close $fh2;
460 };
461
462 warn $@ if $@;
463 _exit 0;
374 1 464 }
465}
466
467=item $value = cf::db_get $family => $key
468
469Returns a single value from the environment database.
470
471=item cf::db_put $family => $key => $value
472
473Stores the given C<$value> in the family. It can currently store binary
474data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475
476=cut
477
478our $DB;
479
480sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job {
485 eval {
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 }
495}
496
497sub db_get($$) {
498 my $key = "$_[0]/$_[1]";
499
500 cf::sync_job {
501 BDB::db_get $DB, undef, $key, my $data;
502
503 $! ? ()
504 : $data
505 }
506}
507
508sub db_put($$$) {
509 BDB::dbreq_pri 4;
510 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
511}
512
513=item cf::cache $id => [$paths...], $processversion => $process
514
515Generic caching function that returns the value of the resource $id,
516caching and regenerating as required.
517
518This function can block.
519
520=cut
521
522sub cache {
523 my ($id, $src, $processversion, $process) = @_;
524
525 my $meta =
526 join "\x00",
527 $processversion,
528 map {
529 aio_stat $_
530 and Carp::croak "$_: $!";
531
532 ($_, (stat _)[7,9])
533 } @$src;
534
535 my $dbmeta = db_get cache => "$id/meta";
536 if ($dbmeta ne $meta) {
537 # changed, we may need to process
538
539 my @data;
540 my $md5;
541
542 for (0 .. $#$src) {
543 0 <= aio_load $src->[$_], $data[$_]
544 or Carp::croak "$src->[$_]: $!";
545 }
546
547 # if processing is expensive, check
548 # checksum first
549 if (1) {
550 $md5 =
551 join "\x00",
552 $processversion,
553 map {
554 Coro::cede;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src;
557
558
559 my $dbmd5 = db_get cache => "$id/md5";
560 if ($dbmd5 eq $md5) {
561 db_put cache => "$id/meta", $meta;
562
563 return db_get cache => "$id/data";
564 }
565 }
566
567 my $t1 = Time::HiRes::time;
568 my $data = $process->(\@data);
569 my $t2 = Time::HiRes::time;
570
571 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
572
573 db_put cache => "$id/data", $data;
574 db_put cache => "$id/md5" , $md5;
575 db_put cache => "$id/meta", $meta;
576
577 return $data;
578 }
579
580 db_get cache => "$id/data"
581}
582
583=item cf::datalog type => key => value, ...
584
585Log a datalog packet of the given type with the given key-value pairs.
586
587=cut
588
589sub datalog($@) {
590 my ($type, %kv) = @_;
591 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
375} 592}
376 593
377=back 594=back
378 595
379=cut 596=cut
386attach callbacks/event handlers (a collection of which is called an "attachment") 603attach callbacks/event handlers (a collection of which is called an "attachment")
387to it. All such attachable objects support the following methods. 604to it. All such attachable objects support the following methods.
388 605
389In the following description, CLASS can be any of C<global>, C<object> 606In the following description, CLASS can be any of C<global>, C<object>
390C<player>, C<client> or C<map> (i.e. the attachable objects in 607C<player>, C<client> or C<map> (i.e. the attachable objects in
391crossfire+). 608Crossfire TRT).
392 609
393=over 4 610=over 4
394 611
395=item $attachable->attach ($attachment, key => $value...) 612=item $attachable->attach ($attachment, key => $value...)
396 613
559 $registry = $CB_TYPE[$object_type] ||= []; 776 $registry = $CB_TYPE[$object_type] ||= [];
560 777
561 } elsif ($type eq "subtype") { 778 } elsif ($type eq "subtype") {
562 defined $object_type or Carp::croak "subtype specified without type"; 779 defined $object_type or Carp::croak "subtype specified without type";
563 my $object_subtype = shift @arg; 780 my $object_subtype = shift @arg;
564 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 781 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
565 782
566 } elsif ($type eq "package") { 783 } elsif ($type eq "package") {
567 my $pkg = shift @arg; 784 my $pkg = shift @arg;
568 785
569 while (my ($name, $id) = each %cb_id) { 786 while (my ($name, $id) = each %cb_id) {
598 _attach $registry, $klass, @attach; 815 _attach $registry, $klass, @attach;
599 } 816 }
600 817
601 $obj->{$name} = \%arg; 818 $obj->{$name} = \%arg;
602 } else { 819 } else {
603 warn "object uses attachment '$name' that is not available, postponing.\n"; 820 warn "object uses attachment '$name' which is not available, postponing.\n";
604 } 821 }
605 822
606 $obj->{_attachment}{$name} = undef; 823 $obj->{_attachment}{$name} = undef;
607} 824}
608 825
610 if (ref $_[0]) { 827 if (ref $_[0]) {
611 _object_attach @_; 828 _object_attach @_;
612 } else { 829 } else {
613 _attach shift->_attach_registry, @_; 830 _attach shift->_attach_registry, @_;
614 } 831 }
832 _recalc_want;
615}; 833};
616 834
617# all those should be optimised 835# all those should be optimised
618sub cf::attachable::detach { 836sub cf::attachable::detach {
619 my ($obj, $name) = @_; 837 my ($obj, $name) = @_;
622 delete $obj->{_attachment}{$name}; 840 delete $obj->{_attachment}{$name};
623 reattach ($obj); 841 reattach ($obj);
624 } else { 842 } else {
625 Carp::croak "cannot, currently, detach class attachments"; 843 Carp::croak "cannot, currently, detach class attachments";
626 } 844 }
845 _recalc_want;
627}; 846};
628 847
629sub cf::attachable::attached { 848sub cf::attachable::attached {
630 my ($obj, $name) = @_; 849 my ($obj, $name) = @_;
631 850
778 } 997 }
779 } else { 998 } else {
780 aio_unlink $filename; 999 aio_unlink $filename;
781 aio_unlink "$filename.pst"; 1000 aio_unlink "$filename.pst";
782 } 1001 }
783
784 #d##TODO# nuke non .map-files if exist
785 if ($filename =~ s/\.map$//) {
786 aio_unlink $filename;
787 aio_unlink "$filename.pst";
788 }
789 } 1002 }
790} 1003}
791 1004
792sub object_freezer_as_string { 1005sub object_freezer_as_string {
793 my ($rdata, $objs) = @_; 1006 my ($rdata, $objs) = @_;
799 1012
800sub object_thawer_load { 1013sub object_thawer_load {
801 my ($filename) = @_; 1014 my ($filename) = @_;
802 1015
803 my ($data, $av); 1016 my ($data, $av);
804
805 #d#TODO remove .map if file does not exist
806 aio_stat $filename and $filename =~ s/\.map$//;
807 1017
808 (aio_load $filename, $data) >= 0 1018 (aio_load $filename, $data) >= 0
809 or return; 1019 or return;
810 1020
811 unless (aio_stat "$filename.pst") { 1021 unless (aio_stat "$filename.pst") {
813 or return; 1023 or return;
814 $av = eval { (Storable::thaw $av)->{objs} }; 1024 $av = eval { (Storable::thaw $av)->{objs} };
815 } 1025 }
816 1026
817 warn sprintf "loading %s (%d)\n", 1027 warn sprintf "loading %s (%d)\n",
818 $filename, length $data, scalar @{$av || []};#d# 1028 $filename, length $data, scalar @{$av || []};
819 return ($data, $av); 1029 return ($data, $av);
820} 1030}
1031
1032=head2 COMMAND CALLBACKS
1033
1034=over 4
1035
1036=cut
821 1037
822############################################################################# 1038#############################################################################
823# command handling &c 1039# command handling &c
824 1040
825=item cf::register_command $name => \&callback($ob,$args); 1041=item cf::register_command $name => \&callback($ob,$args);
838 push @{ $COMMAND{$name} }, [$caller, $cb]; 1054 push @{ $COMMAND{$name} }, [$caller, $cb];
839} 1055}
840 1056
841=item cf::register_extcmd $name => \&callback($pl,$packet); 1057=item cf::register_extcmd $name => \&callback($pl,$packet);
842 1058
843Register a callbackf ro execution when the client sends an extcmd packet. 1059Register a callback for execution when the client sends an (synchronous)
1060extcmd packet. Ext commands will be processed in the order they are
1061received by the server, like other user commands. The first argument is
1062the logged-in player. Ext commands can only be processed after a player
1063has logged in successfully.
844 1064
845If the callback returns something, it is sent back as if reply was being 1065If the callback returns something, it is sent back as if reply was being
846called. 1066called.
847 1067
1068=item cf::register_exticmd $name => \&callback($ns,$packet);
1069
1070Register a callback for execution when the client sends an (asynchronous)
1071exticmd packet. Exti commands are processed by the server as soon as they
1072are received, i.e. out of order w.r.t. other commands. The first argument
1073is a client socket. Exti commands can be received anytime, even before
1074log-in.
1075
1076If the callback returns something, it is sent back as if reply was being
1077called.
1078
848=cut 1079=cut
849 1080
850sub register_extcmd { 1081sub register_extcmd {
851 my ($name, $cb) = @_; 1082 my ($name, $cb) = @_;
852 1083
853 $EXTCMD{$name} = $cb; 1084 $EXTCMD{$name} = $cb;
1085}
1086
1087sub register_exticmd {
1088 my ($name, $cb) = @_;
1089
1090 $EXTICMD{$name} = $cb;
854} 1091}
855 1092
856cf::player->attach ( 1093cf::player->attach (
857 on_command => sub { 1094 on_command => sub {
858 my ($pl, $name, $params) = @_; 1095 my ($pl, $name, $params) = @_;
867 cf::override; 1104 cf::override;
868 }, 1105 },
869 on_extcmd => sub { 1106 on_extcmd => sub {
870 my ($pl, $buf) = @_; 1107 my ($pl, $buf) = @_;
871 1108
872 my $msg = eval { from_json $buf }; 1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
873 1110
874 if (ref $msg) { 1111 if (ref $msg) {
875 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) {
876 if (my %reply = $cb->($pl, $msg)) { 1113 if (my %reply = $cb->($pl, $msg)) {
877 $pl->ext_reply ($msg->{msgid}, %reply); 1114 $pl->ext_reply ($msg->{msgid}, %reply);
883 1120
884 cf::override; 1121 cf::override;
885 }, 1122 },
886); 1123);
887 1124
888sub load_extension {
889 my ($path) = @_;
890
891 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
892 my $base = $1;
893 my $pkg = $1;
894 $pkg =~ s/[^[:word:]]/_/g;
895 $pkg = "ext::$pkg";
896
897 warn "... loading '$path' into '$pkg'\n";
898
899 open my $fh, "<:utf8", $path
900 or die "$path: $!";
901
902 my $source =
903 "package $pkg; use strict; use utf8;\n"
904 . "#line 1 \"$path\"\n{\n"
905 . (do { local $/; <$fh> })
906 . "\n};\n1";
907
908 unless (eval $source) {
909 my $msg = $@ ? "$path: $@\n"
910 : "extension disabled.\n";
911 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
912 warn $@;
913 warn "mandatory extension failed to load, exiting.\n";
914 exit 1;
915 }
916 die $@;
917 }
918
919 push @EXTS, $pkg;
920}
921
922sub load_extensions { 1125sub load_extensions {
1126 cf::sync_job {
1127 my %todo;
1128
923 for my $ext (<$LIBDIR/*.ext>) { 1129 for my $path (<$LIBDIR/*.ext>) {
924 next unless -r $ext; 1130 next unless -r $path;
925 eval { 1131
926 load_extension $ext; 1132 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1133 my $base = $1;
1134 my $pkg = $1;
1135 $pkg =~ s/[^[:word:]]/_/g;
1136 $pkg = "ext::$pkg";
1137
1138 open my $fh, "<:utf8", $path
1139 or die "$path: $!";
1140
1141 my $source = do { local $/; <$fh> };
1142
1143 my %ext = (
1144 path => $path,
1145 base => $base,
1146 pkg => $pkg,
1147 );
1148
1149 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1150 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1151
1152 $ext{source} =
1153 "package $pkg; use strict; use utf8;\n"
1154 . "#line 1 \"$path\"\n{\n"
1155 . $source
1156 . "\n};\n1";
1157
1158 $todo{$base} = \%ext;
1159 }
1160
1161 my %done;
1162 while (%todo) {
1163 my $progress;
1164
1165 while (my ($k, $v) = each %todo) {
1166 for (split /,\s*/, $v->{meta}{depends}) {
1167 goto skip
1168 unless exists $done{$_};
1169 }
1170
1171 warn "... loading '$k' into '$v->{pkg}'\n";
1172
1173 unless (eval $v->{source}) {
1174 my $msg = $@ ? "$v->{path}: $@\n"
1175 : "$v->{base}: extension inactive.\n";
1176
1177 if (exists $v->{meta}{mandatory}) {
1178 warn $msg;
1179 warn "mandatory extension failed to load, exiting.\n";
1180 exit 1;
1181 }
1182
1183 warn $msg;
1184 }
1185
1186 $done{$k} = delete $todo{$k};
1187 push @EXTS, $v->{pkg};
1188 $progress = 1;
927 1 1189 }
928 } or warn "$ext not loaded: $@"; 1190
1191 skip:
1192 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1193 unless $progress;
1194 }
929 } 1195 };
930} 1196}
931 1197
932############################################################################# 1198#############################################################################
933 1199
1200=back
1201
934=head2 CORE EXTENSIONS 1202=head2 CORE EXTENSIONS
935 1203
936Functions and methods that extend core crossfire objects. 1204Functions and methods that extend core crossfire objects.
937 1205
938=cut 1206=cut
950Returns the given player object, loading it if necessary (might block). 1218Returns the given player object, loading it if necessary (might block).
951 1219
952=cut 1220=cut
953 1221
954sub playerdir($) { 1222sub playerdir($) {
955 cf::localdir 1223 "$PLAYERDIR/"
956 . "/"
957 . cf::playerdir
958 . "/"
959 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1224 . (ref $_[0] ? $_[0]->ob->name : $_[0])
960} 1225}
961 1226
962sub path($) { 1227sub path($) {
963 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1228 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964 1229
965 (playerdir $login) . "/$login.pl" 1230 (playerdir $login) . "/playerdata"
966} 1231}
967 1232
968sub find_active($) { 1233sub find_active($) {
969 $cf::PLAYER{$_[0]} 1234 $cf::PLAYER{$_[0]}
970 and $cf::PLAYER{$_[0]}->active 1235 and $cf::PLAYER{$_[0]}->active
983 my $login = $_[0]; 1248 my $login = $_[0];
984 1249
985 my $guard = cf::lock_acquire "user_find:$login"; 1250 my $guard = cf::lock_acquire "user_find:$login";
986 1251
987 $cf::PLAYER{$_[0]} || do { 1252 $cf::PLAYER{$_[0]} || do {
1253 # rename old playerfiles to new ones
1254 #TODO: remove when no longer required
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl";
1259
988 my $pl = load_pl path $login 1260 my $pl = load_pl path $login
989 or return; 1261 or return;
990 $cf::PLAYER{$login} = $pl 1262 $cf::PLAYER{$login} = $pl
991 } 1263 }
992 } 1264 }
1029 1301
1030=cut 1302=cut
1031 1303
1032sub quit_character { 1304sub quit_character {
1033 my ($pl) = @_; 1305 my ($pl) = @_;
1306
1307 my $name = $pl->ob->name;
1034 1308
1035 $pl->{deny_save} = 1; 1309 $pl->{deny_save} = 1;
1036 $pl->password ("*"); # this should lock out the player until we nuked the dir 1310 $pl->password ("*"); # this should lock out the player until we nuked the dir
1037 1311
1038 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1312 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1043 my $path = playerdir $pl; 1317 my $path = playerdir $pl;
1044 my $temp = "$path~$cf::RUNTIME~deleting~"; 1318 my $temp = "$path~$cf::RUNTIME~deleting~";
1045 aio_rename $path, $temp; 1319 aio_rename $path, $temp;
1046 delete $cf::PLAYER{$pl->ob->name}; 1320 delete $cf::PLAYER{$pl->ob->name};
1047 $pl->destroy; 1321 $pl->destroy;
1322
1323 my $prefix = qr<^~\Q$name\E/>;
1324
1325 # nuke player maps
1326 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1327
1048 IO::AIO::aio_rmtree $temp; 1328 IO::AIO::aio_rmtree $temp;
1329}
1330
1331=item $pl->kick
1332
1333Kicks a player out of the game. This destroys the connection.
1334
1335=cut
1336
1337sub kick {
1338 my ($pl, $kicker) = @_;
1339
1340 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1341 $pl->killer ("kicked");
1342 $pl->ns->destroy;
1049} 1343}
1050 1344
1051=item cf::player::list_logins 1345=item cf::player::list_logins
1052 1346
1053Returns am arrayref of all valid playernames in the system, can take a 1347Returns am arrayref of all valid playernames in the system, can take a
1054while and may block, so not sync_job-capable, ever. 1348while and may block, so not sync_job-capable, ever.
1055 1349
1056=cut 1350=cut
1057 1351
1058sub list_logins { 1352sub list_logins {
1059 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1353 my $dirs = aio_readdir $PLAYERDIR
1060 or return []; 1354 or return [];
1061 1355
1062 my @logins; 1356 my @logins;
1063 1357
1064 for my $login (@$dirs) { 1358 for my $login (@$dirs) {
1099 } 1393 }
1100 1394
1101 \@paths 1395 \@paths
1102} 1396}
1103 1397
1398=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1399
1400Expand crossfire pod fragments into protocol xml.
1401
1402=cut
1403
1404sub expand_cfpod {
1405 ((my $self), (local $_)) = @_;
1406
1407 # escape & and <
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410
1411 # this is buggy, it needs to properly take care of nested <'s
1412
1413 1 while
1414 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/
1418 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1
1421 }ge
1422 # replace H<hint text>
1423 || s{H<([^\>]*)>}
1424 {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "")
1428 [$self->{hintmode}]
1429 }ge;
1430
1431 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g;
1433
1434 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines
1439
1440 $_
1441}
1442
1443sub hintmode {
1444 $_[0]{hintmode} = $_[1] if @_ > 1;
1445 $_[0]{hintmode}
1446}
1447
1104=item $player->ext_reply ($msgid, $msgtype, %msg) 1448=item $player->ext_reply ($msgid, %msg)
1105 1449
1106Sends an ext reply to the player. 1450Sends an ext reply to the player.
1107 1451
1108=cut 1452=cut
1109 1453
1110sub ext_reply($$$%) { 1454sub ext_reply($$%) {
1111 my ($self, $id, %msg) = @_; 1455 my ($self, $id, %msg) = @_;
1112 1456
1113 $msg{msgid} = $id; 1457 $msg{msgid} = $id;
1114 1458 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1115 $self->send ("ext " . cf::to_json \%msg);
1116} 1459}
1117 1460
1118package cf; 1461=item $player->ext_event ($type, %msg)
1462
1463Sends an ext event to the client.
1464
1465=cut
1466
1467sub ext_event($$%) {
1468 my ($self, $type, %msg) = @_;
1469
1470 $self->ns->ext_event ($type, %msg);
1471}
1472
1473=head3 cf::region
1474
1475=over 4
1476
1477=cut
1478
1479package cf::region;
1480
1481=item cf::region::find_by_path $path
1482
1483Tries to decuce the likely region for a map knowing only its path.
1484
1485=cut
1486
1487sub find_by_path($) {
1488 my ($path) = @_;
1489
1490 my ($match, $specificity);
1491
1492 for my $region (list) {
1493 if ($region->match && $path =~ $region->match) {
1494 ($match, $specificity) = ($region, $region->specificity)
1495 if $region->specificity > $specificity;
1496 }
1497 }
1498
1499 $match
1500}
1119 1501
1120=back 1502=back
1121
1122 1503
1123=head3 cf::map 1504=head3 cf::map
1124 1505
1125=over 4 1506=over 4
1126 1507
1181 my ($self, $merge) = @_; 1562 my ($self, $merge) = @_;
1182 1563
1183 # we have to keep some variables in memory intact 1564 # we have to keep some variables in memory intact
1184 local $self->{path}; 1565 local $self->{path};
1185 local $self->{load_path}; 1566 local $self->{load_path};
1186 local $self->{deny_save};
1187 local $self->{deny_reset};
1188 1567
1189 $self->SUPER::thawer_merge ($merge); 1568 $self->SUPER::thawer_merge ($merge);
1190} 1569}
1191 1570
1192sub normalise { 1571sub normalise {
1264 1643
1265# the original (read-only) location 1644# the original (read-only) location
1266sub load_path { 1645sub load_path {
1267 my ($self) = @_; 1646 my ($self) = @_;
1268 1647
1269 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1648 "$MAPDIR/$self->{path}.map"
1270} 1649}
1271 1650
1272# the temporary/swap location 1651# the temporary/swap location
1273sub save_path { 1652sub save_path {
1274 my ($self) = @_; 1653 my ($self) = @_;
1275 1654
1276 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1655 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1277 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1656 "$TMPDIR/$path.map"
1278} 1657}
1279 1658
1280# the unique path, undef == no special unique path 1659# the unique path, undef == no special unique path
1281sub uniq_path { 1660sub uniq_path {
1282 my ($self) = @_; 1661 my ($self) = @_;
1283 1662
1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1663 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1285 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1664 "$UNIQUEDIR/$path"
1286} 1665}
1287 1666
1288# and all this just because we cannot iterate over 1667# and all this just because we cannot iterate over
1289# all maps in C++... 1668# all maps in C++...
1290sub change_all_map_light { 1669sub change_all_map_light {
1292 1671
1293 $_->change_map_light ($change) 1672 $_->change_map_light ($change)
1294 for grep $_->outdoor, values %cf::MAP; 1673 for grep $_->outdoor, values %cf::MAP;
1295} 1674}
1296 1675
1676sub decay_objects {
1677 my ($self) = @_;
1678
1679 return if $self->{deny_reset};
1680
1681 $self->do_decay_objects;
1682}
1683
1297sub unlink_save { 1684sub unlink_save {
1298 my ($self) = @_; 1685 my ($self) = @_;
1299 1686
1300 utf8::encode (my $save = $self->save_path); 1687 utf8::encode (my $save = $self->save_path);
1301 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1688 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1302 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst"; 1689 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";
1303
1304 #d#TODO remove .map and also nuke
1305 $save =~ s/\.map// or return;#d#
1306 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;#d#
1307 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink "$save.pst";#d#
1308} 1690}
1309 1691
1310sub load_header_from($) { 1692sub load_header_from($) {
1311 my ($self, $path) = @_; 1693 my ($self, $path) = @_;
1312 1694
1362 $self->load_header_orig 1744 $self->load_header_orig
1363 or return; 1745 or return;
1364 $self->prepare_orig; 1746 $self->prepare_orig;
1365 } 1747 }
1366 1748
1749 $self->{deny_reset} = 1
1750 if $self->no_reset;
1751
1752 $self->default_region (cf::region::find_by_path $self->{path})
1753 unless $self->default_region;
1754
1367 1 1755 1
1368} 1756}
1369 1757
1370sub find; 1758sub find;
1371sub find { 1759sub find {
1383 $map->{last_save} = $cf::RUNTIME; 1771 $map->{last_save} = $cf::RUNTIME;
1384 1772
1385 $map->load_header 1773 $map->load_header
1386 or return; 1774 or return;
1387 1775
1388 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1776 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1389 # doing this can freeze the server in a sync job, obviously 1777 # doing this can freeze the server in a sync job, obviously
1390 #$cf::WAIT_FOR_TICK->wait; 1778 #$cf::WAIT_FOR_TICK->wait;
1391 $map->reset; 1779 $map->reset;
1392 undef $guard; 1780 undef $guard;
1393 return find $path; 1781 return find $path;
1404 my ($self) = @_; 1792 my ($self) = @_;
1405 1793
1406 local $self->{deny_reset} = 1; # loading can take a long time 1794 local $self->{deny_reset} = 1; # loading can take a long time
1407 1795
1408 my $path = $self->{path}; 1796 my $path = $self->{path};
1797
1798 {
1409 my $guard = cf::lock_acquire "map_load:$path"; 1799 my $guard = cf::lock_acquire "map_load:$path";
1410 1800
1411 return if $self->in_memory != cf::MAP_SWAPPED; 1801 return if $self->in_memory != cf::MAP_SWAPPED;
1412 1802
1413 $self->in_memory (cf::MAP_LOADING); 1803 $self->in_memory (cf::MAP_LOADING);
1414 1804
1415 $self->alloc; 1805 $self->alloc;
1416 1806
1417 $self->pre_load; 1807 $self->pre_load;
1418
1419 $self->_load_objects ($self->{load_path}, 1)
1420 or return;
1421
1422 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1423 if delete $self->{load_original};
1424
1425 if (my $uniq = $self->uniq_path) {
1426 utf8::encode $uniq;
1427 if (aio_open $uniq, O_RDONLY, 0) {
1428 $self->clear_unique_items;
1429 $self->_load_objects ($uniq, 0);
1430 }
1431 }
1432
1433 Coro::cede;
1434
1435 # now do the right thing for maps
1436 $self->link_multipart_objects;
1437
1438 unless ($self->{deny_activate}) {
1439 $self->decay_objects;
1440 $self->fix_auto_apply;
1441 $self->update_buttons;
1442 Coro::cede; 1808 Coro::cede;
1443 $self->set_darkness_map; 1809
1810 $self->_load_objects ($self->{load_path}, 1)
1811 or return;
1812
1813 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1814 if delete $self->{load_original};
1815
1816 if (my $uniq = $self->uniq_path) {
1817 utf8::encode $uniq;
1818 if (aio_open $uniq, O_RDONLY, 0) {
1819 $self->clear_unique_items;
1820 $self->_load_objects ($uniq, 0);
1821 }
1822 }
1823
1824 Coro::cede;
1825 # now do the right thing for maps
1826 $self->link_multipart_objects;
1444 $self->difficulty ($self->estimate_difficulty) 1827 $self->difficulty ($self->estimate_difficulty)
1445 unless $self->difficulty; 1828 unless $self->difficulty;
1446 Coro::cede; 1829 Coro::cede;
1830
1831 unless ($self->{deny_activate}) {
1832 $self->decay_objects;
1833 $self->fix_auto_apply;
1834 $self->update_buttons;
1835 Coro::cede;
1836 $self->set_darkness_map;
1837 Coro::cede;
1447 $self->activate; 1838 $self->activate;
1839 }
1840
1841 $self->in_memory (cf::MAP_IN_MEMORY);
1448 } 1842 }
1449 1843
1450 $self->post_load; 1844 $self->post_load;
1451
1452 $self->in_memory (cf::MAP_IN_MEMORY);
1453} 1845}
1454 1846
1455sub customise_for { 1847sub customise_for {
1456 my ($self, $ob) = @_; 1848 my ($self, $ob) = @_;
1457 1849
1458 return find "~" . $ob->name . "/" . $self->{path} 1850 return find "~" . $ob->name . "/" . $self->{path}
1459 if $self->per_player; 1851 if $self->per_player;
1852
1853# return find "?party/" . $ob->name . "/" . $self->{path}
1854# if $self->per_party;
1460 1855
1461 $self 1856 $self
1462} 1857}
1463 1858
1464# find and load all maps in the 3x3 area around a map 1859# find and load all maps in the 3x3 area around a map
1575 1970
1576sub reset_at { 1971sub reset_at {
1577 my ($self) = @_; 1972 my ($self) = @_;
1578 1973
1579 # TODO: safety, remove and allow resettable per-player maps 1974 # TODO: safety, remove and allow resettable per-player maps
1580 return 1e99 if $self->isa ("ext::map_per_player");#d#
1581 return 1e99 if $self->{deny_reset}; 1975 return 1e99 if $self->{deny_reset};
1582 1976
1583 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 1977 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1584 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 1978 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1585 1979
1596 my ($self) = @_; 1990 my ($self) = @_;
1597 1991
1598 my $lock = cf::lock_acquire "map_data:$self->{path}"; 1992 my $lock = cf::lock_acquire "map_data:$self->{path}";
1599 1993
1600 return if $self->players; 1994 return if $self->players;
1601 return if $self->isa ("ext::map_per_player");#d#
1602 1995
1603 warn "resetting map ", $self->path;#d# 1996 warn "resetting map ", $self->path;
1997
1998 $self->in_memory (cf::MAP_SWAPPED);
1999
2000 # need to save uniques path
2001 unless ($self->{deny_save}) {
2002 my $uniq = $self->uniq_path; utf8::encode $uniq;
2003
2004 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2005 if $uniq;
2006 }
1604 2007
1605 delete $cf::MAP{$self->path}; 2008 delete $cf::MAP{$self->path};
1606 2009
1607 $self->in_memory (cf::MAP_SWAPPED);
1608 $self->clear; 2010 $self->clear;
1609 2011
1610 $_->clear_links_to ($self) for values %cf::MAP; 2012 $_->clear_links_to ($self) for values %cf::MAP;
1611 2013
1612 $self->unlink_save; 2014 $self->unlink_save;
1631 $cf::MAP{$self->path} = $self; 2033 $cf::MAP{$self->path} = $self;
1632 2034
1633 $self->reset; # polite request, might not happen 2035 $self->reset; # polite request, might not happen
1634} 2036}
1635 2037
2038=item $maps = cf::map::tmp_maps
2039
2040Returns an arrayref with all map paths of currently instantiated and saved
2041maps. May block.
2042
2043=cut
2044
2045sub tmp_maps() {
2046 [
2047 map {
2048 utf8::decode $_;
2049 /\.map$/
2050 ? normalise $_
2051 : ()
2052 } @{ aio_readdir $TMPDIR or [] }
2053 ]
2054}
2055
2056=item $maps = cf::map::random_maps
2057
2058Returns an arrayref with all map paths of currently instantiated and saved
2059random maps. May block.
2060
2061=cut
2062
2063sub random_maps() {
2064 [
2065 map {
2066 utf8::decode $_;
2067 /\.map$/
2068 ? normalise "?random/$_"
2069 : ()
2070 } @{ aio_readdir $RANDOMDIR or [] }
2071 ]
2072}
2073
1636=item cf::map::unique_maps 2074=item cf::map::unique_maps
1637 2075
1638Returns an arrayref of paths of all shared maps that have 2076Returns an arrayref of paths of all shared maps that have
1639instantiated unique items. May block. 2077instantiated unique items. May block.
1640 2078
1641=cut 2079=cut
1642 2080
1643sub unique_maps() { 2081sub unique_maps() {
1644 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2082 [
1645 or return; 2083 map {
1646
1647 my @paths;
1648
1649 for (@$files) {
1650 utf8::decode $_; 2084 utf8::decode $_;
1651 next if /\.pst$/; 2085 /\.map$/
1652 next unless /^$PATH_SEP/o; 2086 ? normalise $_
1653 2087 : ()
1654 push @paths, cf::map::normalise $_; 2088 } @{ aio_readdir $UNIQUEDIR or [] }
1655 } 2089 ]
1656
1657 \@paths
1658} 2090}
1659 2091
1660package cf; 2092package cf;
1661 2093
1662=back 2094=back
1708 2140
1709 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2141 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1710 2142
1711 if ($self->{record_replies}) { 2143 if ($self->{record_replies}) {
1712 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2144 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2145
1713 } else { 2146 } else {
2147 my $pl = $self->contr;
2148
2149 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2150 my $diag = $pl->{npc_dialog};
2151 $diag->{pl}->ext_reply (
2152 $diag->{id},
2153 msgtype => "reply",
2154 msg => $diag->{pl}->expand_cfpod ($msg),
2155 add_topics => []
2156 );
2157
2158 } else {
1714 $msg = $npc->name . " says: $msg" if $npc; 2159 $msg = $npc->name . " says: $msg" if $npc;
1715 $self->message ($msg, $flags); 2160 $self->message ($msg, $flags);
2161 }
1716 } 2162 }
1717} 2163}
1718 2164
1719=item $player_object->may ("access") 2165=item $player_object->may ("access")
1720 2166
1768 $self->deactivate_recursive; 2214 $self->deactivate_recursive;
1769 2215
1770 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2216 return if UNIVERSAL::isa $self->map, "ext::map_link";
1771 2217
1772 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2218 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1773 if $self->map; 2219 if $self->map && $self->map->{path} ne "{link}";
1774 2220
1775 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2221 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1776} 2222}
1777 2223
1778sub cf::object::player::leave_link { 2224sub cf::object::player::leave_link {
1779 my ($self, $map, $x, $y) = @_; 2225 my ($self, $map, $x, $y) = @_;
2226
2227 return unless $self->contr->active;
1780 2228
1781 my $link_pos = delete $self->{_link_pos}; 2229 my $link_pos = delete $self->{_link_pos};
1782 2230
1783 unless ($map) { 2231 unless ($map) {
1784 # restore original map position 2232 # restore original map position
1802 $map->load; 2250 $map->load;
1803 $map->load_diag; 2251 $map->load_diag;
1804 2252
1805 return unless $self->contr->active; 2253 return unless $self->contr->active;
1806 $self->activate_recursive; 2254 $self->activate_recursive;
2255
2256 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1807 $self->enter_map ($map, $x, $y); 2257 $self->enter_map ($map, $x, $y);
1808} 2258}
1809 2259
1810cf::player->attach (
1811 on_logout => sub {
1812 my ($pl) = @_;
1813
1814 # abort map switching before logout
1815 if ($pl->ob->{_link_pos}) {
1816 cf::sync_job {
1817 $pl->ob->leave_link
1818 };
1819 }
1820 },
1821 on_login => sub {
1822 my ($pl) = @_;
1823
1824 # try to abort aborted map switching on player login :)
1825 # should happen only on crashes
1826 if ($pl->ob->{_link_pos}) {
1827 $pl->ob->enter_link;
1828 (async {
1829 # we need this sleep as the login has a concurrent enter_exit running
1830 # and this sleep increases chances of the player not ending up in scorn
1831 $pl->ob->reply (undef,
1832 "There was an internal problem at your last logout, "
1833 . "the server will try to bring you to your intended destination in a second.",
1834 cf::NDI_RED);
1835 Coro::Timer::sleep 1;
1836 $pl->ob->leave_link;
1837 })->prio (2);
1838 }
1839 },
1840);
1841
1842=item $player_object->goto ($path, $x, $y) 2260=item $player_object->goto ($path, $x, $y[, $check->($map)])
1843 2261
2262Moves the player to the given map-path and coordinates by first freezing
2263her, loading and preparing them map, calling the provided $check callback
2264that has to return the map if sucecssful, and then unfreezes the player on
2265the new (success) or old (failed) map position.
2266
1844=cut 2267=cut
2268
2269our $GOTOGEN;
1845 2270
1846sub cf::object::player::goto { 2271sub cf::object::player::goto {
1847 my ($self, $path, $x, $y) = @_; 2272 my ($self, $path, $x, $y, $check) = @_;
2273
2274 # do generation counting so two concurrent goto's will be executed in-order
2275 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1848 2276
1849 $self->enter_link; 2277 $self->enter_link;
1850 2278
1851 (async { 2279 (async {
1852 my $map = eval { 2280 my $map = eval {
1853 my $map = cf::map::find $path; 2281 my $map = cf::map::find $path;
2282
2283 if ($map) {
1854 $map = $map->customise_for ($self) if $map; 2284 $map = $map->customise_for ($self);
2285 $map = $check->($map) if $check && $map;
2286 } else {
2287 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2288 }
2289
1855 $map 2290 $map
2291 };
2292
2293 if ($@) {
2294 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2295 LOG llevError | logBacktrace, Carp::longmess $@;
1856 } or 2296 }
1857 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1858 2297
2298 if ($gen == $self->{_goto_generation}) {
2299 delete $self->{_goto_generation};
1859 $self->leave_link ($map, $x, $y); 2300 $self->leave_link ($map, $x, $y);
2301 }
1860 })->prio (1); 2302 })->prio (1);
1861} 2303}
1862 2304
1863=item $player_object->enter_exit ($exit_object) 2305=item $player_object->enter_exit ($exit_object)
1864 2306
1903 2345
1904 $rmp->{random_seed} ||= $exit->random_seed; 2346 $rmp->{random_seed} ||= $exit->random_seed;
1905 2347
1906 my $data = cf::to_json $rmp; 2348 my $data = cf::to_json $rmp;
1907 my $md5 = Digest::MD5::md5_hex $data; 2349 my $md5 = Digest::MD5::md5_hex $data;
1908 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2350 my $meta = "$RANDOMDIR/$md5.meta";
1909 2351
1910 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2352 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1911 aio_write $fh, 0, (length $data), $data, 0; 2353 aio_write $fh, 0, (length $data), $data, 0;
1912 undef $fh; 2354 undef $fh;
1913 aio_rename "$meta~", $meta; 2355 aio_rename "$meta~", $meta;
1922 2364
1923 return unless $self->type == cf::PLAYER; 2365 return unless $self->type == cf::PLAYER;
1924 2366
1925 if ($exit->slaying eq "/!") { 2367 if ($exit->slaying eq "/!") {
1926 #TODO: this should de-fi-ni-te-ly not be a sync-job 2368 #TODO: this should de-fi-ni-te-ly not be a sync-job
2369 # the problem is that $exit might not survive long enough
2370 # so it needs to be done right now, right here
1927 cf::sync_job { prepare_random_map $exit }; 2371 cf::sync_job { prepare_random_map $exit };
1928 } 2372 }
1929 2373
1930 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2374 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1931 my $hp = $exit->stats->hp; 2375 my $hp = $exit->stats->hp;
1932 my $sp = $exit->stats->sp; 2376 my $sp = $exit->stats->sp;
1933 2377
1934 $self->enter_link; 2378 $self->enter_link;
2379
2380 # if exit is damned, update players death & WoR home-position
2381 $self->contr->savebed ($slaying, $hp, $sp)
2382 if $exit->flag (FLAG_DAMNED);
1935 2383
1936 (async { 2384 (async {
1937 $self->deactivate_recursive; # just to be sure 2385 $self->deactivate_recursive; # just to be sure
1938 unless (eval { 2386 unless (eval {
1939 $self->goto ($slaying, $hp, $sp); 2387 $self->goto ($slaying, $hp, $sp);
1940 2388
1941 1; 2389 1;
1942 }) { 2390 }) {
1943 $self->message ("Something went wrong deep within the crossfire server. " 2391 $self->message ("Something went wrong deep within the crossfire server. "
1944 . "I'll try to bring you back to the map you were before. " 2392 . "I'll try to bring you back to the map you were before. "
1945 . "Please report this to the dungeon master!", 2393 . "Please report this to the dungeon master!",
1946 cf::NDI_UNIQUE | cf::NDI_RED); 2394 cf::NDI_UNIQUE | cf::NDI_RED);
1947 2395
1948 warn "ERROR in enter_exit: $@"; 2396 warn "ERROR in enter_exit: $@";
1949 $self->leave_link; 2397 $self->leave_link;
1950 } 2398 }
1951 })->prio (1); 2399 })->prio (1);
1964 2412
1965sub cf::client::send_drawinfo { 2413sub cf::client::send_drawinfo {
1966 my ($self, $text, $flags) = @_; 2414 my ($self, $text, $flags) = @_;
1967 2415
1968 utf8::encode $text; 2416 utf8::encode $text;
1969 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2417 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1970} 2418}
1971 2419
2420=item $client->send_msg ($color, $type, $msg, [extra...])
2421
2422Send a drawinfo or msg packet to the client, formatting the msg for the
2423client if neccessary. C<$type> should be a string identifying the type of
2424the message, with C<log> being the default. If C<$color> is negative, suppress
2425the message unless the client supports the msg packet.
2426
2427=cut
2428
2429sub cf::client::send_msg {
2430 my ($self, $color, $type, $msg, @extra) = @_;
2431
2432 $msg = $self->pl->expand_cfpod ($msg);
2433
2434 return unless @extra || length $msg;
2435
2436 if ($self->can_msg) {
2437 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra]));
2438 } else {
2439 # replace some tags by gcfclient-compatible ones
2440 for ($msg) {
2441 1 while
2442 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2443 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2444 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2445 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2446 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2447 }
2448
2449 if ($color >= 0) {
2450 if (0 && $msg =~ /\[/) {
2451 $self->send_packet ("drawextinfo $color 4 0 $msg")
2452 } else {
2453 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2454 $self->send_packet ("drawinfo $color $msg")
2455 }
2456 }
2457 }
2458}
2459
2460=item $client->ext_event ($type, %msg)
2461
2462Sends an ext event to the client.
2463
2464=cut
2465
2466sub cf::client::ext_event($$%) {
2467 my ($self, $type, %msg) = @_;
2468
2469 $msg{msgtype} = "event_$type";
2470 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg));
2471}
1972 2472
1973=item $success = $client->query ($flags, "text", \&cb) 2473=item $success = $client->query ($flags, "text", \&cb)
1974 2474
1975Queues a query to the client, calling the given callback with 2475Queues a query to the client, calling the given callback with
1976the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2476the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1977C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2477C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1978 2478
1979Queries can fail, so check the return code. Or don't, as queries will become 2479Queries can fail, so check the return code. Or don't, as queries will
1980reliable at some point in the future. 2480become reliable at some point in the future.
1981 2481
1982=cut 2482=cut
1983 2483
1984sub cf::client::query { 2484sub cf::client::query {
1985 my ($self, $flags, $text, $cb) = @_; 2485 my ($self, $flags, $text, $cb) = @_;
1993 utf8::encode $text; 2493 utf8::encode $text;
1994 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2494 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1995 2495
1996 $self->send_packet ($self->{query_queue}[0][0]) 2496 $self->send_packet ($self->{query_queue}[0][0])
1997 if @{ $self->{query_queue} } == 1; 2497 if @{ $self->{query_queue} } == 1;
2498
2499 1
1998} 2500}
1999 2501
2000cf::client->attach ( 2502cf::client->attach (
2503 on_connect => sub {
2504 my ($ns) = @_;
2505
2506 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2507 },
2001 on_reply => sub { 2508 on_reply => sub {
2002 my ($ns, $msg) = @_; 2509 my ($ns, $msg) = @_;
2003 2510
2004 # this weird shuffling is so that direct followup queries 2511 # this weird shuffling is so that direct followup queries
2005 # get handled first 2512 # get handled first
2017 } else { 2524 } else {
2018 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2525 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2019 } 2526 }
2020 } 2527 }
2021 }, 2528 },
2529 on_exticmd => sub {
2530 my ($ns, $buf) = @_;
2531
2532 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2533
2534 if (ref $msg) {
2535 if (my $cb = $EXTICMD{$msg->{msgtype}}) {
2536 if (my %reply = $cb->($ns, $msg)) {
2537 $reply{msgid} = $msg->{msgid};
2538 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2539 }
2540 }
2541 } else {
2542 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2543 }
2544
2545 cf::override;
2546 },
2022); 2547);
2023 2548
2024=item $client->async (\&cb) 2549=item $client->async (\&cb)
2025 2550
2026Create a new coroutine, running the specified callback. The coroutine will 2551Create a new coroutine, running the specified callback. The coroutine will
2073 2598
2074# here we export the classes and methods available to script code 2599# here we export the classes and methods available to script code
2075 2600
2076=pod 2601=pod
2077 2602
2078The following fucntions and emthods are available within a safe environment: 2603The following functions and methods are available within a safe environment:
2079 2604
2080 cf::object contr pay_amount pay_player map 2605 cf::object
2606 contr pay_amount pay_player map x y force_find force_add
2607 insert remove
2608
2081 cf::object::player player 2609 cf::object::player
2082 cf::player peaceful 2610 player
2083 cf::map trigger 2611
2612 cf::player
2613 peaceful
2614
2615 cf::map
2616 trigger
2084 2617
2085=cut 2618=cut
2086 2619
2087for ( 2620for (
2088 ["cf::object" => qw(contr pay_amount pay_player map)], 2621 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2622 insert remove)],
2089 ["cf::object::player" => qw(player)], 2623 ["cf::object::player" => qw(player)],
2090 ["cf::player" => qw(peaceful)], 2624 ["cf::player" => qw(peaceful)],
2091 ["cf::map" => qw(trigger)], 2625 ["cf::map" => qw(trigger)],
2092) { 2626) {
2093 no strict 'refs'; 2627 no strict 'refs';
2164=back 2698=back
2165 2699
2166=cut 2700=cut
2167 2701
2168############################################################################# 2702#############################################################################
2169
2170=head2 EXTENSION DATABASE SUPPORT
2171
2172Crossfire maintains a very simple database for extension use. It can
2173currently store anything that can be serialised using Storable, which
2174excludes objects.
2175
2176The parameter C<$family> should best start with the name of the extension
2177using it, it should be unique.
2178
2179=over 4
2180
2181=item $hashref = cf::db_get $family
2182
2183Return a hashref for use by the extension C<$family>, which can be
2184modified. After modifications, you have to call C<cf::db_dirty> or
2185C<cf::db_sync>.
2186
2187=item $value = cf::db_get $family => $key
2188
2189Returns a single value from the database
2190
2191=item cf::db_put $family => $hashref
2192
2193Stores the given family hashref into the database. Updates are delayed, if
2194you want the data to be synced to disk immediately, use C<cf::db_sync>.
2195
2196=item cf::db_put $family => $key => $value
2197
2198Stores the given C<$value> in the family hash. Updates are delayed, if you
2199want the data to be synced to disk immediately, use C<cf::db_sync>.
2200
2201=item cf::db_dirty
2202
2203Marks the database as dirty, to be updated at a later time.
2204
2205=item cf::db_sync
2206
2207Immediately write the database to disk I<if it is dirty>.
2208
2209=cut
2210
2211our $DB;
2212
2213{
2214 my $path = cf::localdir . "/database.pst";
2215
2216 sub db_load() {
2217 $DB = stat $path ? Storable::retrieve $path : { };
2218 }
2219
2220 my $pid;
2221
2222 sub db_save() {
2223 waitpid $pid, 0 if $pid;
2224 if (0 == ($pid = fork)) {
2225 $DB->{_meta}{version} = 1;
2226 Storable::nstore $DB, "$path~";
2227 rename "$path~", $path;
2228 cf::_exit 0 if defined $pid;
2229 }
2230 }
2231
2232 my $dirty;
2233
2234 sub db_sync() {
2235 db_save if $dirty;
2236 undef $dirty;
2237 }
2238
2239 my $idle = Event->idle (
2240 reentrant => 0,
2241 min => 10,
2242 max => 20,
2243 repeat => 0,
2244 data => WF_AUTOCANCEL,
2245 cb => \&db_sync,
2246 );
2247
2248 sub db_dirty() {
2249 $dirty = 1;
2250 $idle->start;
2251 }
2252
2253 sub db_get($;$) {
2254 @_ >= 2
2255 ? $DB->{$_[0]}{$_[1]}
2256 : ($DB->{$_[0]} ||= { })
2257 }
2258
2259 sub db_put($$;$) {
2260 if (@_ >= 3) {
2261 $DB->{$_[0]}{$_[1]} = $_[2];
2262 } else {
2263 $DB->{$_[0]} = $_[1];
2264 }
2265 db_dirty;
2266 }
2267
2268 cf::global->attach (
2269 prio => 10000,
2270 on_cleanup => sub {
2271 db_sync;
2272 },
2273 );
2274}
2275
2276#############################################################################
2277# the server's init and main functions 2703# the server's init and main functions
2278 2704
2279sub load_resources { 2705sub load_facedata($) {
2280 load_regions sprintf "%s/%s/regions", cf::datadir, cf::mapdir 2706 my ($path) = @_;
2707
2708 warn "loading facedata from $path\n";
2709
2710 my $facedata;
2711 0 < aio_load $path, $facedata
2712 or die "$path: $!";
2713
2714 $facedata = Coro::Storable::thaw $facedata;
2715
2716 $facedata->{version} == 2
2717 or cf::cleanup "$path: version mismatch, cannot proceed.";
2718
2719 {
2720 my $faces = $facedata->{faceinfo};
2721
2722 while (my ($face, $info) = each %$faces) {
2723 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2724 cf::face::set $idx, $info->{visibility}, $info->{magicmap};
2725 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2726 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2727 Coro::cede;
2728 }
2729
2730 while (my ($face, $info) = each %$faces) {
2731 next unless $info->{smooth};
2732 my $idx = cf::face::find $face
2733 or next;
2734 if (my $smooth = cf::face::find $info->{smooth}) {
2735 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel};
2736 } else {
2737 warn "smooth face '$info->{smooth}' not found for face '$face'";
2738 }
2739 Coro::cede;
2740 }
2741 }
2742
2743 {
2744 my $anims = $facedata->{animinfo};
2745
2746 while (my ($anim, $info) = each %$anims) {
2747 cf::anim::set $anim, $info->{frames}, $info->{facings};
2748 Coro::cede;
2749 }
2750
2751 cf::anim::invalidate_all; # d'oh
2752 }
2753
2754 1
2755}
2756
2757sub reload_regions {
2758 load_resource_file "$MAPDIR/regions"
2281 or die "unable to load regions file\n";#d# 2759 or die "unable to load regions file\n";
2760}
2761
2762sub reload_facedata {
2763 load_facedata "$DATADIR/facedata"
2764 or die "unable to load facedata\n";
2765}
2766
2767sub reload_archetypes {
2768 load_resource_file "$DATADIR/archetypes"
2769 or die "unable to load archetypes\n";
2770 #d# NEED to laod twice to resolve forward references
2771 # this really needs to be done in an extra post-pass
2772 # (which needs to be synchronous, so solve it differently)
2773 load_resource_file "$DATADIR/archetypes"
2774 or die "unable to load archetypes\n";
2775}
2776
2777sub reload_treasures {
2778 load_resource_file "$DATADIR/treasures"
2779 or die "unable to load treasurelists\n";
2780}
2781
2782sub reload_resources {
2783 warn "reloading resource files...\n";
2784
2785 reload_regions;
2786 reload_facedata;
2787 #reload_archetypes;#d#
2788 reload_archetypes;
2789 reload_treasures;
2790
2791 warn "finished reloading resource files\n";
2792}
2793
2794sub init {
2795 reload_resources;
2282} 2796}
2283 2797
2284sub cfg_load { 2798sub cfg_load {
2285 open my $fh, "<:utf8", cf::confdir . "/config" 2799 open my $fh, "<:utf8", "$CONFDIR/config"
2286 or return; 2800 or return;
2287 2801
2288 local $/; 2802 local $/;
2289 *CFG = YAML::Syck::Load <$fh>; 2803 *CFG = YAML::Syck::Load <$fh>;
2290 2804
2298 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 2812 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2299 and die "WARNING: m(un)lockall failed: $!\n"; 2813 and die "WARNING: m(un)lockall failed: $!\n";
2300 }; 2814 };
2301 warn $@ if $@; 2815 warn $@ if $@;
2302 } 2816 }
2303}
2304
2305sub init {
2306 load_resources;
2307} 2817}
2308 2818
2309sub main { 2819sub main {
2310 # we must not ever block the main coroutine 2820 # we must not ever block the main coroutine
2311 local $Coro::idle = sub { 2821 local $Coro::idle = sub {
2314 Event::one_event; 2824 Event::one_event;
2315 })->prio (Coro::PRIO_MAX); 2825 })->prio (Coro::PRIO_MAX);
2316 }; 2826 };
2317 2827
2318 cfg_load; 2828 cfg_load;
2319 db_load; 2829 db_init;
2320 load_extensions; 2830 load_extensions;
2321 2831
2322 $TICK_WATCHER->start; 2832 $TICK_WATCHER->start;
2323 Event::loop; 2833 Event::loop;
2324} 2834}
2339 }, 2849 },
2340 ); 2850 );
2341 } 2851 }
2342} 2852}
2343 2853
2854sub write_runtime {
2855 my $runtime = "$LOCALDIR/runtime";
2856
2857 # first touch the runtime file to show we are still running:
2858 # the fsync below can take a very very long time.
2859
2860 IO::AIO::aio_utime $runtime, undef, undef;
2861
2862 my $guard = cf::lock_acquire "write_runtime";
2863
2864 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
2865 or return;
2866
2867 my $value = $cf::RUNTIME + 90 + 10;
2868 # 10 is the runtime save interval, for a monotonic clock
2869 # 60 allows for the watchdog to kill the server.
2870
2871 (aio_write $fh, 0, (length $value), $value, 0) <= 0
2872 and return;
2873
2874 # always fsync - this file is important
2875 aio_fsync $fh
2876 and return;
2877
2878 # touch it again to show we are up-to-date
2879 aio_utime $fh, undef, undef;
2880
2881 close $fh
2882 or return;
2883
2884 aio_rename "$runtime~", $runtime
2885 and return;
2886
2887 warn "runtime file written.\n";
2888
2889 1
2890}
2891
2344sub emergency_save() { 2892sub emergency_save() {
2345 my $freeze_guard = cf::freeze_mainloop; 2893 my $freeze_guard = cf::freeze_mainloop;
2346 2894
2347 warn "enter emergency perl save\n"; 2895 warn "enter emergency perl save\n";
2348 2896
2363 my $map = $cf::MAP{$path} or next; 2911 my $map = $cf::MAP{$path} or next;
2364 $map->valid or next; 2912 $map->valid or next;
2365 $map->save; 2913 $map->save;
2366 } 2914 }
2367 warn "end emergency map save\n"; 2915 warn "end emergency map save\n";
2916
2917 warn "begin emergency database checkpoint\n";
2918 BDB::db_env_txn_checkpoint $DB_ENV;
2919 warn "end emergency database checkpoint\n";
2368 }; 2920 };
2369 2921
2370 warn "leave emergency perl save\n"; 2922 warn "leave emergency perl save\n";
2371} 2923}
2372 2924
2925sub post_cleanup {
2926 my ($make_core) = @_;
2927
2928 warn Carp::longmess "post_cleanup backtrace"
2929 if $make_core;
2930}
2931
2373sub reload() { 2932sub do_reload_perl() {
2374 # can/must only be called in main 2933 # can/must only be called in main
2375 if ($Coro::current != $Coro::main) { 2934 if ($Coro::current != $Coro::main) {
2376 warn "can only reload from main coroutine"; 2935 warn "can only reload from main coroutine";
2377 return; 2936 return;
2378 } 2937 }
2379 2938
2380 warn "reloading..."; 2939 warn "reloading...";
2381 2940
2382 warn "cancelling server ticker"; 2941 warn "entering sync_job";
2383 $TICK_WATCHER->cancel;
2384 2942
2943 cf::sync_job {
2944 cf::write_runtime; # external watchdog should not bark
2385 cf::emergency_save; 2945 cf::emergency_save;
2946 cf::write_runtime; # external watchdog should not bark
2386 2947
2387 eval { 2948 warn "syncing database to disk";
2949 BDB::db_env_txn_checkpoint $DB_ENV;
2950
2388 # if anything goes wrong in here, we should simply crash as we already saved 2951 # if anything goes wrong in here, we should simply crash as we already saved
2389
2390 warn "syncing database to disk";
2391 cf::db_sync;
2392 2952
2393 warn "cancelling all WF_AUTOCANCEL watchers"; 2953 warn "cancelling all WF_AUTOCANCEL watchers";
2394 for (Event::all_watchers) { 2954 for (Event::all_watchers) {
2395 $_->cancel if $_->data & WF_AUTOCANCEL; 2955 $_->cancel if $_->data & WF_AUTOCANCEL;
2396 } 2956 }
2397 2957
2398 warn "flushing outstanding aio requests"; 2958 warn "flushing outstanding aio requests";
2399 for (;;) { 2959 for (;;) {
2960 BDB::flush;
2400 IO::AIO::flush; 2961 IO::AIO::flush;
2401 Coro::cede; 2962 Coro::cede;
2402 last unless IO::AIO::nreqs; 2963 last unless IO::AIO::nreqs || BDB::nreqs;
2403 warn "iterate..."; 2964 warn "iterate...";
2404 } 2965 }
2966
2967 ++$RELOAD;
2405 2968
2406 warn "cancelling all extension coros"; 2969 warn "cancelling all extension coros";
2407 $_->cancel for values %EXT_CORO; 2970 $_->cancel for values %EXT_CORO;
2408 %EXT_CORO = (); 2971 %EXT_CORO = ();
2409 2972
2410 warn "removing commands"; 2973 warn "removing commands";
2411 %COMMAND = (); 2974 %COMMAND = ();
2412 2975
2413 warn "removing ext commands"; 2976 warn "removing ext/exti commands";
2414 %EXTCMD = (); 2977 %EXTCMD = ();
2978 %EXTICMD = ();
2415 2979
2416 warn "unloading/nuking all extensions"; 2980 warn "unloading/nuking all extensions";
2417 for my $pkg (@EXTS) { 2981 for my $pkg (@EXTS) {
2418 warn "... unloading $pkg"; 2982 warn "... unloading $pkg";
2419 2983
2449 Symbol::delete_package "safe::$_" 3013 Symbol::delete_package "safe::$_"
2450 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3014 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2451 3015
2452 warn "unloading cf.pm \"a bit\""; 3016 warn "unloading cf.pm \"a bit\"";
2453 delete $INC{"cf.pm"}; 3017 delete $INC{"cf.pm"};
3018 delete $INC{"cf/pod.pm"};
2454 3019
2455 # don't, removes xs symbols, too, 3020 # don't, removes xs symbols, too,
2456 # and global variables created in xs 3021 # and global variables created in xs
2457 #Symbol::delete_package __PACKAGE__; 3022 #Symbol::delete_package __PACKAGE__;
2458 3023
2462 require cf; 3027 require cf;
2463 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3028 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2464 3029
2465 warn "loading config and database again"; 3030 warn "loading config and database again";
2466 cf::cfg_load; 3031 cf::cfg_load;
2467 cf::db_load;
2468 3032
2469 warn "loading extensions"; 3033 warn "loading extensions";
2470 cf::load_extensions; 3034 cf::load_extensions;
2471 3035
2472 warn "reattaching attachments to objects/players"; 3036 warn "reattaching attachments to objects/players";
2473 _global_reattach; 3037 _global_reattach; # objects, sockets
2474 warn "reattaching attachments to maps"; 3038 warn "reattaching attachments to maps";
2475 reattach $_ for values %MAP; 3039 reattach $_ for values %MAP;
3040 warn "reattaching attachments to players";
3041 reattach $_ for values %PLAYER;
2476 3042
2477 warn "loading reloadable resources"; 3043 warn "leaving sync_job";
2478 load_resources;
2479 3044
2480 warn "restarting server ticker"; 3045 1
2481 3046 } or do {
2482 $TICK_WATCHER->start;
2483 };
2484
2485 if ($@) {
2486 warn $@; 3047 warn $@;
2487 warn "error while reloading, exiting."; 3048 warn "error while reloading, exiting.";
2488 exit 1; 3049 exit 1;
2489 } 3050 };
2490 3051
2491 warn "reloaded"; 3052 warn "reloaded";
2492}; 3053};
2493 3054
2494our $RELOAD_WATCHER; # used only during reload 3055our $RELOAD_WATCHER; # used only during reload
2495 3056
3057sub reload_perl() {
3058 # doing reload synchronously and two reloads happen back-to-back,
3059 # coro crashes during coro_state_free->destroy here.
3060
3061 $RELOAD_WATCHER ||= Event->timer (
3062 reentrant => 0,
3063 after => 0,
3064 data => WF_AUTOCANCEL,
3065 cb => sub {
3066 do_reload_perl;
3067 undef $RELOAD_WATCHER;
3068 },
3069 );
3070}
3071
2496register_command "reload" => sub { 3072register_command "reload" => sub {
2497 my ($who, $arg) = @_; 3073 my ($who, $arg) = @_;
2498 3074
2499 if ($who->flag (FLAG_WIZ)) { 3075 if ($who->flag (FLAG_WIZ)) {
2500 $who->message ("reloading server."); 3076 $who->message ("reloading server.");
2501 3077 async { reload_perl };
2502 # doing reload synchronously and two reloads happen back-to-back,
2503 # coro crashes during coro_state_free->destroy here.
2504
2505 $RELOAD_WATCHER ||= Event->timer (
2506 reentrant => 0,
2507 after => 0,
2508 data => WF_AUTOCANCEL,
2509 cb => sub {
2510 reload;
2511 undef $RELOAD_WATCHER;
2512 },
2513 );
2514 } 3078 }
2515}; 3079};
2516 3080
2517unshift @INC, $LIBDIR; 3081unshift @INC, $LIBDIR;
2518 3082
2519my $bug_warning = 0; 3083my $bug_warning = 0;
2520 3084
3085our @WAIT_FOR_TICK;
3086our @WAIT_FOR_TICK_BEGIN;
3087
3088sub wait_for_tick {
3089 return unless $TICK_WATCHER->is_active;
3090 return if $Coro::current == $Coro::main;
3091
3092 my $signal = new Coro::Signal;
3093 push @WAIT_FOR_TICK, $signal;
3094 $signal->wait;
3095}
3096
3097sub wait_for_tick_begin {
3098 return unless $TICK_WATCHER->is_active;
3099 return if $Coro::current == $Coro::main;
3100
3101 my $signal = new Coro::Signal;
3102 push @WAIT_FOR_TICK_BEGIN, $signal;
3103 $signal->wait;
3104}
3105
3106 my $min = 1e6;#d#
3107 my $avg = 10;
2521$TICK_WATCHER = Event->timer ( 3108$TICK_WATCHER = Event->timer (
2522 reentrant => 0, 3109 reentrant => 0,
2523 parked => 1, 3110 parked => 1,
2524 prio => 0, 3111 prio => 0,
2525 at => $NEXT_TICK || $TICK, 3112 at => $NEXT_TICK || $TICK,
2529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3116 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2530 unless ++$bug_warning > 10; 3117 unless ++$bug_warning > 10;
2531 return; 3118 return;
2532 } 3119 }
2533 3120
2534 $NOW = Event::time; 3121 $NOW = $tick_start = Event::time;
2535 3122
2536 cf::server_tick; # one server iteration 3123 cf::server_tick; # one server iteration
3124
3125 0 && sync_job {#d#
3126 for(1..10) {
3127 my $t = Event::time;
3128 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3129 or die;
3130
3131 $map->width (50);
3132 $map->height (50);
3133 $map->alloc;
3134 $map->_load_objects ("/tmp/x.map", 1);
3135 my $t = Event::time - $t;
3136
3137 #next unless $t < 0.0013;#d#
3138 if ($t < $min) {
3139 $min = $t;
3140 }
3141 $avg = $avg * 0.99 + $t * 0.01;
3142 }
3143 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3144 exit 0;
3145 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3146 };
3147
2537 $RUNTIME += $TICK; 3148 $RUNTIME += $TICK;
2538 $NEXT_TICK += $TICK; 3149 $NEXT_TICK += $TICK;
2539 3150
2540 $WAIT_FOR_TICK->broadcast; 3151 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2541 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3152 $NEXT_RUNTIME_WRITE = $NOW + 10;
2542 3153 Coro::async_pool {
2543 Event::sweep; 3154 write_runtime
2544 Coro::cede_notself; 3155 or warn "ERROR: unable to write runtime file: $!";
3156 };
2545 3157 }
3158
2546# my $AFTER = Event::time; 3159# my $AFTER = Event::time;
2547# warn $AFTER - $NOW;#d# 3160# warn $AFTER - $NOW;#d#
2548 3161
3162 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3163 $sig->send;
3164 }
3165 while (my $sig = shift @WAIT_FOR_TICK) {
3166 $sig->send;
3167 }
3168
3169 $NOW = Event::time;
3170
2549 # if we are delayed by four ticks or more, skip them all 3171 # if we are delayed by four ticks or more, skip them all
2550 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3172 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2551 3173
2552 $TICK_WATCHER->at ($NEXT_TICK); 3174 $TICK_WATCHER->at ($NEXT_TICK);
2553 $TICK_WATCHER->start; 3175 $TICK_WATCHER->start;
3176
3177 $LOAD = ($NOW - $tick_start) / $TICK;
3178 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3179
3180 _post_tick;
3181
3182
2554 }, 3183 },
2555); 3184);
2556 3185
3186{
3187 BDB::max_poll_time $TICK * 0.1;
3188 $BDB_POLL_WATCHER = Event->io (
3189 reentrant => 0,
3190 fd => BDB::poll_fileno,
3191 poll => 'r',
3192 prio => 0,
3193 data => WF_AUTOCANCEL,
3194 cb => \&BDB::poll_cb,
3195 );
3196 BDB::min_parallel 8;
3197
3198 BDB::set_sync_prepare {
3199 my $status;
3200 my $current = $Coro::current;
3201 (
3202 sub {
3203 $status = $!;
3204 $current->ready; undef $current;
3205 },
3206 sub {
3207 Coro::schedule while defined $current;
3208 $! = $status;
3209 },
3210 )
3211 };
3212
3213 unless ($DB_ENV) {
3214 $DB_ENV = BDB::db_env_create;
3215
3216 cf::sync_job {
3217 eval {
3218 BDB::db_env_open
3219 $DB_ENV,
3220 $BDBDIR,
3221 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3222 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3223 0666;
3224
3225 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3226
3227 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3228 $DB_ENV->set_lk_detect;
3229 };
3230
3231 cf::cleanup "db_env_open(db): $@" if $@;
3232 };
3233 }
3234}
3235
3236{
3237 IO::AIO::min_parallel 8;
3238
3239 undef $Coro::AIO::WATCHER;
2557IO::AIO::max_poll_time $TICK * 0.1; 3240 IO::AIO::max_poll_time $TICK * 0.1;
2558
2559undef $Coro::AIO::WATCHER;
2560$AIO_POLL_WATCHER = Event->io ( 3241 $AIO_POLL_WATCHER = Event->io (
2561 reentrant => 0, 3242 reentrant => 0,
3243 data => WF_AUTOCANCEL,
2562 fd => IO::AIO::poll_fileno, 3244 fd => IO::AIO::poll_fileno,
2563 poll => 'r', 3245 poll => 'r',
2564 prio => 6, 3246 prio => 6,
2565 data => WF_AUTOCANCEL,
2566 cb => \&IO::AIO::poll_cb, 3247 cb => \&IO::AIO::poll_cb,
2567); 3248 );
3249}
2568 3250
2569$WRITE_RUNTIME_WATCHER = Event->timer ( 3251my $_log_backtrace;
2570 reentrant => 0, 3252
2571 data => WF_AUTOCANCEL, 3253sub _log_backtrace {
2572 after => 1, 3254 my ($msg, @addr) = @_;
2573 interval => 10, 3255
2574 prio => 6, # keep it lowest so it acts like a watchdog 3256 $msg =~ s/\n//;
2575 cb => Coro::unblock_sub { 3257
2576 write_runtime 3258 # limit the # of concurrent backtraces
2577 or warn "ERROR: unable to write runtime file: $!"; 3259 if ($_log_backtrace < 2) {
3260 ++$_log_backtrace;
3261 async {
3262 my @bt = fork_call {
3263 @addr = map { sprintf "%x", $_ } @addr;
3264 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3265 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3266 or die "addr2line: $!";
3267
3268 my @funcs;
3269 my @res = <$fh>;
3270 chomp for @res;
3271 while (@res) {
3272 my ($func, $line) = splice @res, 0, 2, ();
3273 push @funcs, "[$func] $line";
3274 }
3275
3276 @funcs
3277 };
3278
3279 LOG llevInfo, "[ABT] $msg\n";
3280 LOG llevInfo, "[ABT] $_\n" for @bt;
3281 --$_log_backtrace;
3282 };
3283 } else {
3284 LOG llevInfo, "[ABT] $msg\n";
3285 LOG llevInfo, "[ABT] [suppressed]\n";
2578 }, 3286 }
2579); 3287}
3288
3289# load additional modules
3290use cf::pod;
2580 3291
2581END { cf::emergency_save } 3292END { cf::emergency_save }
2582 3293
25831 32941
2584 3295

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines