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.322 by root, Fri Jul 27 10:10:51 2007 UTC vs.
Revision 1.442 by root, Sun Aug 31 09:03:31 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
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
34use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
35 63
36# configure various modules to our taste 64# configure various modules to our taste
37# 65#
38$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::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 68Compress::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 69
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 71
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 73
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
74 98
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 101our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
82 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 107our $DB_ENV;
85 108
86our %CFG; 109our %CFG;
87 110
88our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 112our $RUNTIME;
113our $NOW;
90 114
91our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
94 118
95# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 121
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
101 126
102binmode STDOUT; 127binmode STDOUT;
103binmode STDERR; 128binmode STDERR;
104 129
105# read virtual server time, if available 130# read virtual server time, if available
158 183
159The raw value load value from the last tick. 184The raw value load value from the last tick.
160 185
161=item %cf::CFG 186=item %cf::CFG
162 187
163Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 189from wherever your confdir points to.
165 190
166=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
167 192
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 211 $msg .= "\n"
187 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
188 213
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 215
191 utf8::encode $msg;
192 LOG llevError, $msg; 216 LOG llevError, $msg;
193 }; 217 };
194} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
195 234
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 245for my $pkg (qw(
207 cf::global cf::attachable 246 cf::global cf::attachable
208 cf::object cf::object::player 247 cf::object cf::object::player
209 cf::client cf::player 248 cf::client cf::player
210 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
211 cf::map cf::party cf::region 251 cf::party cf::region
212)) { 252)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 254}
216 255
217$Event::DIED = sub { 256$EV::DIED = sub {
218 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
219}; 258};
220 259
221############################################################################# 260#############################################################################
222 261
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 285 $d
247 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
248} 287}
249 288
250=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
251 290
252Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
253 292
254=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
255 294
256Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
257 296
258=cut 297=cut
259 298
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 300
262sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
264 303
265=item cf::lock_wait $string 304=item cf::lock_wait $string
266 305
267Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
268 307
271Wait until the given lock is available and then acquires it and returns 310Wait 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, 311a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
274returned. 313returned.
275 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
276Lock names should begin with a unique identifier (for example, cf::map::find 318Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
278 320
279=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
280 322
281Return true if the lock is currently active, i.e. somebody has locked it. 323Return true if the lock is currently active, i.e. somebody has locked it.
282 324
283=cut 325=cut
284 326
285our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
286 329
287sub lock_wait($) { 330sub lock_wait($) {
288 my ($key) = @_; 331 my ($key) = @_;
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
289 337
290 # wait for lock, if any 338 # wait for lock, if any
291 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 341 Coro::schedule;
299 347
300 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
301 lock_wait $key; 349 lock_wait $key;
302 350
303 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
304 353
305 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
308 } 358 }
309} 359}
310 360
313 363
314 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
315} 365}
316 366
317sub freeze_mainloop { 367sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
319 369
320 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 371}
322 }; 372
323 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
324 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
325} 386}
326 387
327=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
328 389
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 401our @SLOT_QUEUE;
341our $SLOT_QUEUE; 402our $SLOT_QUEUE;
342 403
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
345 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
346 409
347 while () { 410 while () {
348 next_job: 411 next_job:
349 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
357 } 420 }
358 } 421 }
359 } 422 }
360 423
361 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 427 $signal->wait;
365 } else { 428 } else {
366 Coro::schedule; 429 Coro::schedule;
367 } 430 }
368 } 431 }
369}; 432};
370 433
371sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
372 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
373 438
374 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
376 441
390 455
391BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
392 457
393=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
394 459
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 461is 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 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 463acceptable.
399 464
400If it must be done, put the blocking parts into C<sync_job>. This will run 465If 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 466the given BLOCK in another coroutine while waiting for the result. The
406 471
407sub sync_job(&) { 472sub sync_job(&) {
408 my ($job) = @_; 473 my ($job) = @_;
409 474
410 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 476 my $time = EV::time;
412 477
413 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
415 480
416 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 482
418 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
419 484
420 my $busy = 1; 485 my $busy = 1;
421 my @res; 486 my @res;
422 487
423 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 490 @res = eval { $job->() };
425 warn $@ if $@; 491 warn $@ if $@;
426 undef $busy; 492 undef $busy;
427 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
428 494
429 while ($busy) { 495 while ($busy) {
430 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
431 } 500 }
501 }
432 502
433 $time = Event::time - $time; 503 my $time = EV::time - $time;
434 504
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 505 $TICK_START += $time; # do not account sync jobs to server load
439 506
440 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
441 } else { 508 } else {
442 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
443 510
468=item fork_call { }, $args 535=item fork_call { }, $args
469 536
470Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
474 541
475=cut 542=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 543
486sub fork_call(&@) { 544sub fork_call(&@) {
487 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
488 546
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 550
494 if (my $pid = fork) { 551 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; 552 reset_signals;
508 local $SIG{__WARN__}; 553 &$cb
509 local $SIG{__DIE__}; 554 }, @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 555
516 eval { 556 wantarray ? @res : $res[-1]
517 close $fh1; 557}
518 558
519 my @res = eval { $cb->(@args) }; 559=item $coin = coin_from_name $name
520 560
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 561=cut
522 close $fh2;
523 };
524 562
525 warn $@ if $@; 563our %coin_alias = (
526 _exit 0; 564 "silver" => "silvercoin",
527 } 565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
528} 584}
529 585
530=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
531 587
532Returns a single value from the environment database. 588Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
535 591
536Stores the given C<$value> in the family. It can currently store binary 592Stores 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). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
539=cut 600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
540 618
541our $DB; 619our $DB;
542 620
543sub db_init { 621sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 622 cf::sync_job {
548 eval { 623 $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 } 624 };
558} 625}
559 626
560sub db_get($$) { 627sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
562 629
612 if (1) { 679 if (1) {
613 $md5 = 680 $md5 =
614 join "\x00", 681 join "\x00",
615 $processversion, 682 $processversion,
616 map { 683 map {
617 Coro::cede; 684 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 686 } 0.. $#$src;
620 687
621 688
622 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
668 735
669In the following description, CLASS can be any of C<global>, C<object> 736In 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 737C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 738Deliantra).
672 739
673=over 4 740=over 4
674 741
675=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
676 743
958 } 1025 }
959 1026
960 0 1027 0
961} 1028}
962 1029
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1031
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1033
967Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
968 1035
974 1041
975=cut 1042=cut
976 1043
977############################################################################# 1044#############################################################################
978# object support 1045# object support
979#
980 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
981sub _can_merge { 1080sub _can_merge {
982 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
983 1082
984 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1084
988 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
989} 1087}
990 1088
991sub reattach { 1089sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1091 my ($obj) = @_;
994 1092
1093 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1095
997 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
998 1097
999 @$registry = (); 1098 @$registry = ();
1000 1099
1015cf::attachable->attach ( 1114cf::attachable->attach (
1016 prio => -1000000, 1115 prio => -1000000,
1017 on_instantiate => sub { 1116 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1019 1118
1020 $data = from_json $data; 1119 $data = decode_json $data;
1021 1120
1022 for (@$data) { 1121 for (@$data) {
1023 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1024 1123
1025 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1140sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1043 1142
1044 sync_job { 1143 sync_job {
1045 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1048 1148
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1153 aio_close $fh;
1054 1154
1055 if (@$objs) { 1155 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1161 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1163 }
1064 } else { 1164 } else {
1065 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1066 } 1166 }
1071 } 1171 }
1072 } else { 1172 } else {
1073 aio_unlink $filename; 1173 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
1075 } 1175 }
1076 } 1176 };
1077} 1177}
1078 1178
1079sub object_freezer_as_string { 1179sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1081 1181
1093 or return; 1193 or return;
1094 1194
1095 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1197 or return;
1198
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1099 } 1201 }
1100 1202
1203 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1206
1103 return ($data, $av); 1207 ($data, $av)
1104} 1208}
1105 1209
1106=head2 COMMAND CALLBACKS 1210=head2 COMMAND CALLBACKS
1107 1211
1108=over 4 1212=over 4
1186 my ($type, $reply, @payload) = 1290 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1291 "ARRAY" eq ref $msg
1188 ? @$msg 1292 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1293 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1294
1295 my @reply;
1296
1191 if (my $cb = $EXTCMD{$type}) { 1297 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1298 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1299 }
1300
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
1197 } else { 1304 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1306 }
1200 1307
1201 cf::override; 1308 cf::override;
1228 1335
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1338
1232 $ext{source} = 1339 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1235 . $source 1342 . $source
1236 . "\n};\n1"; 1343 . "\n};\n1";
1237 1344
1238 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1256 1363
1257 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1365 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1367 }
1262 1368
1263 warn $msg; 1369 warn $msg;
1264 } 1370 }
1265 1371
1290use Coro::AIO; 1396use Coro::AIO;
1291 1397
1292=head3 cf::player 1398=head3 cf::player
1293 1399
1294=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1295 1415
1296=item cf::player::find $login 1416=item cf::player::find $login
1297 1417
1298Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1299 1419
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1459
1340 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1461 or return;
1462
1463 my $pl = cf::player::load_pl $f
1464 or return;
1465
1466 local $cf::PLAYER_LOADING{$login} = $pl;
1467 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1343 } 1469 }
1344 } 1470 }
1345} 1471}
1346 1472
1355 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1356 1482
1357 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1359 1485
1486 cf::get_slot 0.01;
1487
1360 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1361 Coro::cede; 1489 cf::cede_to_tick;
1362} 1490}
1363 1491
1364sub new($) { 1492sub new($) {
1365 my ($login) = @_; 1493 my ($login) = @_;
1366 1494
1372 $cf::PLAYER{$login} = $self; 1500 $cf::PLAYER{$login} = $self;
1373 1501
1374 $self 1502 $self
1375} 1503}
1376 1504
1505=item $player->send_msg ($channel, $msg, $color, [extra...])
1506
1507=cut
1508
1509sub send_msg {
1510 my $ns = shift->ns
1511 or return;
1512 $ns->send_msg (@_);
1513}
1514
1377=item $pl->quit_character 1515=item $pl->quit_character
1378 1516
1379Nukes the player without looking back. If logged in, the connection will 1517Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1518be destroyed. May block for a long time.
1381 1519
1389 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1390 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1391 1529
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1396 1536
1397 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1434 or return []; 1574 or return [];
1435 1575
1436 my @logins; 1576 my @logins;
1437 1577
1438 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1579 my $path = path $login;
1580
1581 # a .pst is a dead give-away for a valid player
1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1442 1588
1443 utf8::decode $login; 1589 utf8::decode $login;
1444 push @logins, $login; 1590 push @logins, $login;
1445 } 1591 }
1446 1592
1480Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1481 1627
1482=cut 1628=cut
1483 1629
1484sub expand_cfpod { 1630sub expand_cfpod {
1485 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1486 1632
1487 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1488 s/&/&amp;/g; 1634 my $xml;
1489 s/(?<![BIUGH])</&lt;/g;
1490 1635
1491 # this is buggy, it needs to properly take care of nested <'s 1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1492 1648
1493 1 while 1649 my $cb;
1494 # replace B<>, I<>, U<> etc. 1650
1495 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1496 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1497 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1498 # replace G<male|female> tags 1654 $cb = sub { "<tt>$_[0]</tt>" };
1499 || s{G<([^>|]*)\|([^>]*)>}{ 1655 } elsif ($code eq "E") {
1500 $self->gender ? $2 : $1 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1501 }ge 1657 } elsif ($code eq "G") {
1502 # replace H<hint text> 1658 $cb = sub {
1503 || s{H<([^\>]*)>} 1659 my ($male, $female) = split /\|/, $_[0];
1504 { 1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "") 1667 "",
1508 [$self->{hintmode}] 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1509 }ge; 1707 }
1708 }
1709 }
1510 1710
1511 # create single paragraphs (very hackish) 1711 $xml
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521} 1712}
1522 1713
1523sub hintmode { 1714sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode} 1716 $_[0]{hintmode}
1532=cut 1723=cut
1533 1724
1534sub ext_reply($$@) { 1725sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1726 my ($self, $id, @msg) = @_;
1536 1727
1537 if ($self->ns->extcmd == 2) { 1728 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1729}
1545 1730
1546=item $player->ext_msg ($type, @msg) 1731=item $player->ext_msg ($type, @msg)
1547 1732
1548Sends an ext event to the client. 1733Sends an ext event to the client.
1604our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1606 1791
1607sub generate_random_map { 1792sub generate_random_map {
1608 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1609 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1798 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1735 1923
1736# the temporary/swap location 1924# the temporary/swap location
1737sub save_path { 1925sub save_path {
1738 my ($self) = @_; 1926 my ($self) = @_;
1739 1927
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1742} 1930}
1743 1931
1744# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1745sub uniq_path { 1933sub uniq_path {
1746 my ($self) = @_; 1934 my ($self) = @_;
1747 1935
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1750} 1938}
1751 1939
1752# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1753# all maps in C++... 1941# all maps in C++...
1776 1964
1777sub load_header_from($) { 1965sub load_header_from($) {
1778 my ($self, $path) = @_; 1966 my ($self, $path) = @_;
1779 1967
1780 utf8::encode $path; 1968 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1969 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1970 or return;
1971
1972 $self->_load_header ($f)
1973 or return;
1974
1975 local $MAP_LOADING{$self->{path}} = $self;
1976 $f->resolve_delayed_derefs;
1786 1977
1787 $self->{load_path} = $path; 1978 $self->{load_path} = $path;
1788 1979
1789 1 1980 1
1790} 1981}
1844sub find { 2035sub find {
1845 my ($path, $origin) = @_; 2036 my ($path, $origin) = @_;
1846 2037
1847 $path = normalise $path, $origin && $origin->path; 2038 $path = normalise $path, $origin && $origin->path;
1848 2039
2040 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1850 2042
1851 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1852 my $guard = cf::lock_acquire "map_find:$path"; 2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
1853 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1854 or return; 2048 or return;
1855 2049
1856 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1857 2051
1859 or return; 2053 or return;
1860 2054
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2059 undef $guard1;
1864 $map->reset; 2060 $map->reset;
1865 undef $guard;
1866 return find $path; 2061 return find $path;
1867 } 2062 }
1868 2063
1869 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1870 } 2065 }
1879 local $self->{deny_reset} = 1; # loading can take a long time 2074 local $self->{deny_reset} = 1; # loading can take a long time
1880 2075
1881 my $path = $self->{path}; 2076 my $path = $self->{path};
1882 2077
1883 { 2078 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2079 my $guard = cf::lock_acquire "map_data:$path";
1885 2080
2081 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2082 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2083
1888 $self->in_memory (cf::MAP_LOADING); 2084 $self->in_memory (cf::MAP_LOADING);
1889 2085
1890 $self->alloc; 2086 $self->alloc;
1891 2087
1892 $self->pre_load; 2088 $self->pre_load;
1893 Coro::cede; 2089 cf::cede_to_tick;
1894 2090
2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2092 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2093 $self->_load_objects ($f)
1896 or return; 2094 or return;
1897 2095
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1899 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1900 2098
1901 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2100 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2101 unless (aio_stat $uniq) {
2102 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2103 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2104 $self->_load_objects ($f);
2105 $f->resolve_delayed_derefs;
2106 }
1906 } 2107 }
1907 } 2108 }
1908 2109
1909 Coro::cede; 2110 $f->resolve_delayed_derefs;
2111
2112 cf::cede_to_tick;
1910 # now do the right thing for maps 2113 # now do the right thing for maps
1911 $self->link_multipart_objects; 2114 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2115 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2116 unless $self->difficulty;
1914 Coro::cede; 2117 cf::cede_to_tick;
1915 2118
1916 unless ($self->{deny_activate}) { 2119 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2120 $self->decay_objects;
1918 $self->fix_auto_apply; 2121 $self->fix_auto_apply;
1919 $self->update_buttons; 2122 $self->update_buttons;
1920 Coro::cede; 2123 cf::cede_to_tick;
1921 $self->set_darkness_map; 2124 $self->set_darkness_map;
1922 Coro::cede; 2125 cf::cede_to_tick;
1923 $self->activate; 2126 $self->activate;
1924 } 2127 }
1925 2128
2129 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME);
2131
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1927 } 2133 }
1928 2134
1929 $self->post_load; 2135 $self->post_load;
1930} 2136}
1931 2137
1940 2146
1941 $self 2147 $self
1942} 2148}
1943 2149
1944# find and load all maps in the 3x3 area around a map 2150# find and load all maps in the 3x3 area around a map
1945sub load_diag { 2151sub load_neighbours {
1946 my ($map) = @_; 2152 my ($map) = @_;
1947 2153
1948 my @diag; # diagonal neighbours 2154 my @neigh; # diagonal neighbours
1949 2155
1950 for (0 .. 3) { 2156 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2157 my $neigh = $map->tile_path ($_)
1952 or next; 2158 or next;
1953 $neigh = find $neigh, $map 2159 $neigh = find $neigh, $map
1954 or next; 2160 or next;
1955 $neigh->load; 2161 $neigh->load;
1956 2162
2163 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2164 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2165 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2166 }
1960 2167
1961 for (@diag) { 2168 for (grep defined $_->[0], @neigh) {
2169 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2170 my $neigh = find $path, $origin
1963 or next; 2171 or next;
1964 $neigh->load; 2172 $neigh->load;
1965 } 2173 }
1966} 2174}
1967 2175
1972} 2180}
1973 2181
1974sub do_load_sync { 2182sub do_load_sync {
1975 my ($map) = @_; 2183 my ($map) = @_;
1976 2184
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main;
2187
1977 cf::sync_job { $map->load }; 2188 cf::sync_job { $map->load };
1978} 2189}
1979 2190
1980our %MAP_PREFETCH; 2191our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2192our $MAP_PREFETCHER = undef;
1982 2193
1983sub find_async { 2194sub find_async {
1984 my ($path, $origin) = @_; 2195 my ($path, $origin, $load) = @_;
1985 2196
1986 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
1987 2198
1988 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990 } 2201 }
1991 2202
1992 undef $MAP_PREFETCH{$path}; 2203 $MAP_PREFETCH{$path} |= $load;
2204
1993 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
1994 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2210 if (my $map = find $k) {
1997 $map->load; 2211 $map->load if $v;
1998 } 2212 }
1999 2213
2000 delete $MAP_PREFETCH{$path}; 2214 delete $MAP_PREFETCH{$k};
2001 } 2215 }
2002 } 2216 }
2003 undef $MAP_PREFETCHER; 2217 undef $MAP_PREFETCHER;
2004 }; 2218 };
2005 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2008} 2222}
2009 2223
2010sub save { 2224sub save {
2011 my ($self) = @_; 2225 my ($self) = @_;
2012 2226
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2228
2015 $self->{last_save} = $cf::RUNTIME; 2229 $self->{last_save} = $cf::RUNTIME;
2016 2230
2017 return unless $self->dirty; 2231 return unless $self->dirty;
2018 2232
2024 return if $self->{deny_save}; 2238 return if $self->{deny_save};
2025 2239
2026 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
2027 2241
2028 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2030 }; 2245 };
2246
2247 cf::get_slot 0.02;
2031 2248
2032 if ($uniq) { 2249 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2035 } else { 2252 } else {
2041 my ($self) = @_; 2258 my ($self) = @_;
2042 2259
2043 # save first because save cedes 2260 # save first because save cedes
2044 $self->save; 2261 $self->save;
2045 2262
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2264
2048 return if $self->players; 2265 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2050 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2051 2268
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2273 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2274}
2055 2275
2056sub reset_at { 2276sub reset_at {
2057 my ($self) = @_; 2277 my ($self) = @_;
2058 2278
2090 if $uniq; 2310 if $uniq;
2091 } 2311 }
2092 2312
2093 delete $cf::MAP{$self->path}; 2313 delete $cf::MAP{$self->path};
2094 2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2317 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2318
2099 $self->unlink_save; 2319 $self->unlink_save;
2100 $self->destroy; 2320 $self->destroy;
2101} 2321}
2102 2322
2103my $nuke_counter = "aaaa"; 2323my $nuke_counter = "aaaa";
2104 2324
2105sub nuke { 2325sub nuke {
2106 my ($self) = @_; 2326 my ($self) = @_;
2107 2327
2328 {
2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2330
2108 delete $cf::MAP{$self->path}; 2331 delete $cf::MAP{$self->path};
2109 2332
2110 $self->unlink_save; 2333 $self->unlink_save;
2111 2334
2112 bless $self, "cf::map"; 2335 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2336 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2337 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2338 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2340
2118 $cf::MAP{$self->path} = $self; 2341 $cf::MAP{$self->path} = $self;
2342 }
2119 2343
2120 $self->reset; # polite request, might not happen 2344 $self->reset; # polite request, might not happen
2121} 2345}
2122 2346
2123=item $maps = cf::map::tmp_maps 2347=item $maps = cf::map::tmp_maps
2165 2389
2166sub unique_maps() { 2390sub unique_maps() {
2167 [ 2391 [
2168 map { 2392 map {
2169 utf8::decode $_; 2393 utf8::decode $_;
2170 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2171 ? normalise $_ 2397 : normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2174 ] 2399 ]
2175} 2400}
2176 2401
2177package cf;
2178
2179=back 2402=back
2180 2403
2181=head3 cf::object 2404=head3 cf::object
2182 2405
2183=cut 2406=cut
2186 2409
2187=over 4 2410=over 4
2188 2411
2189=item $ob->inv_recursive 2412=item $ob->inv_recursive
2190 2413
2191Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2192 2416
2193=cut 2417=cut
2194 2418
2195sub inv_recursive_; 2419sub inv_recursive_;
2196sub inv_recursive_ { 2420sub inv_recursive_ {
2199 2423
2200sub inv_recursive { 2424sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2202} 2426}
2203 2427
2428=item $ref = $ob->ref
2429
2430Creates and returns a persistent reference to an object that can be stored as a string.
2431
2432=item $ob = cf::object::deref ($refstring)
2433
2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2435even if the object actually exists. May block.
2436
2437=cut
2438
2439sub deref {
2440 my ($ref) = @_;
2441
2442 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2443 my ($uuid, $name) = ($1, $2);
2444 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2445 or return;
2446 $pl->ob->uuid eq $uuid
2447 or return;
2448
2449 $pl->ob
2450 } else {
2451 warn "$ref: cannot resolve object reference\n";
2452 undef
2453 }
2454}
2455
2204package cf; 2456package cf;
2205 2457
2206=back 2458=back
2207 2459
2208=head3 cf::object::player 2460=head3 cf::object::player
2214Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2466Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2215can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2216dialogue with the given NPC character. 2468dialogue with the given NPC character.
2217 2469
2218=cut 2470=cut
2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2219 2485
2220# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2221# with dialog boxes. 2487# with dialog boxes.
2222#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2223sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2235 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237 2503
2238 } else { 2504 } else {
2239 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2240 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2241 } 2507 }
2242 } 2508 }
2509}
2510
2511=item $object->send_msg ($channel, $msg, $color, [extra...])
2512
2513=cut
2514
2515sub cf::object::send_msg {
2516 my $pl = shift->contr
2517 or return;
2518 $pl->send_msg (@_);
2243} 2519}
2244 2520
2245=item $player_object->may ("access") 2521=item $player_object->may ("access")
2246 2522
2247Returns wether the given player is authorized to access resource "access" 2523Returns wether the given player is authorized to access resource "access"
2326 # use -1 or undef as default coordinates, not 0, 0 2602 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2603 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2604 if $x <=0 && $y <= 0;
2329 2605
2330 $map->load; 2606 $map->load;
2331 $map->load_diag; 2607 $map->load_neighbours;
2332 2608
2333 return unless $self->contr->active; 2609 return unless $self->contr->active;
2334 $self->activate_recursive; 2610 $self->activate_recursive;
2335 2611
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2343her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2344that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2345the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2346be called at the end of this process. 2622be called at the end of this process.
2347 2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2626
2348=cut 2627=cut
2349 2628
2350our $GOTOGEN; 2629our $GOTOGEN;
2351 2630
2352sub cf::object::player::goto { 2631sub cf::object::player::goto {
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2636
2358 $self->enter_link; 2637 $self->enter_link;
2359 2638
2360 (async { 2639 (async {
2640 $Coro::current->{desc} = "player::goto $path $x $y";
2641
2642 # *tag paths override both path and x|y
2643 if ($path =~ /^\*(.*)$/) {
2644 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2645 my $ob = $obs[rand @obs];
2646
2647 # see if we actually can go there
2648 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2649 $ob = $obs[rand @obs];
2650 } else {
2651 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2652 }
2653 # else put us there anyways for now #d#
2654
2655 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2656 } else {
2657 ($path, $x, $y) = (undef, undef, undef);
2658 }
2659 }
2660
2361 my $map = eval { 2661 my $map = eval {
2362 my $map = cf::map::find $path; 2662 my $map = defined $path ? cf::map::find $path : undef;
2363 2663
2364 if ($map) { 2664 if ($map) {
2365 $map = $map->customise_for ($self); 2665 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2666 $map = $check->($map) if $check && $map;
2367 } else { 2667 } else {
2368 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2668 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2369 } 2669 }
2370 2670
2371 $map 2671 $map
2372 }; 2672 };
2373 2673
2409} 2709}
2410 2710
2411sub prepare_random_map { 2711sub prepare_random_map {
2412 my ($exit) = @_; 2712 my ($exit) = @_;
2413 2713
2414 my $guard = cf::lock_acquire "exit_prepare:$exit";
2415
2416 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2417 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2418 # that depends on the exit object 2716 # that depends on the exit object
2419 2717
2420 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2422 if ($exit->map) { 2720 if ($exit->map) {
2423 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2424 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2425 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2426 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2427 } 2727 }
2428 2728
2429 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2430 2730
2431 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2434 2734
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2437 undef $fh; 2737 undef $fh;
2438 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2439 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2440 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2441 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2442 } 2746 }
2443} 2747}
2444 2748
2445sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2446 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2447 2751
2448 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2449 2753
2450 if ($exit->slaying eq "/!") {
2451 #TODO: this should de-fi-ni-te-ly not be a sync-job
2452 # the problem is that $exit might not survive long enough
2453 # so it needs to be done right now, right here
2454 cf::sync_job { prepare_random_map $exit };
2455 }
2456
2457 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458 my $hp = $exit->stats->hp;
2459 my $sp = $exit->stats->sp;
2460
2461 $self->enter_link; 2754 $self->enter_link;
2462 2755
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2467 (async { 2756 (async {
2468 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2469 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2470 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2471 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2472 1; 2780 1
2473 }) { 2781 }) {
2474 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2475 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2476 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2477 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2507the message, with C<log> being the default. If C<$color> is negative, suppress 2815the message, with C<log> being the default. If C<$color> is negative, suppress
2508the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2509 2817
2510=cut 2818=cut
2511 2819
2820# non-persistent channels (usually the info channel)
2821our %CHANNEL = (
2822 "c/identify" => {
2823 id => "infobox",
2824 title => "Identify",
2825 reply => undef,
2826 tooltip => "Items recently identified",
2827 },
2828 "c/examine" => {
2829 id => "infobox",
2830 title => "Examine",
2831 reply => undef,
2832 tooltip => "Signs and other items you examined",
2833 },
2834 "c/book" => {
2835 id => "infobox",
2836 title => "Book",
2837 reply => undef,
2838 tooltip => "The contents of a note or book",
2839 },
2840 "c/lookat" => {
2841 id => "infobox",
2842 title => "Look",
2843 reply => undef,
2844 tooltip => "What you saw there",
2845 },
2846 "c/who" => {
2847 id => "infobox",
2848 title => "Players",
2849 reply => undef,
2850 tooltip => "Shows players who are currently online",
2851 },
2852 "c/body" => {
2853 id => "infobox",
2854 title => "Body Parts",
2855 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available",
2857 },
2858 "c/uptime" => {
2859 id => "infobox",
2860 title => "Uptime",
2861 reply => undef,
2862 tooltip => "How long the server has been running since last restart",
2863 },
2864 "c/mapinfo" => {
2865 id => "infobox",
2866 title => "Map Info",
2867 reply => undef,
2868 tooltip => "Information related to the maps",
2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2876);
2877
2512sub cf::client::send_msg { 2878sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2880
2515 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2516 2882
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2883 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2884
2885 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel};
2888
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id};
2893
2519 if (ref $channel) { 2894 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2895 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2896 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2897 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2898 $self->ext_msg (channel_info => $channel)
2899 if $self->can_msg;
2524 } 2900 }
2525 2901
2526 $channel = $channel->{id}; 2902 $channel = $channel->{id};
2527 } 2903 }
2528 2904
2529 return unless @extra || length $msg; 2905 return unless @extra || length $msg;
2530 2906
2531 if ($self->can_msg) { 2907 if ($self->can_msg) {
2908 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF;
2911
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2912 $self->send_packet ("msg " . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2914 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2915 if ($color >= 0) {
2916 # replace some tags by gcfclient-compatible ones
2917 for ($msg) {
2918 1 while
2919 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924 }
2925
2926 $color &= cf::NDI_COLOR_MASK;
2927
2928 utf8::encode $msg;
2929
2545 if (0 && $msg =~ /\[/) { 2930 if (0 && $msg =~ /\[/) {
2931 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2932 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2933 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2934 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2935 $self->send_packet ("drawinfo $color $msg")
2550 } 2936 }
2551 } 2937 }
2559=cut 2945=cut
2560 2946
2561sub cf::client::ext_msg($$@) { 2947sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2948 my ($self, $type, @msg) = @_;
2563 2949
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2950 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2951 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2952 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2953 push @msg, msgtype => "event_$type";
2954 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2955 }
2956}
2957
2958=item $client->ext_reply ($msgid, @msg)
2959
2960Sends an ext reply to the client.
2961
2962=cut
2963
2964sub cf::client::ext_reply($$@) {
2965 my ($self, $id, @msg) = @_;
2966
2967 if ($self->extcmd == 2) {
2968 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2969 } elsif ($self->extcmd == 1) {
2970 #TODO: version 1, remove
2971 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2972 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2973 }
2572} 2974}
2573 2975
2574=item $success = $client->query ($flags, "text", \&cb) 2976=item $success = $client->query ($flags, "text", \&cb)
2636 my ($type, $reply, @payload) = 3038 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 3039 "ARRAY" eq ref $msg
2638 ? @$msg 3040 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3041 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 3042
3043 my @reply;
3044
2641 if (my $cb = $EXTICMD{$type}) { 3045 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 3046 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 3047 }
3048
3049 $ns->ext_reply ($reply, @reply)
3050 if $reply;
3051
2647 } else { 3052 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3053 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 3054 }
2650 3055
2651 cf::override; 3056 cf::override;
2698our $safe = new Safe "safe"; 3103our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3104our $safe_hole = new Safe::Hole;
2700 3105
2701$SIG{FPE} = 'IGNORE'; 3106$SIG{FPE} = 'IGNORE';
2702 3107
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3108$safe->permit_only (Opcode::opset qw(
3109 :base_core :base_mem :base_orig :base_math
3110 grepstart grepwhile mapstart mapwhile
3111 sort time
3112));
2704 3113
2705# here we export the classes and methods available to script code 3114# here we export the classes and methods available to script code
2706 3115
2707=pod 3116=pod
2708 3117
2709The following functions and methods are available within a safe environment: 3118The following functions and methods are available within a safe environment:
2710 3119
2711 cf::object 3120 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3121 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove 3122 insert remove name archname title slaying race decrease split
2714 3123
2715 cf::object::player 3124 cf::object::player
2716 player 3125 player
2717 3126
2718 cf::player 3127 cf::player
2723 3132
2724=cut 3133=cut
2725 3134
2726for ( 3135for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3136 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)], 3137 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)],
2729 ["cf::object::player" => qw(player)], 3139 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3140 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3141 ["cf::map" => qw(trigger)],
2732) { 3142) {
2733 no strict 'refs'; 3143 no strict 'refs';
2809# the server's init and main functions 3219# the server's init and main functions
2810 3220
2811sub load_facedata($) { 3221sub load_facedata($) {
2812 my ($path) = @_; 3222 my ($path) = @_;
2813 3223
3224 # HACK to clear player env face cache, we need some signal framework
3225 # for this (global event?)
3226 %ext::player_env::MUSIC_FACE_CACHE = ();
3227
3228 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3229
2814 warn "loading facedata from $path\n"; 3230 warn "loading facedata from $path\n";
2815 3231
2816 my $facedata; 3232 my $facedata;
2817 0 < aio_load $path, $facedata 3233 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3234 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3236 $facedata = Coro::Storable::thaw $facedata;
2821 3237
2822 $facedata->{version} == 2 3238 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3239 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3240
3241 # patch in the exptable
3242 $facedata->{resource}{"res/exp_table"} = {
3243 type => FT_RSRC,
3244 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3245 };
3246 cf::cede_to_tick;
3247
2825 { 3248 {
2826 my $faces = $facedata->{faceinfo}; 3249 my $faces = $facedata->{faceinfo};
2827 3250
2828 while (my ($face, $info) = each %$faces) { 3251 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3252 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253
2830 cf::face::set_visibility $idx, $info->{visibility}; 3254 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3255 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3258
2835 cf::cede_to_tick; 3259 cf::cede_to_tick;
2836 } 3260 }
2837 3261
2838 while (my ($face, $info) = each %$faces) { 3262 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3263 next unless $info->{smooth};
3264
2840 my $idx = cf::face::find $face 3265 my $idx = cf::face::find $face
2841 or next; 3266 or next;
3267
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3268 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3269 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3271 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3272 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3289
2864 { 3290 {
2865 # TODO: for gcfclient pleasure, we should give resources 3291 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3292 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3293 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3294
2872 while (my ($name, $info) = each %$res) { 3295 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3296 if (defined $info->{type}) {
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3297 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3298 my $data;
2879 3299
2880 if ($info->{type} & 1) { 3300 if ($info->{type} & 1) {
2881 # prepend meta info 3301 # prepend meta info
2882 3302
3303 my $meta = $enc->encode ({
3304 name => $name,
3305 %{ $info->{meta} || {} },
3306 });
3307
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3308 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3309 } else {
3310 $data = $info->{data};
3311 }
2885 3312
2886 cf::face::set_data $idx, 0, $data, $chk; 3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type};
2887 } else { 3315 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3316 $RESOURCE{$name} = $info;
2889 } 3317 }
2890 3318
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3319 cf::cede_to_tick;
2894 } 3320 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904
2905 cf::sound::set $sound->[0] => $face;
2906 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2907 }
2908
2909 #TODO
2910 }
2911 } 3321 }
3322
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2912 3324
2913 1 3325 1
2914} 3326}
3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
2915 3347
2916register_exticmd fx_want => sub { 3348register_exticmd fx_want => sub {
2917 my ($ns, $want) = @_; 3349 my ($ns, $want) = @_;
2918 3350
2919 while (my ($k, $v) = each %$want) { 3351 while (my ($k, $v) = each %$want) {
2920 $ns->fx_want ($k, $v); 3352 $ns->fx_want ($k, $v);
2921 } 3353 }
2922}; 3354};
2923 3355
3356sub load_resource_file($) {
3357 my $guard = lock_acquire "load_resource_file";
3358
3359 my $status = load_resource_file_ $_[0];
3360 get_slot 0.1, 100;
3361 cf::arch::commit_load;
3362
3363 $status
3364}
3365
2924sub reload_regions { 3366sub reload_regions {
3367 # HACK to clear player env face cache, we need some signal framework
3368 # for this (global event?)
3369 %ext::player_env::MUSIC_FACE_CACHE = ();
3370
2925 load_resource_file "$MAPDIR/regions" 3371 load_resource_file "$MAPDIR/regions"
2926 or die "unable to load regions file\n"; 3372 or die "unable to load regions file\n";
2927 3373
2928 for (cf::region::list) { 3374 for (cf::region::list) {
2929 $_->{match} = qr/$_->{match}/ 3375 $_->{match} = qr/$_->{match}/
2937} 3383}
2938 3384
2939sub reload_archetypes { 3385sub reload_archetypes {
2940 load_resource_file "$DATADIR/archetypes" 3386 load_resource_file "$DATADIR/archetypes"
2941 or die "unable to load archetypes\n"; 3387 or die "unable to load archetypes\n";
2942 #d# NEED to laod twice to resolve forward references
2943 # this really needs to be done in an extra post-pass
2944 # (which needs to be synchronous, so solve it differently)
2945 load_resource_file "$DATADIR/archetypes"
2946 or die "unable to load archetypes\n";
2947} 3388}
2948 3389
2949sub reload_treasures { 3390sub reload_treasures {
2950 load_resource_file "$DATADIR/treasures" 3391 load_resource_file "$DATADIR/treasures"
2951 or die "unable to load treasurelists\n"; 3392 or die "unable to load treasurelists\n";
2952} 3393}
2953 3394
2954sub reload_resources { 3395sub reload_resources {
2955 warn "reloading resource files...\n"; 3396 warn "reloading resource files...\n";
2956 3397
3398 reload_facedata;
3399 reload_archetypes;
2957 reload_regions; 3400 reload_regions;
2958 reload_facedata;
2959 #reload_archetypes;#d#
2960 reload_archetypes;
2961 reload_treasures; 3401 reload_treasures;
2962 3402
2963 warn "finished reloading resource files\n"; 3403 warn "finished reloading resource files\n";
2964} 3404}
2965 3405
2966sub init { 3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
2967 reload_resources; 3411 reload_resources;
2968} 3412}
2969 3413
2970sub cfg_load { 3414sub reload_config {
2971 open my $fh, "<:utf8", "$CONFDIR/config" 3415 open my $fh, "<:utf8", "$CONFDIR/config"
2972 or return; 3416 or return;
2973 3417
2974 local $/; 3418 local $/;
2975 *CFG = YAML::Syck::Load <$fh>; 3419 *CFG = YAML::Load <$fh>;
2976 3420
2977 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2978 3422
2979 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2980 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2991sub main { 3435sub main {
2992 # we must not ever block the main coroutine 3436 # we must not ever block the main coroutine
2993 local $Coro::idle = sub { 3437 local $Coro::idle = sub {
2994 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2995 (async { 3439 (async {
2996 Event::one_event; 3440 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT;
2997 })->prio (Coro::PRIO_MAX); 3442 })->prio (Coro::PRIO_MAX);
2998 }; 3443 };
2999 3444
3000 cfg_load; 3445 {
3446 my $guard = freeze_mainloop;
3447 reload_config;
3001 db_init; 3448 db_init;
3002 load_extensions; 3449 load_extensions;
3003 3450
3004 $TICK_WATCHER->start; 3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3452 }
3453
3005 Event::loop; 3454 EV::loop;
3006} 3455}
3007 3456
3008############################################################################# 3457#############################################################################
3009# initialisation and cleanup 3458# initialisation and cleanup
3010 3459
3011# install some emergency cleanup handlers 3460# install some emergency cleanup handlers
3012BEGIN { 3461BEGIN {
3462 our %SIGWATCHER = ();
3013 for my $signal (qw(INT HUP TERM)) { 3463 for my $signal (qw(INT HUP TERM)) {
3014 Event->signal ( 3464 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3015 reentrant => 0,
3016 data => WF_AUTOCANCEL,
3017 signal => $signal,
3018 prio => 0,
3019 cb => sub {
3020 cf::cleanup "SIG$signal"; 3465 cf::cleanup "SIG$signal";
3021 },
3022 ); 3466 };
3023 } 3467 }
3024} 3468}
3025 3469
3026sub write_runtime { 3470sub write_runtime_sync {
3027 my $runtime = "$LOCALDIR/runtime"; 3471 my $runtime = "$LOCALDIR/runtime";
3028 3472
3029 # first touch the runtime file to show we are still running: 3473 # first touch the runtime file to show we are still running:
3030 # the fsync below can take a very very long time. 3474 # the fsync below can take a very very long time.
3031 3475
3057 and return; 3501 and return;
3058 3502
3059 warn "runtime file written.\n"; 3503 warn "runtime file written.\n";
3060 3504
3061 1 3505 1
3506}
3507
3508our $uuid_lock;
3509our $uuid_skip;
3510
3511sub write_uuid_sync($) {
3512 $uuid_skip ||= $_[0];
3513
3514 return if $uuid_lock;
3515 local $uuid_lock = 1;
3516
3517 my $uuid = "$LOCALDIR/uuid";
3518
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return;
3521
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3523 $uuid_skip = 0;
3524
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return;
3527
3528 # always fsync - this file is important
3529 aio_fsync $fh
3530 and return;
3531
3532 close $fh
3533 or return;
3534
3535 aio_rename "$uuid~", $uuid
3536 and return;
3537
3538 warn "uuid file written ($value).\n";
3539
3540 1
3541
3542}
3543
3544sub write_uuid($$) {
3545 my ($skip, $sync) = @_;
3546
3547 $sync ? write_uuid_sync $skip
3548 : async { write_uuid_sync $skip };
3062} 3549}
3063 3550
3064sub emergency_save() { 3551sub emergency_save() {
3065 my $freeze_guard = cf::freeze_mainloop; 3552 my $freeze_guard = cf::freeze_mainloop;
3066 3553
3072 # and maps saved/destroyed asynchronously. 3559 # and maps saved/destroyed asynchronously.
3073 warn "begin emergency player save\n"; 3560 warn "begin emergency player save\n";
3074 for my $login (keys %cf::PLAYER) { 3561 for my $login (keys %cf::PLAYER) {
3075 my $pl = $cf::PLAYER{$login} or next; 3562 my $pl = $cf::PLAYER{$login} or next;
3076 $pl->valid or next; 3563 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3077 $pl->save; 3565 $pl->save;
3078 } 3566 }
3079 warn "end emergency player save\n"; 3567 warn "end emergency player save\n";
3080 3568
3081 warn "begin emergency map save\n"; 3569 warn "begin emergency map save\n";
3087 warn "end emergency map save\n"; 3575 warn "end emergency map save\n";
3088 3576
3089 warn "begin emergency database checkpoint\n"; 3577 warn "begin emergency database checkpoint\n";
3090 BDB::db_env_txn_checkpoint $DB_ENV; 3578 BDB::db_env_txn_checkpoint $DB_ENV;
3091 warn "end emergency database checkpoint\n"; 3579 warn "end emergency database checkpoint\n";
3580
3581 warn "begin write uuid\n";
3582 write_uuid_sync 1;
3583 warn "end write uuid\n";
3092 }; 3584 };
3093 3585
3094 warn "leave emergency perl save\n"; 3586 warn "leave emergency perl save\n";
3095} 3587}
3096 3588
3098 my ($make_core) = @_; 3590 my ($make_core) = @_;
3099 3591
3100 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3101 if $make_core; 3593 if $make_core;
3102} 3594}
3595
3596# a safer delete_package, copied from Symbol
3597sub clear_package($) {
3598 my $pkg = shift;
3599
3600 # expand to full symbol table name if needed
3601 unless ($pkg =~ /^main::.*::$/) {
3602 $pkg = "main$pkg" if $pkg =~ /^::/;
3603 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3604 $pkg .= '::' unless $pkg =~ /::$/;
3605 }
3606
3607 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3608 my $stem_symtab = *{$stem}{HASH};
3609
3610 defined $stem_symtab and exists $stem_symtab->{$leaf}
3611 or return;
3612
3613 # clear all symbols
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 }
3619 warn "cleared package #$pkg\n";#d#
3620}
3621
3622our $RELOAD; # how many times to reload
3103 3623
3104sub do_reload_perl() { 3624sub do_reload_perl() {
3105 # can/must only be called in main 3625 # can/must only be called in main
3106 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3107 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3108 return; 3628 return;
3109 } 3629 }
3110 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3111 warn "reloading..."; 3634 warn "reloading...";
3112 3635
3113 warn "entering sync_job"; 3636 warn "entering sync_job";
3114 3637
3115 cf::sync_job { 3638 cf::sync_job {
3116 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3117 cf::emergency_save; 3640 cf::emergency_save;
3118 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3119 3642
3120 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3121 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3122 3645
3123 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3124 3647
3125 warn "cancelling all WF_AUTOCANCEL watchers";
3126 for (Event::all_watchers) {
3127 $_->cancel if $_->data & WF_AUTOCANCEL;
3128 }
3129
3130 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3131 for (;;) {
3132 BDB::flush;
3133 IO::AIO::flush;
3134 Coro::cede;
3135 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3136 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3137 }
3138
3139 ++$RELOAD;
3140
3141 warn "cancelling all extension coros";
3142 $_->cancel for values %EXT_CORO;
3143 %EXT_CORO = ();
3144
3145 warn "removing commands";
3146 %COMMAND = ();
3147
3148 warn "removing ext/exti commands";
3149 %EXTCMD = ();
3150 %EXTICMD = ();
3151
3152 warn "unloading/nuking all extensions";
3153 for my $pkg (@EXTS) {
3154 warn "... unloading $pkg";
3155
3156 if (my $cb = $pkg->can ("unload")) {
3157 eval {
3158 $cb->($pkg);
3159 1
3160 } or warn "$pkg unloaded, but with errors: $@";
3161 } 3651 }
3162 3652
3163 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3164 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3165 } 3655 %EXT_CORO = ();
3166 3656
3167 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3168 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3169 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3170 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3171 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3172 delete $INC{$k};
3173 3667
3174 $k =~ s/\.pm$//;
3175 $k =~ s/\//::/g;
3176
3177 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3178 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3179 } 3677 }
3180 3678
3181 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3182 } 3694 }
3183 3695
3184 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3185 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3186 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3187 3699
3188 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3189 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3190 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3191 3703
3192 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3193 # and global variables created in xs 3705 # and global variables created in xs
3194 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3195 3707
3196 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3197 3709
3198 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3199 require cf; 3711 require cf;
3200 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3201 3713
3202 warn "loading config and database again"; 3714 warn "loading config and database again";
3203 cf::cfg_load; 3715 cf::reload_config;
3204 3716
3205 warn "loading extensions"; 3717 warn "loading extensions";
3206 cf::load_extensions; 3718 cf::load_extensions;
3207 3719
3208 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3209 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3210 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3211 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3212 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3213 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3214 3726
3215 warn "leaving sync_job"; 3727 warn "leaving sync_job";
3216 3728
3217 1 3729 1
3218 } or do { 3730 } or do {
3219 warn $@; 3731 warn $@;
3220 warn "error while reloading, exiting."; 3732 cf::cleanup "error while reloading, exiting.";
3221 exit 1;
3222 }; 3733 };
3223 3734
3224 warn "reloaded"; 3735 warn "reloaded";
3736 --$RELOAD;
3737 }
3225}; 3738};
3226 3739
3227our $RELOAD_WATCHER; # used only during reload 3740our $RELOAD_WATCHER; # used only during reload
3228 3741
3229sub reload_perl() { 3742sub reload_perl() {
3230 # doing reload synchronously and two reloads happen back-to-back, 3743 # doing reload synchronously and two reloads happen back-to-back,
3231 # coro crashes during coro_state_free->destroy here. 3744 # coro crashes during coro_state_free->destroy here.
3232 3745
3233 $RELOAD_WATCHER ||= Event->timer ( 3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3234 reentrant => 0,
3235 after => 0,
3236 data => WF_AUTOCANCEL,
3237 cb => sub {
3238 do_reload_perl; 3747 do_reload_perl;
3239 undef $RELOAD_WATCHER; 3748 undef $RELOAD_WATCHER;
3240 },
3241 ); 3749 };
3242} 3750}
3243 3751
3244register_command "reload" => sub { 3752register_command "reload" => sub {
3245 my ($who, $arg) = @_; 3753 my ($who, $arg) = @_;
3246 3754
3247 if ($who->flag (FLAG_WIZ)) { 3755 if ($who->flag (FLAG_WIZ)) {
3248 $who->message ("reloading server."); 3756 $who->message ("reloading server.");
3757 async {
3758 $Coro::current->{desc} = "perl_reload";
3249 async { reload_perl }; 3759 reload_perl;
3760 };
3250 } 3761 }
3251}; 3762};
3252 3763
3253unshift @INC, $LIBDIR; 3764unshift @INC, $LIBDIR;
3254 3765
3256 3767
3257our @WAIT_FOR_TICK; 3768our @WAIT_FOR_TICK;
3258our @WAIT_FOR_TICK_BEGIN; 3769our @WAIT_FOR_TICK_BEGIN;
3259 3770
3260sub wait_for_tick { 3771sub wait_for_tick {
3261 return unless $TICK_WATCHER->is_active;
3262 return if $Coro::current == $Coro::main; 3772 return if tick_inhibit || $Coro::current == $Coro::main;
3263 3773
3264 my $signal = new Coro::Signal; 3774 my $signal = new Coro::Signal;
3265 push @WAIT_FOR_TICK, $signal; 3775 push @WAIT_FOR_TICK, $signal;
3266 $signal->wait; 3776 $signal->wait;
3267} 3777}
3268 3778
3269sub wait_for_tick_begin { 3779sub wait_for_tick_begin {
3270 return unless $TICK_WATCHER->is_active;
3271 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3272 3781
3273 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3274 push @WAIT_FOR_TICK_BEGIN, $signal; 3783 push @WAIT_FOR_TICK_BEGIN, $signal;
3275 $signal->wait; 3784 $signal->wait;
3276} 3785}
3277 3786
3278 my $min = 1e6;#d# 3787sub tick {
3279 my $avg = 10;
3280$TICK_WATCHER = Event->timer (
3281 reentrant => 0,
3282 parked => 1,
3283 prio => 0,
3284 at => $NEXT_TICK || $TICK,
3285 data => WF_AUTOCANCEL,
3286 cb => sub {
3287 if ($Coro::current != $Coro::main) { 3788 if ($Coro::current != $Coro::main) {
3288 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3789 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3289 unless ++$bug_warning > 10; 3790 unless ++$bug_warning > 10;
3290 return; 3791 return;
3291 } 3792 }
3292 3793
3293 $NOW = $tick_start = Event::time;
3294
3295 cf::server_tick; # one server iteration 3794 cf::server_tick; # one server iteration
3296 3795
3297 0 && sync_job {#d# 3796 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3298 for(1..10) { 3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3299 my $t = Event::time; 3798 Coro::async_pool {
3300 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3799 $Coro::current->{desc} = "runtime saver";
3301 or die; 3800 write_runtime_sync
3302 3801 or warn "ERROR: unable to write runtime file: $!";
3303 $map->width (50);
3304 $map->height (50);
3305 $map->alloc;
3306 $map->_load_objects ("/tmp/x.map", 1);
3307 my $t = Event::time - $t;
3308
3309 #next unless $t < 0.0013;#d#
3310 if ($t < $min) {
3311 $min = $t;
3312 }
3313 $avg = $avg * 0.99 + $t * 0.01;
3314 }
3315 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3316 exit 0;
3317 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3318 }; 3802 };
3803 }
3319 3804
3320 $RUNTIME += $TICK;
3321 $NEXT_TICK += $TICK;
3322
3323 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3324 $NEXT_RUNTIME_WRITE = $NOW + 10;
3325 Coro::async_pool {
3326 write_runtime
3327 or warn "ERROR: unable to write runtime file: $!";
3328 };
3329 }
3330
3331# my $AFTER = Event::time;
3332# warn $AFTER - $NOW;#d#
3333
3334 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3335 $sig->send; 3806 $sig->send;
3336 } 3807 }
3337 while (my $sig = shift @WAIT_FOR_TICK) { 3808 while (my $sig = shift @WAIT_FOR_TICK) {
3338 $sig->send; 3809 $sig->send;
3339 } 3810 }
3340 3811
3341 $NOW = Event::time; 3812 $LOAD = ($NOW - $TICK_START) / $TICK;
3342
3343 # if we are delayed by four ticks or more, skip them all
3344 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3345
3346 $TICK_WATCHER->at ($NEXT_TICK);
3347 $TICK_WATCHER->start;
3348
3349 $LOAD = ($NOW - $tick_start) / $TICK;
3350 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3813 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3351 3814
3352 _post_tick; 3815 if (0) {
3353 3816 if ($NEXT_TICK) {
3354 3817 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d#
3820 }
3355 }, 3821 }
3356); 3822}
3357 3823
3358{ 3824{
3359 BDB::max_poll_time $TICK * 0.1; 3825 # configure BDB
3360 $BDB_POLL_WATCHER = Event->io ( 3826
3361 reentrant => 0,
3362 fd => BDB::poll_fileno,
3363 poll => 'r',
3364 prio => 0,
3365 data => WF_AUTOCANCEL,
3366 cb => \&BDB::poll_cb,
3367 );
3368 BDB::min_parallel 8; 3827 BDB::min_parallel 8;
3369 3828 BDB::max_poll_reqs $TICK * 0.1;
3370 BDB::set_sync_prepare { 3829 $AnyEvent::BDB::WATCHER->priority (1);
3371 my $status;
3372 my $current = $Coro::current;
3373 (
3374 sub {
3375 $status = $!;
3376 $current->ready; undef $current;
3377 },
3378 sub {
3379 Coro::schedule while defined $current;
3380 $! = $status;
3381 },
3382 )
3383 };
3384 3830
3385 unless ($DB_ENV) { 3831 unless ($DB_ENV) {
3386 $DB_ENV = BDB::db_env_create; 3832 $DB_ENV = BDB::db_env_create;
3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3834 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3835 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3836 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3837 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3387 3838
3388 cf::sync_job { 3839 cf::sync_job {
3389 eval { 3840 eval {
3390 BDB::db_env_open 3841 BDB::db_env_open
3391 $DB_ENV, 3842 $DB_ENV,
3393 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3844 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3394 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3845 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3395 0666; 3846 0666;
3396 3847
3397 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3848 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3398
3399 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3400 $DB_ENV->set_lk_detect;
3401 }; 3849 };
3402 3850
3403 cf::cleanup "db_env_open(db): $@" if $@; 3851 cf::cleanup "db_env_open(db): $@" if $@;
3404 }; 3852 };
3405 } 3853 }
3854
3855 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3856 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3857 };
3858 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3859 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3860 };
3861 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3862 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3863 };
3406} 3864}
3407 3865
3408{ 3866{
3867 # configure IO::AIO
3868
3409 IO::AIO::min_parallel 8; 3869 IO::AIO::min_parallel 8;
3410
3411 undef $Coro::AIO::WATCHER;
3412 IO::AIO::max_poll_time $TICK * 0.1; 3870 IO::AIO::max_poll_time $TICK * 0.1;
3413 $AIO_POLL_WATCHER = Event->io ( 3871 undef $AnyEvent::AIO::WATCHER;
3414 reentrant => 0,
3415 data => WF_AUTOCANCEL,
3416 fd => IO::AIO::poll_fileno,
3417 poll => 'r',
3418 prio => 6,
3419 cb => \&IO::AIO::poll_cb,
3420 );
3421} 3872}
3422 3873
3423my $_log_backtrace; 3874my $_log_backtrace;
3424 3875
3425sub _log_backtrace { 3876sub _log_backtrace {
3429 3880
3430 # limit the # of concurrent backtraces 3881 # limit the # of concurrent backtraces
3431 if ($_log_backtrace < 2) { 3882 if ($_log_backtrace < 2) {
3432 ++$_log_backtrace; 3883 ++$_log_backtrace;
3433 async { 3884 async {
3885 $Coro::current->{desc} = "abt $msg";
3886
3434 my @bt = fork_call { 3887 my @bt = fork_call {
3435 @addr = map { sprintf "%x", $_ } @addr; 3888 @addr = map { sprintf "%x", $_ } @addr;
3436 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3889 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3437 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3890 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3438 or die "addr2line: $!"; 3891 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines