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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines