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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.412 by root, Wed Apr 2 11:13:55 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV 1.86;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro 4.32 ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::EV;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
22use Coro::AIO; 43use Coro::AIO;
44use Coro::BDB;
23use Coro::Storable; 45use Coro::Storable;
46use Coro::Util ();
24 47
25use JSON::XS 1.4 (); 48use JSON::XS 2.01 ();
26use BDB (); 49use BDB ();
27use Data::Dumper; 50use Data::Dumper;
28use Digest::MD5; 51use Digest::MD5;
29use Fcntl; 52use Fcntl;
30use YAML::Syck (); 53use YAML ();
31use IO::AIO 2.32 (); 54use IO::AIO 2.51 ();
32use Time::HiRes; 55use Time::HiRes;
33use Compress::LZF; 56use Compress::LZF;
34use Digest::MD5 (); 57use Digest::MD5 ();
35 58
36# configure various modules to our taste 59# configure various modules to our taste
37# 60#
38$Storable::canonical = 1; # reduce rsync transfers 61$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46 64
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 66
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 68
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 87our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 89our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 90our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 91our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE;
74 93
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER; 95our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 97our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 98our $USE_FSYNC = 1; # use fsync to write maps - default off
82 99
83our $BDB_POLL_WATCHER; 100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 104our $DB_ENV;
85 105
86our %CFG; 106our %CFG;
87 107
88our $UPTIME; $UPTIME ||= time; 108our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 109our $RUNTIME;
110our $NOW;
90 111
91our %PLAYER; # all users 112our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 113our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 114our $LINK_MAP; # the special {link} map, which is always available
94 115
95# used to convert map paths into valid unix filenames by replacing / by ∕ 116# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 117our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 118
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 119our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 120our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 122our $TICK_START; # for load detecting purposes
101 123
102binmode STDOUT; 124binmode STDOUT;
103binmode STDERR; 125binmode STDERR;
104 126
105# read virtual server time, if available 127# read virtual server time, if available
158 180
159The raw value load value from the last tick. 181The raw value load value from the last tick.
160 182
161=item %cf::CFG 183=item %cf::CFG
162 184
163Configuration for the server, loaded from C</etc/crossfire/config>, or 185Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 186from wherever your confdir points to.
165 187
166=item cf::wait_for_tick, cf::wait_for_tick_begin 188=item cf::wait_for_tick, cf::wait_for_tick_begin
167 189
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 208 $msg .= "\n"
187 unless $msg =~ /\n$/; 209 unless $msg =~ /\n$/;
188 210
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 212
191 utf8::encode $msg;
192 LOG llevError, $msg; 213 LOG llevError, $msg;
193 }; 214 };
194} 215}
216
217$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "=="
219
220 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d#
223 }#d#
224
225 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate
228};
229
230$SIG{__DIE__} = sub { }; #d#?
195 231
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
212)) { 248)) {
213 no strict 'refs'; 249 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 251}
216 252
217$Event::DIED = sub { 253$EV::DIED = sub {
218 warn "error in event callback: @_"; 254 warn "error in event callback: @_";
219}; 255};
220 256
221############################################################################# 257#############################################################################
222 258
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 282 $d
247 } || "[unable to dump $_[0]: '$@']"; 283 } || "[unable to dump $_[0]: '$@']";
248} 284}
249 285
250=item $ref = cf::from_json $json 286=item $ref = cf::decode_json $json
251 287
252Converts a JSON string into the corresponding perl data structure. 288Converts a JSON string into the corresponding perl data structure.
253 289
254=item $json = cf::to_json $ref 290=item $json = cf::encode_json $ref
255 291
256Converts a perl data structure into its JSON representation. 292Converts a perl data structure into its JSON representation.
257 293
258=cut 294=cut
259 295
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 297
262sub to_json ($) { $json_coder->encode ($_[0]) } 298sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 299sub decode_json($) { $json_coder->decode ($_[0]) }
264 300
265=item cf::lock_wait $string 301=item cf::lock_wait $string
266 302
267Wait until the given lock is available. See cf::lock_acquire. 303Wait until the given lock is available. See cf::lock_acquire.
268 304
271Wait until the given lock is available and then acquires it and returns 307Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 308a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 309for example when the coroutine gets canceled), the lock is automatically
274returned. 310returned.
275 311
312Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro.
314
276Lock names should begin with a unique identifier (for example, cf::map::find 315Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 316uses map_find and cf::map::load uses map_load).
278 317
279=item $locked = cf::lock_active $string 318=item $locked = cf::lock_active $string
280 319
281Return true if the lock is currently active, i.e. somebody has locked it. 320Return true if the lock is currently active, i.e. somebody has locked it.
282 321
283=cut 322=cut
284 323
285our %LOCK; 324our %LOCK;
325our %LOCKER;#d#
286 326
287sub lock_wait($) { 327sub lock_wait($) {
288 my ($key) = @_; 328 my ($key) = @_;
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
289 334
290 # wait for lock, if any 335 # wait for lock, if any
291 while ($LOCK{$key}) { 336 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 337 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 338 Coro::schedule;
299 344
300 # wait, to be sure we are not locked 345 # wait, to be sure we are not locked
301 lock_wait $key; 346 lock_wait $key;
302 347
303 $LOCK{$key} = []; 348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
304 350
305 Coro::guard { 351 Coro::guard {
352 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 353 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 354 $_->ready for @{ delete $LOCK{$key} };
308 } 355 }
309} 356}
310 357
313 360
314 ! ! $LOCK{$key} 361 ! ! $LOCK{$key}
315} 362}
316 363
317sub freeze_mainloop { 364sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 365 tick_inhibit_inc;
319 366
320 my $guard = Coro::guard { 367 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 368}
322 }; 369
323 $TICK_WATCHER->stop; 370=item cf::periodic $interval, $cb
324 $guard 371
372Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer.
374
375=cut
376
377sub periodic($$) {
378 my ($interval, $cb) = @_;
379
380 my $start = rand List::Util::min 180, $interval;
381
382 EV::periodic $start, $interval, 0, $cb
325} 383}
326 384
327=item cf::get_slot $time[, $priority[, $name]] 385=item cf::get_slot $time[, $priority[, $name]]
328 386
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 387Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 398our @SLOT_QUEUE;
341our $SLOT_QUEUE; 399our $SLOT_QUEUE;
342 400
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 401$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 402$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager");
404
345 my $signal = new Coro::Signal; 405 my $signal = new Coro::Signal;
346 406
347 while () { 407 while () {
348 next_job: 408 next_job:
349 my $avail = cf::till_tick; 409 my $avail = cf::till_tick;
357 } 417 }
358 } 418 }
359 } 419 }
360 420
361 if (@SLOT_QUEUE) { 421 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 422 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 423 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 424 $signal->wait;
365 } else { 425 } else {
366 Coro::schedule; 426 Coro::schedule;
367 } 427 }
390 450
391BEGIN { *async = \&Coro::async_pool } 451BEGIN { *async = \&Coro::async_pool }
392 452
393=item cf::sync_job { BLOCK } 453=item cf::sync_job { BLOCK }
394 454
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 455The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 456is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 457partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 458acceptable.
399 459
400If it must be done, put the blocking parts into C<sync_job>. This will run 460If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 461the given BLOCK in another coroutine while waiting for the result. The
406 466
407sub sync_job(&) { 467sub sync_job(&) {
408 my ($job) = @_; 468 my ($job) = @_;
409 469
410 if ($Coro::current == $Coro::main) { 470 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 471 my $time = EV::time;
412 472
413 # this is the main coro, too bad, we have to block 473 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 474 # till the operation succeeds, freezing the server :/
415 475
416 # TODO: use suspend/resume instead 476 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 477
418 my $freeze_guard = freeze_mainloop; 478 my $freeze_guard = freeze_mainloop;
419 479
420 my $busy = 1; 480 my $busy = 1;
421 my @res; 481 my @res;
422 482
423 (async { 483 (async {
484 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 485 @res = eval { $job->() };
425 warn $@ if $@; 486 warn $@ if $@;
426 undef $busy; 487 undef $busy;
427 })->prio (Coro::PRIO_MAX); 488 })->prio (Coro::PRIO_MAX);
428 489
429 while ($busy) { 490 while ($busy) {
430 Coro::cede or Event::one_event; 491 if (Coro::nready) {
492 Coro::cede_notself;
493 } else {
494 EV::loop EV::LOOP_ONESHOT;
431 } 495 }
496 }
432 497
433 $time = Event::time - $time; 498 my $time = EV::time - $time;
434 499
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 500 $TICK_START += $time; # do not account sync jobs to server load
439 501
440 wantarray ? @res : $res[0] 502 wantarray ? @res : $res[0]
441 } else { 503 } else {
442 # we are in another coroutine, how wonderful, everything just works 504 # we are in another coroutine, how wonderful, everything just works
443 505
468=item fork_call { }, $args 530=item fork_call { }, $args
469 531
470Executes the given code block with the given arguments in a seperate 532Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 533process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 534Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 535never block itself or use any form of event handling.
474 536
475=cut 537=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 538
486sub fork_call(&@) { 539sub fork_call(&@) {
487 my ($cb, @args) = @_; 540 my ($cb, @args) = @_;
488 541
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 542 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 543 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 544 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 545
494 if (my $pid = fork) { 546 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 547 reset_signals;
508 local $SIG{__WARN__}; 548 &$cb
509 local $SIG{__DIE__}; 549 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 550
516 eval { 551 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 552}
529 553
530=item $value = cf::db_get $family => $key 554=item $value = cf::db_get $family => $key
531 555
532Returns a single value from the environment database. 556Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 558=item cf::db_put $family => $key => $value
535 559
536Stores the given C<$value> in the family. It can currently store binary 560Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 561data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 562
563=item $db = cf::db_table "name"
564
565Create and/or open a new database table. The string must not be "db" and must be unique
566within each server.
567
539=cut 568=cut
569
570sub db_table($) {
571 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV;
573
574 eval {
575 $db->set_flags (BDB::CHKSUM);
576
577 utf8::encode $name;
578 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
579 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
580 cf::cleanup "db_open(db): $!" if $!;
581 };
582 cf::cleanup "db_open(db): $@" if $@;
583
584 $db
585}
540 586
541our $DB; 587our $DB;
542 588
543sub db_init { 589sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 590 cf::sync_job {
548 eval { 591 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 592 };
558} 593}
559 594
560sub db_get($$) { 595sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 596 my $key = "$_[0]/$_[1]";
562 597
612 if (1) { 647 if (1) {
613 $md5 = 648 $md5 =
614 join "\x00", 649 join "\x00",
615 $processversion, 650 $processversion,
616 map { 651 map {
617 Coro::cede; 652 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 653 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 654 } 0.. $#$src;
620 655
621 656
622 my $dbmd5 = db_get cache => "$id/md5"; 657 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 701attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 702to it. All such attachable objects support the following methods.
668 703
669In the following description, CLASS can be any of C<global>, C<object> 704In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 705C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 706Deliantra).
672 707
673=over 4 708=over 4
674 709
675=item $attachable->attach ($attachment, key => $value...) 710=item $attachable->attach ($attachment, key => $value...)
676 711
958 } 993 }
959 994
960 0 995 0
961} 996}
962 997
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 998=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 999
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1000=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1001
967Generate an object-specific event with the given arguments. 1002Generate an object-specific event with the given arguments.
968 1003
974 1009
975=cut 1010=cut
976 1011
977############################################################################# 1012#############################################################################
978# object support 1013# object support
979#
980 1014
1015sub _object_equal($$);
1016sub _object_equal($$) {
1017 my ($a, $b) = @_;
1018
1019 return 0 unless (ref $a) eq (ref $b);
1020
1021 if ("HASH" eq ref $a) {
1022 my @ka = keys %$a;
1023 my @kb = keys %$b;
1024
1025 return 0 if @ka != @kb;
1026
1027 for (0 .. $#ka) {
1028 return 0 unless $ka[$_] eq $kb[$_];
1029 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1030 }
1031
1032 } elsif ("ARRAY" eq ref $a) {
1033
1034 return 0 if @$a != @$b;
1035
1036 for (0 .. $#$a) {
1037 return 0 unless _object_equal $a->[$_], $b->[$_];
1038 }
1039
1040 } elsif ($a ne $b) {
1041 return 0;
1042 }
1043
1044 1
1045}
1046
1047our $SLOW_MERGES;#d#
981sub _can_merge { 1048sub _can_merge {
982 my ($ob1, $ob2) = @_; 1049 my ($ob1, $ob2) = @_;
983 1050
984 local $Storable::canonical = 1; 1051 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1052
988 $fob1 eq $fob2 1053 # we do the slow way here
1054 return _object_equal $ob1, $ob2
989} 1055}
990 1056
991sub reattach { 1057sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1058 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1059 my ($obj) = @_;
1015cf::attachable->attach ( 1081cf::attachable->attach (
1016 prio => -1000000, 1082 prio => -1000000,
1017 on_instantiate => sub { 1083 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1084 my ($obj, $data) = @_;
1019 1085
1020 $data = from_json $data; 1086 $data = decode_json $data;
1021 1087
1022 for (@$data) { 1088 for (@$data) {
1023 my ($name, $args) = @$_; 1089 my ($name, $args) = @$_;
1024 1090
1025 $obj->attach ($name, %{$args || {} }); 1091 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1107sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1108 my ($filename, $rdata, $objs) = @_;
1043 1109
1044 sync_job { 1110 sync_job {
1045 if (length $$rdata) { 1111 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1113 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1114 $decname, length $$rdata, scalar @$objs;
1048 1115
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1117 chmod SAVE_MODE, $fh;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1119 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1120 close $fh;
1054 1121
1055 if (@$objs) { 1122 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1124 chmod SAVE_MODE, $fh;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1126 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1127 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1128 close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1129 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1130 }
1071 } 1138 }
1072 } else { 1139 } else {
1073 aio_unlink $filename; 1140 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1141 aio_unlink "$filename.pst";
1075 } 1142 }
1076 } 1143 };
1077} 1144}
1078 1145
1079sub object_freezer_as_string { 1146sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1147 my ($rdata, $objs) = @_;
1081 1148
1093 or return; 1160 or return;
1094 1161
1095 unless (aio_stat "$filename.pst") { 1162 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1163 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1164 or return;
1165
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1166 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs};
1099 } 1168 }
1100 1169
1170 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1171 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1172 $decname, length $data, scalar @{$av || []};
1173
1103 return ($data, $av); 1174 ($data, $av)
1104} 1175}
1105 1176
1106=head2 COMMAND CALLBACKS 1177=head2 COMMAND CALLBACKS
1107 1178
1108=over 4 1179=over 4
1181 my ($pl, $buf) = @_; 1252 my ($pl, $buf) = @_;
1182 1253
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1255
1185 if (ref $msg) { 1256 if (ref $msg) {
1257 my ($type, $reply, @payload) =
1258 "ARRAY" eq ref $msg
1259 ? @$msg
1260 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1261
1262 my @reply;
1263
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1264 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1265 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1266 }
1267
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1191 } else { 1271 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1273 }
1194 1274
1195 cf::override; 1275 cf::override;
1248 my $msg = $@ ? "$v->{path}: $@\n" 1328 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1329 : "$v->{base}: extension inactive.\n";
1250 1330
1251 if (exists $v->{meta}{mandatory}) { 1331 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1332 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1333 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1334 }
1256 1335
1257 warn $msg; 1336 warn $msg;
1258 } 1337 }
1259 1338
1284use Coro::AIO; 1363use Coro::AIO;
1285 1364
1286=head3 cf::player 1365=head3 cf::player
1287 1366
1288=over 4 1367=over 4
1368
1369=item cf::player::num_playing
1370
1371Returns the official number of playing players, as per the Crossfire metaserver rules.
1372
1373=cut
1374
1375sub num_playing {
1376 scalar grep
1377 $_->ob->map
1378 && !$_->hidden
1379 && !$_->ob->flag (cf::FLAG_WIZ),
1380 cf::player::list
1381}
1289 1382
1290=item cf::player::find $login 1383=item cf::player::find $login
1291 1384
1292Returns the given player object, loading it if necessary (might block). 1385Returns the given player object, loading it if necessary (might block).
1293 1386
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1422 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1423 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1424 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1425 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1426
1334 my $pl = load_pl path $login 1427 my $f = new_from_file cf::object::thawer path $login
1335 or return; 1428 or return;
1429
1430 my $pl = cf::player::load_pl $f
1431 or return;
1432 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs;
1336 $cf::PLAYER{$login} = $pl 1434 $cf::PLAYER{$login} = $pl
1337 } 1435 }
1338 } 1436 }
1339} 1437}
1340 1438
1350 1448
1351 aio_mkdir playerdir $pl, 0770; 1449 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1450 $pl->{last_save} = $cf::RUNTIME;
1353 1451
1354 $pl->save_pl ($path); 1452 $pl->save_pl ($path);
1355 Coro::cede; 1453 cf::cede_to_tick;
1356} 1454}
1357 1455
1358sub new($) { 1456sub new($) {
1359 my ($login) = @_; 1457 my ($login) = @_;
1360 1458
1364 $self->{deny_save} = 1; 1462 $self->{deny_save} = 1;
1365 1463
1366 $cf::PLAYER{$login} = $self; 1464 $cf::PLAYER{$login} = $self;
1367 1465
1368 $self 1466 $self
1467}
1468
1469=item $player->send_msg ($channel, $msg, $color, [extra...])
1470
1471=cut
1472
1473sub send_msg {
1474 my $ns = shift->ns
1475 or return;
1476 $ns->send_msg (@_);
1369} 1477}
1370 1478
1371=item $pl->quit_character 1479=item $pl->quit_character
1372 1480
1373Nukes the player without looking back. If logged in, the connection will 1481Nukes the player without looking back. If logged in, the connection will
1428 or return []; 1536 or return [];
1429 1537
1430 my @logins; 1538 my @logins;
1431 1539
1432 for my $login (@$dirs) { 1540 for my $login (@$dirs) {
1541 my $path = path $login;
1542
1543 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1546 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1547 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 }
1436 1549
1437 utf8::decode $login; 1550 utf8::decode $login;
1438 push @logins, $login; 1551 push @logins, $login;
1439 } 1552 }
1440 1553
1473 1586
1474Expand crossfire pod fragments into protocol xml. 1587Expand crossfire pod fragments into protocol xml.
1475 1588
1476=cut 1589=cut
1477 1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1478sub expand_cfpod { 1602sub expand_cfpod {
1479 ((my $self), (local $_)) = @_; 1603 my ($self, $pod) = @_;
1480 1604
1481 # escape & and < 1605 my $xml;
1482 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g;
1484 1606
1485 # this is buggy, it needs to properly take care of nested <'s 1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1486 1610
1487 1 while 1611 $group =~ s/&/&amp;/g;
1488 # replace B<>, I<>, U<> etc. 1612 $group =~ s/</&lt;/g;
1489 s/B<([^\>]*)>/<b>$1<\/b>/ 1613
1490 || s/I<([^\>]*)>/<i>$1<\/i>/ 1614 $xml .= $group;
1491 || s/U<([^\>]*)>/<u>$1<\/u>/ 1615 } elsif ($pod =~ m%\G
1492 # replace G<male|female> tags 1616 ([BCGHITU])
1493 || s{G<([^>|]*)\|([^>]*)>}{ 1617 <
1494 $self->gender ? $2 : $1 1618 (?:
1495 }ge 1619 ([^<>]*) (?{ $group = $^N })
1496 # replace H<hint text> 1620 | < $interior >
1497 || s{H<([^\>]*)>} 1621 )
1622 >
1623 %gcsx
1498 { 1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "") 1644 "")
1502 [$self->{hintmode}] 1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1503 }ge; 1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1504 1656
1657 for ($xml) {
1505 # create single paragraphs (very hackish) 1658 # create single paragraphs (very hackish)
1506 s/(?<=\S)\n(?=\w)/ /g; 1659 s/(?<=\S)\n(?=\w)/ /g;
1507 1660
1508 # compress some whitespace 1661 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends 1662 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines 1663 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines 1664 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines 1665 s/\n+$//; # ending lines
1666 }
1513 1667
1514 $_ 1668 $xml
1515} 1669}
1670
1671no re 'eval';
1516 1672
1517sub hintmode { 1673sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1; 1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode} 1675 $_[0]{hintmode}
1520} 1676}
1521 1677
1522=item $player->ext_reply ($msgid, %msg) 1678=item $player->ext_reply ($msgid, @msg)
1523 1679
1524Sends an ext reply to the player. 1680Sends an ext reply to the player.
1525 1681
1526=cut 1682=cut
1527 1683
1528sub ext_reply($$%) { 1684sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1685 my ($self, $id, @msg) = @_;
1530 1686
1531 $msg{msgid} = $id; 1687 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1688}
1534 1689
1535=item $player->ext_event ($type, %msg) 1690=item $player->ext_msg ($type, @msg)
1536 1691
1537Sends an ext event to the client. 1692Sends an ext event to the client.
1538 1693
1539=cut 1694=cut
1540 1695
1541sub ext_event($$%) { 1696sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1697 my ($self, $type, @msg) = @_;
1543 1698
1544 $self->ns->ext_event ($type, %msg); 1699 $self->ns->ext_msg ($type, @msg);
1545} 1700}
1546 1701
1547=head3 cf::region 1702=head3 cf::region
1548 1703
1549=over 4 1704=over 4
1765 1920
1766sub load_header_from($) { 1921sub load_header_from($) {
1767 my ($self, $path) = @_; 1922 my ($self, $path) = @_;
1768 1923
1769 utf8::encode $path; 1924 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1925 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1926 or return;
1927
1928 $self->_load_header ($f)
1929 or return;
1930
1931 local $MAP_LOADING{$self->{path}} = $self;
1932 $f->resolve_delayed_derefs;
1775 1933
1776 $self->{load_path} = $path; 1934 $self->{load_path} = $path;
1777 1935
1778 1 1936 1
1779} 1937}
1833sub find { 1991sub find {
1834 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
1835 1993
1836 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
1837 1995
1996 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1997 cf::lock_wait "map_find:$path";
1839 1998
1840 $cf::MAP{$path} || do { 1999 $cf::MAP{$path} || do {
1841 my $guard = cf::lock_acquire "map_find:$path"; 2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
1842 my $map = new_from_path cf::map $path 2003 my $map = new_from_path cf::map $path
1843 or return; 2004 or return;
1844 2005
1845 $map->{last_save} = $cf::RUNTIME; 2006 $map->{last_save} = $cf::RUNTIME;
1846 2007
1848 or return; 2009 or return;
1849 2010
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 2012 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 2013 #$cf::WAIT_FOR_TICK->wait;
2014 undef $guard1;
2015 undef $guard2;
1853 $map->reset; 2016 $map->reset;
1854 undef $guard;
1855 return find $path; 2017 return find $path;
1856 } 2018 }
1857 2019
1858 $cf::MAP{$path} = $map 2020 $cf::MAP{$path} = $map
1859 } 2021 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 2030 local $self->{deny_reset} = 1; # loading can take a long time
1869 2031
1870 my $path = $self->{path}; 2032 my $path = $self->{path};
1871 2033
1872 { 2034 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 2035 my $guard = cf::lock_acquire "map_data:$path";
1874 2036
2037 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 2038 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 2039
1877 $self->in_memory (cf::MAP_LOADING); 2040 $self->in_memory (cf::MAP_LOADING);
1878 2041
1879 $self->alloc; 2042 $self->alloc;
1880 2043
1881 $self->pre_load; 2044 $self->pre_load;
1882 Coro::cede; 2045 cf::cede_to_tick;
1883 2046
2047 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 2049 $self->_load_objects ($f)
1885 or return; 2050 or return;
1886 2051
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1888 if delete $self->{load_original}; 2053 if delete $self->{load_original};
1889 2054
1890 if (my $uniq = $self->uniq_path) { 2055 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 2056 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 2057 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 2059 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 2060 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs;
2062 }
1895 } 2063 }
1896 } 2064 }
1897 2065
1898 Coro::cede; 2066 $f->resolve_delayed_derefs;
2067
2068 cf::cede_to_tick;
1899 # now do the right thing for maps 2069 # now do the right thing for maps
1900 $self->link_multipart_objects; 2070 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 2071 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 2072 unless $self->difficulty;
1903 Coro::cede; 2073 cf::cede_to_tick;
1904 2074
1905 unless ($self->{deny_activate}) { 2075 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 2076 $self->decay_objects;
1907 $self->fix_auto_apply; 2077 $self->fix_auto_apply;
1908 $self->update_buttons; 2078 $self->update_buttons;
1909 Coro::cede; 2079 cf::cede_to_tick;
1910 $self->set_darkness_map; 2080 $self->set_darkness_map;
1911 Coro::cede; 2081 cf::cede_to_tick;
1912 $self->activate; 2082 $self->activate;
1913 } 2083 }
2084
2085 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME);
1914 2087
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2088 $self->in_memory (cf::MAP_IN_MEMORY);
1916 } 2089 }
1917 2090
1918 $self->post_load; 2091 $self->post_load;
1929 2102
1930 $self 2103 $self
1931} 2104}
1932 2105
1933# find and load all maps in the 3x3 area around a map 2106# find and load all maps in the 3x3 area around a map
1934sub load_diag { 2107sub load_neighbours {
1935 my ($map) = @_; 2108 my ($map) = @_;
1936 2109
1937 my @diag; # diagonal neighbours 2110 my @neigh; # diagonal neighbours
1938 2111
1939 for (0 .. 3) { 2112 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2113 my $neigh = $map->tile_path ($_)
1941 or next; 2114 or next;
1942 $neigh = find $neigh, $map 2115 $neigh = find $neigh, $map
1943 or next; 2116 or next;
1944 $neigh->load; 2117 $neigh->load;
1945 2118
2119 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2122 }
1949 2123
1950 for (@diag) { 2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2126 my $neigh = find $path, $origin
1952 or next; 2127 or next;
1953 $neigh->load; 2128 $neigh->load;
1954 } 2129 }
1955} 2130}
1956 2131
1961} 2136}
1962 2137
1963sub do_load_sync { 2138sub do_load_sync {
1964 my ($map) = @_; 2139 my ($map) = @_;
1965 2140
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main;
2143
1966 cf::sync_job { $map->load }; 2144 cf::sync_job { $map->load };
1967} 2145}
1968 2146
1969our %MAP_PREFETCH; 2147our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2148our $MAP_PREFETCHER = undef;
1971 2149
1972sub find_async { 2150sub find_async {
1973 my ($path, $origin) = @_; 2151 my ($path, $origin, $load) = @_;
1974 2152
1975 $path = normalise $path, $origin && $origin->{path}; 2153 $path = normalise $path, $origin && $origin->{path};
1976 2154
1977 if (my $map = $cf::MAP{$path}) { 2155 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1979 } 2157 }
1980 2158
1981 undef $MAP_PREFETCH{$path}; 2159 $MAP_PREFETCH{$path} |= $load;
2160
1982 $MAP_PREFETCHER ||= cf::async { 2161 $MAP_PREFETCHER ||= cf::async {
2162 $Coro::current->{desc} = "map prefetcher";
2163
1983 while (%MAP_PREFETCH) { 2164 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2165 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2166 if (my $map = find $k) {
1986 $map->load; 2167 $map->load if $v;
1987 } 2168 }
1988 2169
1989 delete $MAP_PREFETCH{$path}; 2170 delete $MAP_PREFETCH{$k};
1990 } 2171 }
1991 } 2172 }
1992 undef $MAP_PREFETCHER; 2173 undef $MAP_PREFETCHER;
1993 }; 2174 };
1994 $MAP_PREFETCHER->prio (6); 2175 $MAP_PREFETCHER->prio (6);
1997} 2178}
1998 2179
1999sub save { 2180sub save {
2000 my ($self) = @_; 2181 my ($self) = @_;
2001 2182
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2184
2004 $self->{last_save} = $cf::RUNTIME; 2185 $self->{last_save} = $cf::RUNTIME;
2005 2186
2006 return unless $self->dirty; 2187 return unless $self->dirty;
2007 2188
2013 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2014 2195
2015 local $self->{last_access} = $self->last_access;#d# 2196 local $self->{last_access} = $self->last_access;#d#
2016 2197
2017 cf::async { 2198 cf::async {
2199 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2200 $_->contr->save for $self->players;
2019 }; 2201 };
2020 2202
2021 if ($uniq) { 2203 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2030 my ($self) = @_; 2212 my ($self) = @_;
2031 2213
2032 # save first because save cedes 2214 # save first because save cedes
2033 $self->save; 2215 $self->save;
2034 2216
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2218
2037 return if $self->players; 2219 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2220 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save}; 2221 return if $self->{deny_save};
2040 2222
2223 $self->in_memory (cf::MAP_SWAPPED);
2224
2225 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2227 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2228}
2044 2229
2045sub reset_at { 2230sub reset_at {
2046 my ($self) = @_; 2231 my ($self) = @_;
2047 2232
2079 if $uniq; 2264 if $uniq;
2080 } 2265 }
2081 2266
2082 delete $cf::MAP{$self->path}; 2267 delete $cf::MAP{$self->path};
2083 2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2271 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2272
2088 $self->unlink_save; 2273 $self->unlink_save;
2089 $self->destroy; 2274 $self->destroy;
2090} 2275}
2091 2276
2092my $nuke_counter = "aaaa"; 2277my $nuke_counter = "aaaa";
2093 2278
2094sub nuke { 2279sub nuke {
2095 my ($self) = @_; 2280 my ($self) = @_;
2096 2281
2282 {
2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284
2097 delete $cf::MAP{$self->path}; 2285 delete $cf::MAP{$self->path};
2098 2286
2099 $self->unlink_save; 2287 $self->unlink_save;
2100 2288
2101 bless $self, "cf::map"; 2289 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2290 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2291 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2292 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2294
2107 $cf::MAP{$self->path} = $self; 2295 $cf::MAP{$self->path} = $self;
2296 }
2108 2297
2109 $self->reset; # polite request, might not happen 2298 $self->reset; # polite request, might not happen
2110} 2299}
2111 2300
2112=item $maps = cf::map::tmp_maps 2301=item $maps = cf::map::tmp_maps
2188 2377
2189sub inv_recursive { 2378sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2379 inv_recursive_ inv $_[0]
2191} 2380}
2192 2381
2382=item $ref = $ob->ref
2383
2384creates and returns a persistent reference to an objetc that can be stored as a string.
2385
2386=item $ob = cf::object::deref ($refstring)
2387
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block.
2390
2391=cut
2392
2393sub deref {
2394 my ($ref) = @_;
2395
2396 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2397 my ($uuid, $name) = ($1, $2);
2398 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2399 or return;
2400 $pl->ob->uuid eq $uuid
2401 or return;
2402
2403 $pl->ob
2404 } else {
2405 warn "$ref: cannot resolve object reference\n";
2406 undef
2407 }
2408}
2409
2193package cf; 2410package cf;
2194 2411
2195=back 2412=back
2196 2413
2197=head3 cf::object::player 2414=head3 cf::object::player
2219 2436
2220 } else { 2437 } else {
2221 my $pl = $self->contr; 2438 my $pl = $self->contr;
2222 2439
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2440 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2443
2232 } else { 2444 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2446 $self->message ($msg, $flags);
2235 } 2447 }
2236 } 2448 }
2449}
2450
2451=item $object->send_msg ($channel, $msg, $color, [extra...])
2452
2453=cut
2454
2455sub cf::object::send_msg {
2456 my $pl = shift->contr
2457 or return;
2458 $pl->send_msg (@_);
2237} 2459}
2238 2460
2239=item $player_object->may ("access") 2461=item $player_object->may ("access")
2240 2462
2241Returns wether the given player is authorized to access resource "access" 2463Returns wether the given player is authorized to access resource "access"
2320 # use -1 or undef as default coordinates, not 0, 0 2542 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2543 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2544 if $x <=0 && $y <= 0;
2323 2545
2324 $map->load; 2546 $map->load;
2325 $map->load_diag; 2547 $map->load_neighbours;
2326 2548
2327 return unless $self->contr->active; 2549 return unless $self->contr->active;
2328 $self->activate_recursive; 2550 $self->activate_recursive;
2329 2551
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2573
2352 $self->enter_link; 2574 $self->enter_link;
2353 2575
2354 (async { 2576 (async {
2577 $Coro::current->{desc} = "player::goto $path $x $y";
2578
2579 # *tag paths override both path and x|y
2580 if ($path =~ /^\*(.*)$/) {
2581 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2582 my $ob = $obs[rand @obs];
2583
2584 # see if we actually can go there
2585 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2586 $ob = $obs[rand @obs];
2587 } else {
2588 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 }
2590 # else put us there anyways for now #d#
2591
2592 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2593 } else {
2594 ($path, $x, $y) = (undef, undef, undef);
2595 }
2596 }
2597
2355 my $map = eval { 2598 my $map = eval {
2356 my $map = cf::map::find $path; 2599 my $map = defined $path ? cf::map::find $path : undef;
2357 2600
2358 if ($map) { 2601 if ($map) {
2359 $map = $map->customise_for ($self); 2602 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2603 $map = $check->($map) if $check && $map;
2361 } else { 2604 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2606 }
2364 2607
2365 $map 2608 $map
2366 }; 2609 };
2367 2610
2420 $rmp->{origin_y} = $exit->y; 2663 $rmp->{origin_y} = $exit->y;
2421 } 2664 }
2422 2665
2423 $rmp->{random_seed} ||= $exit->random_seed; 2666 $rmp->{random_seed} ||= $exit->random_seed;
2424 2667
2425 my $data = cf::to_json $rmp; 2668 my $data = cf::encode_json $rmp;
2426 my $md5 = Digest::MD5::md5_hex $data; 2669 my $md5 = Digest::MD5::md5_hex $data;
2427 my $meta = "$RANDOMDIR/$md5.meta"; 2670 my $meta = "$RANDOMDIR/$md5.meta";
2428 2671
2429 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2430 aio_write $fh, 0, (length $data), $data, 0; 2673 aio_write $fh, 0, (length $data), $data, 0;
2457 # if exit is damned, update players death & WoR home-position 2700 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp) 2701 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED); 2702 if $exit->flag (FLAG_DAMNED);
2460 2703
2461 (async { 2704 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2706
2462 $self->deactivate_recursive; # just to be sure 2707 $self->deactivate_recursive; # just to be sure
2463 unless (eval { 2708 unless (eval {
2464 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($slaying, $hp, $sp);
2465 2710
2466 1; 2711 1;
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2503 2748
2504=cut 2749=cut
2505 2750
2751# non-persistent channels (usually the info channel)
2752our %CHANNEL = (
2753 "c/identify" => {
2754 id => "infobox",
2755 title => "Identify",
2756 reply => undef,
2757 tooltip => "Items recently identified",
2758 },
2759 "c/examine" => {
2760 id => "infobox",
2761 title => "Examine",
2762 reply => undef,
2763 tooltip => "Signs and other items you examined",
2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801);
2802
2506sub cf::client::send_msg { 2803sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2804 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2805
2509 $msg = $self->pl->expand_cfpod ($msg); 2806 $msg = $self->pl->expand_cfpod ($msg);
2510 2807
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2809
2810 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2513 if (ref $channel) { 2819 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2820 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2821 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2822 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2518 } 2825 }
2519 2826
2520 $channel = $channel->{id}; 2827 $channel = $channel->{id};
2521 } 2828 }
2522 2829
2523 return unless @extra || length $msg; 2830 return unless @extra || length $msg;
2524 2831
2525 if ($self->can_msg) { 2832 if ($self->can_msg) {
2833 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF;
2836
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2837 $self->send_packet ("msg " . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2527 } else { 2839 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850
2851 $color &= cf::NDI_COLOR_MASK;
2852
2853 utf8::encode $msg;
2854
2539 if (0 && $msg =~ /\[/) { 2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2858 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2860 $self->send_packet ("drawinfo $color $msg")
2544 } 2861 }
2545 } 2862 }
2546 } 2863 }
2547} 2864}
2548 2865
2549=item $client->ext_event ($type, %msg) 2866=item $client->ext_msg ($type, @msg)
2550 2867
2551Sends an ext event to the client. 2868Sends an ext event to the client.
2552 2869
2553=cut 2870=cut
2554 2871
2555sub cf::client::ext_event($$%) { 2872sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2873 my ($self, $type, @msg) = @_;
2557 2874
2558 return unless $self->extcmd; 2875 if ($self->extcmd == 2) {
2559 2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2878 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2881}
2882
2883=item $client->ext_reply ($msgid, @msg)
2884
2885Sends an ext reply to the client.
2886
2887=cut
2888
2889sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_;
2891
2892 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 }
2562} 2899}
2563 2900
2564=item $success = $client->query ($flags, "text", \&cb) 2901=item $success = $client->query ($flags, "text", \&cb)
2565 2902
2566Queues a query to the client, calling the given callback with 2903Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2958 my ($ns, $buf) = @_;
2622 2959
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2960 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2961
2625 if (ref $msg) { 2962 if (ref $msg) {
2963 my ($type, $reply, @payload) =
2964 "ARRAY" eq ref $msg
2965 ? @$msg
2966 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2967
2968 my @reply;
2969
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2970 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2971 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2972 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2632 } else { 2977 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2979 }
2635 2980
2636 cf::override; 2981 cf::override;
2683our $safe = new Safe "safe"; 3028our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 3029our $safe_hole = new Safe::Hole;
2685 3030
2686$SIG{FPE} = 'IGNORE'; 3031$SIG{FPE} = 'IGNORE';
2687 3032
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3033$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math
3035 grepstart grepwhile mapstart mapwhile
3036 sort time
3037));
2689 3038
2690# here we export the classes and methods available to script code 3039# here we export the classes and methods available to script code
2691 3040
2692=pod 3041=pod
2693 3042
2694The following functions and methods are available within a safe environment: 3043The following functions and methods are available within a safe environment:
2695 3044
2696 cf::object 3045 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 3046 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 3047 insert remove name archname title slaying race decrease_ob_nr
2699 3048
2700 cf::object::player 3049 cf::object::player
2701 player 3050 player
2702 3051
2703 cf::player 3052 cf::player
2708 3057
2709=cut 3058=cut
2710 3059
2711for ( 3060for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race
2713 insert remove)], 3063 decrease_ob_nr destroy)],
2714 ["cf::object::player" => qw(player)], 3064 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 3065 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 3066 ["cf::map" => qw(trigger)],
2717) { 3067) {
2718 no strict 'refs'; 3068 no strict 'refs';
2794# the server's init and main functions 3144# the server's init and main functions
2795 3145
2796sub load_facedata($) { 3146sub load_facedata($) {
2797 my ($path) = @_; 3147 my ($path) = @_;
2798 3148
3149 # HACK to clear player env face cache, we need some signal framework
3150 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = ();
3152
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154
2799 warn "loading facedata from $path\n"; 3155 warn "loading facedata from $path\n";
2800 3156
2801 my $facedata; 3157 my $facedata;
2802 0 < aio_load $path, $facedata 3158 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3159 or die "$path: $!";
2805 $facedata = Coro::Storable::thaw $facedata; 3161 $facedata = Coro::Storable::thaw $facedata;
2806 3162
2807 $facedata->{version} == 2 3163 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3164 or cf::cleanup "$path: version mismatch, cannot proceed.";
2809 3165
3166 # patch in the exptable
3167 $facedata->{resource}{"res/exp_table"} = {
3168 type => FT_RSRC,
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3170 };
3171 cf::cede_to_tick;
3172
2810 { 3173 {
2811 my $faces = $facedata->{faceinfo}; 3174 my $faces = $facedata->{faceinfo};
2812 3175
2813 while (my ($face, $info) = each %$faces) { 3176 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3177 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178
2815 cf::face::set_visibility $idx, $info->{visibility}; 3179 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3180 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3183
2820 cf::cede_to_tick; 3184 cf::cede_to_tick;
2821 } 3185 }
2822 3186
2823 while (my ($face, $info) = each %$faces) { 3187 while (my ($face, $info) = each %$faces) {
2824 next unless $info->{smooth}; 3188 next unless $info->{smooth};
3189
2825 my $idx = cf::face::find $face 3190 my $idx = cf::face::find $face
2826 or next; 3191 or next;
3192
2827 if (my $smooth = cf::face::find $info->{smooth}) { 3193 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth; 3194 cf::face::set_smooth $idx, $smooth;
2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2830 } else { 3196 } else {
2831 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3197 warn "smooth face '$info->{smooth}' not found for face '$face'";
2848 3214
2849 { 3215 {
2850 # TODO: for gcfclient pleasure, we should give resources 3216 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3217 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3218 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854 3219
2855 while (my ($name, $info) = each %$res) { 3220 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({ 3221 if (defined $info->{type}) {
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3222 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
2863 3224
2864 if ($name =~ /\.jpg$/) { 3225 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3226 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type};
2867 } else { 3240 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3241 $RESOURCE{$name} = $info;
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3242 }
2874 3243
2875 cf::cede_to_tick; 3244 cf::cede_to_tick;
2876 } 3245 }
2877 } 3246 }
2878 3247
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249
2879 1 3250 1
2880} 3251}
2881 3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272
3273register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_;
3275
3276 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v);
3278 }
3279};
3280
2882sub reload_regions { 3281sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = ();
3285
2883 load_resource_file "$MAPDIR/regions" 3286 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3287 or die "unable to load regions file\n";
2885 3288
2886 for (cf::region::list) { 3289 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3290 $_->{match} = qr/$_->{match}/
2923 3326
2924sub init { 3327sub init {
2925 reload_resources; 3328 reload_resources;
2926} 3329}
2927 3330
2928sub cfg_load { 3331sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3332 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3333 or return;
2931 3334
2932 local $/; 3335 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3336 *CFG = YAML::Load <$fh>;
2934 3337
2935 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2936 3339
2937 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2938 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2949sub main { 3352sub main {
2950 # we must not ever block the main coroutine 3353 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3354 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3356 (async {
2954 Event::one_event; 3357 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT;
2955 })->prio (Coro::PRIO_MAX); 3359 })->prio (Coro::PRIO_MAX);
2956 }; 3360 };
2957 3361
2958 cfg_load; 3362 reload_config;
2959 db_init; 3363 db_init;
2960 load_extensions; 3364 load_extensions;
2961 3365
2962 $TICK_WATCHER->start; 3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start;
2963 Event::loop; 3368 EV::loop;
2964} 3369}
2965 3370
2966############################################################################# 3371#############################################################################
2967# initialisation and cleanup 3372# initialisation and cleanup
2968 3373
2969# install some emergency cleanup handlers 3374# install some emergency cleanup handlers
2970BEGIN { 3375BEGIN {
3376 our %SIGWATCHER = ();
2971 for my $signal (qw(INT HUP TERM)) { 3377 for my $signal (qw(INT HUP TERM)) {
2972 Event->signal ( 3378 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2973 reentrant => 0,
2974 data => WF_AUTOCANCEL,
2975 signal => $signal,
2976 prio => 0,
2977 cb => sub {
2978 cf::cleanup "SIG$signal"; 3379 cf::cleanup "SIG$signal";
2979 },
2980 ); 3380 };
2981 } 3381 }
2982} 3382}
2983 3383
2984sub write_runtime { 3384sub write_runtime {
2985 my $runtime = "$LOCALDIR/runtime"; 3385 my $runtime = "$LOCALDIR/runtime";
3030 # and maps saved/destroyed asynchronously. 3430 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3431 warn "begin emergency player save\n";
3032 for my $login (keys %cf::PLAYER) { 3432 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3433 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3434 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3436 $pl->save;
3036 } 3437 }
3037 warn "end emergency player save\n"; 3438 warn "end emergency player save\n";
3038 3439
3039 warn "begin emergency map save\n"; 3440 warn "begin emergency map save\n";
3078 warn "syncing database to disk"; 3479 warn "syncing database to disk";
3079 BDB::db_env_txn_checkpoint $DB_ENV; 3480 BDB::db_env_txn_checkpoint $DB_ENV;
3080 3481
3081 # if anything goes wrong in here, we should simply crash as we already saved 3482 # if anything goes wrong in here, we should simply crash as we already saved
3082 3483
3083 warn "cancelling all WF_AUTOCANCEL watchers";
3084 for (Event::all_watchers) {
3085 $_->cancel if $_->data & WF_AUTOCANCEL;
3086 }
3087
3088 warn "flushing outstanding aio requests"; 3484 warn "flushing outstanding aio requests";
3089 for (;;) { 3485 for (;;) {
3090 BDB::flush; 3486 BDB::flush;
3091 IO::AIO::flush; 3487 IO::AIO::flush;
3092 Coro::cede; 3488 Coro::cede_notself;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3489 last unless IO::AIO::nreqs || BDB::nreqs;
3094 warn "iterate..."; 3490 warn "iterate...";
3095 } 3491 }
3096 3492
3097 ++$RELOAD; 3493 ++$RELOAD;
3156 warn "reloading cf.pm"; 3552 warn "reloading cf.pm";
3157 require cf; 3553 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3555
3160 warn "loading config and database again"; 3556 warn "loading config and database again";
3161 cf::cfg_load; 3557 cf::reload_config;
3162 3558
3163 warn "loading extensions"; 3559 warn "loading extensions";
3164 cf::load_extensions; 3560 cf::load_extensions;
3165 3561
3166 warn "reattaching attachments to objects/players"; 3562 warn "reattaching attachments to objects/players";
3173 warn "leaving sync_job"; 3569 warn "leaving sync_job";
3174 3570
3175 1 3571 1
3176 } or do { 3572 } or do {
3177 warn $@; 3573 warn $@;
3178 warn "error while reloading, exiting."; 3574 cf::cleanup "error while reloading, exiting.";
3179 exit 1;
3180 }; 3575 };
3181 3576
3182 warn "reloaded"; 3577 warn "reloaded";
3183}; 3578};
3184 3579
3186 3581
3187sub reload_perl() { 3582sub reload_perl() {
3188 # doing reload synchronously and two reloads happen back-to-back, 3583 # doing reload synchronously and two reloads happen back-to-back,
3189 # coro crashes during coro_state_free->destroy here. 3584 # coro crashes during coro_state_free->destroy here.
3190 3585
3191 $RELOAD_WATCHER ||= Event->timer ( 3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3192 reentrant => 0,
3193 after => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => sub {
3196 do_reload_perl; 3587 do_reload_perl;
3197 undef $RELOAD_WATCHER; 3588 undef $RELOAD_WATCHER;
3198 },
3199 ); 3589 };
3200} 3590}
3201 3591
3202register_command "reload" => sub { 3592register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3593 my ($who, $arg) = @_;
3204 3594
3205 if ($who->flag (FLAG_WIZ)) { 3595 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3596 $who->message ("reloading server.");
3597 async {
3598 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3599 reload_perl;
3600 };
3208 } 3601 }
3209}; 3602};
3210 3603
3211unshift @INC, $LIBDIR; 3604unshift @INC, $LIBDIR;
3212 3605
3214 3607
3215our @WAIT_FOR_TICK; 3608our @WAIT_FOR_TICK;
3216our @WAIT_FOR_TICK_BEGIN; 3609our @WAIT_FOR_TICK_BEGIN;
3217 3610
3218sub wait_for_tick { 3611sub wait_for_tick {
3219 return unless $TICK_WATCHER->is_active; 3612 return if tick_inhibit;
3220 return if $Coro::current == $Coro::main; 3613 return if $Coro::current == $Coro::main;
3221 3614
3222 my $signal = new Coro::Signal; 3615 my $signal = new Coro::Signal;
3223 push @WAIT_FOR_TICK, $signal; 3616 push @WAIT_FOR_TICK, $signal;
3224 $signal->wait; 3617 $signal->wait;
3225} 3618}
3226 3619
3227sub wait_for_tick_begin { 3620sub wait_for_tick_begin {
3228 return unless $TICK_WATCHER->is_active; 3621 return if tick_inhibit;
3229 return if $Coro::current == $Coro::main; 3622 return if $Coro::current == $Coro::main;
3230 3623
3231 my $signal = new Coro::Signal; 3624 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3625 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3626 $signal->wait;
3234} 3627}
3235 3628
3236 my $min = 1e6;#d# 3629sub tick {
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer (
3239 reentrant => 0,
3240 parked => 1,
3241 prio => 0,
3242 at => $NEXT_TICK || $TICK,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 if ($Coro::current != $Coro::main) { 3630 if ($Coro::current != $Coro::main) {
3246 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3247 unless ++$bug_warning > 10; 3632 unless ++$bug_warning > 10;
3248 return; 3633 return;
3249 } 3634 }
3250 3635
3251 $NOW = $tick_start = Event::time;
3252
3253 cf::server_tick; # one server iteration 3636 cf::server_tick; # one server iteration
3254 3637
3255 0 && sync_job {#d# 3638 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3256 for(1..10) { 3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3257 my $t = Event::time; 3640 Coro::async_pool {
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3641 $Coro::current->{desc} = "runtime saver";
3259 or die; 3642 write_runtime
3260 3643 or warn "ERROR: unable to write runtime file: $!";
3261 $map->width (50);
3262 $map->height (50);
3263 $map->alloc;
3264 $map->_load_objects ("/tmp/x.map", 1);
3265 my $t = Event::time - $t;
3266
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 }; 3644 };
3645 }
3277 3646
3278 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK;
3280
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool {
3284 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!";
3286 };
3287 }
3288
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3648 $sig->send;
3294 } 3649 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3650 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3651 $sig->send;
3297 } 3652 }
3298 3653
3299 $NOW = Event::time; 3654 $LOAD = ($NOW - $TICK_START) / $TICK;
3300
3301 # if we are delayed by four ticks or more, skip them all
3302 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3303
3304 $TICK_WATCHER->at ($NEXT_TICK);
3305 $TICK_WATCHER->start;
3306
3307 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3656
3310 _post_tick; 3657 if (0) {
3311 3658 if ($NEXT_TICK) {
3312 3659 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d#
3662 }
3313 }, 3663 }
3314); 3664}
3315 3665
3316{ 3666{
3317 BDB::max_poll_time $TICK * 0.1; 3667 # configure BDB
3318 $BDB_POLL_WATCHER = Event->io ( 3668
3319 reentrant => 0,
3320 fd => BDB::poll_fileno,
3321 poll => 'r',
3322 prio => 0,
3323 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb,
3325 );
3326 BDB::min_parallel 8; 3669 BDB::min_parallel 8;
3327 3670 BDB::max_poll_reqs $TICK * 0.1;
3328 BDB::set_sync_prepare { 3671 $Coro::BDB::WATCHER->priority (1);
3329 my $status;
3330 my $current = $Coro::current;
3331 (
3332 sub {
3333 $status = $!;
3334 $current->ready; undef $current;
3335 },
3336 sub {
3337 Coro::schedule while defined $current;
3338 $! = $status;
3339 },
3340 )
3341 };
3342 3672
3343 unless ($DB_ENV) { 3673 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3674 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3676 | BDB::LOG_AUTOREMOVE, 1);
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3679
3346 cf::sync_job { 3680 cf::sync_job {
3347 eval { 3681 eval {
3348 BDB::db_env_open 3682 BDB::db_env_open
3349 $DB_ENV, 3683 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3685 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3686 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3687 0666;
3354 3688
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3689 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3690 };
3360 3691
3361 cf::cleanup "db_env_open(db): $@" if $@; 3692 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3693 };
3363 } 3694 }
3695
3696 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3697 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3698 };
3699 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3701 };
3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3704 };
3364} 3705}
3365 3706
3366{ 3707{
3708 # configure IO::AIO
3709
3367 IO::AIO::min_parallel 8; 3710 IO::AIO::min_parallel 8;
3368
3369 undef $Coro::AIO::WATCHER;
3370 IO::AIO::max_poll_time $TICK * 0.1; 3711 IO::AIO::max_poll_time $TICK * 0.1;
3371 $AIO_POLL_WATCHER = Event->io ( 3712 $Coro::AIO::WATCHER->priority (1);
3372 reentrant => 0,
3373 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno,
3375 poll => 'r',
3376 prio => 6,
3377 cb => \&IO::AIO::poll_cb,
3378 );
3379} 3713}
3380 3714
3381my $_log_backtrace; 3715my $_log_backtrace;
3382 3716
3383sub _log_backtrace { 3717sub _log_backtrace {
3387 3721
3388 # limit the # of concurrent backtraces 3722 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3723 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3724 ++$_log_backtrace;
3391 async { 3725 async {
3726 $Coro::current->{desc} = "abt $msg";
3727
3392 my @bt = fork_call { 3728 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3729 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3730 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3731 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 3732 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines