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.261 by root, Fri Apr 27 20:09:48 2007 UTC vs.
Revision 1.410 by root, Tue Jan 15 12:02:24 2008 UTC

… …
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Socket; 8use Socket;
9use Storable; 9use EV 1.86;
10use Event;
11use Opcode; 10use Opcode;
12use Safe; 11use Safe;
13use Safe::Hole; 12use Safe::Hole;
13use Storable ();
14 14
15use Coro 3.61 (); 15use Coro 4.32 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::EV;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::BDB;
23use Coro::Storable; 24use Coro::Storable;
25use Coro::Util ();
24 26
27use JSON::XS 2.01 ();
25use BDB (); 28use BDB ();
26use Data::Dumper; 29use Data::Dumper;
27use Digest::MD5; 30use Digest::MD5;
28use Fcntl; 31use Fcntl;
29use YAML::Syck (); 32use YAML ();
30use IO::AIO 2.32 (); 33use IO::AIO 2.51 ();
31use Time::HiRes; 34use Time::HiRes;
32use Compress::LZF; 35use Compress::LZF;
36use Digest::MD5 ();
33 37
34# configure various modules to our taste 38# configure various modules to our taste
35# 39#
36$Storable::canonical = 1; # reduce rsync transfers 40$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 43
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 45
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 47
49our %COMMAND = (); 48our %COMMAND = ();
50our %COMMAND_TIME = (); 49our %COMMAND_TIME = ();
51 50
52our @EXTS = (); # list of extension package names 51our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 52our %EXTCMD = ();
53our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 54our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 55our %EXT_MAP = (); # pluggable maps
56 56
57our $RELOAD; # number of reloads so far 57our $RELOAD; # number of reloads so far
58our @EVENT; 58our @EVENT;
… …
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 66our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 68our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 69our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 70our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE;
71 72
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER; 74our $TICK_WATCHER;
74our $AIO_POLL_WATCHER; 75our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 77our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 78our $USE_FSYNC = 1; # use fsync to write maps - default off
79 79
80our $BDB_POLL_WATCHER; 80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 84our $DB_ENV;
82 85
83our %CFG; 86our %CFG;
84 87
85our $UPTIME; $UPTIME ||= time; 88our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 89our $RUNTIME;
90our $NOW;
87 91
88our %PLAYER; # all users 92our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 93our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 94our $LINK_MAP; # the special {link} map, which is always available
91 95
92# used to convert map paths into valid unix filenames by replacing / by ∕ 96# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98
99our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing
101our $tick_start; # for load detecting purposes
94 102
95binmode STDOUT; 103binmode STDOUT;
96binmode STDERR; 104binmode STDERR;
97 105
98# read virtual server time, if available 106# read virtual server time, if available
… …
139 147
140=item $cf::TICK 148=item $cf::TICK
141 149
142The interval between server ticks, in seconds. 150The interval between server ticks, in seconds.
143 151
152=item $cf::LOADAVG
153
154The current CPU load on the server (alpha-smoothed), as a value between 0
155(none) and 1 (overloaded), indicating how much time is spent on processing
156objects per tick. Healthy values are < 0.5.
157
158=item $cf::LOAD
159
160The raw value load value from the last tick.
161
144=item %cf::CFG 162=item %cf::CFG
145 163
146Configuration for the server, loaded from C</etc/crossfire/config>, or 164Configuration for the server, loaded from C</etc/deliantra-server/config>, or
147from wherever your confdir points to. 165from wherever your confdir points to.
148 166
149=item cf::wait_for_tick, cf::wait_for_tick_begin 167=item cf::wait_for_tick, cf::wait_for_tick_begin
150 168
151These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
152returns directly I<after> the tick processing (and consequently, can only wake one process 170returns directly I<after> the tick processing (and consequently, can only wake one process
153per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 171per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
154 172
173=item @cf::INVOKE_RESULTS
174
175This array contains the results of the last C<invoke ()> call. When
176C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
177that call.
178
155=back 179=back
156 180
157=cut 181=cut
158 182
159BEGIN { 183BEGIN {
… …
163 $msg .= "\n" 187 $msg .= "\n"
164 unless $msg =~ /\n$/; 188 unless $msg =~ /\n$/;
165 189
166 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
167 191
168 utf8::encode $msg;
169 LOG llevError, $msg; 192 LOG llevError, $msg;
170 }; 193 };
171} 194}
195
196$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "=="
198
199 if ($Coro::current == $Coro::main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d#
202 }#d#
203
204 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate
207};
208
209$SIG{__DIE__} = sub { }; #d#?
172 210
173@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
174@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
175@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
176@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
177@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 215@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
216@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
178@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 217@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
179 218
180# we bless all objects into (empty) derived classes to force a method lookup 219# we bless all objects into (empty) derived classes to force a method lookup
181# within the Safe compartment. 220# within the Safe compartment.
182for my $pkg (qw( 221for my $pkg (qw(
183 cf::global cf::attachable 222 cf::global cf::attachable
… …
188)) { 227)) {
189 no strict 'refs'; 228 no strict 'refs';
190 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
191} 230}
192 231
193$Event::DIED = sub { 232$EV::DIED = sub {
194 warn "error in event callback: @_"; 233 warn "error in event callback: @_";
195}; 234};
235
236#############################################################################
196 237
197=head2 UTILITY FUNCTIONS 238=head2 UTILITY FUNCTIONS
198 239
199=over 4 240=over 4
200 241
… …
219 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 260 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
220 $d 261 $d
221 } || "[unable to dump $_[0]: '$@']"; 262 } || "[unable to dump $_[0]: '$@']";
222} 263}
223 264
224use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
225
226=item $ref = cf::from_json $json 265=item $ref = cf::decode_json $json
227 266
228Converts a JSON string into the corresponding perl data structure. 267Converts a JSON string into the corresponding perl data structure.
229 268
230=item $json = cf::to_json $ref 269=item $json = cf::encode_json $ref
231 270
232Converts a perl data structure into its JSON representation. 271Converts a perl data structure into its JSON representation.
272
273=cut
274
275our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
276
277sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) }
233 279
234=item cf::lock_wait $string 280=item cf::lock_wait $string
235 281
236Wait until the given lock is available. See cf::lock_acquire. 282Wait until the given lock is available. See cf::lock_acquire.
237 283
… …
240Wait until the given lock is available and then acquires it and returns 286Wait until the given lock is available and then acquires it and returns
241a Coro::guard object. If the guard object gets destroyed (goes out of scope, 287a Coro::guard object. If the guard object gets destroyed (goes out of scope,
242for example when the coroutine gets canceled), the lock is automatically 288for example when the coroutine gets canceled), the lock is automatically
243returned. 289returned.
244 290
291Locks are *not* recursive, locking from the same coro twice results in a
292deadlocked coro.
293
245Lock names should begin with a unique identifier (for example, cf::map::find 294Lock names should begin with a unique identifier (for example, cf::map::find
246uses map_find and cf::map::load uses map_load). 295uses map_find and cf::map::load uses map_load).
247 296
248=item $locked = cf::lock_active $string 297=item $locked = cf::lock_active $string
249 298
250Return true if the lock is currently active, i.e. somebody has locked it. 299Return true if the lock is currently active, i.e. somebody has locked it.
251 300
252=cut 301=cut
253 302
254our %LOCK; 303our %LOCK;
304our %LOCKER;#d#
255 305
256sub lock_wait($) { 306sub lock_wait($) {
257 my ($key) = @_; 307 my ($key) = @_;
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
258 313
259 # wait for lock, if any 314 # wait for lock, if any
260 while ($LOCK{$key}) { 315 while ($LOCK{$key}) {
261 push @{ $LOCK{$key} }, $Coro::current; 316 push @{ $LOCK{$key} }, $Coro::current;
262 Coro::schedule; 317 Coro::schedule;
… …
268 323
269 # wait, to be sure we are not locked 324 # wait, to be sure we are not locked
270 lock_wait $key; 325 lock_wait $key;
271 326
272 $LOCK{$key} = []; 327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
273 329
274 Coro::guard { 330 Coro::guard {
331 delete $LOCKER{$key};#d#
275 # wake up all waiters, to be on the safe side 332 # wake up all waiters, to be on the safe side
276 $_->ready for @{ delete $LOCK{$key} }; 333 $_->ready for @{ delete $LOCK{$key} };
277 } 334 }
278} 335}
279 336
… …
291 }; 348 };
292 $TICK_WATCHER->stop; 349 $TICK_WATCHER->stop;
293 $guard 350 $guard
294} 351}
295 352
353=item cf::periodic $interval, $cb
354
355Like EV::periodic, but randomly selects a starting point so that the actions
356get spread over timer.
357
358=cut
359
360sub periodic($$) {
361 my ($interval, $cb) = @_;
362
363 my $start = rand List::Util::min 180, $interval;
364
365 EV::periodic $start, $interval, 0, $cb
366}
367
368=item cf::get_slot $time[, $priority[, $name]]
369
370Allocate $time seconds of blocking CPU time at priority C<$priority>:
371This call blocks and returns only when you have at least C<$time> seconds
372of cpu time till the next tick. The slot is only valid till the next cede.
373
374The optional C<$name> can be used to identify the job to run. It might be
375used for statistical purposes and should identify the same time-class.
376
377Useful for short background jobs.
378
379=cut
380
381our @SLOT_QUEUE;
382our $SLOT_QUEUE;
383
384$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager");
387
388 my $signal = new Coro::Signal;
389
390 while () {
391 next_job:
392 my $avail = cf::till_tick;
393 if ($avail > 0.01) {
394 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) {
396 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send;
398 Coro::cede;
399 goto next_job;
400 }
401 }
402 }
403
404 if (@SLOT_QUEUE) {
405 # we do not use wait_for_tick() as it returns immediately when tick is inactive
406 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait;
408 } else {
409 Coro::schedule;
410 }
411 }
412};
413
414sub get_slot($;$$) {
415 my ($time, $pri, $name) = @_;
416
417 $time = $TICK * .6 if $time > $TICK * .6;
418 my $sig = new Coro::Signal;
419
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready;
423 $sig->wait;
424}
425
296=item cf::async { BLOCK } 426=item cf::async { BLOCK }
297 427
298Currently the same as Coro::async_pool, meaning you cannot use 428Currently the same as Coro::async_pool, meaning you cannot use
299C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 429C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
300thing you are allowed to do is call C<prio> on it. 430thing you are allowed to do is call C<prio> on it.
… …
303 433
304BEGIN { *async = \&Coro::async_pool } 434BEGIN { *async = \&Coro::async_pool }
305 435
306=item cf::sync_job { BLOCK } 436=item cf::sync_job { BLOCK }
307 437
308The design of crossfire+ requires that the main coro ($Coro::main) is 438The design of Deliantra requires that the main coroutine ($Coro::main)
309always able to handle events or runnable, as crossfire+ is only partly 439is always able to handle events or runnable, as Deliantra is only
310reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
441acceptable.
311 442
312If it must be done, put the blocking parts into C<sync_job>. This will run 443If it must be done, put the blocking parts into C<sync_job>. This will run
313the given BLOCK in another coroutine while waiting for the result. The 444the given BLOCK in another coroutine while waiting for the result. The
314server will be frozen during this time, so the block should either finish 445server will be frozen during this time, so the block should either finish
315fast or be very important. 446fast or be very important.
… …
318 449
319sub sync_job(&) { 450sub sync_job(&) {
320 my ($job) = @_; 451 my ($job) = @_;
321 452
322 if ($Coro::current == $Coro::main) { 453 if ($Coro::current == $Coro::main) {
454 my $time = EV::time;
455
323 # this is the main coro, too bad, we have to block 456 # this is the main coro, too bad, we have to block
324 # till the operation succeeds, freezing the server :/ 457 # till the operation succeeds, freezing the server :/
325 458
459 LOG llevError, Carp::longmess "sync job";#d#
460
326 # TODO: use suspend/resume instead 461 # TODO: use suspend/resume instead
327 # (but this is cancel-safe) 462 # (but this is cancel-safe)
328 my $freeze_guard = freeze_mainloop; 463 my $freeze_guard = freeze_mainloop;
329 464
330 my $busy = 1; 465 my $busy = 1;
331 my @res; 466 my @res;
332 467
333 (async { 468 (async {
469 $Coro::current->desc ("sync job coro");
334 @res = eval { $job->() }; 470 @res = eval { $job->() };
335 warn $@ if $@; 471 warn $@ if $@;
336 undef $busy; 472 undef $busy;
337 })->prio (Coro::PRIO_MAX); 473 })->prio (Coro::PRIO_MAX);
338 474
339 while ($busy) { 475 while ($busy) {
340 Coro::cede or Event::one_event; 476 if (Coro::nready) {
477 Coro::cede_notself;
478 } else {
479 EV::loop EV::LOOP_ONESHOT;
341 } 480 }
481 }
482
483 $time = EV::time - $time;
484
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load
342 489
343 wantarray ? @res : $res[0] 490 wantarray ? @res : $res[0]
344 } else { 491 } else {
345 # we are in another coroutine, how wonderful, everything just works 492 # we are in another coroutine, how wonderful, everything just works
346 493
… …
366 $EXT_CORO{$coro+0} = $coro; 513 $EXT_CORO{$coro+0} = $coro;
367 514
368 $coro 515 $coro
369} 516}
370 517
371sub write_runtime { 518=item fork_call { }, $args
372 my $guard = cf::lock_acquire "write_runtime";
373 519
374 my $runtime = "$LOCALDIR/runtime"; 520Executes the given code block with the given arguments in a seperate
521process, returning the results. Everything must be serialisable with
522Coro::Storable. May, of course, block. Note that the executed sub may
523never block itself or use any form of event handling.
375 524
376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 525=cut
377 or return;
378 526
379 my $value = $cf::RUNTIME + 90 + 10; 527sub fork_call(&@) {
380 # 10 is the runtime save interval, for a monotonic clock 528 my ($cb, @args) = @_;
381 # 60 allows for the watchdog to kill the server.
382 529
383 (aio_write $fh, 0, (length $value), $value, 0) <= 0 530 # we seemingly have to make a local copy of the whole thing,
384 and return; 531 # otherwise perl prematurely frees the stuff :/
532 # TODO: investigate and fix (likely this will be rather laborious)
385 533
386 # always fsync - this file is important 534 my @res = Coro::Util::fork_eval {
387 aio_fsync $fh 535 reset_signals;
388 and return; 536 &$cb
537 }, @args;
389 538
390 close $fh 539 wantarray ? @res : $res[-1]
391 or return; 540}
392 541
393 aio_rename "$runtime~", $runtime 542=item $value = cf::db_get $family => $key
394 and return;
395 543
544Returns a single value from the environment database.
545
546=item cf::db_put $family => $key => $value
547
548Stores the given C<$value> in the family. It can currently store binary
549data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
550
551=item $db = cf::db_table "name"
552
553Create and/or open a new database table. The string must not be "db" and must be unique
554within each server.
555
556=cut
557
558sub db_table($) {
559 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV;
561
562 eval {
563 $db->set_flags (BDB::CHKSUM);
564
565 utf8::encode $name;
566 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
567 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
568 cf::cleanup "db_open(db): $!" if $!;
569 };
570 cf::cleanup "db_open(db): $@" if $@;
571
572 $db
573}
574
575our $DB;
576
577sub db_init {
578 cf::sync_job {
579 $DB ||= db_table "db";
580 };
581}
582
583sub db_get($$) {
584 my $key = "$_[0]/$_[1]";
585
586 cf::sync_job {
587 BDB::db_get $DB, undef, $key, my $data;
588
589 $! ? ()
590 : $data
396 1 591 }
592}
593
594sub db_put($$$) {
595 BDB::dbreq_pri 4;
596 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
597}
598
599=item cf::cache $id => [$paths...], $processversion => $process
600
601Generic caching function that returns the value of the resource $id,
602caching and regenerating as required.
603
604This function can block.
605
606=cut
607
608sub cache {
609 my ($id, $src, $processversion, $process) = @_;
610
611 my $meta =
612 join "\x00",
613 $processversion,
614 map {
615 aio_stat $_
616 and Carp::croak "$_: $!";
617
618 ($_, (stat _)[7,9])
619 } @$src;
620
621 my $dbmeta = db_get cache => "$id/meta";
622 if ($dbmeta ne $meta) {
623 # changed, we may need to process
624
625 my @data;
626 my $md5;
627
628 for (0 .. $#$src) {
629 0 <= aio_load $src->[$_], $data[$_]
630 or Carp::croak "$src->[$_]: $!";
631 }
632
633 # if processing is expensive, check
634 # checksum first
635 if (1) {
636 $md5 =
637 join "\x00",
638 $processversion,
639 map {
640 cf::cede_to_tick;
641 ($src->[$_], Digest::MD5::md5_hex $data[$_])
642 } 0.. $#$src;
643
644
645 my $dbmd5 = db_get cache => "$id/md5";
646 if ($dbmd5 eq $md5) {
647 db_put cache => "$id/meta", $meta;
648
649 return db_get cache => "$id/data";
650 }
651 }
652
653 my $t1 = Time::HiRes::time;
654 my $data = $process->(\@data);
655 my $t2 = Time::HiRes::time;
656
657 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
658
659 db_put cache => "$id/data", $data;
660 db_put cache => "$id/md5" , $md5;
661 db_put cache => "$id/meta", $meta;
662
663 return $data;
664 }
665
666 db_get cache => "$id/data"
397} 667}
398 668
399=item cf::datalog type => key => value, ... 669=item cf::datalog type => key => value, ...
400 670
401Log a datalog packet of the given type with the given key-value pairs. 671Log a datalog packet of the given type with the given key-value pairs.
… …
419attach callbacks/event handlers (a collection of which is called an "attachment") 689attach callbacks/event handlers (a collection of which is called an "attachment")
420to it. All such attachable objects support the following methods. 690to it. All such attachable objects support the following methods.
421 691
422In the following description, CLASS can be any of C<global>, C<object> 692In the following description, CLASS can be any of C<global>, C<object>
423C<player>, C<client> or C<map> (i.e. the attachable objects in 693C<player>, C<client> or C<map> (i.e. the attachable objects in
424crossfire+). 694Deliantra).
425 695
426=over 4 696=over 4
427 697
428=item $attachable->attach ($attachment, key => $value...) 698=item $attachable->attach ($attachment, key => $value...)
429 699
… …
592 $registry = $CB_TYPE[$object_type] ||= []; 862 $registry = $CB_TYPE[$object_type] ||= [];
593 863
594 } elsif ($type eq "subtype") { 864 } elsif ($type eq "subtype") {
595 defined $object_type or Carp::croak "subtype specified without type"; 865 defined $object_type or Carp::croak "subtype specified without type";
596 my $object_subtype = shift @arg; 866 my $object_subtype = shift @arg;
597 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 867 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
598 868
599 } elsif ($type eq "package") { 869 } elsif ($type eq "package") {
600 my $pkg = shift @arg; 870 my $pkg = shift @arg;
601 871
602 while (my ($name, $id) = each %cb_id) { 872 while (my ($name, $id) = each %cb_id) {
… …
631 _attach $registry, $klass, @attach; 901 _attach $registry, $klass, @attach;
632 } 902 }
633 903
634 $obj->{$name} = \%arg; 904 $obj->{$name} = \%arg;
635 } else { 905 } else {
636 warn "object uses attachment '$name' that is not available, postponing.\n"; 906 warn "object uses attachment '$name' which is not available, postponing.\n";
637 } 907 }
638 908
639 $obj->{_attachment}{$name} = undef; 909 $obj->{_attachment}{$name} = undef;
640} 910}
641 911
… …
643 if (ref $_[0]) { 913 if (ref $_[0]) {
644 _object_attach @_; 914 _object_attach @_;
645 } else { 915 } else {
646 _attach shift->_attach_registry, @_; 916 _attach shift->_attach_registry, @_;
647 } 917 }
918 _recalc_want;
648}; 919};
649 920
650# all those should be optimised 921# all those should be optimised
651sub cf::attachable::detach { 922sub cf::attachable::detach {
652 my ($obj, $name) = @_; 923 my ($obj, $name) = @_;
… …
655 delete $obj->{_attachment}{$name}; 926 delete $obj->{_attachment}{$name};
656 reattach ($obj); 927 reattach ($obj);
657 } else { 928 } else {
658 Carp::croak "cannot, currently, detach class attachments"; 929 Carp::croak "cannot, currently, detach class attachments";
659 } 930 }
931 _recalc_want;
660}; 932};
661 933
662sub cf::attachable::attached { 934sub cf::attachable::attached {
663 my ($obj, $name) = @_; 935 my ($obj, $name) = @_;
664 936
… …
679 "; 951 ";
680 die if $@; 952 die if $@;
681} 953}
682 954
683our $override; 955our $override;
684our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 956our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
685 957
686sub override { 958sub override {
687 $override = 1; 959 $override = 1;
688 @invoke_results = (); 960 @INVOKE_RESULTS = (@_);
689} 961}
690 962
691sub do_invoke { 963sub do_invoke {
692 my $event = shift; 964 my $event = shift;
693 my $callbacks = shift; 965 my $callbacks = shift;
694 966
695 @invoke_results = (); 967 @INVOKE_RESULTS = ();
696 968
697 local $override; 969 local $override;
698 970
699 for (@$callbacks) { 971 for (@$callbacks) {
700 eval { &{$_->[1]} }; 972 eval { &{$_->[1]} };
… …
709 } 981 }
710 982
711 0 983 0
712} 984}
713 985
714=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 986=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
715 987
716=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 988=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
717 989
718Generate an object-specific event with the given arguments. 990Generate an object-specific event with the given arguments.
719 991
720This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 992This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
721removed in future versions), and there is no public API to access override 993removed in future versions), and there is no public API to access override
722results (if you must, access C<@cf::invoke_results> directly). 994results (if you must, access C<@cf::INVOKE_RESULTS> directly).
723 995
724=back 996=back
725 997
726=cut 998=cut
727 999
728############################################################################# 1000#############################################################################
729# object support 1001# object support
1002
1003sub _object_equal($$);
1004sub _object_equal($$) {
1005 my ($a, $b) = @_;
1006
1007 return 0 unless (ref $a) eq (ref $b);
1008
1009 if ("HASH" eq ref $a) {
1010 my @ka = keys %$a;
1011 my @kb = keys %$b;
1012
1013 return 0 if @ka != @kb;
1014
1015 for (0 .. $#ka) {
1016 return 0 unless $ka[$_] eq $kb[$_];
1017 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1018 }
1019
1020 } elsif ("ARRAY" eq ref $a) {
1021
1022 return 0 if @$a != @$b;
1023
1024 for (0 .. $#$a) {
1025 return 0 unless _object_equal $a->[$_], $b->[$_];
1026 }
1027
1028 } elsif ($a ne $b) {
1029 return 0;
1030 }
1031
1032 1
1033}
1034
1035our $SLOW_MERGES;#d#
1036sub _can_merge {
1037 my ($ob1, $ob2) = @_;
1038
1039 ++$SLOW_MERGES;#d#
1040
1041 # we do the slow way here
1042 return _object_equal $ob1, $ob2
1043}
730 1044
731sub reattach { 1045sub reattach {
732 # basically do the same as instantiate, without calling instantiate 1046 # basically do the same as instantiate, without calling instantiate
733 my ($obj) = @_; 1047 my ($obj) = @_;
734 1048
… …
755cf::attachable->attach ( 1069cf::attachable->attach (
756 prio => -1000000, 1070 prio => -1000000,
757 on_instantiate => sub { 1071 on_instantiate => sub {
758 my ($obj, $data) = @_; 1072 my ($obj, $data) = @_;
759 1073
760 $data = from_json $data; 1074 $data = decode_json $data;
761 1075
762 for (@$data) { 1076 for (@$data) {
763 my ($name, $args) = @$_; 1077 my ($name, $args) = @$_;
764 1078
765 $obj->attach ($name, %{$args || {} }); 1079 $obj->attach ($name, %{$args || {} });
… …
781sub object_freezer_save { 1095sub object_freezer_save {
782 my ($filename, $rdata, $objs) = @_; 1096 my ($filename, $rdata, $objs) = @_;
783 1097
784 sync_job { 1098 sync_job {
785 if (length $$rdata) { 1099 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename);
786 warn sprintf "saving %s (%d,%d)\n", 1101 warn sprintf "saving %s (%d,%d)\n",
787 $filename, length $$rdata, scalar @$objs; 1102 $decname, length $$rdata, scalar @$objs;
788 1103
789 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
790 chmod SAVE_MODE, $fh; 1105 chmod SAVE_MODE, $fh;
791 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
792 aio_fsync $fh if $cf::USE_FSYNC; 1107 aio_fsync $fh if $cf::USE_FSYNC;
793 close $fh; 1108 close $fh;
794 1109
795 if (@$objs) { 1110 if (@$objs) {
796 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1111 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
797 chmod SAVE_MODE, $fh; 1112 chmod SAVE_MODE, $fh;
798 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
799 aio_write $fh, 0, (length $data), $data, 0; 1114 aio_write $fh, 0, (length $data), $data, 0;
800 aio_fsync $fh if $cf::USE_FSYNC; 1115 aio_fsync $fh if $cf::USE_FSYNC;
801 close $fh; 1116 close $fh;
802 aio_rename "$filename.pst~", "$filename.pst"; 1117 aio_rename "$filename.pst~", "$filename.pst";
803 } 1118 }
… …
811 } 1126 }
812 } else { 1127 } else {
813 aio_unlink $filename; 1128 aio_unlink $filename;
814 aio_unlink "$filename.pst"; 1129 aio_unlink "$filename.pst";
815 } 1130 }
816 } 1131 };
817} 1132}
818 1133
819sub object_freezer_as_string { 1134sub object_freezer_as_string {
820 my ($rdata, $objs) = @_; 1135 my ($rdata, $objs) = @_;
821 1136
… …
833 or return; 1148 or return;
834 1149
835 unless (aio_stat "$filename.pst") { 1150 unless (aio_stat "$filename.pst") {
836 (aio_load "$filename.pst", $av) >= 0 1151 (aio_load "$filename.pst", $av) >= 0
837 or return; 1152 or return;
1153
838 $av = eval { (Storable::thaw $av)->{objs} }; 1154 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs};
839 } 1156 }
840 1157
1158 utf8::decode (my $decname = $filename);
841 warn sprintf "loading %s (%d)\n", 1159 warn sprintf "loading %s (%d,%d)\n",
842 $filename, length $data, scalar @{$av || []};#d# 1160 $decname, length $data, scalar @{$av || []};
1161
843 return ($data, $av); 1162 ($data, $av)
844} 1163}
1164
1165=head2 COMMAND CALLBACKS
1166
1167=over 4
1168
1169=cut
845 1170
846############################################################################# 1171#############################################################################
847# command handling &c 1172# command handling &c
848 1173
849=item cf::register_command $name => \&callback($ob,$args); 1174=item cf::register_command $name => \&callback($ob,$args);
… …
862 push @{ $COMMAND{$name} }, [$caller, $cb]; 1187 push @{ $COMMAND{$name} }, [$caller, $cb];
863} 1188}
864 1189
865=item cf::register_extcmd $name => \&callback($pl,$packet); 1190=item cf::register_extcmd $name => \&callback($pl,$packet);
866 1191
867Register a callbackf ro execution when the client sends an extcmd packet. 1192Register a callback for execution when the client sends an (synchronous)
1193extcmd packet. Ext commands will be processed in the order they are
1194received by the server, like other user commands. The first argument is
1195the logged-in player. Ext commands can only be processed after a player
1196has logged in successfully.
868 1197
869If the callback returns something, it is sent back as if reply was being 1198If the callback returns something, it is sent back as if reply was being
870called. 1199called.
871 1200
1201=item cf::register_exticmd $name => \&callback($ns,$packet);
1202
1203Register a callback for execution when the client sends an (asynchronous)
1204exticmd packet. Exti commands are processed by the server as soon as they
1205are received, i.e. out of order w.r.t. other commands. The first argument
1206is a client socket. Exti commands can be received anytime, even before
1207log-in.
1208
1209If the callback returns something, it is sent back as if reply was being
1210called.
1211
872=cut 1212=cut
873 1213
874sub register_extcmd { 1214sub register_extcmd {
875 my ($name, $cb) = @_; 1215 my ($name, $cb) = @_;
876 1216
877 $EXTCMD{$name} = $cb; 1217 $EXTCMD{$name} = $cb;
1218}
1219
1220sub register_exticmd {
1221 my ($name, $cb) = @_;
1222
1223 $EXTICMD{$name} = $cb;
878} 1224}
879 1225
880cf::player->attach ( 1226cf::player->attach (
881 on_command => sub { 1227 on_command => sub {
882 my ($pl, $name, $params) = @_; 1228 my ($pl, $name, $params) = @_;
… …
891 cf::override; 1237 cf::override;
892 }, 1238 },
893 on_extcmd => sub { 1239 on_extcmd => sub {
894 my ($pl, $buf) = @_; 1240 my ($pl, $buf) = @_;
895 1241
896 my $msg = eval { from_json $buf }; 1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
897 1243
898 if (ref $msg) { 1244 if (ref $msg) {
1245 my ($type, $reply, @payload) =
1246 "ARRAY" eq ref $msg
1247 ? @$msg
1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1249
1250 my @reply;
1251
899 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1252 if (my $cb = $EXTCMD{$type}) {
900 if (my %reply = $cb->($pl, $msg)) { 1253 @reply = $cb->($pl, @payload);
901 $pl->ext_reply ($msg->{msgid}, %reply);
902 }
903 } 1254 }
1255
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
904 } else { 1259 } else {
905 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
906 } 1261 }
907 1262
908 cf::override; 1263 cf::override;
909 }, 1264 },
910); 1265);
911 1266
912sub load_extension {
913 my ($path) = @_;
914
915 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
916 my $base = $1;
917 my $pkg = $1;
918 $pkg =~ s/[^[:word:]]/_/g;
919 $pkg = "ext::$pkg";
920
921 warn "... loading '$path' into '$pkg'\n";
922
923 open my $fh, "<:utf8", $path
924 or die "$path: $!";
925
926 my $source =
927 "package $pkg; use strict; use utf8;\n"
928 . "#line 1 \"$path\"\n{\n"
929 . (do { local $/; <$fh> })
930 . "\n};\n1";
931
932 unless (eval $source) {
933 my $msg = $@ ? "$path: $@\n"
934 : "extension disabled.\n";
935 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
936 warn $@;
937 warn "mandatory extension failed to load, exiting.\n";
938 exit 1;
939 }
940 die $@;
941 }
942
943 push @EXTS, $pkg;
944}
945
946sub load_extensions { 1267sub load_extensions {
1268 cf::sync_job {
1269 my %todo;
1270
947 for my $ext (<$LIBDIR/*.ext>) { 1271 for my $path (<$LIBDIR/*.ext>) {
948 next unless -r $ext; 1272 next unless -r $path;
949 eval { 1273
950 load_extension $ext; 1274 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1275 my $base = $1;
1276 my $pkg = $1;
1277 $pkg =~ s/[^[:word:]]/_/g;
1278 $pkg = "ext::$pkg";
1279
1280 open my $fh, "<:utf8", $path
1281 or die "$path: $!";
1282
1283 my $source = do { local $/; <$fh> };
1284
1285 my %ext = (
1286 path => $path,
1287 base => $base,
1288 pkg => $pkg,
1289 );
1290
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293
1294 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n"
1296 . "#line 1 \"$path\"\n{\n"
1297 . $source
1298 . "\n};\n1";
1299
1300 $todo{$base} = \%ext;
1301 }
1302
1303 my %done;
1304 while (%todo) {
1305 my $progress;
1306
1307 while (my ($k, $v) = each %todo) {
1308 for (split /,\s*/, $v->{meta}{depends}) {
1309 goto skip
1310 unless exists $done{$_};
1311 }
1312
1313 warn "... loading '$k' into '$v->{pkg}'\n";
1314
1315 unless (eval $v->{source}) {
1316 my $msg = $@ ? "$v->{path}: $@\n"
1317 : "$v->{base}: extension inactive.\n";
1318
1319 if (exists $v->{meta}{mandatory}) {
1320 warn $msg;
1321 warn "mandatory extension failed to load, exiting.\n";
1322 exit 1;
1323 }
1324
1325 warn $msg;
1326 }
1327
1328 $done{$k} = delete $todo{$k};
1329 push @EXTS, $v->{pkg};
1330 $progress = 1;
951 1 1331 }
952 } or warn "$ext not loaded: $@"; 1332
1333 skip:
1334 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1335 unless $progress;
1336 }
953 } 1337 };
954} 1338}
955 1339
956############################################################################# 1340#############################################################################
957 1341
1342=back
1343
958=head2 CORE EXTENSIONS 1344=head2 CORE EXTENSIONS
959 1345
960Functions and methods that extend core crossfire objects. 1346Functions and methods that extend core crossfire objects.
961 1347
962=cut 1348=cut
… …
966use Coro::AIO; 1352use Coro::AIO;
967 1353
968=head3 cf::player 1354=head3 cf::player
969 1355
970=over 4 1356=over 4
1357
1358=item cf::player::num_playing
1359
1360Returns the official number of playing players, as per the Crossfire metaserver rules.
1361
1362=cut
1363
1364sub num_playing {
1365 scalar grep
1366 $_->ob->map
1367 && !$_->hidden
1368 && !$_->ob->flag (cf::FLAG_WIZ),
1369 cf::player::list
1370}
971 1371
972=item cf::player::find $login 1372=item cf::player::find $login
973 1373
974Returns the given player object, loading it if necessary (might block). 1374Returns the given player object, loading it if necessary (might block).
975 1375
… …
1011 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1411 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1012 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1412 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1013 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1413 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1014 aio_unlink +(playerdir $login) . "/$login.pl"; 1414 aio_unlink +(playerdir $login) . "/$login.pl";
1015 1415
1016 my $pl = load_pl path $login 1416 my $f = new_from_file cf::object::thawer path $login
1017 or return; 1417 or return;
1418
1419 my $pl = cf::player::load_pl $f
1420 or return;
1421 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs;
1018 $cf::PLAYER{$login} = $pl 1423 $cf::PLAYER{$login} = $pl
1019 } 1424 }
1020 } 1425 }
1021} 1426}
1022 1427
… …
1032 1437
1033 aio_mkdir playerdir $pl, 0770; 1438 aio_mkdir playerdir $pl, 0770;
1034 $pl->{last_save} = $cf::RUNTIME; 1439 $pl->{last_save} = $cf::RUNTIME;
1035 1440
1036 $pl->save_pl ($path); 1441 $pl->save_pl ($path);
1037 Coro::cede; 1442 cf::cede_to_tick;
1038} 1443}
1039 1444
1040sub new($) { 1445sub new($) {
1041 my ($login) = @_; 1446 my ($login) = @_;
1042 1447
… …
1046 $self->{deny_save} = 1; 1451 $self->{deny_save} = 1;
1047 1452
1048 $cf::PLAYER{$login} = $self; 1453 $cf::PLAYER{$login} = $self;
1049 1454
1050 $self 1455 $self
1456}
1457
1458=item $player->send_msg ($channel, $msg, $color, [extra...])
1459
1460=cut
1461
1462sub send_msg {
1463 my $ns = shift->ns
1464 or return;
1465 $ns->send_msg (@_);
1051} 1466}
1052 1467
1053=item $pl->quit_character 1468=item $pl->quit_character
1054 1469
1055Nukes the player without looking back. If logged in, the connection will 1470Nukes the player without looking back. If logged in, the connection will
… …
1110 or return []; 1525 or return [];
1111 1526
1112 my @logins; 1527 my @logins;
1113 1528
1114 for my $login (@$dirs) { 1529 for my $login (@$dirs) {
1530 my $path = path $login;
1531
1532 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") {
1115 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1116 aio_read $fh, 0, 512, my $buf, 0 or next; 1535 aio_read $fh, 0, 512, my $buf, 0 or next;
1117 $buf !~ /^password -------------$/m or next; # official not-valid tag 1536 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 }
1118 1538
1119 utf8::decode $login; 1539 utf8::decode $login;
1120 push @logins, $login; 1540 push @logins, $login;
1121 } 1541 }
1122 1542
… …
1149 } 1569 }
1150 1570
1151 \@paths 1571 \@paths
1152} 1572}
1153 1573
1574=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1575
1576Expand crossfire pod fragments into protocol xml.
1577
1578=cut
1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1591sub expand_cfpod {
1592 my ($self, $pod) = @_;
1593
1594 my $xml;
1595
1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1599
1600 $group =~ s/&/&amp;/g;
1601 $group =~ s/</&lt;/g;
1602
1603 $xml .= $group;
1604 } elsif ($pod =~ m%\G
1605 ([BCGHITU])
1606 <
1607 (?:
1608 ([^<>]*) (?{ $group = $^N })
1609 | < $interior >
1610 )
1611 >
1612 %gcsx
1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1633 "")
1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1645
1646 for ($xml) {
1647 # create single paragraphs (very hackish)
1648 s/(?<=\S)\n(?=\w)/ /g;
1649
1650 # compress some whitespace
1651 s/\s+\n/\n/g; # ws line-ends
1652 s/\n\n+/\n/g; # double lines
1653 s/^\n+//; # beginning lines
1654 s/\n+$//; # ending lines
1655 }
1656
1657 $xml
1658}
1659
1660no re 'eval';
1661
1662sub hintmode {
1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1664 $_[0]{hintmode}
1665}
1666
1154=item $player->ext_reply ($msgid, %msg) 1667=item $player->ext_reply ($msgid, @msg)
1155 1668
1156Sends an ext reply to the player. 1669Sends an ext reply to the player.
1157 1670
1158=cut 1671=cut
1159 1672
1160sub ext_reply($$%) { 1673sub ext_reply($$@) {
1161 my ($self, $id, %msg) = @_; 1674 my ($self, $id, @msg) = @_;
1162 1675
1163 $msg{msgid} = $id; 1676 $self->ns->ext_reply ($id, @msg)
1164
1165 $self->send ("ext " . cf::to_json \%msg);
1166} 1677}
1167 1678
1168=item $player->ext_event ($type, %msg) 1679=item $player->ext_msg ($type, @msg)
1169 1680
1170Sends an ext event to the client. 1681Sends an ext event to the client.
1171 1682
1172=cut 1683=cut
1173 1684
1174sub ext_event($$%) { 1685sub ext_msg($$@) {
1175 my ($self, $type, %msg) = @_; 1686 my ($self, $type, @msg) = @_;
1176 1687
1177 $self->ns->ext_event ($type, %msg); 1688 $self->ns->ext_msg ($type, @msg);
1178} 1689}
1179 1690
1180=head3 cf::region 1691=head3 cf::region
1181 1692
1182=over 4 1693=over 4
… …
1185 1696
1186package cf::region; 1697package cf::region;
1187 1698
1188=item cf::region::find_by_path $path 1699=item cf::region::find_by_path $path
1189 1700
1190Tries to decuce the probable region for a map knowing only its path. 1701Tries to decuce the likely region for a map knowing only its path.
1191 1702
1192=cut 1703=cut
1193 1704
1194sub find_by_path($) { 1705sub find_by_path($) {
1195 my ($path) = @_; 1706 my ($path) = @_;
1196 1707
1197 my ($match, $specificity); 1708 my ($match, $specificity);
1198 1709
1199 for my $region (list) { 1710 for my $region (list) {
1200 if ($region->match && $path =~ $region->match) { 1711 if ($region->{match} && $path =~ $region->{match}) {
1201 ($match, $specificity) = ($region, $region->specificity) 1712 ($match, $specificity) = ($region, $region->specificity)
1202 if $region->specificity > $specificity; 1713 if $region->specificity > $specificity;
1203 } 1714 }
1204 } 1715 }
1205 1716
… …
1269 my ($self, $merge) = @_; 1780 my ($self, $merge) = @_;
1270 1781
1271 # we have to keep some variables in memory intact 1782 # we have to keep some variables in memory intact
1272 local $self->{path}; 1783 local $self->{path};
1273 local $self->{load_path}; 1784 local $self->{load_path};
1274 local $self->{deny_save};
1275 local $self->{deny_reset};
1276 1785
1277 $self->SUPER::thawer_merge ($merge); 1786 $self->SUPER::thawer_merge ($merge);
1278} 1787}
1279 1788
1280sub normalise { 1789sub normalise {
… …
1327 $self->init; # pass $1 etc. 1836 $self->init; # pass $1 etc.
1328 return $self; 1837 return $self;
1329 } 1838 }
1330 } 1839 }
1331 1840
1332 Carp::carp "unable to resolve path '$path' (base '$base')."; 1841 Carp::cluck "unable to resolve path '$path' (base '$base').";
1333 () 1842 ()
1334} 1843}
1335 1844
1336sub init { 1845sub init {
1337 my ($self) = @_; 1846 my ($self) = @_;
… …
1380 1889
1381 $_->change_map_light ($change) 1890 $_->change_map_light ($change)
1382 for grep $_->outdoor, values %cf::MAP; 1891 for grep $_->outdoor, values %cf::MAP;
1383} 1892}
1384 1893
1894sub decay_objects {
1895 my ($self) = @_;
1896
1897 return if $self->{deny_reset};
1898
1899 $self->do_decay_objects;
1900}
1901
1385sub unlink_save { 1902sub unlink_save {
1386 my ($self) = @_; 1903 my ($self) = @_;
1387 1904
1388 utf8::encode (my $save = $self->save_path); 1905 utf8::encode (my $save = $self->save_path);
1389 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1906 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1392 1909
1393sub load_header_from($) { 1910sub load_header_from($) {
1394 my ($self, $path) = @_; 1911 my ($self, $path) = @_;
1395 1912
1396 utf8::encode $path; 1913 utf8::encode $path;
1397 #aio_open $path, O_RDONLY, 0 1914 my $f = new_from_file cf::object::thawer $path
1398 # or return;
1399
1400 $self->_load_header ($path)
1401 or return; 1915 or return;
1916
1917 $self->_load_header ($f)
1918 or return;
1919
1920 local $MAP_LOADING{$self->{path}} = $self;
1921 $f->resolve_delayed_derefs;
1402 1922
1403 $self->{load_path} = $path; 1923 $self->{load_path} = $path;
1404 1924
1405 1 1925 1
1406} 1926}
… …
1445 $self->load_header_orig 1965 $self->load_header_orig
1446 or return; 1966 or return;
1447 $self->prepare_orig; 1967 $self->prepare_orig;
1448 } 1968 }
1449 1969
1970 $self->{deny_reset} = 1
1971 if $self->no_reset;
1972
1450 $self->default_region (cf::region::find_by_path $self->{path}) 1973 $self->default_region (cf::region::find_by_path $self->{path})
1451 unless $self->default_region; 1974 unless $self->default_region;
1452 1975
1453 1 1976 1
1454} 1977}
… …
1457sub find { 1980sub find {
1458 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
1459 1982
1460 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
1461 1984
1985 cf::lock_wait "map_data:$path";#d#remove
1462 cf::lock_wait "map_find:$path"; 1986 cf::lock_wait "map_find:$path";
1463 1987
1464 $cf::MAP{$path} || do { 1988 $cf::MAP{$path} || do {
1465 my $guard = cf::lock_acquire "map_find:$path"; 1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1466 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
1467 or return; 1993 or return;
1468 1994
1469 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
1470 1996
1471 $map->load_header 1997 $map->load_header
1472 or return; 1998 or return;
1473 1999
1474 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1475 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
1476 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard1;
2004 undef $guard2;
1477 $map->reset; 2005 $map->reset;
1478 undef $guard;
1479 return find $path; 2006 return find $path;
1480 } 2007 }
1481 2008
1482 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
1483 } 2010 }
… …
1492 local $self->{deny_reset} = 1; # loading can take a long time 2019 local $self->{deny_reset} = 1; # loading can take a long time
1493 2020
1494 my $path = $self->{path}; 2021 my $path = $self->{path};
1495 2022
1496 { 2023 {
1497 my $guard = cf::lock_acquire "map_load:$path"; 2024 my $guard = cf::lock_acquire "map_data:$path";
1498 2025
2026 return unless $self->valid;
1499 return if $self->in_memory != cf::MAP_SWAPPED; 2027 return unless $self->in_memory == cf::MAP_SWAPPED;
1500 2028
1501 $self->in_memory (cf::MAP_LOADING); 2029 $self->in_memory (cf::MAP_LOADING);
1502 2030
1503 $self->alloc; 2031 $self->alloc;
1504 2032
1505 $self->pre_load; 2033 $self->pre_load;
1506 Coro::cede; 2034 cf::cede_to_tick;
1507 2035
2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block;
1508 $self->_load_objects ($self->{load_path}, 1) 2038 $self->_load_objects ($f)
1509 or return; 2039 or return;
1510 2040
1511 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1512 if delete $self->{load_original}; 2042 if delete $self->{load_original};
1513 2043
1514 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
1515 utf8::encode $uniq; 2045 utf8::encode $uniq;
1516 if (aio_open $uniq, O_RDONLY, 0) { 2046 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) {
1517 $self->clear_unique_items; 2048 $self->clear_unique_items;
1518 $self->_load_objects ($uniq, 0); 2049 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs;
2051 }
1519 } 2052 }
1520 } 2053 }
1521 2054
1522 Coro::cede; 2055 $f->resolve_delayed_derefs;
2056
2057 cf::cede_to_tick;
1523 # now do the right thing for maps 2058 # now do the right thing for maps
1524 $self->link_multipart_objects; 2059 $self->link_multipart_objects;
1525 $self->difficulty ($self->estimate_difficulty) 2060 $self->difficulty ($self->estimate_difficulty)
1526 unless $self->difficulty; 2061 unless $self->difficulty;
1527 Coro::cede; 2062 cf::cede_to_tick;
1528 2063
1529 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
1530 $self->decay_objects; 2065 $self->decay_objects;
1531 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
1532 $self->update_buttons; 2067 $self->update_buttons;
1533 Coro::cede; 2068 cf::cede_to_tick;
1534 $self->set_darkness_map; 2069 $self->set_darkness_map;
1535 Coro::cede; 2070 cf::cede_to_tick;
1536 $self->activate; 2071 $self->activate;
1537 } 2072 }
2073
2074 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME);
1538 2076
1539 $self->in_memory (cf::MAP_IN_MEMORY); 2077 $self->in_memory (cf::MAP_IN_MEMORY);
1540 } 2078 }
1541 2079
1542 $self->post_load; 2080 $self->post_load;
… …
1546 my ($self, $ob) = @_; 2084 my ($self, $ob) = @_;
1547 2085
1548 return find "~" . $ob->name . "/" . $self->{path} 2086 return find "~" . $ob->name . "/" . $self->{path}
1549 if $self->per_player; 2087 if $self->per_player;
1550 2088
2089# return find "?party/" . $ob->name . "/" . $self->{path}
2090# if $self->per_party;
2091
1551 $self 2092 $self
1552} 2093}
1553 2094
1554# find and load all maps in the 3x3 area around a map 2095# find and load all maps in the 3x3 area around a map
1555sub load_diag { 2096sub load_neighbours {
1556 my ($map) = @_; 2097 my ($map) = @_;
1557 2098
1558 my @diag; # diagonal neighbours 2099 my @neigh; # diagonal neighbours
1559 2100
1560 for (0 .. 3) { 2101 for (0 .. 3) {
1561 my $neigh = $map->tile_path ($_) 2102 my $neigh = $map->tile_path ($_)
1562 or next; 2103 or next;
1563 $neigh = find $neigh, $map 2104 $neigh = find $neigh, $map
1564 or next; 2105 or next;
1565 $neigh->load; 2106 $neigh->load;
1566 2107
2108 push @neigh,
1567 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1568 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1569 } 2111 }
1570 2112
1571 for (@diag) { 2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
1572 my $neigh = find @$_ 2115 my $neigh = find $path, $origin
1573 or next; 2116 or next;
1574 $neigh->load; 2117 $neigh->load;
1575 } 2118 }
1576} 2119}
1577 2120
… …
1582} 2125}
1583 2126
1584sub do_load_sync { 2127sub do_load_sync {
1585 my ($map) = @_; 2128 my ($map) = @_;
1586 2129
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main;
2132
1587 cf::sync_job { $map->load }; 2133 cf::sync_job { $map->load };
1588} 2134}
1589 2135
1590our %MAP_PREFETCH; 2136our %MAP_PREFETCH;
1591our $MAP_PREFETCHER = undef; 2137our $MAP_PREFETCHER = undef;
1592 2138
1593sub find_async { 2139sub find_async {
1594 my ($path, $origin) = @_; 2140 my ($path, $origin, $load) = @_;
1595 2141
1596 $path = normalise $path, $origin && $origin->{path}; 2142 $path = normalise $path, $origin && $origin->{path};
1597 2143
1598 if (my $map = $cf::MAP{$path}) { 2144 if (my $map = $cf::MAP{$path}) {
1599 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1600 } 2146 }
1601 2147
1602 undef $MAP_PREFETCH{$path}; 2148 $MAP_PREFETCH{$path} |= $load;
2149
1603 $MAP_PREFETCHER ||= cf::async { 2150 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher";
2152
1604 while (%MAP_PREFETCH) { 2153 while (%MAP_PREFETCH) {
1605 for my $path (keys %MAP_PREFETCH) { 2154 while (my ($k, $v) = each %MAP_PREFETCH) {
1606 my $map = find $path 2155 if (my $map = find $k) {
1607 or next;
1608 $map->load; 2156 $map->load if $v;
2157 }
1609 2158
1610 delete $MAP_PREFETCH{$path}; 2159 delete $MAP_PREFETCH{$k};
1611 } 2160 }
1612 } 2161 }
1613 undef $MAP_PREFETCHER; 2162 undef $MAP_PREFETCHER;
1614 }; 2163 };
1615 $MAP_PREFETCHER->prio (6); 2164 $MAP_PREFETCHER->prio (6);
… …
1618} 2167}
1619 2168
1620sub save { 2169sub save {
1621 my ($self) = @_; 2170 my ($self) = @_;
1622 2171
1623 my $lock = cf::lock_acquire "map_data:" . $self->path; 2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
1624 2173
1625 $self->{last_save} = $cf::RUNTIME; 2174 $self->{last_save} = $cf::RUNTIME;
1626 2175
1627 return unless $self->dirty; 2176 return unless $self->dirty;
1628 2177
… …
1634 return if $self->{deny_save}; 2183 return if $self->{deny_save};
1635 2184
1636 local $self->{last_access} = $self->last_access;#d# 2185 local $self->{last_access} = $self->last_access;#d#
1637 2186
1638 cf::async { 2187 cf::async {
2188 $Coro::current->{desc} = "map player save";
1639 $_->contr->save for $self->players; 2189 $_->contr->save for $self->players;
1640 }; 2190 };
1641 2191
1642 if ($uniq) { 2192 if ($uniq) {
1643 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1651 my ($self) = @_; 2201 my ($self) = @_;
1652 2202
1653 # save first because save cedes 2203 # save first because save cedes
1654 $self->save; 2204 $self->save;
1655 2205
1656 my $lock = cf::lock_acquire "map_data:" . $self->path; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
1657 2207
1658 return if $self->players; 2208 return if $self->players;
1659 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_IN_MEMORY;
1660 return if $self->{deny_save}; 2210 return if $self->{deny_save};
1661 2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP;
1662 $self->clear; 2216 $self->clear;
1663 $self->in_memory (cf::MAP_SWAPPED);
1664} 2217}
1665 2218
1666sub reset_at { 2219sub reset_at {
1667 my ($self) = @_; 2220 my ($self) = @_;
1668 2221
1669 # TODO: safety, remove and allow resettable per-player maps 2222 # TODO: safety, remove and allow resettable per-player maps
1670 return 1e99 if $self->isa ("ext::map_per_player");#d#
1671 return 1e99 if $self->{deny_reset}; 2223 return 1e99 if $self->{deny_reset};
1672 2224
1673 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1674 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1675 2227
… …
1686 my ($self) = @_; 2238 my ($self) = @_;
1687 2239
1688 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
1689 2241
1690 return if $self->players; 2242 return if $self->players;
1691 return if $self->isa ("ext::map_per_player");#d#
1692 2243
1693 warn "resetting map ", $self->path;#d# 2244 warn "resetting map ", $self->path;
1694 2245
1695 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
1696 2247
1697 # need to save uniques path 2248 # need to save uniques path
1698 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
… …
1702 if $uniq; 2253 if $uniq;
1703 } 2254 }
1704 2255
1705 delete $cf::MAP{$self->path}; 2256 delete $cf::MAP{$self->path};
1706 2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
1707 $self->clear; 2260 $self->clear;
1708
1709 $_->clear_links_to ($self) for values %cf::MAP;
1710 2261
1711 $self->unlink_save; 2262 $self->unlink_save;
1712 $self->destroy; 2263 $self->destroy;
1713} 2264}
1714 2265
1715my $nuke_counter = "aaaa"; 2266my $nuke_counter = "aaaa";
1716 2267
1717sub nuke { 2268sub nuke {
1718 my ($self) = @_; 2269 my ($self) = @_;
1719 2270
2271 {
2272 my $lock = cf::lock_acquire "map_data:$self->{path}";
2273
1720 delete $cf::MAP{$self->path}; 2274 delete $cf::MAP{$self->path};
1721 2275
1722 $self->unlink_save; 2276 $self->unlink_save;
1723 2277
1724 bless $self, "cf::map"; 2278 bless $self, "cf::map";
1725 delete $self->{deny_reset}; 2279 delete $self->{deny_reset};
1726 $self->{deny_save} = 1; 2280 $self->{deny_save} = 1;
1727 $self->reset_timeout (1); 2281 $self->reset_timeout (1);
1728 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1729 2283
1730 $cf::MAP{$self->path} = $self; 2284 $cf::MAP{$self->path} = $self;
2285 }
1731 2286
1732 $self->reset; # polite request, might not happen 2287 $self->reset; # polite request, might not happen
2288}
2289
2290=item $maps = cf::map::tmp_maps
2291
2292Returns an arrayref with all map paths of currently instantiated and saved
2293maps. May block.
2294
2295=cut
2296
2297sub tmp_maps() {
2298 [
2299 map {
2300 utf8::decode $_;
2301 /\.map$/
2302 ? normalise $_
2303 : ()
2304 } @{ aio_readdir $TMPDIR or [] }
2305 ]
2306}
2307
2308=item $maps = cf::map::random_maps
2309
2310Returns an arrayref with all map paths of currently instantiated and saved
2311random maps. May block.
2312
2313=cut
2314
2315sub random_maps() {
2316 [
2317 map {
2318 utf8::decode $_;
2319 /\.map$/
2320 ? normalise "?random/$_"
2321 : ()
2322 } @{ aio_readdir $RANDOMDIR or [] }
2323 ]
1733} 2324}
1734 2325
1735=item cf::map::unique_maps 2326=item cf::map::unique_maps
1736 2327
1737Returns an arrayref of paths of all shared maps that have 2328Returns an arrayref of paths of all shared maps that have
1738instantiated unique items. May block. 2329instantiated unique items. May block.
1739 2330
1740=cut 2331=cut
1741 2332
1742sub unique_maps() { 2333sub unique_maps() {
1743 my $files = aio_readdir $UNIQUEDIR 2334 [
1744 or return; 2335 map {
1745
1746 my @paths;
1747
1748 for (@$files) {
1749 utf8::decode $_; 2336 utf8::decode $_;
1750 next if /\.pst$/; 2337 /\.map$/
1751 next unless /^$PATH_SEP/o; 2338 ? normalise $_
1752 2339 : ()
1753 push @paths, cf::map::normalise $_; 2340 } @{ aio_readdir $UNIQUEDIR or [] }
1754 } 2341 ]
1755
1756 \@paths
1757} 2342}
1758 2343
1759package cf; 2344package cf;
1760 2345
1761=back 2346=back
… …
1779 map { $_, inv_recursive_ $_->inv } @_ 2364 map { $_, inv_recursive_ $_->inv } @_
1780} 2365}
1781 2366
1782sub inv_recursive { 2367sub inv_recursive {
1783 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2369}
2370
2371=item $ref = $ob->ref
2372
2373creates and returns a persistent reference to an objetc that can be stored as a string.
2374
2375=item $ob = cf::object::deref ($refstring)
2376
2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2378even if the object actually exists. May block.
2379
2380=cut
2381
2382sub deref {
2383 my ($ref) = @_;
2384
2385 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2386 my ($uuid, $name) = ($1, $2);
2387 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2388 or return;
2389 $pl->ob->uuid eq $uuid
2390 or return;
2391
2392 $pl->ob
2393 } else {
2394 warn "$ref: cannot resolve object reference\n";
2395 undef
2396 }
1784} 2397}
1785 2398
1786package cf; 2399package cf;
1787 2400
1788=back 2401=back
… …
1807 2420
1808 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2421 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1809 2422
1810 if ($self->{record_replies}) { 2423 if ($self->{record_replies}) {
1811 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2424 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2425
1812 } else { 2426 } else {
2427 my $pl = $self->contr;
2428
2429 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2430 my $dialog = $pl->{npc_dialog};
2431 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2432
2433 } else {
1813 $msg = $npc->name . " says: $msg" if $npc; 2434 $msg = $npc->name . " says: $msg" if $npc;
1814 $self->message ($msg, $flags); 2435 $self->message ($msg, $flags);
2436 }
1815 } 2437 }
2438}
2439
2440=item $object->send_msg ($channel, $msg, $color, [extra...])
2441
2442=cut
2443
2444sub cf::object::send_msg {
2445 my $pl = shift->contr
2446 or return;
2447 $pl->send_msg (@_);
1816} 2448}
1817 2449
1818=item $player_object->may ("access") 2450=item $player_object->may ("access")
1819 2451
1820Returns wether the given player is authorized to access resource "access" 2452Returns wether the given player is authorized to access resource "access"
… …
1867 $self->deactivate_recursive; 2499 $self->deactivate_recursive;
1868 2500
1869 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2501 return if UNIVERSAL::isa $self->map, "ext::map_link";
1870 2502
1871 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1872 if $self->map; 2504 if $self->map && $self->map->{path} ne "{link}";
1873 2505
1874 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2506 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1875} 2507}
1876 2508
1877sub cf::object::player::leave_link { 2509sub cf::object::player::leave_link {
1878 my ($self, $map, $x, $y) = @_; 2510 my ($self, $map, $x, $y) = @_;
2511
2512 return unless $self->contr->active;
1879 2513
1880 my $link_pos = delete $self->{_link_pos}; 2514 my $link_pos = delete $self->{_link_pos};
1881 2515
1882 unless ($map) { 2516 unless ($map) {
1883 # restore original map position 2517 # restore original map position
… …
1897 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
1898 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
1899 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
1900 2534
1901 $map->load; 2535 $map->load;
1902 $map->load_diag; 2536 $map->load_neighbours;
1903 2537
1904 return unless $self->contr->active; 2538 return unless $self->contr->active;
1905 $self->activate_recursive; 2539 $self->activate_recursive;
1906 2540
1907 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1908 $self->enter_map ($map, $x, $y); 2542 $self->enter_map ($map, $x, $y);
1909} 2543}
1910 2544
1911cf::player->attach ( 2545=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1912 on_logout => sub {
1913 my ($pl) = @_;
1914 2546
1915 # abort map switching before logout 2547Moves the player to the given map-path and coordinates by first freezing
1916 if ($pl->ob->{_link_pos}) { 2548her, loading and preparing them map, calling the provided $check callback
1917 cf::sync_job { 2549that has to return the map if sucecssful, and then unfreezes the player on
1918 $pl->ob->leave_link 2550the new (success) or old (failed) map position. In either case, $done will
1919 }; 2551be called at the end of this process.
1920 }
1921 },
1922 on_login => sub {
1923 my ($pl) = @_;
1924 2552
1925 # try to abort aborted map switching on player login :)
1926 # should happen only on crashes
1927 if ($pl->ob->{_link_pos}) {
1928 $pl->ob->enter_link;
1929 (async {
1930 $pl->ob->reply (undef,
1931 "There was an internal problem at your last logout, "
1932 . "the server will try to bring you to your intended destination in a second.",
1933 cf::NDI_RED);
1934 # we need this sleep as the login has a concurrent enter_exit running
1935 # and this sleep increases chances of the player not ending up in scorn
1936 Coro::Timer::sleep 1;
1937 $pl->ob->leave_link;
1938 })->prio (2);
1939 }
1940 },
1941);
1942
1943=item $player_object->goto ($path, $x, $y)
1944
1945=cut 2553=cut
2554
2555our $GOTOGEN;
1946 2556
1947sub cf::object::player::goto { 2557sub cf::object::player::goto {
1948 my ($self, $path, $x, $y) = @_; 2558 my ($self, $path, $x, $y, $check, $done) = @_;
2559
2560 # do generation counting so two concurrent goto's will be executed in-order
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1949 2562
1950 $self->enter_link; 2563 $self->enter_link;
1951 2564
1952 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
1953 my $map = eval { 2587 my $map = eval {
1954 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2589
2590 if ($map) {
1955 $map = $map->customise_for ($self) if $map; 2591 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map;
2593 } else {
2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2595 }
2596
1956 $map 2597 $map
2598 };
2599
2600 if ($@) {
2601 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2602 LOG llevError | logBacktrace, Carp::longmess $@;
1957 } or 2603 }
1958 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1959 2604
2605 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation};
1960 $self->leave_link ($map, $x, $y); 2607 $self->leave_link ($map, $x, $y);
2608 }
2609
2610 $done->() if $done;
1961 })->prio (1); 2611 })->prio (1);
1962} 2612}
1963 2613
1964=item $player_object->enter_exit ($exit_object) 2614=item $player_object->enter_exit ($exit_object)
1965 2615
… …
2002 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2003 } 2653 }
2004 2654
2005 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2006 2656
2007 my $data = cf::to_json $rmp; 2657 my $data = cf::encode_json $rmp;
2008 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2009 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2010 2660
2011 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2012 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
… …
2034 my $hp = $exit->stats->hp; 2684 my $hp = $exit->stats->hp;
2035 my $sp = $exit->stats->sp; 2685 my $sp = $exit->stats->sp;
2036 2686
2037 $self->enter_link; 2687 $self->enter_link;
2038 2688
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2039 (async { 2693 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2695
2040 $self->deactivate_recursive; # just to be sure 2696 $self->deactivate_recursive; # just to be sure
2041 unless (eval { 2697 unless (eval {
2042 $self->goto ($slaying, $hp, $sp); 2698 $self->goto ($slaying, $hp, $sp);
2043 2699
2044 1; 2700 1;
… …
2070 2726
2071 utf8::encode $text; 2727 utf8::encode $text;
2072 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2073} 2729}
2074 2730
2731=item $client->send_msg ($channel, $msg, $color, [extra...])
2732
2733Send a drawinfo or msg packet to the client, formatting the msg for the
2734client if neccessary. C<$type> should be a string identifying the type of
2735the message, with C<log> being the default. If C<$color> is negative, suppress
2736the message unless the client supports the msg packet.
2737
2738=cut
2739
2740# non-persistent channels (usually the info channel)
2741our %CHANNEL = (
2742 "c/identify" => {
2743 id => "infobox",
2744 title => "Identify",
2745 reply => undef,
2746 tooltip => "Items recently identified",
2747 },
2748 "c/examine" => {
2749 id => "infobox",
2750 title => "Examine",
2751 reply => undef,
2752 tooltip => "Signs and other items you examined",
2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/uptime" => {
2779 id => "infobox",
2780 title => "Uptime",
2781 reply => undef,
2782 tooltip => "How long the server has been running since last restart",
2783 },
2784 "c/mapinfo" => {
2785 id => "infobox",
2786 title => "Map Info",
2787 reply => undef,
2788 tooltip => "Information related to the maps",
2789 },
2790);
2791
2792sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_;
2794
2795 $msg = $self->pl->expand_cfpod ($msg);
2796
2797 $color &= cf::NDI_CLIENT_MASK; # just in case...
2798
2799 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel};
2802
2803 $self->ext_msg (channel_info => $channel)
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id};
2807
2808 } elsif (ref $channel) {
2809 # send meta info to client, if not yet sent
2810 unless (exists $self->{channel}{$channel->{id}}) {
2811 $self->{channel}{$channel->{id}} = $channel;
2812 $self->ext_msg (channel_info => $channel)
2813 if $self->can_msg;
2814 }
2815
2816 $channel = $channel->{id};
2817 }
2818
2819 return unless @extra || length $msg;
2820
2821 if ($self->can_msg) {
2822 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF;
2825
2826 $self->send_packet ("msg " . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2828 } else {
2829 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones
2831 for ($msg) {
2832 1 while
2833 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2834 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2835 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2836 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2837 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2838 }
2839
2840 $color &= cf::NDI_COLOR_MASK;
2841
2842 utf8::encode $msg;
2843
2844 if (0 && $msg =~ /\[/) {
2845 # COMMAND/INFO
2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2847 } else {
2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2849 $self->send_packet ("drawinfo $color $msg")
2850 }
2851 }
2852 }
2853}
2854
2075=item $client->ext_event ($type, %msg) 2855=item $client->ext_msg ($type, @msg)
2076 2856
2077Sends an exti event to the client. 2857Sends an ext event to the client.
2078 2858
2079=cut 2859=cut
2080 2860
2081sub cf::client::ext_event($$%) { 2861sub cf::client::ext_msg($$@) {
2082 my ($self, $type, %msg) = @_; 2862 my ($self, $type, @msg) = @_;
2083 2863
2864 if ($self->extcmd == 2) {
2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2866 } elsif ($self->extcmd == 1) { # TODO: remove
2084 $msg{msgtype} = "event_$type"; 2867 push @msg, msgtype => "event_$type";
2085 $self->send_packet ("ext " . cf::to_json \%msg); 2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2869 }
2870}
2871
2872=item $client->ext_reply ($msgid, @msg)
2873
2874Sends an ext reply to the client.
2875
2876=cut
2877
2878sub cf::client::ext_reply($$@) {
2879 my ($self, $id, @msg) = @_;
2880
2881 if ($self->extcmd == 2) {
2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2883 } elsif ($self->extcmd == 1) {
2884 #TODO: version 1, remove
2885 unshift @msg, msgtype => "reply", msgid => $id;
2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2887 }
2086} 2888}
2087 2889
2088=item $success = $client->query ($flags, "text", \&cb) 2890=item $success = $client->query ($flags, "text", \&cb)
2089 2891
2090Queues a query to the client, calling the given callback with 2892Queues a query to the client, calling the given callback with
2091the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2893the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2092C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2894C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2093 2895
2094Queries can fail, so check the return code. Or don't, as queries will become 2896Queries can fail, so check the return code. Or don't, as queries will
2095reliable at some point in the future. 2897become reliable at some point in the future.
2096 2898
2097=cut 2899=cut
2098 2900
2099sub cf::client::query { 2901sub cf::client::query {
2100 my ($self, $flags, $text, $cb) = @_; 2902 my ($self, $flags, $text, $cb) = @_;
… …
2108 utf8::encode $text; 2910 utf8::encode $text;
2109 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2911 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2110 2912
2111 $self->send_packet ($self->{query_queue}[0][0]) 2913 $self->send_packet ($self->{query_queue}[0][0])
2112 if @{ $self->{query_queue} } == 1; 2914 if @{ $self->{query_queue} } == 1;
2915
2916 1
2113} 2917}
2114 2918
2115cf::client->attach ( 2919cf::client->attach (
2920 on_connect => sub {
2921 my ($ns) = @_;
2922
2923 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2924 },
2116 on_reply => sub { 2925 on_reply => sub {
2117 my ($ns, $msg) = @_; 2926 my ($ns, $msg) = @_;
2118 2927
2119 # this weird shuffling is so that direct followup queries 2928 # this weird shuffling is so that direct followup queries
2120 # get handled first 2929 # get handled first
… …
2132 } else { 2941 } else {
2133 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2942 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2134 } 2943 }
2135 } 2944 }
2136 }, 2945 },
2946 on_exticmd => sub {
2947 my ($ns, $buf) = @_;
2948
2949 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2950
2951 if (ref $msg) {
2952 my ($type, $reply, @payload) =
2953 "ARRAY" eq ref $msg
2954 ? @$msg
2955 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2956
2957 my @reply;
2958
2959 if (my $cb = $EXTICMD{$type}) {
2960 @reply = $cb->($ns, @payload);
2961 }
2962
2963 $ns->ext_reply ($reply, @reply)
2964 if $reply;
2965
2966 } else {
2967 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2968 }
2969
2970 cf::override;
2971 },
2137); 2972);
2138 2973
2139=item $client->async (\&cb) 2974=item $client->async (\&cb)
2140 2975
2141Create a new coroutine, running the specified callback. The coroutine will 2976Create a new coroutine, running the specified callback. The coroutine will
… …
2182our $safe = new Safe "safe"; 3017our $safe = new Safe "safe";
2183our $safe_hole = new Safe::Hole; 3018our $safe_hole = new Safe::Hole;
2184 3019
2185$SIG{FPE} = 'IGNORE'; 3020$SIG{FPE} = 'IGNORE';
2186 3021
2187$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3022$safe->permit_only (Opcode::opset qw(
3023 :base_core :base_mem :base_orig :base_math
3024 grepstart grepwhile mapstart mapwhile
3025 sort time
3026));
2188 3027
2189# here we export the classes and methods available to script code 3028# here we export the classes and methods available to script code
2190 3029
2191=pod 3030=pod
2192 3031
2193The following functions and methods are available within a safe environment: 3032The following functions and methods are available within a safe environment:
2194 3033
2195 cf::object contr pay_amount pay_player map 3034 cf::object
3035 contr pay_amount pay_player map x y force_find force_add destroy
3036 insert remove name archname title slaying race decrease_ob_nr
3037
2196 cf::object::player player 3038 cf::object::player
2197 cf::player peaceful 3039 player
2198 cf::map trigger 3040
3041 cf::player
3042 peaceful
3043
3044 cf::map
3045 trigger
2199 3046
2200=cut 3047=cut
2201 3048
2202for ( 3049for (
2203 ["cf::object" => qw(contr pay_amount pay_player map)], 3050 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3051 insert remove inv name archname title slaying race
3052 decrease_ob_nr destroy)],
2204 ["cf::object::player" => qw(player)], 3053 ["cf::object::player" => qw(player)],
2205 ["cf::player" => qw(peaceful)], 3054 ["cf::player" => qw(peaceful)],
2206 ["cf::map" => qw(trigger)], 3055 ["cf::map" => qw(trigger)],
2207) { 3056) {
2208 no strict 'refs'; 3057 no strict 'refs';
… …
2279=back 3128=back
2280 3129
2281=cut 3130=cut
2282 3131
2283############################################################################# 3132#############################################################################
2284
2285=head2 EXTENSION DATABASE SUPPORT
2286
2287Crossfire maintains a very simple database for extension use. It can
2288currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2289convert to/from binary).
2290
2291The parameter C<$family> should best start with the name of the extension
2292using it, it should be unique.
2293
2294=over 4
2295
2296=item $value = cf::db_get $family => $key
2297
2298Returns a single value from the database.
2299
2300=item cf::db_put $family => $key => $value
2301
2302Stores the given C<$value> in the family.
2303
2304=cut
2305
2306our $DB;
2307
2308sub db_init {
2309 unless ($DB) {
2310 $DB = BDB::db_create $DB_ENV;
2311
2312 cf::sync_job {
2313 eval {
2314 $DB->set_flags (BDB::CHKSUM);
2315
2316 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2317 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2318 cf::cleanup "db_open(db): $!" if $!;
2319 };
2320 cf::cleanup "db_open(db): $@" if $@;
2321 };
2322 }
2323}
2324
2325sub db_get($$) {
2326 my $key = "$_[0]/$_[1]";
2327
2328 cf::sync_job {
2329 BDB::db_get $DB, undef, $key, my $data;
2330
2331 $! ? ()
2332 : $data
2333 }
2334}
2335
2336sub db_put($$$) {
2337 BDB::dbreq_pri 4;
2338 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2339}
2340
2341=item cf::cache $id => [$paths...], $processversion => $process
2342
2343Generic caching function that returns the value of the resource $id,
2344caching and regenerating as required.
2345
2346This function can block.
2347
2348=cut
2349
2350sub cache {
2351 my ($id, $src, $processversion, $process) = @_;
2352
2353 my $meta =
2354 join "\x00",
2355 $processversion,
2356 map {
2357 aio_stat $_
2358 and Carp::croak "$_: $!";
2359
2360 ($_, (stat _)[7,9])
2361 } @$src;
2362
2363 my $dbmeta = db_get cache => "$id/meta";
2364 if ($dbmeta ne $meta) {
2365 # changed, we may need to process
2366
2367 my @data;
2368 my $md5;
2369
2370 for (0 .. $#$src) {
2371 0 <= aio_load $src->[$_], $data[$_]
2372 or Carp::croak "$src->[$_]: $!";
2373 }
2374
2375 # if processing is expensive, check
2376 # checksum first
2377 if (1) {
2378 $md5 =
2379 join "\x00",
2380 $processversion,
2381 map {
2382 Coro::cede;
2383 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2384 } 0.. $#$src;
2385
2386
2387 my $dbmd5 = db_get cache => "$id/md5";
2388 if ($dbmd5 eq $md5) {
2389 db_put cache => "$id/meta", $meta;
2390
2391 return db_get cache => "$id/data";
2392 }
2393 }
2394
2395 my $t1 = Time::HiRes::time;
2396 my $data = $process->(\@data);
2397 my $t2 = Time::HiRes::time;
2398
2399 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2400
2401 db_put cache => "$id/data", $data;
2402 db_put cache => "$id/md5" , $md5;
2403 db_put cache => "$id/meta", $meta;
2404
2405 return $data;
2406 }
2407
2408 db_get cache => "$id/data"
2409}
2410
2411=item fork_call { }, $args
2412
2413Executes the given code block with the given arguments in a seperate
2414process, returning the results. Everything must be serialisable with
2415Coro::Storable. May, of course, block. Note that the executed sub may
2416never block itself or use any form of Event handling.
2417
2418=cut
2419
2420sub fork_call(&@) {
2421 my ($cb, @args) = @_;
2422
2423# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2424# or die "socketpair: $!";
2425 pipe my $fh1, my $fh2
2426 or die "pipe: $!";
2427
2428 if (my $pid = fork) {
2429 close $fh2;
2430
2431 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2432 $res = Coro::Storable::thaw $res;
2433
2434 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2435
2436 die $$res unless "ARRAY" eq ref $res;
2437
2438 return wantarray ? @$res : $res->[-1];
2439 } else {
2440 local $SIG{__WARN__};
2441 eval {
2442 local $SIG{__DIE__};
2443 close $fh1;
2444
2445 my @res = eval { $cb->(@args) };
2446 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2447 };
2448
2449 warn $@ if $@;
2450 _exit 0;
2451 }
2452}
2453
2454
2455
2456#############################################################################
2457# the server's init and main functions 3133# the server's init and main functions
2458 3134
2459sub load_facedata($) { 3135sub load_facedata($) {
2460 my ($path) = @_; 3136 my ($path) = @_;
3137
3138 # HACK to clear player env face cache, we need some signal framework
3139 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = ();
3141
3142 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2461 3143
2462 warn "loading facedata from $path\n"; 3144 warn "loading facedata from $path\n";
2463 3145
2464 my $facedata; 3146 my $facedata;
2465 0 < aio_load $path, $facedata 3147 0 < aio_load $path, $facedata
… …
2468 $facedata = Coro::Storable::thaw $facedata; 3150 $facedata = Coro::Storable::thaw $facedata;
2469 3151
2470 $facedata->{version} == 2 3152 $facedata->{version} == 2
2471 or cf::cleanup "$path: version mismatch, cannot proceed."; 3153 or cf::cleanup "$path: version mismatch, cannot proceed.";
2472 3154
3155 # patch in the exptable
3156 $facedata->{resource}{"res/exp_table"} = {
3157 type => FT_RSRC,
3158 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3159 };
3160 cf::cede_to_tick;
3161
2473 { 3162 {
2474 my $faces = $facedata->{faceinfo}; 3163 my $faces = $facedata->{faceinfo};
2475 3164
2476 while (my ($face, $info) = each %$faces) { 3165 while (my ($face, $info) = each %$faces) {
2477 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3166 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167
2478 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3168 cf::face::set_visibility $idx, $info->{visibility};
3169 cf::face::set_magicmap $idx, $info->{magicmap};
2479 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2480 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3171 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2481 Coro::cede; 3172
3173 cf::cede_to_tick;
2482 } 3174 }
2483 3175
2484 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2485 next unless $info->{smooth}; 3177 next unless $info->{smooth};
3178
2486 my $idx = cf::face::find $face 3179 my $idx = cf::face::find $face
2487 or next; 3180 or next;
3181
2488 if (my $smooth = cf::face::find $info->{smooth}) { 3182 if (my $smooth = cf::face::find $info->{smooth}) {
3183 cf::face::set_smooth $idx, $smooth;
2489 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2490 } else { 3185 } else {
2491 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3186 warn "smooth face '$info->{smooth}' not found for face '$face'";
2492 } 3187 }
2493 Coro::cede; 3188
3189 cf::cede_to_tick;
2494 } 3190 }
2495 } 3191 }
2496 3192
2497 { 3193 {
2498 my $anims = $facedata->{animinfo}; 3194 my $anims = $facedata->{animinfo};
2499 3195
2500 while (my ($anim, $info) = each %$anims) { 3196 while (my ($anim, $info) = each %$anims) {
2501 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3197 cf::anim::set $anim, $info->{frames}, $info->{facings};
2502 Coro::cede; 3198 cf::cede_to_tick;
2503 } 3199 }
2504 3200
2505 cf::anim::invalidate_all; # d'oh 3201 cf::anim::invalidate_all; # d'oh
2506 } 3202 }
2507 3203
3204 {
3205 # TODO: for gcfclient pleasure, we should give resources
3206 # that gcfclient doesn't grok a >10000 face index.
3207 my $res = $facedata->{resource};
3208
3209 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) {
3211 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3212 my $data;
3213
3214 if ($info->{type} & 1) {
3215 # prepend meta info
3216
3217 my $meta = $enc->encode ({
3218 name => $name,
3219 %{ $info->{meta} || {} },
3220 });
3221
3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type};
3229 } else {
3230 $RESOURCE{$name} = $info;
3231 }
3232
3233 cf::cede_to_tick;
3234 }
3235 }
3236
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3238
2508 1 3239 1
2509} 3240}
2510 3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
3261
3262register_exticmd fx_want => sub {
3263 my ($ns, $want) = @_;
3264
3265 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v);
3267 }
3268};
3269
2511sub reload_regions { 3270sub reload_regions {
3271 # HACK to clear player env face cache, we need some signal framework
3272 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = ();
3274
2512 load_resource_file "$MAPDIR/regions" 3275 load_resource_file "$MAPDIR/regions"
2513 or die "unable to load regions file\n"; 3276 or die "unable to load regions file\n";
3277
3278 for (cf::region::list) {
3279 $_->{match} = qr/$_->{match}/
3280 if exists $_->{match};
3281 }
2514} 3282}
2515 3283
2516sub reload_facedata { 3284sub reload_facedata {
2517 load_facedata "$DATADIR/facedata" 3285 load_facedata "$DATADIR/facedata"
2518 or die "unable to load facedata\n"; 3286 or die "unable to load facedata\n";
2519} 3287}
2520 3288
2521sub reload_archetypes { 3289sub reload_archetypes {
2522 load_resource_file "$DATADIR/archetypes" 3290 load_resource_file "$DATADIR/archetypes"
2523 or die "unable to load archetypes\n"; 3291 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references
3293 # this really needs to be done in an extra post-pass
3294 # (which needs to be synchronous, so solve it differently)
3295 load_resource_file "$DATADIR/archetypes"
3296 or die "unable to load archetypes\n";
2524} 3297}
2525 3298
2526sub reload_treasures { 3299sub reload_treasures {
2527 load_resource_file "$DATADIR/treasures" 3300 load_resource_file "$DATADIR/treasures"
2528 or die "unable to load treasurelists\n"; 3301 or die "unable to load treasurelists\n";
… …
2531sub reload_resources { 3304sub reload_resources {
2532 warn "reloading resource files...\n"; 3305 warn "reloading resource files...\n";
2533 3306
2534 reload_regions; 3307 reload_regions;
2535 reload_facedata; 3308 reload_facedata;
3309 #reload_archetypes;#d#
2536 reload_archetypes; 3310 reload_archetypes;
2537 reload_treasures; 3311 reload_treasures;
2538 3312
2539 warn "finished reloading resource files\n"; 3313 warn "finished reloading resource files\n";
2540} 3314}
2541 3315
2542sub init { 3316sub init {
2543 reload_resources; 3317 reload_resources;
2544} 3318}
2545 3319
2546sub cfg_load { 3320sub reload_config {
2547 open my $fh, "<:utf8", "$CONFDIR/config" 3321 open my $fh, "<:utf8", "$CONFDIR/config"
2548 or return; 3322 or return;
2549 3323
2550 local $/; 3324 local $/;
2551 *CFG = YAML::Syck::Load <$fh>; 3325 *CFG = YAML::Load <$fh>;
2552 3326
2553 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2554 3328
2555 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3329 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2556 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3330 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2567sub main { 3341sub main {
2568 # we must not ever block the main coroutine 3342 # we must not ever block the main coroutine
2569 local $Coro::idle = sub { 3343 local $Coro::idle = sub {
2570 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3344 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2571 (async { 3345 (async {
2572 Event::one_event; 3346 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT;
2573 })->prio (Coro::PRIO_MAX); 3348 })->prio (Coro::PRIO_MAX);
2574 }; 3349 };
2575 3350
2576 cfg_load; 3351 reload_config;
2577 db_init; 3352 db_init;
2578 load_extensions; 3353 load_extensions;
2579 3354
2580 $TICK_WATCHER->start; 3355 $TICK_WATCHER->start;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
2581 Event::loop; 3357 EV::loop;
2582} 3358}
2583 3359
2584############################################################################# 3360#############################################################################
2585# initialisation and cleanup 3361# initialisation and cleanup
2586 3362
2587# install some emergency cleanup handlers 3363# install some emergency cleanup handlers
2588BEGIN { 3364BEGIN {
3365 our %SIGWATCHER = ();
2589 for my $signal (qw(INT HUP TERM)) { 3366 for my $signal (qw(INT HUP TERM)) {
2590 Event->signal ( 3367 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2591 reentrant => 0,
2592 data => WF_AUTOCANCEL,
2593 signal => $signal,
2594 prio => 0,
2595 cb => sub {
2596 cf::cleanup "SIG$signal"; 3368 cf::cleanup "SIG$signal";
2597 },
2598 ); 3369 };
3370 }
3371}
3372
3373sub write_runtime {
3374 my $runtime = "$LOCALDIR/runtime";
3375
3376 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time.
3378
3379 IO::AIO::aio_utime $runtime, undef, undef;
3380
3381 my $guard = cf::lock_acquire "write_runtime";
3382
3383 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3384 or return;
3385
3386 my $value = $cf::RUNTIME + 90 + 10;
3387 # 10 is the runtime save interval, for a monotonic clock
3388 # 60 allows for the watchdog to kill the server.
3389
3390 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3391 and return;
3392
3393 # always fsync - this file is important
3394 aio_fsync $fh
3395 and return;
3396
3397 # touch it again to show we are up-to-date
3398 aio_utime $fh, undef, undef;
3399
3400 close $fh
3401 or return;
3402
3403 aio_rename "$runtime~", $runtime
3404 and return;
3405
3406 warn "runtime file written.\n";
3407
2599 } 3408 1
2600} 3409}
2601 3410
2602sub emergency_save() { 3411sub emergency_save() {
2603 my $freeze_guard = cf::freeze_mainloop; 3412 my $freeze_guard = cf::freeze_mainloop;
2604 3413
… …
2610 # and maps saved/destroyed asynchronously. 3419 # and maps saved/destroyed asynchronously.
2611 warn "begin emergency player save\n"; 3420 warn "begin emergency player save\n";
2612 for my $login (keys %cf::PLAYER) { 3421 for my $login (keys %cf::PLAYER) {
2613 my $pl = $cf::PLAYER{$login} or next; 3422 my $pl = $cf::PLAYER{$login} or next;
2614 $pl->valid or next; 3423 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2615 $pl->save; 3425 $pl->save;
2616 } 3426 }
2617 warn "end emergency player save\n"; 3427 warn "end emergency player save\n";
2618 3428
2619 warn "begin emergency map save\n"; 3429 warn "begin emergency map save\n";
… …
2658 warn "syncing database to disk"; 3468 warn "syncing database to disk";
2659 BDB::db_env_txn_checkpoint $DB_ENV; 3469 BDB::db_env_txn_checkpoint $DB_ENV;
2660 3470
2661 # if anything goes wrong in here, we should simply crash as we already saved 3471 # if anything goes wrong in here, we should simply crash as we already saved
2662 3472
2663 warn "cancelling all WF_AUTOCANCEL watchers";
2664 for (Event::all_watchers) {
2665 $_->cancel if $_->data & WF_AUTOCANCEL;
2666 }
2667
2668 warn "flushing outstanding aio requests"; 3473 warn "flushing outstanding aio requests";
2669 for (;;) { 3474 for (;;) {
2670 BDB::flush; 3475 BDB::flush;
2671 IO::AIO::flush; 3476 IO::AIO::flush;
2672 Coro::cede; 3477 Coro::cede_notself;
2673 last unless IO::AIO::nreqs || BDB::nreqs; 3478 last unless IO::AIO::nreqs || BDB::nreqs;
2674 warn "iterate..."; 3479 warn "iterate...";
2675 } 3480 }
2676 3481
2677 ++$RELOAD; 3482 ++$RELOAD;
… …
2681 %EXT_CORO = (); 3486 %EXT_CORO = ();
2682 3487
2683 warn "removing commands"; 3488 warn "removing commands";
2684 %COMMAND = (); 3489 %COMMAND = ();
2685 3490
2686 warn "removing ext commands"; 3491 warn "removing ext/exti commands";
2687 %EXTCMD = (); 3492 %EXTCMD = ();
3493 %EXTICMD = ();
2688 3494
2689 warn "unloading/nuking all extensions"; 3495 warn "unloading/nuking all extensions";
2690 for my $pkg (@EXTS) { 3496 for my $pkg (@EXTS) {
2691 warn "... unloading $pkg"; 3497 warn "... unloading $pkg";
2692 3498
… …
2735 warn "reloading cf.pm"; 3541 warn "reloading cf.pm";
2736 require cf; 3542 require cf;
2737 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2738 3544
2739 warn "loading config and database again"; 3545 warn "loading config and database again";
2740 cf::cfg_load; 3546 cf::reload_config;
2741 3547
2742 warn "loading extensions"; 3548 warn "loading extensions";
2743 cf::load_extensions; 3549 cf::load_extensions;
2744 3550
2745 warn "reattaching attachments to objects/players"; 3551 warn "reattaching attachments to objects/players";
… …
2765 3571
2766sub reload_perl() { 3572sub reload_perl() {
2767 # doing reload synchronously and two reloads happen back-to-back, 3573 # doing reload synchronously and two reloads happen back-to-back,
2768 # coro crashes during coro_state_free->destroy here. 3574 # coro crashes during coro_state_free->destroy here.
2769 3575
2770 $RELOAD_WATCHER ||= Event->timer ( 3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2771 reentrant => 0,
2772 after => 0,
2773 data => WF_AUTOCANCEL,
2774 cb => sub {
2775 do_reload_perl; 3577 do_reload_perl;
2776 undef $RELOAD_WATCHER; 3578 undef $RELOAD_WATCHER;
2777 },
2778 ); 3579 };
2779} 3580}
2780 3581
2781register_command "reload" => sub { 3582register_command "reload" => sub {
2782 my ($who, $arg) = @_; 3583 my ($who, $arg) = @_;
2783 3584
2784 if ($who->flag (FLAG_WIZ)) { 3585 if ($who->flag (FLAG_WIZ)) {
2785 $who->message ("reloading server."); 3586 $who->message ("reloading server.");
3587 async {
3588 $Coro::current->{desc} = "perl_reload";
2786 async { reload_perl }; 3589 reload_perl;
3590 };
2787 } 3591 }
2788}; 3592};
2789 3593
2790unshift @INC, $LIBDIR; 3594unshift @INC, $LIBDIR;
2791 3595
… …
2810 my $signal = new Coro::Signal; 3614 my $signal = new Coro::Signal;
2811 push @WAIT_FOR_TICK_BEGIN, $signal; 3615 push @WAIT_FOR_TICK_BEGIN, $signal;
2812 $signal->wait; 3616 $signal->wait;
2813} 3617}
2814 3618
2815$TICK_WATCHER = Event->timer ( 3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub {
2816 reentrant => 0,
2817 parked => 1,
2818 prio => 0,
2819 at => $NEXT_TICK || $TICK,
2820 data => WF_AUTOCANCEL,
2821 cb => sub {
2822 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
2823 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3621 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2824 unless ++$bug_warning > 10; 3622 unless ++$bug_warning > 10;
2825 return; 3623 return;
2826 } 3624 }
2827 3625
2828 $NOW = Event::time; 3626 $NOW = $tick_start = EV::now;
2829 3627
2830 cf::server_tick; # one server iteration 3628 cf::server_tick; # one server iteration
2831 3629
2832 $RUNTIME += $TICK; 3630 $RUNTIME += $TICK;
2833 $NEXT_TICK += $TICK; 3631 $NEXT_TICK = $_[0]->at;
2834 3632
2835 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3633 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2836 $NEXT_RUNTIME_WRITE = $NOW + 10; 3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2837 Coro::async_pool { 3635 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver";
2838 write_runtime 3637 write_runtime
2839 or warn "ERROR: unable to write runtime file: $!"; 3638 or warn "ERROR: unable to write runtime file: $!";
2840 };
2841 } 3639 };
3640 }
2842 3641
2843# my $AFTER = Event::time;
2844# warn $AFTER - $NOW;#d#
2845
2846 # if we are delayed by four ticks or more, skip them all
2847 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2848
2849 $TICK_WATCHER->at ($NEXT_TICK);
2850 $TICK_WATCHER->start;
2851
2852 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2853 $sig->send; 3643 $sig->send;
2854 } 3644 }
2855 while (my $sig = shift @WAIT_FOR_TICK) { 3645 while (my $sig = shift @WAIT_FOR_TICK) {
2856 $sig->send; 3646 $sig->send;
2857 } 3647 }
2858 3648
3649 $LOAD = ($NOW - $tick_start) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651
2859 _post_tick; 3652 _post_tick;
2860 }, 3653};
2861); 3654$TICK_WATCHER->priority (EV::MAXPRI);
2862 3655
2863{ 3656{
2864 BDB::max_poll_time $TICK * 0.1; 3657 # configure BDB
2865 $BDB_POLL_WATCHER = Event->io ( 3658
2866 reentrant => 0,
2867 fd => BDB::poll_fileno,
2868 poll => 'r',
2869 prio => 0,
2870 data => WF_AUTOCANCEL,
2871 cb => \&BDB::poll_cb,
2872 );
2873 BDB::min_parallel 8; 3659 BDB::min_parallel 8;
2874 3660 BDB::max_poll_reqs $TICK * 0.1;
2875 BDB::set_sync_prepare { 3661 $Coro::BDB::WATCHER->priority (1);
2876 my $status;
2877 my $current = $Coro::current;
2878 (
2879 sub {
2880 $status = $!;
2881 $current->ready; undef $current;
2882 },
2883 sub {
2884 Coro::schedule while defined $current;
2885 $! = $status;
2886 },
2887 )
2888 };
2889 3662
2890 unless ($DB_ENV) { 3663 unless ($DB_ENV) {
2891 $DB_ENV = BDB::db_env_create; 3664 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3666 | BDB::LOG_AUTOREMOVE, 1);
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2892 3669
2893 cf::sync_job { 3670 cf::sync_job {
2894 eval { 3671 eval {
2895 BDB::db_env_open 3672 BDB::db_env_open
2896 $DB_ENV, 3673 $DB_ENV,
… …
2898 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3675 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2899 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3676 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2900 0666; 3677 0666;
2901 3678
2902 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3679 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2903
2904 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2905 $DB_ENV->set_lk_detect;
2906 }; 3680 };
2907 3681
2908 cf::cleanup "db_env_open(db): $@" if $@; 3682 cf::cleanup "db_env_open(db): $@" if $@;
2909 }; 3683 };
2910 } 3684 }
3685
3686 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3687 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3688 };
3689 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 };
2911} 3695}
2912 3696
2913{ 3697{
3698 # configure IO::AIO
3699
2914 IO::AIO::min_parallel 8; 3700 IO::AIO::min_parallel 8;
2915
2916 undef $Coro::AIO::WATCHER;
2917 IO::AIO::max_poll_time $TICK * 0.1; 3701 IO::AIO::max_poll_time $TICK * 0.1;
2918 $AIO_POLL_WATCHER = Event->io ( 3702 $Coro::AIO::WATCHER->priority (1);
2919 reentrant => 0,
2920 data => WF_AUTOCANCEL,
2921 fd => IO::AIO::poll_fileno,
2922 poll => 'r',
2923 prio => 6,
2924 cb => \&IO::AIO::poll_cb,
2925 );
2926} 3703}
3704
3705my $_log_backtrace;
2927 3706
2928sub _log_backtrace { 3707sub _log_backtrace {
2929 my ($msg, @addr) = @_; 3708 my ($msg, @addr) = @_;
2930 3709
3710 $msg =~ s/\n//;
3711
3712 # limit the # of concurrent backtraces
3713 if ($_log_backtrace < 2) {
3714 ++$_log_backtrace;
2931 async { 3715 async {
3716 $Coro::current->{desc} = "abt $msg";
3717
2932 my @bt = fork_call { 3718 my @bt = fork_call {
2933 @addr = map { sprintf "%x", $_ } @addr; 3719 @addr = map { sprintf "%x", $_ } @addr;
2934 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3720 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
2935 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3721 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
2936 or die "addr2line: $!"; 3722 or die "addr2line: $!";
2937 3723
2938 my @funcs; 3724 my @funcs;
2939 my @res = <$fh>; 3725 my @res = <$fh>;
2940 chomp for @res; 3726 chomp for @res;
2941 while (@res) { 3727 while (@res) {
2942 my ($func, $line) = splice @res, 0, 2, (); 3728 my ($func, $line) = splice @res, 0, 2, ();
2943 push @funcs, "[$func] $line"; 3729 push @funcs, "[$func] $line";
3730 }
3731
3732 @funcs
2944 } 3733 };
2945 3734
2946 @funcs 3735 LOG llevInfo, "[ABT] $msg\n";
3736 LOG llevInfo, "[ABT] $_\n" for @bt;
3737 --$_log_backtrace;
2947 }; 3738 };
2948 3739 } else {
2949 $msg =~ s/\n//;
2950
2951 LOG llevInfo, "[ABT] $msg\n"; 3740 LOG llevInfo, "[ABT] $msg\n";
2952 LOG llevInfo, "[ABT] $_\n" for @bt; 3741 LOG llevInfo, "[ABT] [suppressed]\n";
2953 }; 3742 }
2954} 3743}
2955 3744
2956# load additional modules 3745# load additional modules
2957use cf::pod; 3746use cf::pod;
2958 3747

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines