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.171 by root, Sun Jan 14 12:24:48 2007 UTC vs.
Revision 1.332 by root, Sat Aug 18 17:33:53 2007 UTC

3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket;
8use Storable; 9use Storable;
10use Event;
9use Opcode; 11use Opcode;
10use Safe; 12use Safe;
11use Safe::Hole; 13use Safe::Hole;
12 14
13use Coro 3.3 (); 15use Coro 3.64 ();
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;
24use Coro::Util ();
19 25
26use JSON::XS 1.4 ();
27use BDB ();
20use Data::Dumper; 28use Data::Dumper;
21use Digest::MD5; 29use Digest::MD5;
22use Fcntl; 30use Fcntl;
31use YAML::Syck ();
23use IO::AIO 2.32 (); 32use IO::AIO 2.32 ();
24use YAML::Syck ();
25use Time::HiRes; 33use Time::HiRes;
34use Compress::LZF;
35use Digest::MD5 ();
26 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
27use Event; $Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
28
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30 44
31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
32$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
33 47
34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
35 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
36our %COMMAND = (); 52our %COMMAND = ();
37our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
38 54
39our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
40our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
41our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
42our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
43 60
61our $RELOAD; # number of reloads so far
44our @EVENT; 62our @EVENT;
45our $LIBDIR = datadir . "/ext";
46 63
47our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
48our $TICK_WATCHER; 77our $TICK_WATCHER;
49our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
50our $WRITE_RUNTIME_WATCHER; 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
51our $NEXT_TICK; 80our $NEXT_TICK;
52our $NOW; 81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off
83
84our $BDB_POLL_WATCHER;
85our $DB_ENV;
53 86
54our %CFG; 87our %CFG;
55 88
56our $UPTIME; $UPTIME ||= time; 89our $UPTIME; $UPTIME ||= time;
57our $RUNTIME; 90our $RUNTIME;
58 91
59our %PLAYER; # all users 92our %PLAYER; # all users
60our %MAP; # all maps 93our %MAP; # all maps
61our $LINK_MAP; # the special {link} map, which is always available 94our $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 95
67# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
68our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
69 98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
102
70binmode STDOUT; 103binmode STDOUT;
71binmode STDERR; 104binmode STDERR;
72 105
73# read virtual server time, if available 106# read virtual server time, if available
74unless ($RUNTIME || !-e cf::localdir . "/runtime") { 107unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
75 open my $fh, "<", cf::localdir . "/runtime" 108 open my $fh, "<", "$LOCALDIR/runtime"
76 or die "unable to read runtime file: $!"; 109 or die "unable to read runtime file: $!";
77 $RUNTIME = <$fh> + 0.; 110 $RUNTIME = <$fh> + 0.;
78} 111}
79 112
80mkdir cf::localdir; 113mkdir $_
81mkdir cf::localdir . "/" . cf::playerdir; 114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
82mkdir cf::localdir . "/" . cf::tmpdir;
83mkdir cf::localdir . "/" . cf::uniquedir;
84mkdir $RANDOM_MAPS;
85 115
86our $EMERGENCY_POSITION; 116our $EMERGENCY_POSITION;
117
118sub cf::map::normalise;
87 119
88############################################################################# 120#############################################################################
89 121
90=head2 GLOBAL VARIABLES 122=head2 GLOBAL VARIABLES
91 123
98=item $cf::RUNTIME 130=item $cf::RUNTIME
99 131
100The time this server has run, starts at 0 and is increased by $cf::TICK on 132The time this server has run, starts at 0 and is increased by $cf::TICK on
101every server tick. 133every server tick.
102 134
103=item $cf::LIBDIR 135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
104 138
105The perl library directory, where extensions and cf-specific modules can 139Various directories - "/etc", read-only install directory, perl-library
106be found. It will be added to C<@INC> automatically. 140directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and
142database environment.
107 143
108=item $cf::NOW 144=item $cf::NOW
109 145
110The time of the last (current) server tick. 146The time of the last (current) server tick.
111 147
112=item $cf::TICK 148=item $cf::TICK
113 149
114The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
115 161
116=item %cf::CFG 162=item %cf::CFG
117 163
118Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/crossfire/config>, or
119from wherever your confdir points to. 165from wherever your confdir points to.
120 166
121=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 167=item cf::wait_for_tick, cf::wait_for_tick_begin
122 168
123These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 169These 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 170returns 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 171per 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. 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
127 178
128=back 179=back
129 180
130=cut 181=cut
131 182
132BEGIN { 183BEGIN {
133 *CORE::GLOBAL::warn = sub { 184 *CORE::GLOBAL::warn = sub {
134 my $msg = join "", @_; 185 my $msg = join "", @_;
135 utf8::encode $msg;
136 186
137 $msg .= "\n" 187 $msg .= "\n"
138 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
139 189
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191
192 utf8::encode $msg;
140 LOG llevError, $msg; 193 LOG llevError, $msg;
141 }; 194 };
142} 195}
143 196
144@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
145@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
146@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
147@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
148@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 201@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
202@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
149@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 203@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
150 204
151# we bless all objects into (empty) derived classes to force a method lookup 205# we bless all objects into (empty) derived classes to force a method lookup
152# within the Safe compartment. 206# within the Safe compartment.
153for my $pkg (qw( 207for my $pkg (qw(
154 cf::global cf::attachable 208 cf::global cf::attachable
162} 216}
163 217
164$Event::DIED = sub { 218$Event::DIED = sub {
165 warn "error in event callback: @_"; 219 warn "error in event callback: @_";
166}; 220};
221
222#############################################################################
167 223
168=head2 UTILITY FUNCTIONS 224=head2 UTILITY FUNCTIONS
169 225
170=over 4 226=over 4
171 227
190 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
191 $d 247 $d
192 } || "[unable to dump $_[0]: '$@']"; 248 } || "[unable to dump $_[0]: '$@']";
193} 249}
194 250
195use JSON::Syck (); # TODO# replace by JSON::PC once working
196
197=item $ref = cf::from_json $json 251=item $ref = cf::from_json $json
198 252
199Converts a JSON string into the corresponding perl data structure. 253Converts a JSON string into the corresponding perl data structure.
200 254
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 255=item $json = cf::to_json $ref
209 256
210Converts a perl data structure into its JSON representation. 257Converts a perl data structure into its JSON representation.
211 258
212=cut 259=cut
213 260
214sub to_json($) { 261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
215 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 262
216 JSON::Syck::Dump $_[0] 263sub to_json ($) { $json_coder->encode ($_[0]) }
217} 264sub from_json ($) { $json_coder->decode ($_[0]) }
218 265
219=item cf::lock_wait $string 266=item cf::lock_wait $string
220 267
221Wait until the given lock is available. See cf::lock_acquire. 268Wait until the given lock is available. See cf::lock_acquire.
222 269
228returned. 275returned.
229 276
230Lock names should begin with a unique identifier (for example, cf::map::find 277Lock names should begin with a unique identifier (for example, cf::map::find
231uses map_find and cf::map::load uses map_load). 278uses map_find and cf::map::load uses map_load).
232 279
280=item $locked = cf::lock_active $string
281
282Return true if the lock is currently active, i.e. somebody has locked it.
283
233=cut 284=cut
234 285
235our %LOCK; 286our %LOCK;
236 287
237sub lock_wait($) { 288sub lock_wait($) {
256 # wake up all waiters, to be on the safe side 307 # wake up all waiters, to be on the safe side
257 $_->ready for @{ delete $LOCK{$key} }; 308 $_->ready for @{ delete $LOCK{$key} };
258 } 309 }
259} 310}
260 311
312sub lock_active($) {
313 my ($key) = @_;
314
315 ! ! $LOCK{$key}
316}
317
261sub freeze_mainloop { 318sub freeze_mainloop {
262 return unless $TICK_WATCHER->is_active; 319 return unless $TICK_WATCHER->is_active;
263 320
264 my $guard = Coro::guard { 321 my $guard = Coro::guard {
265 $TICK_WATCHER->start; 322 $TICK_WATCHER->start;
266 $WRITE_RUNTIME_WATCHER->start;
267 }; 323 };
268 $WRITE_RUNTIME_WATCHER->stop;
269 $TICK_WATCHER->stop; 324 $TICK_WATCHER->stop;
270 $guard 325 $guard
326}
327
328=item cf::get_slot $time[, $priority[, $name]]
329
330Allocate $time seconds of blocking CPU time at priority C<$priority>:
331This call blocks and returns only when you have at least C<$time> seconds
332of cpu time till the next tick. The slot is only valid till the next cede.
333
334The optional C<$name> can be used to identify the job to run. It might be
335used for statistical purposes and should identify the same time-class.
336
337Useful for short background jobs.
338
339=cut
340
341our @SLOT_QUEUE;
342our $SLOT_QUEUE;
343
344$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async {
346 my $signal = new Coro::Signal;
347
348 while () {
349 next_job:
350 my $avail = cf::till_tick;
351 if ($avail > 0.01) {
352 for (0 .. $#SLOT_QUEUE) {
353 if ($SLOT_QUEUE[$_][0] < $avail) {
354 my $job = splice @SLOT_QUEUE, $_, 1, ();
355 $job->[2]->send;
356 Coro::cede;
357 goto next_job;
358 }
359 }
360 }
361
362 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait;
366 } else {
367 Coro::schedule;
368 }
369 }
370};
371
372sub get_slot($;$$) {
373 my ($time, $pri, $name) = @_;
374
375 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal;
377
378 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
379 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
380 $SLOT_QUEUE->ready;
381 $sig->wait;
271} 382}
272 383
273=item cf::async { BLOCK } 384=item cf::async { BLOCK }
274 385
275Currently the same as Coro::async_pool, meaning you cannot use 386Currently the same as Coro::async_pool, meaning you cannot use
280 391
281BEGIN { *async = \&Coro::async_pool } 392BEGIN { *async = \&Coro::async_pool }
282 393
283=item cf::sync_job { BLOCK } 394=item cf::sync_job { BLOCK }
284 395
285The design of crossfire+ requires that the main coro ($Coro::main) is 396The design of Crossfire TRT requires that the main coroutine ($Coro::main)
286always able to handle events or runnable, as crossfire+ is only partly 397is 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. 398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable.
288 400
289If it must be done, put the blocking parts into C<sync_job>. This will run 401If 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 402the given BLOCK in another coroutine while waiting for the result. The
291server will be frozen during this time, so the block should either finish 403server will be frozen during this time, so the block should either finish
292fast or be very important. 404fast or be very important.
295 407
296sub sync_job(&) { 408sub sync_job(&) {
297 my ($job) = @_; 409 my ($job) = @_;
298 410
299 if ($Coro::current == $Coro::main) { 411 if ($Coro::current == $Coro::main) {
412 my $time = Event::time;
413
300 # this is the main coro, too bad, we have to block 414 # this is the main coro, too bad, we have to block
301 # till the operation succeeds, freezing the server :/ 415 # till the operation succeeds, freezing the server :/
302 416
303 # TODO: use suspend/resume instead 417 # TODO: use suspend/resume instead
304 # (but this is cancel-safe) 418 # (but this is cancel-safe)
315 429
316 while ($busy) { 430 while ($busy) {
317 Coro::cede or Event::one_event; 431 Coro::cede or Event::one_event;
318 } 432 }
319 433
434 $time = Event::time - $time;
435
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load
440
320 wantarray ? @res : $res[0] 441 wantarray ? @res : $res[0]
321 } else { 442 } else {
322 # we are in another coroutine, how wonderful, everything just works 443 # we are in another coroutine, how wonderful, everything just works
323 444
324 $job->() 445 $job->()
343 $EXT_CORO{$coro+0} = $coro; 464 $EXT_CORO{$coro+0} = $coro;
344 465
345 $coro 466 $coro
346} 467}
347 468
348sub write_runtime { 469=item fork_call { }, $args
349 my $runtime = cf::localdir . "/runtime";
350 470
351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 471Executes the given code block with the given arguments in a seperate
352 or return; 472process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling.
353 475
354 my $value = $cf::RUNTIME + 1 + 10; # 10 is the runtime save interval, for a monotonic clock 476=cut
355 (aio_write $fh, 0, (length $value), $value, 0) <= 0
356 and return;
357 477
358 aio_fsync $fh 478sub fork_call(&@) {
359 and return; 479 my ($cb, @args) = @_;
360 480
361 close $fh 481 # we seemingly have to make a local copy of the whole thing,
362 or return; 482 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious)
363 484
364 aio_rename "$runtime~", $runtime 485 my @res = Coro::Util::fork_eval {
365 and return; 486 reset_signals;
487 &$cb
488 }, @args;
366 489
490 wantarray ? @res : $res[-1]
491}
492
493=item $value = cf::db_get $family => $key
494
495Returns a single value from the environment database.
496
497=item cf::db_put $family => $key => $value
498
499Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501
502=cut
503
504our $DB;
505
506sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job {
511 eval {
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
367 1 520 }
521}
522
523sub db_get($$) {
524 my $key = "$_[0]/$_[1]";
525
526 cf::sync_job {
527 BDB::db_get $DB, undef, $key, my $data;
528
529 $! ? ()
530 : $data
531 }
532}
533
534sub db_put($$$) {
535 BDB::dbreq_pri 4;
536 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
537}
538
539=item cf::cache $id => [$paths...], $processversion => $process
540
541Generic caching function that returns the value of the resource $id,
542caching and regenerating as required.
543
544This function can block.
545
546=cut
547
548sub cache {
549 my ($id, $src, $processversion, $process) = @_;
550
551 my $meta =
552 join "\x00",
553 $processversion,
554 map {
555 aio_stat $_
556 and Carp::croak "$_: $!";
557
558 ($_, (stat _)[7,9])
559 } @$src;
560
561 my $dbmeta = db_get cache => "$id/meta";
562 if ($dbmeta ne $meta) {
563 # changed, we may need to process
564
565 my @data;
566 my $md5;
567
568 for (0 .. $#$src) {
569 0 <= aio_load $src->[$_], $data[$_]
570 or Carp::croak "$src->[$_]: $!";
571 }
572
573 # if processing is expensive, check
574 # checksum first
575 if (1) {
576 $md5 =
577 join "\x00",
578 $processversion,
579 map {
580 Coro::cede;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src;
583
584
585 my $dbmd5 = db_get cache => "$id/md5";
586 if ($dbmd5 eq $md5) {
587 db_put cache => "$id/meta", $meta;
588
589 return db_get cache => "$id/data";
590 }
591 }
592
593 my $t1 = Time::HiRes::time;
594 my $data = $process->(\@data);
595 my $t2 = Time::HiRes::time;
596
597 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
598
599 db_put cache => "$id/data", $data;
600 db_put cache => "$id/md5" , $md5;
601 db_put cache => "$id/meta", $meta;
602
603 return $data;
604 }
605
606 db_get cache => "$id/data"
607}
608
609=item cf::datalog type => key => value, ...
610
611Log a datalog packet of the given type with the given key-value pairs.
612
613=cut
614
615sub datalog($@) {
616 my ($type, %kv) = @_;
617 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
368} 618}
369 619
370=back 620=back
371 621
372=cut 622=cut
379attach callbacks/event handlers (a collection of which is called an "attachment") 629attach callbacks/event handlers (a collection of which is called an "attachment")
380to it. All such attachable objects support the following methods. 630to it. All such attachable objects support the following methods.
381 631
382In the following description, CLASS can be any of C<global>, C<object> 632In the following description, CLASS can be any of C<global>, C<object>
383C<player>, C<client> or C<map> (i.e. the attachable objects in 633C<player>, C<client> or C<map> (i.e. the attachable objects in
384crossfire+). 634Crossfire TRT).
385 635
386=over 4 636=over 4
387 637
388=item $attachable->attach ($attachment, key => $value...) 638=item $attachable->attach ($attachment, key => $value...)
389 639
552 $registry = $CB_TYPE[$object_type] ||= []; 802 $registry = $CB_TYPE[$object_type] ||= [];
553 803
554 } elsif ($type eq "subtype") { 804 } elsif ($type eq "subtype") {
555 defined $object_type or Carp::croak "subtype specified without type"; 805 defined $object_type or Carp::croak "subtype specified without type";
556 my $object_subtype = shift @arg; 806 my $object_subtype = shift @arg;
557 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 807 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
558 808
559 } elsif ($type eq "package") { 809 } elsif ($type eq "package") {
560 my $pkg = shift @arg; 810 my $pkg = shift @arg;
561 811
562 while (my ($name, $id) = each %cb_id) { 812 while (my ($name, $id) = each %cb_id) {
591 _attach $registry, $klass, @attach; 841 _attach $registry, $klass, @attach;
592 } 842 }
593 843
594 $obj->{$name} = \%arg; 844 $obj->{$name} = \%arg;
595 } else { 845 } else {
596 warn "object uses attachment '$name' that is not available, postponing.\n"; 846 warn "object uses attachment '$name' which is not available, postponing.\n";
597 } 847 }
598 848
599 $obj->{_attachment}{$name} = undef; 849 $obj->{_attachment}{$name} = undef;
600} 850}
601 851
603 if (ref $_[0]) { 853 if (ref $_[0]) {
604 _object_attach @_; 854 _object_attach @_;
605 } else { 855 } else {
606 _attach shift->_attach_registry, @_; 856 _attach shift->_attach_registry, @_;
607 } 857 }
858 _recalc_want;
608}; 859};
609 860
610# all those should be optimised 861# all those should be optimised
611sub cf::attachable::detach { 862sub cf::attachable::detach {
612 my ($obj, $name) = @_; 863 my ($obj, $name) = @_;
615 delete $obj->{_attachment}{$name}; 866 delete $obj->{_attachment}{$name};
616 reattach ($obj); 867 reattach ($obj);
617 } else { 868 } else {
618 Carp::croak "cannot, currently, detach class attachments"; 869 Carp::croak "cannot, currently, detach class attachments";
619 } 870 }
871 _recalc_want;
620}; 872};
621 873
622sub cf::attachable::attached { 874sub cf::attachable::attached {
623 my ($obj, $name) = @_; 875 my ($obj, $name) = @_;
624 876
639 "; 891 ";
640 die if $@; 892 die if $@;
641} 893}
642 894
643our $override; 895our $override;
644our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 896our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
645 897
646sub override { 898sub override {
647 $override = 1; 899 $override = 1;
648 @invoke_results = (); 900 @INVOKE_RESULTS = (@_);
649} 901}
650 902
651sub do_invoke { 903sub do_invoke {
652 my $event = shift; 904 my $event = shift;
653 my $callbacks = shift; 905 my $callbacks = shift;
654 906
655 @invoke_results = (); 907 @INVOKE_RESULTS = ();
656 908
657 local $override; 909 local $override;
658 910
659 for (@$callbacks) { 911 for (@$callbacks) {
660 eval { &{$_->[1]} }; 912 eval { &{$_->[1]} };
677 929
678Generate an object-specific event with the given arguments. 930Generate an object-specific event with the given arguments.
679 931
680This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 932This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
681removed in future versions), and there is no public API to access override 933removed in future versions), and there is no public API to access override
682results (if you must, access C<@cf::invoke_results> directly). 934results (if you must, access C<@cf::INVOKE_RESULTS> directly).
683 935
684=back 936=back
685 937
686=cut 938=cut
687 939
688############################################################################# 940#############################################################################
689# object support 941# object support
942#
943
944sub _can_merge {
945 my ($ob1, $ob2) = @_;
946
947 local $Storable::canonical = 1;
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950
951 $fob1 eq $fob2
952}
690 953
691sub reattach { 954sub reattach {
692 # basically do the same as instantiate, without calling instantiate 955 # basically do the same as instantiate, without calling instantiate
693 my ($obj) = @_; 956 my ($obj) = @_;
694 957
747 $filename, length $$rdata, scalar @$objs; 1010 $filename, length $$rdata, scalar @$objs;
748 1011
749 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
750 chmod SAVE_MODE, $fh; 1013 chmod SAVE_MODE, $fh;
751 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
752 aio_fsync $fh; 1015 aio_fsync $fh if $cf::USE_FSYNC;
753 close $fh; 1016 close $fh;
754 1017
755 if (@$objs) { 1018 if (@$objs) {
756 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
757 chmod SAVE_MODE, $fh; 1020 chmod SAVE_MODE, $fh;
758 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1021 my $data = Storable::nfreeze { version => 1, objs => $objs };
759 aio_write $fh, 0, (length $data), $data, 0; 1022 aio_write $fh, 0, (length $data), $data, 0;
760 aio_fsync $fh; 1023 aio_fsync $fh if $cf::USE_FSYNC;
761 close $fh; 1024 close $fh;
762 aio_rename "$filename.pst~", "$filename.pst"; 1025 aio_rename "$filename.pst~", "$filename.pst";
763 } 1026 }
764 } else { 1027 } else {
765 aio_unlink "$filename.pst"; 1028 aio_unlink "$filename.pst";
797 or return; 1060 or return;
798 $av = eval { (Storable::thaw $av)->{objs} }; 1061 $av = eval { (Storable::thaw $av)->{objs} };
799 } 1062 }
800 1063
801 warn sprintf "loading %s (%d)\n", 1064 warn sprintf "loading %s (%d)\n",
802 $filename, length $data, scalar @{$av || []};#d# 1065 $filename, length $data, scalar @{$av || []};
803 return ($data, $av); 1066 return ($data, $av);
804} 1067}
1068
1069=head2 COMMAND CALLBACKS
1070
1071=over 4
1072
1073=cut
805 1074
806############################################################################# 1075#############################################################################
807# command handling &c 1076# command handling &c
808 1077
809=item cf::register_command $name => \&callback($ob,$args); 1078=item cf::register_command $name => \&callback($ob,$args);
822 push @{ $COMMAND{$name} }, [$caller, $cb]; 1091 push @{ $COMMAND{$name} }, [$caller, $cb];
823} 1092}
824 1093
825=item cf::register_extcmd $name => \&callback($pl,$packet); 1094=item cf::register_extcmd $name => \&callback($pl,$packet);
826 1095
827Register a callbackf ro execution when the client sends an extcmd packet. 1096Register a callback for execution when the client sends an (synchronous)
1097extcmd packet. Ext commands will be processed in the order they are
1098received by the server, like other user commands. The first argument is
1099the logged-in player. Ext commands can only be processed after a player
1100has logged in successfully.
828 1101
829If the callback returns something, it is sent back as if reply was being 1102If the callback returns something, it is sent back as if reply was being
830called. 1103called.
831 1104
1105=item cf::register_exticmd $name => \&callback($ns,$packet);
1106
1107Register a callback for execution when the client sends an (asynchronous)
1108exticmd packet. Exti commands are processed by the server as soon as they
1109are received, i.e. out of order w.r.t. other commands. The first argument
1110is a client socket. Exti commands can be received anytime, even before
1111log-in.
1112
1113If the callback returns something, it is sent back as if reply was being
1114called.
1115
832=cut 1116=cut
833 1117
834sub register_extcmd { 1118sub register_extcmd {
835 my ($name, $cb) = @_; 1119 my ($name, $cb) = @_;
836 1120
837 $EXTCMD{$name} = $cb; 1121 $EXTCMD{$name} = $cb;
1122}
1123
1124sub register_exticmd {
1125 my ($name, $cb) = @_;
1126
1127 $EXTICMD{$name} = $cb;
838} 1128}
839 1129
840cf::player->attach ( 1130cf::player->attach (
841 on_command => sub { 1131 on_command => sub {
842 my ($pl, $name, $params) = @_; 1132 my ($pl, $name, $params) = @_;
851 cf::override; 1141 cf::override;
852 }, 1142 },
853 on_extcmd => sub { 1143 on_extcmd => sub {
854 my ($pl, $buf) = @_; 1144 my ($pl, $buf) = @_;
855 1145
856 my $msg = eval { from_json $buf }; 1146 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
857 1147
858 if (ref $msg) { 1148 if (ref $msg) {
1149 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg
1151 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153
859 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1154 if (my $cb = $EXTCMD{$type}) {
860 if (my %reply = $cb->($pl, $msg)) { 1155 my @reply = $cb->($pl, @payload);
1156
861 $pl->ext_reply ($msg->{msgid}, %reply); 1157 $pl->ext_reply ($reply, @reply)
862 } 1158 if $reply;
863 } 1159 }
864 } else { 1160 } else {
865 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
866 } 1162 }
867 1163
868 cf::override; 1164 cf::override;
869 }, 1165 },
870); 1166);
871 1167
872sub load_extension {
873 my ($path) = @_;
874
875 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
876 my $base = $1;
877 my $pkg = $1;
878 $pkg =~ s/[^[:word:]]/_/g;
879 $pkg = "ext::$pkg";
880
881 warn "... loading '$path' into '$pkg'\n";
882
883 open my $fh, "<:utf8", $path
884 or die "$path: $!";
885
886 my $source =
887 "package $pkg; use strict; use utf8;\n"
888 . "#line 1 \"$path\"\n{\n"
889 . (do { local $/; <$fh> })
890 . "\n};\n1";
891
892 unless (eval $source) {
893 my $msg = $@ ? "$path: $@\n"
894 : "extension disabled.\n";
895 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
896 warn $@;
897 warn "mandatory extension failed to load, exiting.\n";
898 exit 1;
899 }
900 die $@;
901 }
902
903 push @EXTS, $pkg;
904}
905
906sub load_extensions { 1168sub load_extensions {
1169 cf::sync_job {
1170 my %todo;
1171
907 for my $ext (<$LIBDIR/*.ext>) { 1172 for my $path (<$LIBDIR/*.ext>) {
908 next unless -r $ext; 1173 next unless -r $path;
909 eval { 1174
910 load_extension $ext; 1175 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1176 my $base = $1;
1177 my $pkg = $1;
1178 $pkg =~ s/[^[:word:]]/_/g;
1179 $pkg = "ext::$pkg";
1180
1181 open my $fh, "<:utf8", $path
1182 or die "$path: $!";
1183
1184 my $source = do { local $/; <$fh> };
1185
1186 my %ext = (
1187 path => $path,
1188 base => $base,
1189 pkg => $pkg,
1190 );
1191
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194
1195 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n"
1198 . $source
1199 . "\n};\n1";
1200
1201 $todo{$base} = \%ext;
1202 }
1203
1204 my %done;
1205 while (%todo) {
1206 my $progress;
1207
1208 while (my ($k, $v) = each %todo) {
1209 for (split /,\s*/, $v->{meta}{depends}) {
1210 goto skip
1211 unless exists $done{$_};
1212 }
1213
1214 warn "... loading '$k' into '$v->{pkg}'\n";
1215
1216 unless (eval $v->{source}) {
1217 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n";
1219
1220 if (exists $v->{meta}{mandatory}) {
1221 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n";
1223 exit 1;
1224 }
1225
1226 warn $msg;
1227 }
1228
1229 $done{$k} = delete $todo{$k};
1230 push @EXTS, $v->{pkg};
1231 $progress = 1;
911 1 1232 }
912 } or warn "$ext not loaded: $@"; 1233
1234 skip:
1235 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1236 unless $progress;
1237 }
913 } 1238 };
914} 1239}
915 1240
916############################################################################# 1241#############################################################################
917 1242
1243=back
1244
918=head2 CORE EXTENSIONS 1245=head2 CORE EXTENSIONS
919 1246
920Functions and methods that extend core crossfire objects. 1247Functions and methods that extend core crossfire objects.
921 1248
922=cut 1249=cut
934Returns the given player object, loading it if necessary (might block). 1261Returns the given player object, loading it if necessary (might block).
935 1262
936=cut 1263=cut
937 1264
938sub playerdir($) { 1265sub playerdir($) {
939 cf::localdir 1266 "$PLAYERDIR/"
940 . "/"
941 . cf::playerdir
942 . "/"
943 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1267 . (ref $_[0] ? $_[0]->ob->name : $_[0])
944} 1268}
945 1269
946sub path($) { 1270sub path($) {
947 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1271 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
948 1272
949 (playerdir $login) . "/$login.pl" 1273 (playerdir $login) . "/playerdata"
950} 1274}
951 1275
952sub find_active($) { 1276sub find_active($) {
953 $cf::PLAYER{$_[0]} 1277 $cf::PLAYER{$_[0]}
954 and $cf::PLAYER{$_[0]}->active 1278 and $cf::PLAYER{$_[0]}->active
957 1281
958sub exists($) { 1282sub exists($) {
959 my ($login) = @_; 1283 my ($login) = @_;
960 1284
961 $cf::PLAYER{$login} 1285 $cf::PLAYER{$login}
962 or cf::sync_job { !aio_stat $login } 1286 or cf::sync_job { !aio_stat path $login }
963} 1287}
964 1288
965sub find($) { 1289sub find($) {
966 return $cf::PLAYER{$_[0]} || do { 1290 return $cf::PLAYER{$_[0]} || do {
967 my $login = $_[0]; 1291 my $login = $_[0];
968 1292
969 my $guard = cf::lock_acquire "user_find:$login"; 1293 my $guard = cf::lock_acquire "user_find:$login";
970 1294
971 $cf::PLAYER{$_[0]} || do { 1295 $cf::PLAYER{$_[0]} || do {
1296 # rename old playerfiles to new ones
1297 #TODO: remove when no longer required
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl";
1302
972 my $pl = load_pl path $login 1303 my $pl = load_pl path $login
973 or return; 1304 or return;
974 $cf::PLAYER{$login} = $pl 1305 $cf::PLAYER{$login} = $pl
975 } 1306 }
976 } 1307 }
1004 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1005 1336
1006 $self 1337 $self
1007} 1338}
1008 1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1348}
1349
1009=item $pl->quit_character 1350=item $pl->quit_character
1010 1351
1011Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
1012be destroyed. May block for a long time. 1353be destroyed. May block for a long time.
1013 1354
1014=cut 1355=cut
1015 1356
1016sub quit_character { 1357sub quit_character {
1017 my ($pl) = @_; 1358 my ($pl) = @_;
1359
1360 my $name = $pl->ob->name;
1018 1361
1019 $pl->{deny_save} = 1; 1362 $pl->{deny_save} = 1;
1020 $pl->password ("*"); # this should lock out the player until we nuked the dir 1363 $pl->password ("*"); # this should lock out the player until we nuked the dir
1021 1364
1022 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1365 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1027 my $path = playerdir $pl; 1370 my $path = playerdir $pl;
1028 my $temp = "$path~$cf::RUNTIME~deleting~"; 1371 my $temp = "$path~$cf::RUNTIME~deleting~";
1029 aio_rename $path, $temp; 1372 aio_rename $path, $temp;
1030 delete $cf::PLAYER{$pl->ob->name}; 1373 delete $cf::PLAYER{$pl->ob->name};
1031 $pl->destroy; 1374 $pl->destroy;
1375
1376 my $prefix = qr<^~\Q$name\E/>;
1377
1378 # nuke player maps
1379 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1380
1032 IO::AIO::aio_rmtree $temp; 1381 IO::AIO::aio_rmtree $temp;
1382}
1383
1384=item $pl->kick
1385
1386Kicks a player out of the game. This destroys the connection.
1387
1388=cut
1389
1390sub kick {
1391 my ($pl, $kicker) = @_;
1392
1393 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1394 $pl->killer ("kicked");
1395 $pl->ns->destroy;
1033} 1396}
1034 1397
1035=item cf::player::list_logins 1398=item cf::player::list_logins
1036 1399
1037Returns am arrayref of all valid playernames in the system, can take a 1400Returns am arrayref of all valid playernames in the system, can take a
1038while and may block, so not sync_job-capable, ever. 1401while and may block, so not sync_job-capable, ever.
1039 1402
1040=cut 1403=cut
1041 1404
1042sub list_logins { 1405sub list_logins {
1043 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1406 my $dirs = aio_readdir $PLAYERDIR
1044 or return []; 1407 or return [];
1045 1408
1046 my @logins; 1409 my @logins;
1047 1410
1048 for my $login (@$dirs) { 1411 for my $login (@$dirs) {
1065=cut 1428=cut
1066 1429
1067sub maps($) { 1430sub maps($) {
1068 my ($pl) = @_; 1431 my ($pl) = @_;
1069 1432
1433 $pl = ref $pl ? $pl->ob->name : $pl;
1434
1070 my $files = aio_readdir playerdir $pl 1435 my $files = aio_readdir playerdir $pl
1071 or return; 1436 or return;
1072 1437
1073 my @paths; 1438 my @paths;
1074 1439
1075 for (@$files) { 1440 for (@$files) {
1076 utf8::decode $_; 1441 utf8::decode $_;
1077 next if /\.(?:pl|pst)$/; 1442 next if /\.(?:pl|pst)$/;
1078 next unless /^$PATH_SEP/o; 1443 next unless /^$PATH_SEP/o;
1079 1444
1080 s/\.map$//; 1445 push @paths, cf::map::normalise "~$pl/$_";
1081 push @paths, "~" . $pl->ob->name . "/" . $_;
1082 } 1446 }
1083 1447
1084 \@paths 1448 \@paths
1085} 1449}
1086 1450
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1452
1453Expand crossfire pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500
1087=item $player->ext_reply ($msgid, $msgtype, %msg) 1501=item $player->ext_reply ($msgid, @msg)
1088 1502
1089Sends an ext reply to the player. 1503Sends an ext reply to the player.
1090 1504
1091=cut 1505=cut
1092 1506
1093sub ext_reply($$$%) { 1507sub ext_reply($$@) {
1094 my ($self, $id, %msg) = @_; 1508 my ($self, $id, @msg) = @_;
1095 1509
1096 $msg{msgid} = $id; 1510 if ($self->ns->extcmd == 2) {
1097 1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1098 $self->send ("ext " . cf::to_json \%msg); 1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1099} 1517}
1100 1518
1101package cf; 1519=item $player->ext_msg ($type, @msg)
1520
1521Sends an ext event to the client.
1522
1523=cut
1524
1525sub ext_msg($$@) {
1526 my ($self, $type, @msg) = @_;
1527
1528 $self->ns->ext_msg ($type, @msg);
1529}
1530
1531=head3 cf::region
1532
1533=over 4
1534
1535=cut
1536
1537package cf::region;
1538
1539=item cf::region::find_by_path $path
1540
1541Tries to decuce the likely region for a map knowing only its path.
1542
1543=cut
1544
1545sub find_by_path($) {
1546 my ($path) = @_;
1547
1548 my ($match, $specificity);
1549
1550 for my $region (list) {
1551 if ($region->{match} && $path =~ $region->{match}) {
1552 ($match, $specificity) = ($region, $region->specificity)
1553 if $region->specificity > $specificity;
1554 }
1555 }
1556
1557 $match
1558}
1102 1559
1103=back 1560=back
1104
1105 1561
1106=head3 cf::map 1562=head3 cf::map
1107 1563
1108=over 4 1564=over 4
1109 1565
1113 1569
1114use Fcntl; 1570use Fcntl;
1115use Coro::AIO; 1571use Coro::AIO;
1116 1572
1117use overload 1573use overload
1118 '""' => \&as_string; 1574 '""' => \&as_string,
1575 fallback => 1;
1119 1576
1120our $MAX_RESET = 3600; 1577our $MAX_RESET = 3600;
1121our $DEFAULT_RESET = 3000; 1578our $DEFAULT_RESET = 3000;
1122 1579
1123sub generate_random_map { 1580sub generate_random_map {
1124 my ($self, $rmp) = @_; 1581 my ($self, $rmp) = @_;
1125
1126 # mit "rum" bekleckern, nicht 1582 # mit "rum" bekleckern, nicht
1127 $self->_create_random_map ( 1583 $self->_create_random_map (
1128 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1129 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1130 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1137 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1593 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1138 (cf::region::find $rmp->{region}), $rmp->{custom} 1594 (cf::region::find $rmp->{region}), $rmp->{custom}
1139 ) 1595 )
1140} 1596}
1141 1597
1598=item cf::map->register ($regex, $prio)
1599
1600Register a handler for the map path matching the given regex at the
1601givne priority (higher is better, built-in handlers have priority 0, the
1602default).
1603
1604=cut
1605
1142sub register { 1606sub register {
1143 my (undef, $regex) = @_; 1607 my (undef, $regex, $prio) = @_;
1144 my $pkg = caller; 1608 my $pkg = caller;
1145 1609
1146 no strict; 1610 no strict;
1147 push @{"$pkg\::ISA"}, __PACKAGE__; 1611 push @{"$pkg\::ISA"}, __PACKAGE__;
1148 1612
1149 $EXT_MAP{$pkg} = qr<$regex>; 1613 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1150} 1614}
1151 1615
1152# also paths starting with '/' 1616# also paths starting with '/'
1153$EXT_MAP{"cf::map"} = qr{^(?=/)}; 1617$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];
1154 1618
1155sub thawer_merge { 1619sub thawer_merge {
1620 my ($self, $merge) = @_;
1621
1156 # we have to keep some variables in memory intact 1622 # we have to keep some variables in memory intact
1157 local $_[0]{path}; 1623 local $self->{path};
1158 local $_[0]{deny_save}; 1624 local $self->{load_path};
1159 local $_[0]{deny_reset};
1160 1625
1161 $_[0]->SUPER::thawer_merge ($_[1]); 1626 $self->SUPER::thawer_merge ($merge);
1162} 1627}
1163 1628
1164sub normalise { 1629sub normalise {
1165 my ($path, $base) = @_; 1630 my ($path, $base) = @_;
1631
1632 $path = "$path"; # make sure its a string
1633
1634 $path =~ s/\.map$//;
1166 1635
1167 # map plan: 1636 # map plan:
1168 # 1637 #
1169 # /! non-realised random map exit (special hack!) 1638 # /! non-realised random map exit (special hack!)
1170 # {... are special paths that are not being touched 1639 # {... are special paths that are not being touched
1198 1667
1199 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object 1668 return $path if UNIVERSAL::isa $path, "cf::map"; # already a map object
1200 1669
1201 $path = normalise $path, $base; 1670 $path = normalise $path, $base;
1202 1671
1203 for my $pkg (keys %EXT_MAP) { 1672 for my $pkg (sort { $EXT_MAP{$b}[0] <=> $EXT_MAP{$a}[0] } keys %EXT_MAP) {
1204 if ($path =~ $EXT_MAP{$pkg}) { 1673 if ($path =~ $EXT_MAP{$pkg}[1]) {
1205 my $self = bless cf::map::new, $pkg; 1674 my $self = bless cf::map::new, $pkg;
1206 $self->{path} = $path; $self->path ($path); 1675 $self->{path} = $path; $self->path ($path);
1207 $self->init; # pass $1 etc. 1676 $self->init; # pass $1 etc.
1208 return $self; 1677 return $self;
1209 } 1678 }
1210 } 1679 }
1211 1680
1212 Carp::carp "unable to resolve path '$path'."; 1681 Carp::cluck "unable to resolve path '$path' (base '$base').";
1213 () 1682 ()
1214} 1683}
1215 1684
1216sub init { 1685sub init {
1217 my ($self) = @_; 1686 my ($self) = @_;
1232 1701
1233# the original (read-only) location 1702# the original (read-only) location
1234sub load_path { 1703sub load_path {
1235 my ($self) = @_; 1704 my ($self) = @_;
1236 1705
1237 sprintf "%s/%s/%s", cf::datadir, cf::mapdir, $self->{path} 1706 "$MAPDIR/$self->{path}.map"
1238} 1707}
1239 1708
1240# the temporary/swap location 1709# the temporary/swap location
1241sub save_path { 1710sub save_path {
1242 my ($self) = @_; 1711 my ($self) = @_;
1243 1712
1244 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1245 sprintf "%s/%s/%s", cf::localdir, cf::tmpdir, $path 1714 "$TMPDIR/$path.map"
1246} 1715}
1247 1716
1248# the unique path, undef == no special unique path 1717# the unique path, undef == no special unique path
1249sub uniq_path { 1718sub uniq_path {
1250 my ($self) = @_; 1719 my ($self) = @_;
1251 1720
1252 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1253 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1722 "$UNIQUEDIR/$path"
1254} 1723}
1255 1724
1256# and all this just because we cannot iterate over 1725# and all this just because we cannot iterate over
1257# all maps in C++... 1726# all maps in C++...
1258sub change_all_map_light { 1727sub change_all_map_light {
1260 1729
1261 $_->change_map_light ($change) 1730 $_->change_map_light ($change)
1262 for grep $_->outdoor, values %cf::MAP; 1731 for grep $_->outdoor, values %cf::MAP;
1263} 1732}
1264 1733
1734sub decay_objects {
1735 my ($self) = @_;
1736
1737 return if $self->{deny_reset};
1738
1739 $self->do_decay_objects;
1740}
1741
1265sub unlink_save { 1742sub unlink_save {
1266 my ($self) = @_; 1743 my ($self) = @_;
1267 1744
1268 utf8::encode (my $save = $self->save_path); 1745 utf8::encode (my $save = $self->save_path);
1269 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1746 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1272 1749
1273sub load_header_from($) { 1750sub load_header_from($) {
1274 my ($self, $path) = @_; 1751 my ($self, $path) = @_;
1275 1752
1276 utf8::encode $path; 1753 utf8::encode $path;
1277 aio_open $path, O_RDONLY, 0 1754 #aio_open $path, O_RDONLY, 0
1278 or return; 1755 # or return;
1279 1756
1280 $self->_load_header ($path) 1757 $self->_load_header ($path)
1281 or return; 1758 or return;
1282 1759
1283 $self->{load_path} = $path; 1760 $self->{load_path} = $path;
1284 1761
1285 1 1762 1
1286} 1763}
1287 1764
1288sub load_orig { 1765sub load_header_orig {
1289 my ($self) = @_; 1766 my ($self) = @_;
1290 1767
1291 $self->load_header_from ($self->load_path) 1768 $self->load_header_from ($self->load_path)
1292} 1769}
1293 1770
1294sub load_temp { 1771sub load_header_temp {
1295 my ($self) = @_; 1772 my ($self) = @_;
1296 1773
1297 $self->load_header_from ($self->save_path) 1774 $self->load_header_from ($self->save_path)
1775}
1776
1777sub prepare_temp {
1778 my ($self) = @_;
1779
1780 $self->last_access ((delete $self->{last_access})
1781 || $cf::RUNTIME); #d#
1782 # safety
1783 $self->{instantiate_time} = $cf::RUNTIME
1784 if $self->{instantiate_time} > $cf::RUNTIME;
1785}
1786
1787sub prepare_orig {
1788 my ($self) = @_;
1789
1790 $self->{load_original} = 1;
1791 $self->{instantiate_time} = $cf::RUNTIME;
1792 $self->last_access ($cf::RUNTIME);
1793 $self->instantiate;
1298} 1794}
1299 1795
1300sub load_header { 1796sub load_header {
1301 my ($self) = @_; 1797 my ($self) = @_;
1302 1798
1303 if ($self->load_temp) { 1799 if ($self->load_header_temp) {
1304 $self->last_access ((delete $self->{last_access}) 1800 $self->prepare_temp;
1305 || $cf::RUNTIME); #d#
1306 # safety
1307 $self->{instantiate_time} = $cf::RUNTIME
1308 if $self->{instantiate_time} > $cf::RUNTIME;
1309 } else { 1801 } else {
1310 $self->load_orig 1802 $self->load_header_orig
1311 or return; 1803 or return;
1312 1804 $self->prepare_orig;
1313 $self->{load_original} = 1;
1314 $self->{instantiate_time} = $cf::RUNTIME;
1315 $self->last_access ($cf::RUNTIME);
1316 $self->instantiate;
1317 } 1805 }
1806
1807 $self->{deny_reset} = 1
1808 if $self->no_reset;
1809
1810 $self->default_region (cf::region::find_by_path $self->{path})
1811 unless $self->default_region;
1318 1812
1319 1 1813 1
1320} 1814}
1321 1815
1322sub find; 1816sub find;
1335 $map->{last_save} = $cf::RUNTIME; 1829 $map->{last_save} = $cf::RUNTIME;
1336 1830
1337 $map->load_header 1831 $map->load_header
1338 or return; 1832 or return;
1339 1833
1340 if ($map->should_reset) { 1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously
1341 $cf::WAIT_FOR_TICK->wait; 1836 #$cf::WAIT_FOR_TICK->wait;
1342 $map->reset; 1837 $map->reset;
1343 undef $guard; 1838 undef $guard;
1344 $map = find $path 1839 return find $path;
1345 or return;
1346 } 1840 }
1347 1841
1348 $cf::MAP{$path} = $map 1842 $cf::MAP{$path} = $map
1349 } 1843 }
1350} 1844}
1845
1846sub pre_load { }
1847sub post_load { }
1351 1848
1352sub load { 1849sub load {
1353 my ($self) = @_; 1850 my ($self) = @_;
1354 1851
1852 local $self->{deny_reset} = 1; # loading can take a long time
1853
1355 my $path = $self->{path}; 1854 my $path = $self->{path};
1855
1856 {
1356 my $guard = cf::lock_acquire "map_load:$path"; 1857 my $guard = cf::lock_acquire "map_load:$path";
1357 1858
1358 return if $self->in_memory != cf::MAP_SWAPPED; 1859 return if $self->in_memory != cf::MAP_SWAPPED;
1359 1860
1360 $self->in_memory (cf::MAP_LOADING); 1861 $self->in_memory (cf::MAP_LOADING);
1361 1862
1362 $self->alloc; 1863 $self->alloc;
1363 $self->_load_objects ($self->{load_path}, 1)
1364 or return;
1365 1864
1366 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 1865 $self->pre_load;
1367 if delete $self->{load_original};
1368
1369 if (my $uniq = $self->uniq_path) {
1370 utf8::encode $uniq;
1371 if (aio_open $uniq, O_RDONLY, 0) {
1372 $self->clear_unique_items;
1373 $self->_load_objects ($uniq, 0);
1374 }
1375 }
1376
1377 Coro::cede;
1378
1379 # now do the right thing for maps
1380 $self->link_multipart_objects;
1381
1382 unless ($self->{deny_activate}) {
1383 $self->decay_objects;
1384 $self->fix_auto_apply;
1385 $self->update_buttons;
1386 Coro::cede; 1866 Coro::cede;
1387 $self->set_darkness_map; 1867
1868 $self->_load_objects ($self->{load_path}, 1)
1869 or return;
1870
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1872 if delete $self->{load_original};
1873
1874 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) {
1877 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0);
1879 }
1880 }
1881
1882 Coro::cede;
1883 # now do the right thing for maps
1884 $self->link_multipart_objects;
1388 $self->difficulty ($self->estimate_difficulty) 1885 $self->difficulty ($self->estimate_difficulty)
1389 unless $self->difficulty; 1886 unless $self->difficulty;
1390 Coro::cede; 1887 Coro::cede;
1888
1889 unless ($self->{deny_activate}) {
1890 $self->decay_objects;
1891 $self->fix_auto_apply;
1892 $self->update_buttons;
1893 Coro::cede;
1894 $self->set_darkness_map;
1895 Coro::cede;
1391 $self->activate; 1896 $self->activate;
1392 } 1897 }
1393 1898
1899 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME);
1901
1394 $self->in_memory (cf::MAP_IN_MEMORY); 1902 $self->in_memory (cf::MAP_IN_MEMORY);
1903 }
1904
1905 $self->post_load;
1395} 1906}
1396 1907
1397sub customise_for { 1908sub customise_for {
1398 my ($self, $ob) = @_; 1909 my ($self, $ob) = @_;
1399 1910
1400 return find "~" . $ob->name . "/" . $self->{path} 1911 return find "~" . $ob->name . "/" . $self->{path}
1401 if $self->per_player; 1912 if $self->per_player;
1913
1914# return find "?party/" . $ob->name . "/" . $self->{path}
1915# if $self->per_party;
1402 1916
1403 $self 1917 $self
1404} 1918}
1405 1919
1406# find and load all maps in the 3x3 area around a map 1920# find and load all maps in the 3x3 area around a map
1438 1952
1439 cf::sync_job { $map->load }; 1953 cf::sync_job { $map->load };
1440} 1954}
1441 1955
1442our %MAP_PREFETCH; 1956our %MAP_PREFETCH;
1443our $MAP_PREFETCHER = Coro::async { 1957our $MAP_PREFETCHER = undef;
1444 while () {
1445 for my $path (keys %MAP_PREFETCH) {
1446 my $map = find $path
1447 or next;
1448 $map->load;
1449
1450 delete $MAP_PREFETCH{$path};
1451 }
1452 Coro::schedule;
1453 }
1454};
1455 1958
1456sub find_async { 1959sub find_async {
1457 my ($path, $origin) = @_; 1960 my ($path, $origin) = @_;
1458 1961
1459 $path = normalise $path, $origin && $origin->{path}; 1962 $path = normalise $path, $origin && $origin->{path};
1460 1963
1461 if (my $map = $cf::MAP{$path}) { 1964 if (my $map = $cf::MAP{$path}) {
1462 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1463 } 1966 }
1464 1967
1465 $MAP_PREFETCH{$path} = 0; 1968 undef $MAP_PREFETCH{$path};
1969 $MAP_PREFETCHER ||= cf::async {
1970 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) {
1972 if (my $map = find $path) {
1973 $map->load;
1974 }
1975
1976 delete $MAP_PREFETCH{$path};
1977 }
1978 }
1979 undef $MAP_PREFETCHER;
1980 };
1466 $MAP_PREFETCHER->ready; 1981 $MAP_PREFETCHER->prio (6);
1467 1982
1468 () 1983 ()
1469} 1984}
1470 1985
1471sub save { 1986sub save {
1516 2031
1517sub reset_at { 2032sub reset_at {
1518 my ($self) = @_; 2033 my ($self) = @_;
1519 2034
1520 # TODO: safety, remove and allow resettable per-player maps 2035 # TODO: safety, remove and allow resettable per-player maps
1521 return 1e99 if $self->isa ("ext::map_per_player");#d#
1522 return 1e99 if $self->{deny_reset}; 2036 return 1e99 if $self->{deny_reset};
1523 2037
1524 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2038 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1525 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2039 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1526 2040
1531 my ($self) = @_; 2045 my ($self) = @_;
1532 2046
1533 $self->reset_at <= $cf::RUNTIME 2047 $self->reset_at <= $cf::RUNTIME
1534} 2048}
1535 2049
1536sub rename {
1537 my ($self, $new_path) = @_;
1538
1539 normalise $new_path;
1540
1541 $self->unlink_save;
1542
1543 delete $cf::MAP{$self->path};
1544 $self->{path} = $new_path; $self->path ($self->{path});
1545 $cf::MAP{$self->path} = $self;
1546
1547 $self->save;
1548}
1549
1550sub reset { 2050sub reset {
1551 my ($self) = @_; 2051 my ($self) = @_;
1552 2052
1553 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2053 my $lock = cf::lock_acquire "map_data:$self->{path}";
1554 2054
1555 return if $self->players; 2055 return if $self->players;
1556 return if $self->isa ("ext::map_per_player");#d#
1557 2056
1558 warn "resetting map ", $self->path;#d# 2057 warn "resetting map ", $self->path;
2058
2059 $self->in_memory (cf::MAP_SWAPPED);
2060
2061 # need to save uniques path
2062 unless ($self->{deny_save}) {
2063 my $uniq = $self->uniq_path; utf8::encode $uniq;
2064
2065 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2066 if $uniq;
2067 }
1559 2068
1560 delete $cf::MAP{$self->path}; 2069 delete $cf::MAP{$self->path};
1561 2070
1562 $self->in_memory (cf::MAP_SWAPPED);
1563 $self->clear; 2071 $self->clear;
1564 2072
1565 $_->clear_links_to ($self) for values %cf::MAP; 2073 $_->clear_links_to ($self) for values %cf::MAP;
1566 2074
1567 $self->unlink_save; 2075 $self->unlink_save;
1571my $nuke_counter = "aaaa"; 2079my $nuke_counter = "aaaa";
1572 2080
1573sub nuke { 2081sub nuke {
1574 my ($self) = @_; 2082 my ($self) = @_;
1575 2083
2084 delete $cf::MAP{$self->path};
2085
2086 $self->unlink_save;
2087
2088 bless $self, "cf::map";
2089 delete $self->{deny_reset};
1576 $self->{deny_save} = 1; 2090 $self->{deny_save} = 1;
1577 $self->reset_timeout (1); 2091 $self->reset_timeout (1);
1578 $self->rename ("{nuke}/" . ($nuke_counter++)); 2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093
2094 $cf::MAP{$self->path} = $self;
2095
1579 $self->reset; # polite request, might not happen 2096 $self->reset; # polite request, might not happen
2097}
2098
2099=item $maps = cf::map::tmp_maps
2100
2101Returns an arrayref with all map paths of currently instantiated and saved
2102maps. May block.
2103
2104=cut
2105
2106sub tmp_maps() {
2107 [
2108 map {
2109 utf8::decode $_;
2110 /\.map$/
2111 ? normalise $_
2112 : ()
2113 } @{ aio_readdir $TMPDIR or [] }
2114 ]
2115}
2116
2117=item $maps = cf::map::random_maps
2118
2119Returns an arrayref with all map paths of currently instantiated and saved
2120random maps. May block.
2121
2122=cut
2123
2124sub random_maps() {
2125 [
2126 map {
2127 utf8::decode $_;
2128 /\.map$/
2129 ? normalise "?random/$_"
2130 : ()
2131 } @{ aio_readdir $RANDOMDIR or [] }
2132 ]
1580} 2133}
1581 2134
1582=item cf::map::unique_maps 2135=item cf::map::unique_maps
1583 2136
1584Returns an arrayref of paths of all shared maps that have 2137Returns an arrayref of paths of all shared maps that have
1585instantiated unique items. May block. 2138instantiated unique items. May block.
1586 2139
1587=cut 2140=cut
1588 2141
1589sub unique_maps() { 2142sub unique_maps() {
1590 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2143 [
1591 or return; 2144 map {
1592
1593 my @paths;
1594
1595 for (@$files) {
1596 utf8::decode $_; 2145 utf8::decode $_;
1597 next if /\.pst$/;
1598 next unless /^$PATH_SEP/o;
1599
1600 s/\.map$//; 2146 /\.map$/
1601 push @paths, $_; 2147 ? normalise $_
2148 : ()
2149 } @{ aio_readdir $UNIQUEDIR or [] }
1602 } 2150 ]
1603
1604 \@paths
1605} 2151}
1606 2152
1607package cf; 2153package cf;
1608 2154
1609=back 2155=back
1655 2201
1656 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2202 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1657 2203
1658 if ($self->{record_replies}) { 2204 if ($self->{record_replies}) {
1659 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2205 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2206
1660 } else { 2207 } else {
2208 my $pl = $self->contr;
2209
2210 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2211 my $dialog = $pl->{npc_dialog};
2212 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2213
2214 } else {
1661 $msg = $npc->name . " says: $msg" if $npc; 2215 $msg = $npc->name . " says: $msg" if $npc;
1662 $self->message ($msg, $flags); 2216 $self->message ($msg, $flags);
2217 }
1663 } 2218 }
2219}
2220
2221=item $object->send_msg ($channel, $msg, $color, [extra...])
2222
2223=cut
2224
2225sub cf::object::send_msg {
2226 my $pl = shift->contr
2227 or return;
2228 $pl->send_msg (@_);
1664} 2229}
1665 2230
1666=item $player_object->may ("access") 2231=item $player_object->may ("access")
1667 2232
1668Returns wether the given player is authorized to access resource "access" 2233Returns wether the given player is authorized to access resource "access"
1700=cut 2265=cut
1701 2266
1702sub link_map { 2267sub link_map {
1703 unless ($LINK_MAP) { 2268 unless ($LINK_MAP) {
1704 $LINK_MAP = cf::map::find "{link}" 2269 $LINK_MAP = cf::map::find "{link}"
1705 or do { warn "FATAL: unable to provide {link} map, exiting."; exit 1 }; 2270 or cf::cleanup "FATAL: unable to provide {link} map, exiting.";
1706 $LINK_MAP->load; 2271 $LINK_MAP->load;
1707 } 2272 }
1708 2273
1709 $LINK_MAP 2274 $LINK_MAP
1710} 2275}
1715 $self->deactivate_recursive; 2280 $self->deactivate_recursive;
1716 2281
1717 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2282 return if UNIVERSAL::isa $self->map, "ext::map_link";
1718 2283
1719 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2284 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1720 if $self->map; 2285 if $self->map && $self->map->{path} ne "{link}";
1721 2286
1722 $self->enter_map ($LINK_MAP || link_map, 20, 20); 2287 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1723} 2288}
1724 2289
1725sub cf::object::player::leave_link { 2290sub cf::object::player::leave_link {
1726 my ($self, $map, $x, $y) = @_; 2291 my ($self, $map, $x, $y) = @_;
2292
2293 return unless $self->contr->active;
1727 2294
1728 my $link_pos = delete $self->{_link_pos}; 2295 my $link_pos = delete $self->{_link_pos};
1729 2296
1730 unless ($map) { 2297 unless ($map) {
1731 # restore original map position 2298 # restore original map position
1749 $map->load; 2316 $map->load;
1750 $map->load_diag; 2317 $map->load_diag;
1751 2318
1752 return unless $self->contr->active; 2319 return unless $self->contr->active;
1753 $self->activate_recursive; 2320 $self->activate_recursive;
2321
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1754 $self->enter_map ($map, $x, $y); 2323 $self->enter_map ($map, $x, $y);
1755} 2324}
1756 2325
1757cf::player->attach ( 2326=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1758 on_logout => sub {
1759 my ($pl) = @_;
1760 2327
1761 # abort map switching before logout 2328Moves the player to the given map-path and coordinates by first freezing
1762 if ($pl->ob->{_link_pos}) { 2329her, loading and preparing them map, calling the provided $check callback
1763 cf::sync_job { 2330that has to return the map if sucecssful, and then unfreezes the player on
1764 $pl->ob->leave_link 2331the new (success) or old (failed) map position. In either case, $done will
1765 }; 2332be called at the end of this process.
1766 }
1767 },
1768 on_login => sub {
1769 my ($pl) = @_;
1770 2333
1771 # try to abort aborted map switching on player login :)
1772 # should happen only on crashes
1773 if ($pl->ob->{_link_pos}) {
1774 $pl->ob->enter_link;
1775 (async {
1776 # we need this sleep as the login has a concurrent enter_exit running
1777 # and this sleep increases chances of the player not ending up in scorn
1778 $pl->ob->reply (undef,
1779 "There was an internal problem at your last logout, "
1780 . "the server will try to bring you to your intended destination in a second.",
1781 cf::NDI_RED);
1782 Coro::Timer::sleep 1;
1783 $pl->ob->leave_link;
1784 })->prio (2);
1785 }
1786 },
1787);
1788
1789=item $player_object->goto ($path, $x, $y)
1790
1791=cut 2334=cut
2335
2336our $GOTOGEN;
1792 2337
1793sub cf::object::player::goto { 2338sub cf::object::player::goto {
1794 my ($self, $path, $x, $y) = @_; 2339 my ($self, $path, $x, $y, $check, $done) = @_;
2340
2341 # do generation counting so two concurrent goto's will be executed in-order
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1795 2343
1796 $self->enter_link; 2344 $self->enter_link;
1797 2345
1798 (async { 2346 (async {
2347 my $map = eval {
1799 my $map = cf::map::find $path; 2348 my $map = cf::map::find $path;
2349
2350 if ($map) {
1800 $map = $map->customise_for ($self) if $map; 2351 $map = $map->customise_for ($self);
1801 2352 $map = $check->($map) if $check && $map;
1802# warn "entering ", $map->path, " at ($x, $y)\n" 2353 } else {
1803# if $map;
1804
1805 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
2355 }
1806 2356
2357 $map
2358 };
2359
2360 if ($@) {
2361 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2362 LOG llevError | logBacktrace, Carp::longmess $@;
2363 }
2364
2365 if ($gen == $self->{_goto_generation}) {
2366 delete $self->{_goto_generation};
1807 $self->leave_link ($map, $x, $y); 2367 $self->leave_link ($map, $x, $y);
2368 }
2369
2370 $done->() if $done;
1808 })->prio (1); 2371 })->prio (1);
1809} 2372}
1810 2373
1811=item $player_object->enter_exit ($exit_object) 2374=item $player_object->enter_exit ($exit_object)
1812 2375
1814 2377
1815sub parse_random_map_params { 2378sub parse_random_map_params {
1816 my ($spec) = @_; 2379 my ($spec) = @_;
1817 2380
1818 my $rmp = { # defaults 2381 my $rmp = { # defaults
1819 xsize => 10, 2382 xsize => (cf::rndm 15, 40),
1820 ysize => 10, 2383 ysize => (cf::rndm 15, 40),
2384 symmetry => (cf::rndm 1, cf::SYMMETRY_XY),
2385 #layout => string,
1821 }; 2386 };
1822 2387
1823 for (split /\n/, $spec) { 2388 for (split /\n/, $spec) {
1824 my ($k, $v) = split /\s+/, $_, 2; 2389 my ($k, $v) = split /\s+/, $_, 2;
1825 2390
1829 $rmp 2394 $rmp
1830} 2395}
1831 2396
1832sub prepare_random_map { 2397sub prepare_random_map {
1833 my ($exit) = @_; 2398 my ($exit) = @_;
2399
2400 my $guard = cf::lock_acquire "exit_prepare:$exit";
1834 2401
1835 # all this does is basically replace the /! path by 2402 # all this does is basically replace the /! path by
1836 # a new random map path (?random/...) with a seed 2403 # a new random map path (?random/...) with a seed
1837 # that depends on the exit object 2404 # that depends on the exit object
1838 2405
1839 my $rmp = parse_random_map_params $exit->msg; 2406 my $rmp = parse_random_map_params $exit->msg;
1840 2407
1841 if ($exit->map) { 2408 if ($exit->map) {
1842 $rmp->{region} = $exit->map->region_name; 2409 $rmp->{region} = $exit->region->name;
1843 $rmp->{origin_map} = $exit->map->path; 2410 $rmp->{origin_map} = $exit->map->path;
1844 $rmp->{origin_x} = $exit->x; 2411 $rmp->{origin_x} = $exit->x;
1845 $rmp->{origin_y} = $exit->y; 2412 $rmp->{origin_y} = $exit->y;
1846 } 2413 }
1847 2414
1848 $rmp->{random_seed} ||= $exit->random_seed; 2415 $rmp->{random_seed} ||= $exit->random_seed;
1849 2416
1850 my $data = cf::to_json $rmp; 2417 my $data = cf::to_json $rmp;
1851 my $md5 = Digest::MD5::md5_hex $data; 2418 my $md5 = Digest::MD5::md5_hex $data;
2419 my $meta = "$RANDOMDIR/$md5.meta";
1852 2420
1853 if (my $fh = aio_open "$cf::RANDOM_MAPS/$md5.meta", O_WRONLY | O_CREAT, 0666) { 2421 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1854 aio_write $fh, 0, (length $data), $data, 0; 2422 aio_write $fh, 0, (length $data), $data, 0;
2423 undef $fh;
2424 aio_rename "$meta~", $meta;
1855 2425
1856 $exit->slaying ("?random/$md5"); 2426 $exit->slaying ("?random/$md5");
1857 $exit->msg (undef); 2427 $exit->msg (undef);
1858 } 2428 }
1859} 2429}
1861sub cf::object::player::enter_exit { 2431sub cf::object::player::enter_exit {
1862 my ($self, $exit) = @_; 2432 my ($self, $exit) = @_;
1863 2433
1864 return unless $self->type == cf::PLAYER; 2434 return unless $self->type == cf::PLAYER;
1865 2435
2436 if ($exit->slaying eq "/!") {
2437 #TODO: this should de-fi-ni-te-ly not be a sync-job
2438 # the problem is that $exit might not survive long enough
2439 # so it needs to be done right now, right here
2440 cf::sync_job { prepare_random_map $exit };
2441 }
2442
2443 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2444 my $hp = $exit->stats->hp;
2445 my $sp = $exit->stats->sp;
2446
1866 $self->enter_link; 2447 $self->enter_link;
2448
2449 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED);
1867 2452
1868 (async { 2453 (async {
1869 $self->deactivate_recursive; # just to be sure 2454 $self->deactivate_recursive; # just to be sure
1870 unless (eval { 2455 unless (eval {
1871 prepare_random_map $exit 2456 $self->goto ($slaying, $hp, $sp);
1872 if $exit->slaying eq "/!";
1873
1874 my $path = new_from_path cf::map $exit->slaying, $exit->map && $exit->map->path;
1875 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1876 2457
1877 1; 2458 1;
1878 }) { 2459 }) {
1879 $self->message ("Something went wrong deep within the crossfire server. " 2460 $self->message ("Something went wrong deep within the crossfire server. "
1880 . "I'll try to bring you back to the map you were before. " 2461 . "I'll try to bring you back to the map you were before. "
1881 . "Please report this to the dungeon master!", 2462 . "Please report this to the dungeon master!",
1882 cf::NDI_UNIQUE | cf::NDI_RED); 2463 cf::NDI_UNIQUE | cf::NDI_RED);
1883 2464
1884 warn "ERROR in enter_exit: $@"; 2465 warn "ERROR in enter_exit: $@";
1885 $self->leave_link; 2466 $self->leave_link;
1886 } 2467 }
1887 })->prio (1); 2468 })->prio (1);
1900 2481
1901sub cf::client::send_drawinfo { 2482sub cf::client::send_drawinfo {
1902 my ($self, $text, $flags) = @_; 2483 my ($self, $text, $flags) = @_;
1903 2484
1904 utf8::encode $text; 2485 utf8::encode $text;
1905 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2486 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1906} 2487}
1907 2488
2489=item $client->send_msg ($channel, $msg, $color, [extra...])
2490
2491Send a drawinfo or msg packet to the client, formatting the msg for the
2492client if neccessary. C<$type> should be a string identifying the type of
2493the message, with C<log> being the default. If C<$color> is negative, suppress
2494the message unless the client supports the msg packet.
2495
2496=cut
2497
2498sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_;
2500
2501 $msg = $self->pl->expand_cfpod ($msg);
2502
2503 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504
2505 if (ref $channel) {
2506 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel);
2510 }
2511
2512 $channel = $channel->{id};
2513 }
2514
2515 return unless @extra || length $msg;
2516
2517 if ($self->can_msg) {
2518 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF;
2521
2522 $self->send_packet ("msg " . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2524 } else {
2525 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones
2527 for ($msg) {
2528 1 while
2529 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2530 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2531 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2532 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2533 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2534 }
2535
2536 $color &= cf::NDI_COLOR_MASK;
2537
2538 utf8::encode $msg;
2539
2540 if (0 && $msg =~ /\[/) {
2541 # COMMAND/INFO
2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2543 } else {
2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2545 $self->send_packet ("drawinfo $color $msg")
2546 }
2547 }
2548 }
2549}
2550
2551=item $client->ext_msg ($type, @msg)
2552
2553Sends an ext event to the client.
2554
2555=cut
2556
2557sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_;
2559
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type";
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 }
2568}
1908 2569
1909=item $success = $client->query ($flags, "text", \&cb) 2570=item $success = $client->query ($flags, "text", \&cb)
1910 2571
1911Queues a query to the client, calling the given callback with 2572Queues a query to the client, calling the given callback with
1912the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2573the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1913C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2574C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1914 2575
1915Queries can fail, so check the return code. Or don't, as queries will become 2576Queries can fail, so check the return code. Or don't, as queries will
1916reliable at some point in the future. 2577become reliable at some point in the future.
1917 2578
1918=cut 2579=cut
1919 2580
1920sub cf::client::query { 2581sub cf::client::query {
1921 my ($self, $flags, $text, $cb) = @_; 2582 my ($self, $flags, $text, $cb) = @_;
1929 utf8::encode $text; 2590 utf8::encode $text;
1930 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2591 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
1931 2592
1932 $self->send_packet ($self->{query_queue}[0][0]) 2593 $self->send_packet ($self->{query_queue}[0][0])
1933 if @{ $self->{query_queue} } == 1; 2594 if @{ $self->{query_queue} } == 1;
2595
2596 1
1934} 2597}
1935 2598
1936cf::client->attach ( 2599cf::client->attach (
2600 on_connect => sub {
2601 my ($ns) = @_;
2602
2603 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2604 },
1937 on_reply => sub { 2605 on_reply => sub {
1938 my ($ns, $msg) = @_; 2606 my ($ns, $msg) = @_;
1939 2607
1940 # this weird shuffling is so that direct followup queries 2608 # this weird shuffling is so that direct followup queries
1941 # get handled first 2609 # get handled first
1942 my $queue = delete $ns->{query_queue} 2610 my $queue = delete $ns->{query_queue}
1943 or return; # be conservative, not sure how that can happen, but we saw a crash here 2611 or return; # be conservative, not sure how that can happen, but we saw a crash here
1944 2612
1945 (shift @$queue)->[1]->($msg); 2613 (shift @$queue)->[1]->($msg);
2614 return unless $ns->valid; # temporary(?) workaround for callback destroying socket
1946 2615
1947 push @{ $ns->{query_queue} }, @$queue; 2616 push @{ $ns->{query_queue} }, @$queue;
1948 2617
1949 if (@{ $ns->{query_queue} } == @$queue) { 2618 if (@{ $ns->{query_queue} } == @$queue) {
1950 if (@$queue) { 2619 if (@$queue) {
1952 } else { 2621 } else {
1953 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2622 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
1954 } 2623 }
1955 } 2624 }
1956 }, 2625 },
2626 on_exticmd => sub {
2627 my ($ns, $buf) = @_;
2628
2629 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2630
2631 if (ref $msg) {
2632 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg
2634 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636
2637 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 }
2643 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 }
2646
2647 cf::override;
2648 },
1957); 2649);
1958 2650
1959=item $client->async (\&cb) 2651=item $client->async (\&cb)
1960 2652
1961Create a new coroutine, running the specified callback. The coroutine will 2653Create a new coroutine, running the specified callback. The coroutine will
2002our $safe = new Safe "safe"; 2694our $safe = new Safe "safe";
2003our $safe_hole = new Safe::Hole; 2695our $safe_hole = new Safe::Hole;
2004 2696
2005$SIG{FPE} = 'IGNORE'; 2697$SIG{FPE} = 'IGNORE';
2006 2698
2007$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2699$safe->permit_only (Opcode::opset qw(
2700 :base_core :base_mem :base_orig :base_math
2701 grepstart grepwhile mapstart mapwhile
2702 sort time
2703));
2008 2704
2009# here we export the classes and methods available to script code 2705# here we export the classes and methods available to script code
2010 2706
2011=pod 2707=pod
2012 2708
2013The following fucntions and emthods are available within a safe environment: 2709The following functions and methods are available within a safe environment:
2014 2710
2015 cf::object contr pay_amount pay_player map 2711 cf::object
2712 contr pay_amount pay_player map x y force_find force_add
2713 insert remove name archname title slaying race
2714
2016 cf::object::player player 2715 cf::object::player
2017 cf::player peaceful 2716 player
2018 cf::map trigger 2717
2718 cf::player
2719 peaceful
2720
2721 cf::map
2722 trigger
2019 2723
2020=cut 2724=cut
2021 2725
2022for ( 2726for (
2023 ["cf::object" => qw(contr pay_amount pay_player map)], 2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove inv name archname title slaying race)],
2024 ["cf::object::player" => qw(player)], 2729 ["cf::object::player" => qw(player)],
2025 ["cf::player" => qw(peaceful)], 2730 ["cf::player" => qw(peaceful)],
2026 ["cf::map" => qw(trigger)], 2731 ["cf::map" => qw(trigger)],
2027) { 2732) {
2028 no strict 'refs'; 2733 no strict 'refs';
2099=back 2804=back
2100 2805
2101=cut 2806=cut
2102 2807
2103############################################################################# 2808#############################################################################
2809# the server's init and main functions
2104 2810
2105=head2 EXTENSION DATABASE SUPPORT 2811sub load_facedata($) {
2812 my ($path) = @_;
2106 2813
2107Crossfire maintains a very simple database for extension use. It can 2814 warn "loading facedata from $path\n";
2108currently store anything that can be serialised using Storable, which
2109excludes objects.
2110 2815
2111The parameter C<$family> should best start with the name of the extension 2816 my $facedata;
2112using it, it should be unique. 2817 0 < aio_load $path, $facedata
2818 or die "$path: $!";
2113 2819
2114=over 4 2820 $facedata = Coro::Storable::thaw $facedata;
2115 2821
2116=item $hashref = cf::db_get $family 2822 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed.";
2117 2824
2118Return a hashref for use by the extension C<$family>, which can be
2119modified. After modifications, you have to call C<cf::db_dirty> or
2120C<cf::db_sync>.
2121
2122=item $value = cf::db_get $family => $key
2123
2124Returns a single value from the database
2125
2126=item cf::db_put $family => $hashref
2127
2128Stores the given family hashref into the database. Updates are delayed, if
2129you want the data to be synced to disk immediately, use C<cf::db_sync>.
2130
2131=item cf::db_put $family => $key => $value
2132
2133Stores the given C<$value> in the family hash. Updates are delayed, if you
2134want the data to be synced to disk immediately, use C<cf::db_sync>.
2135
2136=item cf::db_dirty
2137
2138Marks the database as dirty, to be updated at a later time.
2139
2140=item cf::db_sync
2141
2142Immediately write the database to disk I<if it is dirty>.
2143
2144=cut
2145
2146our $DB;
2147
2148{
2149 my $path = cf::localdir . "/database.pst";
2150
2151 sub db_load() {
2152 $DB = stat $path ? Storable::retrieve $path : { };
2153 } 2825 {
2826 my $faces = $facedata->{faceinfo};
2154 2827
2155 my $pid; 2828 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64};
2156 2834
2157 sub db_save() { 2835 cf::cede_to_tick;
2158 waitpid $pid, 0 if $pid;
2159 if (0 == ($pid = fork)) {
2160 $DB->{_meta}{version} = 1;
2161 Storable::nstore $DB, "$path~";
2162 rename "$path~", $path;
2163 cf::_exit 0 if defined $pid;
2164 }
2165 }
2166
2167 my $dirty;
2168
2169 sub db_sync() {
2170 db_save if $dirty;
2171 undef $dirty;
2172 }
2173
2174 my $idle = Event->idle (min => $TICK * 2.8, max => 10, repeat => 0, data => WF_AUTOCANCEL, cb => sub {
2175 db_sync;
2176 });
2177
2178 sub db_dirty() {
2179 $dirty = 1;
2180 $idle->start;
2181 }
2182
2183 sub db_get($;$) {
2184 @_ >= 2
2185 ? $DB->{$_[0]}{$_[1]}
2186 : ($DB->{$_[0]} ||= { })
2187 }
2188
2189 sub db_put($$;$) {
2190 if (@_ >= 3) {
2191 $DB->{$_[0]}{$_[1]} = $_[2];
2192 } else {
2193 $DB->{$_[0]} = $_[1];
2194 }
2195 db_dirty;
2196 }
2197
2198 cf::global->attach (
2199 prio => 10000,
2200 on_cleanup => sub {
2201 db_sync;
2202 }, 2836 }
2203 );
2204}
2205 2837
2206############################################################################# 2838 while (my ($face, $info) = each %$faces) {
2207# the server's main() 2839 next unless $info->{smooth};
2840 my $idx = cf::face::find $face
2841 or next;
2842 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'";
2847 }
2848
2849 cf::cede_to_tick;
2850 }
2851 }
2852
2853 {
2854 my $anims = $facedata->{animinfo};
2855
2856 while (my ($anim, $info) = each %$anims) {
2857 cf::anim::set $anim, $info->{frames}, $info->{facings};
2858 cf::cede_to_tick;
2859 }
2860
2861 cf::anim::invalidate_all; # d'oh
2862 }
2863
2864 {
2865 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871
2872 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2879
2880 if ($info->{type} & 1) {
2881 # prepend meta info
2882
2883 my $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885
2886 cf::face::set_data $idx, 0, $data, $chk;
2887 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2889 }
2890
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick;
2894 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 }
2914
2915 1
2916}
2917
2918register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_;
2920
2921 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v);
2923 }
2924};
2925
2926sub reload_regions {
2927 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n";
2929
2930 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/
2932 if exists $_->{match};
2933 }
2934}
2935
2936sub reload_facedata {
2937 load_facedata "$DATADIR/facedata"
2938 or die "unable to load facedata\n";
2939}
2940
2941sub reload_archetypes {
2942 load_resource_file "$DATADIR/archetypes"
2943 or die "unable to load archetypes\n";
2944 #d# NEED to laod twice to resolve forward references
2945 # this really needs to be done in an extra post-pass
2946 # (which needs to be synchronous, so solve it differently)
2947 load_resource_file "$DATADIR/archetypes"
2948 or die "unable to load archetypes\n";
2949}
2950
2951sub reload_treasures {
2952 load_resource_file "$DATADIR/treasures"
2953 or die "unable to load treasurelists\n";
2954}
2955
2956sub reload_resources {
2957 warn "reloading resource files...\n";
2958
2959 reload_regions;
2960 reload_facedata;
2961 #reload_archetypes;#d#
2962 reload_archetypes;
2963 reload_treasures;
2964
2965 warn "finished reloading resource files\n";
2966}
2967
2968sub init {
2969 reload_resources;
2970}
2208 2971
2209sub cfg_load { 2972sub cfg_load {
2210 open my $fh, "<:utf8", cf::confdir . "/config" 2973 open my $fh, "<:utf8", "$CONFDIR/config"
2211 or return; 2974 or return;
2212 2975
2213 local $/; 2976 local $/;
2214 *CFG = YAML::Syck::Load <$fh>; 2977 *CFG = YAML::Syck::Load <$fh>;
2215 2978
2229 2992
2230sub main { 2993sub main {
2231 # we must not ever block the main coroutine 2994 # we must not ever block the main coroutine
2232 local $Coro::idle = sub { 2995 local $Coro::idle = sub {
2233 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2996 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2997 (async {
2234 async { Event::one_event }; 2998 Event::one_event;
2999 })->prio (Coro::PRIO_MAX);
2235 }; 3000 };
2236 3001
2237 cfg_load; 3002 cfg_load;
2238 db_load; 3003 db_init;
2239 load_extensions; 3004 load_extensions;
3005
3006 $TICK_WATCHER->start;
2240 Event::loop; 3007 Event::loop;
2241} 3008}
2242 3009
2243############################################################################# 3010#############################################################################
2244# initialisation and cleanup 3011# initialisation and cleanup
2245 3012
2246# install some emergency cleanup handlers 3013# install some emergency cleanup handlers
2247BEGIN { 3014BEGIN {
2248 for my $signal (qw(INT HUP TERM)) { 3015 for my $signal (qw(INT HUP TERM)) {
2249 Event->signal ( 3016 Event->signal (
3017 reentrant => 0,
2250 data => WF_AUTOCANCEL, 3018 data => WF_AUTOCANCEL,
2251 signal => $signal, 3019 signal => $signal,
3020 prio => 0,
2252 cb => sub { 3021 cb => sub {
2253 cf::cleanup "SIG$signal"; 3022 cf::cleanup "SIG$signal";
2254 }, 3023 },
2255 ); 3024 );
2256 } 3025 }
3026}
3027
3028sub write_runtime {
3029 my $runtime = "$LOCALDIR/runtime";
3030
3031 # first touch the runtime file to show we are still running:
3032 # the fsync below can take a very very long time.
3033
3034 IO::AIO::aio_utime $runtime, undef, undef;
3035
3036 my $guard = cf::lock_acquire "write_runtime";
3037
3038 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3039 or return;
3040
3041 my $value = $cf::RUNTIME + 90 + 10;
3042 # 10 is the runtime save interval, for a monotonic clock
3043 # 60 allows for the watchdog to kill the server.
3044
3045 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3046 and return;
3047
3048 # always fsync - this file is important
3049 aio_fsync $fh
3050 and return;
3051
3052 # touch it again to show we are up-to-date
3053 aio_utime $fh, undef, undef;
3054
3055 close $fh
3056 or return;
3057
3058 aio_rename "$runtime~", $runtime
3059 and return;
3060
3061 warn "runtime file written.\n";
3062
3063 1
2257} 3064}
2258 3065
2259sub emergency_save() { 3066sub emergency_save() {
2260 my $freeze_guard = cf::freeze_mainloop; 3067 my $freeze_guard = cf::freeze_mainloop;
2261 3068
2278 my $map = $cf::MAP{$path} or next; 3085 my $map = $cf::MAP{$path} or next;
2279 $map->valid or next; 3086 $map->valid or next;
2280 $map->save; 3087 $map->save;
2281 } 3088 }
2282 warn "end emergency map save\n"; 3089 warn "end emergency map save\n";
3090
3091 warn "begin emergency database checkpoint\n";
3092 BDB::db_env_txn_checkpoint $DB_ENV;
3093 warn "end emergency database checkpoint\n";
2283 }; 3094 };
2284 3095
2285 warn "leave emergency perl save\n"; 3096 warn "leave emergency perl save\n";
2286} 3097}
2287 3098
3099sub post_cleanup {
3100 my ($make_core) = @_;
3101
3102 warn Carp::longmess "post_cleanup backtrace"
3103 if $make_core;
3104}
3105
2288sub reload() { 3106sub do_reload_perl() {
2289 # can/must only be called in main 3107 # can/must only be called in main
2290 if ($Coro::current != $Coro::main) { 3108 if ($Coro::current != $Coro::main) {
2291 warn "can only reload from main coroutine\n"; 3109 warn "can only reload from main coroutine";
2292 return; 3110 return;
2293 } 3111 }
2294 3112
2295 warn "reloading..."; 3113 warn "reloading...";
2296 3114
2297 warn "freezing server"; 3115 warn "entering sync_job";
2298 my $guard = freeze_mainloop; 3116
3117 cf::sync_job {
3118 cf::write_runtime; # external watchdog should not bark
2299 cf::emergency_save; 3119 cf::emergency_save;
3120 cf::write_runtime; # external watchdog should not bark
2300 3121
2301 warn "sync database to disk"; 3122 warn "syncing database to disk";
2302 cf::db_sync; 3123 BDB::db_env_txn_checkpoint $DB_ENV;
2303 IO::AIO::flush;
2304 3124
2305 eval {
2306 # if anything goes wrong in here, we should simply crash as we already saved 3125 # if anything goes wrong in here, we should simply crash as we already saved
2307 3126
2308 warn "cancel all watchers"; 3127 warn "cancelling all WF_AUTOCANCEL watchers";
2309 for (Event::all_watchers) { 3128 for (Event::all_watchers) {
2310 $_->cancel if $_->data & WF_AUTOCANCEL; 3129 $_->cancel if $_->data & WF_AUTOCANCEL;
2311 } 3130 }
2312 3131
3132 warn "flushing outstanding aio requests";
3133 for (;;) {
3134 BDB::flush;
3135 IO::AIO::flush;
3136 Coro::cede;
3137 last unless IO::AIO::nreqs || BDB::nreqs;
3138 warn "iterate...";
3139 }
3140
3141 ++$RELOAD;
3142
2313 warn "cancel all extension coros"; 3143 warn "cancelling all extension coros";
2314 $_->cancel for values %EXT_CORO; 3144 $_->cancel for values %EXT_CORO;
2315 %EXT_CORO = (); 3145 %EXT_CORO = ();
2316 3146
2317 warn "remove commands"; 3147 warn "removing commands";
2318 %COMMAND = (); 3148 %COMMAND = ();
2319 3149
2320 warn "remove ext commands"; 3150 warn "removing ext/exti commands";
2321 %EXTCMD = (); 3151 %EXTCMD = ();
3152 %EXTICMD = ();
2322 3153
2323 warn "unload/nuke all extensions"; 3154 warn "unloading/nuking all extensions";
2324 for my $pkg (@EXTS) { 3155 for my $pkg (@EXTS) {
2325 warn "... unloading $pkg"; 3156 warn "... unloading $pkg";
2326 3157
2327 if (my $cb = $pkg->can ("unload")) { 3158 if (my $cb = $pkg->can ("unload")) {
2328 eval { 3159 eval {
2333 3164
2334 warn "... nuking $pkg"; 3165 warn "... nuking $pkg";
2335 Symbol::delete_package $pkg; 3166 Symbol::delete_package $pkg;
2336 } 3167 }
2337 3168
2338 warn "unload all perl modules loaded from $LIBDIR"; 3169 warn "unloading all perl modules loaded from $LIBDIR";
2339 while (my ($k, $v) = each %INC) { 3170 while (my ($k, $v) = each %INC) {
2340 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3171 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2341 3172
2342 warn "removing <$k>"; 3173 warn "... unloading $k";
2343 delete $INC{$k}; 3174 delete $INC{$k};
2344 3175
2345 $k =~ s/\.pm$//; 3176 $k =~ s/\.pm$//;
2346 $k =~ s/\//::/g; 3177 $k =~ s/\//::/g;
2347 3178
2350 } 3181 }
2351 3182
2352 Symbol::delete_package $k; 3183 Symbol::delete_package $k;
2353 } 3184 }
2354 3185
2355 warn "get rid of safe::, as good as possible"; 3186 warn "getting rid of safe::, as good as possible";
2356 Symbol::delete_package "safe::$_" 3187 Symbol::delete_package "safe::$_"
2357 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3188 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2358 3189
2359 warn "unload cf.pm \"a bit\""; 3190 warn "unloading cf.pm \"a bit\"";
2360 delete $INC{"cf.pm"}; 3191 delete $INC{"cf.pm"};
3192 delete $INC{"cf/pod.pm"};
2361 3193
2362 # don't, removes xs symbols, too, 3194 # don't, removes xs symbols, too,
2363 # and global variables created in xs 3195 # and global variables created in xs
2364 #Symbol::delete_package __PACKAGE__; 3196 #Symbol::delete_package __PACKAGE__;
2365 3197
3198 warn "unload completed, starting to reload now";
3199
2366 warn "reloading cf.pm"; 3200 warn "reloading cf.pm";
2367 require cf; 3201 require cf;
2368 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2369 3203
2370 warn "load config and database again"; 3204 warn "loading config and database again";
2371 cf::cfg_load; 3205 cf::cfg_load;
2372 cf::db_load;
2373 3206
2374 warn "load extensions"; 3207 warn "loading extensions";
2375 cf::load_extensions; 3208 cf::load_extensions;
2376 3209
2377 warn "reattach attachments to objects/players"; 3210 warn "reattaching attachments to objects/players";
2378 _global_reattach; 3211 _global_reattach; # objects, sockets
2379 warn "reattach attachments to maps"; 3212 warn "reattaching attachments to maps";
2380 reattach $_ for values %MAP; 3213 reattach $_ for values %MAP;
2381 }; 3214 warn "reattaching attachments to players";
3215 reattach $_ for values %PLAYER;
2382 3216
2383 if ($@) { 3217 warn "leaving sync_job";
3218
3219 1
3220 } or do {
2384 warn $@; 3221 warn $@;
2385 warn "error while reloading, exiting."; 3222 warn "error while reloading, exiting.";
2386 exit 1; 3223 exit 1;
2387 } 3224 };
2388 3225
2389 warn "reloaded"; 3226 warn "reloaded";
2390}; 3227};
2391 3228
3229our $RELOAD_WATCHER; # used only during reload
3230
3231sub reload_perl() {
3232 # doing reload synchronously and two reloads happen back-to-back,
3233 # coro crashes during coro_state_free->destroy here.
3234
3235 $RELOAD_WATCHER ||= Event->timer (
3236 reentrant => 0,
3237 after => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => sub {
3240 do_reload_perl;
3241 undef $RELOAD_WATCHER;
3242 },
3243 );
3244}
3245
2392register_command "reload" => sub { 3246register_command "reload" => sub {
2393 my ($who, $arg) = @_; 3247 my ($who, $arg) = @_;
2394 3248
2395 if ($who->flag (FLAG_WIZ)) { 3249 if ($who->flag (FLAG_WIZ)) {
2396 $who->message ("start of reload.");
2397 reload;
2398 $who->message ("end of reload."); 3250 $who->message ("reloading server.");
3251 async { reload_perl };
2399 } 3252 }
2400}; 3253};
2401 3254
2402unshift @INC, $LIBDIR; 3255unshift @INC, $LIBDIR;
2403 3256
3257my $bug_warning = 0;
3258
3259our @WAIT_FOR_TICK;
3260our @WAIT_FOR_TICK_BEGIN;
3261
3262sub wait_for_tick {
3263 return unless $TICK_WATCHER->is_active;
3264 return if $Coro::current == $Coro::main;
3265
3266 my $signal = new Coro::Signal;
3267 push @WAIT_FOR_TICK, $signal;
3268 $signal->wait;
3269}
3270
3271sub wait_for_tick_begin {
3272 return unless $TICK_WATCHER->is_active;
3273 return if $Coro::current == $Coro::main;
3274
3275 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait;
3278}
3279
3280 my $min = 1e6;#d#
3281 my $avg = 10;
2404$TICK_WATCHER = Event->timer ( 3282$TICK_WATCHER = Event->timer (
2405 reentrant => 0, 3283 reentrant => 0,
3284 parked => 1,
2406 prio => 0, 3285 prio => 0,
2407 at => $NEXT_TICK || $TICK, 3286 at => $NEXT_TICK || $TICK,
2408 data => WF_AUTOCANCEL, 3287 data => WF_AUTOCANCEL,
2409 cb => sub { 3288 cb => sub {
3289 if ($Coro::current != $Coro::main) {
3290 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3291 unless ++$bug_warning > 10;
3292 return;
3293 }
3294
2410 $NOW = Event::time; 3295 $NOW = $tick_start = Event::time;
2411 3296
2412 cf::server_tick; # one server iteration 3297 cf::server_tick; # one server iteration
3298
3299 0 && sync_job {#d#
3300 for(1..10) {
3301 my $t = Event::time;
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3303 or die;
3304
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 };
3321
2413 $RUNTIME += $TICK; 3322 $RUNTIME += $TICK;
2414 $NEXT_TICK += $TICK; 3323 $NEXT_TICK += $TICK;
2415 3324
2416 $WAIT_FOR_TICK->broadcast; 3325 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2417 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3326 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool {
3328 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!";
3330 };
3331 }
3332
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send;
3338 }
3339 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send;
3341 }
3342
3343 $NOW = Event::time;
2418 3344
2419 # if we are delayed by four ticks or more, skip them all 3345 # if we are delayed by four ticks or more, skip them all
2420 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3346 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2421 3347
2422 $TICK_WATCHER->at ($NEXT_TICK); 3348 $TICK_WATCHER->at ($NEXT_TICK);
2423 $TICK_WATCHER->start; 3349 $TICK_WATCHER->start;
3350
3351 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353
3354 _post_tick;
3355
3356
2424 }, 3357 },
2425); 3358);
2426 3359
3360{
3361 BDB::max_poll_time $TICK * 0.1;
3362 $BDB_POLL_WATCHER = Event->io (
3363 reentrant => 0,
3364 fd => BDB::poll_fileno,
3365 poll => 'r',
3366 prio => 0,
3367 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb,
3369 );
3370 BDB::min_parallel 8;
3371
3372 BDB::set_sync_prepare {
3373 my $status;
3374 my $current = $Coro::current;
3375 (
3376 sub {
3377 $status = $!;
3378 $current->ready; undef $current;
3379 },
3380 sub {
3381 Coro::schedule while defined $current;
3382 $! = $status;
3383 },
3384 )
3385 };
3386
3387 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create;
3389
3390 cf::sync_job {
3391 eval {
3392 BDB::db_env_open
3393 $DB_ENV,
3394 $BDBDIR,
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666;
3398
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 };
3404
3405 cf::cleanup "db_env_open(db): $@" if $@;
3406 };
3407 }
3408}
3409
3410{
3411 IO::AIO::min_parallel 8;
3412
3413 undef $Coro::AIO::WATCHER;
2427IO::AIO::max_poll_time $TICK * 0.2; 3414 IO::AIO::max_poll_time $TICK * 0.1;
2428
2429$AIO_POLL_WATCHER = Event->io ( 3415 $AIO_POLL_WATCHER = Event->io (
2430 fd => IO::AIO::poll_fileno, 3416 reentrant => 0,
2431 poll => 'r',
2432 prio => 5,
2433 data => WF_AUTOCANCEL,
2434 cb => \&IO::AIO::poll_cb,
2435);
2436
2437$WRITE_RUNTIME_WATCHER = Event->timer (
2438 data => WF_AUTOCANCEL, 3417 data => WF_AUTOCANCEL,
2439 after => 0, 3418 fd => IO::AIO::poll_fileno,
2440 interval => 10, 3419 poll => 'r',
2441 cb => sub { 3420 prio => 6,
2442 (Coro::unblock_sub { 3421 cb => \&IO::AIO::poll_cb,
2443 write_runtime 3422 );
2444 or warn "ERROR: unable to write runtime file: $!"; 3423}
3424
3425my $_log_backtrace;
3426
3427sub _log_backtrace {
3428 my ($msg, @addr) = @_;
3429
3430 $msg =~ s/\n//;
3431
3432 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace;
3435 async {
3436 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!";
3441
3442 my @funcs;
3443 my @res = <$fh>;
3444 chomp for @res;
3445 while (@res) {
3446 my ($func, $line) = splice @res, 0, 2, ();
3447 push @funcs, "[$func] $line";
3448 }
3449
3450 @funcs
3451 };
3452
3453 LOG llevInfo, "[ABT] $msg\n";
3454 LOG llevInfo, "[ABT] $_\n" for @bt;
3455 --$_log_backtrace;
2445 })->(); 3456 };
3457 } else {
3458 LOG llevInfo, "[ABT] $msg\n";
3459 LOG llevInfo, "[ABT] [suppressed]\n";
2446 }, 3460 }
2447); 3461}
3462
3463# load additional modules
3464use cf::pod;
2448 3465
2449END { cf::emergency_save } 3466END { cf::emergency_save }
2450 3467
24511 34681
2452 3469

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines