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

Diff Legend

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