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.324 by root, Sat Jul 28 14:23:17 2007 UTC vs.
Revision 1.443 by root, Sun Aug 31 10:05:26 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
1385 my ($pl) = @_; 1523 my ($pl) = @_;
1386 1524
1387 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1388 1526
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 have 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
1926 $map->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
1927 $map->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
1928 2131
1929 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1930 } 2133 }
1931 2134
1932 $self->post_load; 2135 $self->post_load;
1933} 2136}
1934 2137
1943 2146
1944 $self 2147 $self
1945} 2148}
1946 2149
1947# 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
1948sub load_diag { 2151sub load_neighbours {
1949 my ($map) = @_; 2152 my ($map) = @_;
1950 2153
1951 my @diag; # diagonal neighbours 2154 my @neigh; # diagonal neighbours
1952 2155
1953 for (0 .. 3) { 2156 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 2157 my $neigh = $map->tile_path ($_)
1955 or next; 2158 or next;
1956 $neigh = find $neigh, $map 2159 $neigh = find $neigh, $map
1957 or next; 2160 or next;
1958 $neigh->load; 2161 $neigh->load;
1959 2162
2163 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2164 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2165 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2166 }
1963 2167
1964 for (@diag) { 2168 for (grep defined $_->[0], @neigh) {
2169 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2170 my $neigh = find $path, $origin
1966 or next; 2171 or next;
1967 $neigh->load; 2172 $neigh->load;
1968 } 2173 }
1969} 2174}
1970 2175
1975} 2180}
1976 2181
1977sub do_load_sync { 2182sub do_load_sync {
1978 my ($map) = @_; 2183 my ($map) = @_;
1979 2184
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main;
2187
1980 cf::sync_job { $map->load }; 2188 cf::sync_job { $map->load };
1981} 2189}
1982 2190
1983our %MAP_PREFETCH; 2191our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2192our $MAP_PREFETCHER = undef;
1985 2193
1986sub find_async { 2194sub find_async {
1987 my ($path, $origin) = @_; 2195 my ($path, $origin, $load) = @_;
1988 2196
1989 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
1990 2198
1991 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1993 } 2201 }
1994 2202
1995 undef $MAP_PREFETCH{$path}; 2203 $MAP_PREFETCH{$path} |= $load;
2204
1996 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
1997 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2210 if (my $map = find $k) {
2000 $map->load; 2211 $map->load if $v;
2001 } 2212 }
2002 2213
2003 delete $MAP_PREFETCH{$path}; 2214 delete $MAP_PREFETCH{$k};
2004 } 2215 }
2005 } 2216 }
2006 undef $MAP_PREFETCHER; 2217 undef $MAP_PREFETCHER;
2007 }; 2218 };
2008 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2011} 2222}
2012 2223
2013sub save { 2224sub save {
2014 my ($self) = @_; 2225 my ($self) = @_;
2015 2226
2016 my $lock = cf::lock_acquire "map_data:" . $self->path; 2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2017 2228
2018 $self->{last_save} = $cf::RUNTIME; 2229 $self->{last_save} = $cf::RUNTIME;
2019 2230
2020 return unless $self->dirty; 2231 return unless $self->dirty;
2021 2232
2027 return if $self->{deny_save}; 2238 return if $self->{deny_save};
2028 2239
2029 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
2030 2241
2031 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
2032 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2033 }; 2245 };
2246
2247 cf::get_slot 0.02;
2034 2248
2035 if ($uniq) { 2249 if ($uniq) {
2036 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2037 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2038 } else { 2252 } else {
2044 my ($self) = @_; 2258 my ($self) = @_;
2045 2259
2046 # save first because save cedes 2260 # save first because save cedes
2047 $self->save; 2261 $self->save;
2048 2262
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2264
2051 return if $self->players; 2265 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2053 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2054 2268
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP;
2055 $self->clear; 2273 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2274}
2058 2275
2059sub reset_at { 2276sub reset_at {
2060 my ($self) = @_; 2277 my ($self) = @_;
2061 2278
2093 if $uniq; 2310 if $uniq;
2094 } 2311 }
2095 2312
2096 delete $cf::MAP{$self->path}; 2313 delete $cf::MAP{$self->path};
2097 2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2317 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2318
2102 $self->unlink_save; 2319 $self->unlink_save;
2103 $self->destroy; 2320 $self->destroy;
2104} 2321}
2105 2322
2106my $nuke_counter = "aaaa"; 2323my $nuke_counter = "aaaa";
2107 2324
2108sub nuke { 2325sub nuke {
2109 my ($self) = @_; 2326 my ($self) = @_;
2110 2327
2328 {
2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2330
2111 delete $cf::MAP{$self->path}; 2331 delete $cf::MAP{$self->path};
2112 2332
2113 $self->unlink_save; 2333 $self->unlink_save;
2114 2334
2115 bless $self, "cf::map"; 2335 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2336 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2337 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2338 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2340
2121 $cf::MAP{$self->path} = $self; 2341 $cf::MAP{$self->path} = $self;
2342 }
2122 2343
2123 $self->reset; # polite request, might not happen 2344 $self->reset; # polite request, might not happen
2124} 2345}
2125 2346
2126=item $maps = cf::map::tmp_maps 2347=item $maps = cf::map::tmp_maps
2168 2389
2169sub unique_maps() { 2390sub unique_maps() {
2170 [ 2391 [
2171 map { 2392 map {
2172 utf8::decode $_; 2393 utf8::decode $_;
2173 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2174 ? normalise $_ 2397 : normalise $_
2175 : ()
2176 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2177 ] 2399 ]
2178} 2400}
2179 2401
2180package cf;
2181
2182=back 2402=back
2183 2403
2184=head3 cf::object 2404=head3 cf::object
2185 2405
2186=cut 2406=cut
2189 2409
2190=over 4 2410=over 4
2191 2411
2192=item $ob->inv_recursive 2412=item $ob->inv_recursive
2193 2413
2194Returns 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.
2195 2416
2196=cut 2417=cut
2197 2418
2198sub inv_recursive_; 2419sub inv_recursive_;
2199sub inv_recursive_ { 2420sub inv_recursive_ {
2202 2423
2203sub inv_recursive { 2424sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2205} 2426}
2206 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
2207package cf; 2456package cf;
2208 2457
2209=back 2458=back
2210 2459
2211=head3 cf::object::player 2460=head3 cf::object::player
2217Sends 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>
2218can 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
2219dialogue with the given NPC character. 2468dialogue with the given NPC character.
2220 2469
2221=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};
2222 2485
2223# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2224# with dialog boxes. 2487# with dialog boxes.
2225#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
2226sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2238 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2239 $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));
2240 2503
2241 } else { 2504 } else {
2242 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2243 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2244 } 2507 }
2245 } 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 (@_);
2246} 2519}
2247 2520
2248=item $player_object->may ("access") 2521=item $player_object->may ("access")
2249 2522
2250Returns wether the given player is authorized to access resource "access" 2523Returns wether the given player is authorized to access resource "access"
2329 # use -1 or undef as default coordinates, not 0, 0 2602 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2603 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2604 if $x <=0 && $y <= 0;
2332 2605
2333 $map->load; 2606 $map->load;
2334 $map->load_diag; 2607 $map->load_neighbours;
2335 2608
2336 return unless $self->contr->active; 2609 return unless $self->contr->active;
2337 $self->activate_recursive; 2610 $self->activate_recursive;
2338 2611
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2346her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2347that 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
2348the 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
2349be called at the end of this process. 2622be called at the end of this process.
2350 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
2351=cut 2627=cut
2352 2628
2353our $GOTOGEN; 2629our $GOTOGEN;
2354 2630
2355sub cf::object::player::goto { 2631sub cf::object::player::goto {
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2636
2361 $self->enter_link; 2637 $self->enter_link;
2362 2638
2363 (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
2364 my $map = eval { 2661 my $map = eval {
2365 my $map = cf::map::find $path; 2662 my $map = defined $path ? cf::map::find $path : undef;
2366 2663
2367 if ($map) { 2664 if ($map) {
2368 $map = $map->customise_for ($self); 2665 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2666 $map = $check->($map) if $check && $map;
2370 } else { 2667 } else {
2371 $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);
2372 } 2669 }
2373 2670
2374 $map 2671 $map
2375 }; 2672 };
2376 2673
2412} 2709}
2413 2710
2414sub prepare_random_map { 2711sub prepare_random_map {
2415 my ($exit) = @_; 2712 my ($exit) = @_;
2416 2713
2417 my $guard = cf::lock_acquire "exit_prepare:$exit";
2418
2419 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2420 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2421 # that depends on the exit object 2716 # that depends on the exit object
2422 2717
2423 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2425 if ($exit->map) { 2720 if ($exit->map) {
2426 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2427 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2428 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2429 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2430 } 2727 }
2431 2728
2432 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2433 2730
2434 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2435 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2436 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2437 2734
2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2440 undef $fh; 2737 undef $fh;
2441 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2442 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2443 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2444 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2445 } 2746 }
2446} 2747}
2447 2748
2448sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2449 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2450 2751
2451 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2452 2753
2453 if ($exit->slaying eq "/!") {
2454 #TODO: this should de-fi-ni-te-ly not be a sync-job
2455 # the problem is that $exit might not survive long enough
2456 # so it needs to be done right now, right here
2457 cf::sync_job { prepare_random_map $exit };
2458 }
2459
2460 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2461 my $hp = $exit->stats->hp;
2462 my $sp = $exit->stats->sp;
2463
2464 $self->enter_link; 2754 $self->enter_link;
2465 2755
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2470 (async { 2756 (async {
2471 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2472 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
2473 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2474 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
2475 1; 2780 1
2476 }) { 2781 }) {
2477 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2478 . "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. "
2479 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2480 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2510the 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
2511the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2512 2817
2513=cut 2818=cut
2514 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
2515sub cf::client::send_msg { 2878sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2517 2880
2518 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2519 2882
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 2883 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521 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
2522 if (ref $channel) { 2894 } elsif (ref $channel) {
2523 # send meta info to client, if not yet sent 2895 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 2896 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 2897 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 2898 $self->ext_msg (channel_info => $channel)
2899 if $self->can_msg;
2527 } 2900 }
2528 2901
2529 $channel = $channel->{id}; 2902 $channel = $channel->{id};
2530 } 2903 }
2531 2904
2534 if ($self->can_msg) { 2907 if ($self->can_msg) {
2535 # default colour, mask it out 2908 # default colour, mask it out
2536 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2537 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2538 2911
2539 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2540 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 );
2916
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt);
2541 } else { 2928 } else {
2542 if ($color >= 0) { 2929 if ($color >= 0) {
2543 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2544 for ($msg) { 2931 for ($msg) {
2545 1 while 2932 1 while
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2937 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 } 2938 }
2552 2939
2553 $color &= cf::NDI_COLOR_MASK; 2940 $color &= cf::NDI_COLOR_MASK;
2554 2941
2942 utf8::encode $msg;
2943
2555 if (0 && $msg =~ /\[/) { 2944 if (0 && $msg =~ /\[/) {
2945 # COMMAND/INFO
2556 $self->send_packet ("drawextinfo $color 4 0 $msg") 2946 $self->send_packet ("drawextinfo $color 10 8 $msg")
2557 } else { 2947 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2948 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg") 2949 $self->send_packet ("drawinfo $color $msg")
2560 } 2950 }
2561 } 2951 }
2569=cut 2959=cut
2570 2960
2571sub cf::client::ext_msg($$@) { 2961sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 2962 my ($self, $type, @msg) = @_;
2573 2963
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 2964 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2965 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 2966 } elsif ($self->extcmd == 1) { # TODO: remove
2579 push @msg, msgtype => "event_$type"; 2967 push @msg, msgtype => "event_$type";
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 }
2970}
2971
2972=item $client->ext_reply ($msgid, @msg)
2973
2974Sends an ext reply to the client.
2975
2976=cut
2977
2978sub cf::client::ext_reply($$@) {
2979 my ($self, $id, @msg) = @_;
2980
2981 if ($self->extcmd == 2) {
2982 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2983 } elsif ($self->extcmd == 1) {
2984 #TODO: version 1, remove
2985 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2986 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2987 }
2582} 2988}
2583 2989
2584=item $success = $client->query ($flags, "text", \&cb) 2990=item $success = $client->query ($flags, "text", \&cb)
2646 my ($type, $reply, @payload) = 3052 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 3053 "ARRAY" eq ref $msg
2648 ? @$msg 3054 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3055 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 3056
3057 my @reply;
3058
2651 if (my $cb = $EXTICMD{$type}) { 3059 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 3060 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 3061 }
3062
3063 $ns->ext_reply ($reply, @reply)
3064 if $reply;
3065
2657 } else { 3066 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3067 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 3068 }
2660 3069
2661 cf::override; 3070 cf::override;
2708our $safe = new Safe "safe"; 3117our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 3118our $safe_hole = new Safe::Hole;
2710 3119
2711$SIG{FPE} = 'IGNORE'; 3120$SIG{FPE} = 'IGNORE';
2712 3121
2713$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3122$safe->permit_only (Opcode::opset qw(
3123 :base_core :base_mem :base_orig :base_math
3124 grepstart grepwhile mapstart mapwhile
3125 sort time
3126));
2714 3127
2715# here we export the classes and methods available to script code 3128# here we export the classes and methods available to script code
2716 3129
2717=pod 3130=pod
2718 3131
2719The following functions and methods are available within a safe environment: 3132The following functions and methods are available within a safe environment:
2720 3133
2721 cf::object 3134 cf::object
2722 contr pay_amount pay_player map x y force_find force_add 3135 contr pay_amount pay_player map x y force_find force_add destroy
2723 insert remove 3136 insert remove name archname title slaying race decrease split
2724 3137
2725 cf::object::player 3138 cf::object::player
2726 player 3139 player
2727 3140
2728 cf::player 3141 cf::player
2733 3146
2734=cut 3147=cut
2735 3148
2736for ( 3149for (
2737 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2738 insert remove)], 3151 insert remove inv nrof name archname title slaying race
3152 decrease split destroy change_exp)],
2739 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
2741 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
2742) { 3156) {
2743 no strict 'refs'; 3157 no strict 'refs';
2819# the server's init and main functions 3233# the server's init and main functions
2820 3234
2821sub load_facedata($) { 3235sub load_facedata($) {
2822 my ($path) = @_; 3236 my ($path) = @_;
2823 3237
3238 # HACK to clear player env face cache, we need some signal framework
3239 # for this (global event?)
3240 %ext::player_env::MUSIC_FACE_CACHE = ();
3241
3242 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3243
2824 warn "loading facedata from $path\n"; 3244 warn "loading facedata from $path\n";
2825 3245
2826 my $facedata; 3246 my $facedata;
2827 0 < aio_load $path, $facedata 3247 0 < aio_load $path, $facedata
2828 or die "$path: $!"; 3248 or die "$path: $!";
2830 $facedata = Coro::Storable::thaw $facedata; 3250 $facedata = Coro::Storable::thaw $facedata;
2831 3251
2832 $facedata->{version} == 2 3252 $facedata->{version} == 2
2833 or cf::cleanup "$path: version mismatch, cannot proceed."; 3253 or cf::cleanup "$path: version mismatch, cannot proceed.";
2834 3254
3255 # patch in the exptable
3256 $facedata->{resource}{"res/exp_table"} = {
3257 type => FT_RSRC,
3258 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3259 };
3260 cf::cede_to_tick;
3261
2835 { 3262 {
2836 my $faces = $facedata->{faceinfo}; 3263 my $faces = $facedata->{faceinfo};
2837 3264
2838 while (my ($face, $info) = each %$faces) { 3265 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3266 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3267
2840 cf::face::set_visibility $idx, $info->{visibility}; 3268 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 3269 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3270 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3271 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2844 3272
2845 cf::cede_to_tick; 3273 cf::cede_to_tick;
2846 } 3274 }
2847 3275
2848 while (my ($face, $info) = each %$faces) { 3276 while (my ($face, $info) = each %$faces) {
2849 next unless $info->{smooth}; 3277 next unless $info->{smooth};
3278
2850 my $idx = cf::face::find $face 3279 my $idx = cf::face::find $face
2851 or next; 3280 or next;
3281
2852 if (my $smooth = cf::face::find $info->{smooth}) { 3282 if (my $smooth = cf::face::find $info->{smooth}) {
2853 cf::face::set_smooth $idx, $smooth; 3283 cf::face::set_smooth $idx, $smooth;
2854 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3284 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2855 } else { 3285 } else {
2856 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3286 warn "smooth face '$info->{smooth}' not found for face '$face'";
2873 3303
2874 { 3304 {
2875 # TODO: for gcfclient pleasure, we should give resources 3305 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index. 3306 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 3307 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881 3308
2882 while (my ($name, $info) = each %$res) { 3309 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({ 3310 if (defined $info->{type}) {
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3311 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3312 my $data;
2889 3313
2890 if ($info->{type} & 1) { 3314 if ($info->{type} & 1) {
2891 # prepend meta info 3315 # prepend meta info
2892 3316
3317 my $meta = $enc->encode ({
3318 name => $name,
3319 %{ $info->{meta} || {} },
3320 });
3321
2893 my $data = pack "(w/a*)*", $meta, $info->{data}; 3322 $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3323 } else {
3324 $data = $info->{data};
3325 }
2895 3326
2896 cf::face::set_data $idx, 0, $data, $chk; 3327 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3328 cf::face::set_type $idx, $info->{type};
2897 } else { 3329 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3330 $RESOURCE{$name} = $info;
2899 } 3331 }
2900 3332
2901 cf::face::set_type $idx, $info->{type};
2902
2903 cf::cede_to_tick; 3333 cf::cede_to_tick;
2904 } 3334 }
2905
2906 if ($soundconf) {
2907 $soundconf = $enc->decode (delete $soundconf->{data});
2908
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_]
2911 or next;
2912
2913 my $face = cf::face::find "sound/$sound->[1]";
2914
2915 cf::sound::set $sound->[0] => $face;
2916 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2917 }
2918
2919 #TODO
2920 }
2921 } 3335 }
3336
3337 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2922 3338
2923 1 3339 1
2924} 3340}
3341
3342cf::global->attach (on_resource_update => sub {
3343 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3344 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3345
3346 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3347 my $sound = $soundconf->{compat}[$_]
3348 or next;
3349
3350 my $face = cf::face::find "sound/$sound->[1]";
3351 cf::sound::set $sound->[0] => $face;
3352 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3353 }
3354
3355 while (my ($k, $v) = each %{$soundconf->{event}}) {
3356 my $face = cf::face::find "sound/$v";
3357 cf::sound::set $k => $face;
3358 }
3359 }
3360});
2925 3361
2926register_exticmd fx_want => sub { 3362register_exticmd fx_want => sub {
2927 my ($ns, $want) = @_; 3363 my ($ns, $want) = @_;
2928 3364
2929 while (my ($k, $v) = each %$want) { 3365 while (my ($k, $v) = each %$want) {
2930 $ns->fx_want ($k, $v); 3366 $ns->fx_want ($k, $v);
2931 } 3367 }
2932}; 3368};
2933 3369
3370sub load_resource_file($) {
3371 my $guard = lock_acquire "load_resource_file";
3372
3373 my $status = load_resource_file_ $_[0];
3374 get_slot 0.1, 100;
3375 cf::arch::commit_load;
3376
3377 $status
3378}
3379
2934sub reload_regions { 3380sub reload_regions {
3381 # HACK to clear player env face cache, we need some signal framework
3382 # for this (global event?)
3383 %ext::player_env::MUSIC_FACE_CACHE = ();
3384
2935 load_resource_file "$MAPDIR/regions" 3385 load_resource_file "$MAPDIR/regions"
2936 or die "unable to load regions file\n"; 3386 or die "unable to load regions file\n";
2937 3387
2938 for (cf::region::list) { 3388 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/ 3389 $_->{match} = qr/$_->{match}/
2947} 3397}
2948 3398
2949sub reload_archetypes { 3399sub reload_archetypes {
2950 load_resource_file "$DATADIR/archetypes" 3400 load_resource_file "$DATADIR/archetypes"
2951 or die "unable to load archetypes\n"; 3401 or die "unable to load archetypes\n";
2952 #d# NEED to laod twice to resolve forward references
2953 # this really needs to be done in an extra post-pass
2954 # (which needs to be synchronous, so solve it differently)
2955 load_resource_file "$DATADIR/archetypes"
2956 or die "unable to load archetypes\n";
2957} 3402}
2958 3403
2959sub reload_treasures { 3404sub reload_treasures {
2960 load_resource_file "$DATADIR/treasures" 3405 load_resource_file "$DATADIR/treasures"
2961 or die "unable to load treasurelists\n"; 3406 or die "unable to load treasurelists\n";
2962} 3407}
2963 3408
2964sub reload_resources { 3409sub reload_resources {
2965 warn "reloading resource files...\n"; 3410 warn "reloading resource files...\n";
2966 3411
3412 reload_facedata;
3413 reload_archetypes;
2967 reload_regions; 3414 reload_regions;
2968 reload_facedata;
2969 #reload_archetypes;#d#
2970 reload_archetypes;
2971 reload_treasures; 3415 reload_treasures;
2972 3416
2973 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
2974} 3418}
2975 3419
2976sub init { 3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
2977 reload_resources; 3425 reload_resources;
2978} 3426}
2979 3427
2980sub cfg_load { 3428sub reload_config {
2981 open my $fh, "<:utf8", "$CONFDIR/config" 3429 open my $fh, "<:utf8", "$CONFDIR/config"
2982 or return; 3430 or return;
2983 3431
2984 local $/; 3432 local $/;
2985 *CFG = YAML::Syck::Load <$fh>; 3433 *CFG = YAML::Load <$fh>;
2986 3434
2987 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3435 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2988 3436
2989 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3437 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2990 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3438 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3001sub main { 3449sub main {
3002 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3003 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3004 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3005 (async { 3453 (async {
3006 Event::one_event; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT;
3007 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3008 }; 3457 };
3009 3458
3010 cfg_load; 3459 {
3460 my $guard = freeze_mainloop;
3461 reload_config;
3011 db_init; 3462 db_init;
3012 load_extensions; 3463 load_extensions;
3013 3464
3014 $TICK_WATCHER->start; 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466 }
3467
3015 Event::loop; 3468 EV::loop;
3016} 3469}
3017 3470
3018############################################################################# 3471#############################################################################
3019# initialisation and cleanup 3472# initialisation and cleanup
3020 3473
3021# install some emergency cleanup handlers 3474# install some emergency cleanup handlers
3022BEGIN { 3475BEGIN {
3476 our %SIGWATCHER = ();
3023 for my $signal (qw(INT HUP TERM)) { 3477 for my $signal (qw(INT HUP TERM)) {
3024 Event->signal ( 3478 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3025 reentrant => 0,
3026 data => WF_AUTOCANCEL,
3027 signal => $signal,
3028 prio => 0,
3029 cb => sub {
3030 cf::cleanup "SIG$signal"; 3479 cf::cleanup "SIG$signal";
3031 },
3032 ); 3480 };
3033 } 3481 }
3034} 3482}
3035 3483
3036sub write_runtime { 3484sub write_runtime_sync {
3037 my $runtime = "$LOCALDIR/runtime"; 3485 my $runtime = "$LOCALDIR/runtime";
3038 3486
3039 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3040 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3041 3489
3067 and return; 3515 and return;
3068 3516
3069 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3070 3518
3071 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3537 $uuid_skip = 0;
3538
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return;
3541
3542 # always fsync - this file is important
3543 aio_fsync $fh
3544 and return;
3545
3546 close $fh
3547 or return;
3548
3549 aio_rename "$uuid~", $uuid
3550 and return;
3551
3552 warn "uuid file written ($value).\n";
3553
3554 1
3555
3556}
3557
3558sub write_uuid($$) {
3559 my ($skip, $sync) = @_;
3560
3561 $sync ? write_uuid_sync $skip
3562 : async { write_uuid_sync $skip };
3072} 3563}
3073 3564
3074sub emergency_save() { 3565sub emergency_save() {
3075 my $freeze_guard = cf::freeze_mainloop; 3566 my $freeze_guard = cf::freeze_mainloop;
3076 3567
3082 # and maps saved/destroyed asynchronously. 3573 # and maps saved/destroyed asynchronously.
3083 warn "begin emergency player save\n"; 3574 warn "begin emergency player save\n";
3084 for my $login (keys %cf::PLAYER) { 3575 for my $login (keys %cf::PLAYER) {
3085 my $pl = $cf::PLAYER{$login} or next; 3576 my $pl = $cf::PLAYER{$login} or next;
3086 $pl->valid or next; 3577 $pl->valid or next;
3578 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3087 $pl->save; 3579 $pl->save;
3088 } 3580 }
3089 warn "end emergency player save\n"; 3581 warn "end emergency player save\n";
3090 3582
3091 warn "begin emergency map save\n"; 3583 warn "begin emergency map save\n";
3097 warn "end emergency map save\n"; 3589 warn "end emergency map save\n";
3098 3590
3099 warn "begin emergency database checkpoint\n"; 3591 warn "begin emergency database checkpoint\n";
3100 BDB::db_env_txn_checkpoint $DB_ENV; 3592 BDB::db_env_txn_checkpoint $DB_ENV;
3101 warn "end emergency database checkpoint\n"; 3593 warn "end emergency database checkpoint\n";
3594
3595 warn "begin write uuid\n";
3596 write_uuid_sync 1;
3597 warn "end write uuid\n";
3102 }; 3598 };
3103 3599
3104 warn "leave emergency perl save\n"; 3600 warn "leave emergency perl save\n";
3105} 3601}
3106 3602
3108 my ($make_core) = @_; 3604 my ($make_core) = @_;
3109 3605
3110 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3111 if $make_core; 3607 if $make_core;
3112} 3608}
3609
3610# a safer delete_package, copied from Symbol
3611sub clear_package($) {
3612 my $pkg = shift;
3613
3614 # expand to full symbol table name if needed
3615 unless ($pkg =~ /^main::.*::$/) {
3616 $pkg = "main$pkg" if $pkg =~ /^::/;
3617 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3618 $pkg .= '::' unless $pkg =~ /::$/;
3619 }
3620
3621 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3622 my $stem_symtab = *{$stem}{HASH};
3623
3624 defined $stem_symtab and exists $stem_symtab->{$leaf}
3625 or return;
3626
3627 # clear all symbols
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 }
3633 warn "cleared package #$pkg\n";#d#
3634}
3635
3636our $RELOAD; # how many times to reload
3113 3637
3114sub do_reload_perl() { 3638sub do_reload_perl() {
3115 # can/must only be called in main 3639 # can/must only be called in main
3116 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3117 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3118 return; 3642 return;
3119 } 3643 }
3120 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3121 warn "reloading..."; 3648 warn "reloading...";
3122 3649
3123 warn "entering sync_job"; 3650 warn "entering sync_job";
3124 3651
3125 cf::sync_job { 3652 cf::sync_job {
3126 cf::write_runtime; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3127 cf::emergency_save; 3654 cf::emergency_save;
3128 cf::write_runtime; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3129 3656
3130 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3131 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3132 3659
3133 # if anything goes wrong in here, we should simply crash as we already saved 3660 # if anything goes wrong in here, we should simply crash as we already saved
3134 3661
3135 warn "cancelling all WF_AUTOCANCEL watchers";
3136 for (Event::all_watchers) {
3137 $_->cancel if $_->data & WF_AUTOCANCEL;
3138 }
3139
3140 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
3141 for (;;) {
3142 BDB::flush;
3143 IO::AIO::flush;
3144 Coro::cede;
3145 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3146 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3147 }
3148
3149 ++$RELOAD;
3150
3151 warn "cancelling all extension coros";
3152 $_->cancel for values %EXT_CORO;
3153 %EXT_CORO = ();
3154
3155 warn "removing commands";
3156 %COMMAND = ();
3157
3158 warn "removing ext/exti commands";
3159 %EXTCMD = ();
3160 %EXTICMD = ();
3161
3162 warn "unloading/nuking all extensions";
3163 for my $pkg (@EXTS) {
3164 warn "... unloading $pkg";
3165
3166 if (my $cb = $pkg->can ("unload")) {
3167 eval {
3168 $cb->($pkg);
3169 1
3170 } or warn "$pkg unloaded, but with errors: $@";
3171 } 3665 }
3172 3666
3173 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3174 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3175 } 3669 %EXT_CORO = ();
3176 3670
3177 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3178 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3179 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3180 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3181 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3182 delete $INC{$k};
3183 3681
3184 $k =~ s/\.pm$//;
3185 $k =~ s/\//::/g;
3186
3187 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3188 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3189 } 3691 }
3190 3692
3191 Symbol::delete_package $k; 3693 warn "unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696
3697 warn "... unloading $k";
3698 delete $INC{$k};
3699
3700 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g;
3702
3703 if (my $cb = $k->can ("unload_module")) {
3704 $cb->();
3705 }
3706
3707 clear_package $k;
3192 } 3708 }
3193 3709
3194 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3195 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3196 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3197 3713
3198 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3199 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3200 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3201 3717
3202 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3203 # and global variables created in xs 3719 # and global variables created in xs
3204 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3205 3721
3206 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3207 3723
3208 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3209 require cf; 3725 require cf;
3210 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3211 3727
3212 warn "loading config and database again"; 3728 warn "loading config and database again";
3213 cf::cfg_load; 3729 cf::reload_config;
3214 3730
3215 warn "loading extensions"; 3731 warn "loading extensions";
3216 cf::load_extensions; 3732 cf::load_extensions;
3217 3733
3218 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3219 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3220 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3221 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3222 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3223 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3224 3740
3225 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3226 3742
3227 1 3743 1
3228 } or do { 3744 } or do {
3229 warn $@; 3745 warn $@;
3230 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3231 exit 1;
3232 }; 3747 };
3233 3748
3234 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3235}; 3752};
3236 3753
3237our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3238 3755
3239sub reload_perl() { 3756sub reload_perl() {
3240 # doing reload synchronously and two reloads happen back-to-back, 3757 # doing reload synchronously and two reloads happen back-to-back,
3241 # coro crashes during coro_state_free->destroy here. 3758 # coro crashes during coro_state_free->destroy here.
3242 3759
3243 $RELOAD_WATCHER ||= Event->timer ( 3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3244 reentrant => 0,
3245 after => 0,
3246 data => WF_AUTOCANCEL,
3247 cb => sub {
3248 do_reload_perl; 3761 do_reload_perl;
3249 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3250 },
3251 ); 3763 };
3252} 3764}
3253 3765
3254register_command "reload" => sub { 3766register_command "reload" => sub {
3255 my ($who, $arg) = @_; 3767 my ($who, $arg) = @_;
3256 3768
3257 if ($who->flag (FLAG_WIZ)) { 3769 if ($who->flag (FLAG_WIZ)) {
3258 $who->message ("reloading server."); 3770 $who->message ("reloading server.");
3771 async {
3772 $Coro::current->{desc} = "perl_reload";
3259 async { reload_perl }; 3773 reload_perl;
3774 };
3260 } 3775 }
3261}; 3776};
3262 3777
3263unshift @INC, $LIBDIR; 3778unshift @INC, $LIBDIR;
3264 3779
3266 3781
3267our @WAIT_FOR_TICK; 3782our @WAIT_FOR_TICK;
3268our @WAIT_FOR_TICK_BEGIN; 3783our @WAIT_FOR_TICK_BEGIN;
3269 3784
3270sub wait_for_tick { 3785sub wait_for_tick {
3271 return unless $TICK_WATCHER->is_active;
3272 return if $Coro::current == $Coro::main; 3786 return if tick_inhibit || $Coro::current == $Coro::main;
3273 3787
3274 my $signal = new Coro::Signal; 3788 my $signal = new Coro::Signal;
3275 push @WAIT_FOR_TICK, $signal; 3789 push @WAIT_FOR_TICK, $signal;
3276 $signal->wait; 3790 $signal->wait;
3277} 3791}
3278 3792
3279sub wait_for_tick_begin { 3793sub wait_for_tick_begin {
3280 return unless $TICK_WATCHER->is_active;
3281 return if $Coro::current == $Coro::main; 3794 return if tick_inhibit || $Coro::current == $Coro::main;
3282 3795
3283 my $signal = new Coro::Signal; 3796 my $signal = new Coro::Signal;
3284 push @WAIT_FOR_TICK_BEGIN, $signal; 3797 push @WAIT_FOR_TICK_BEGIN, $signal;
3285 $signal->wait; 3798 $signal->wait;
3286} 3799}
3287 3800
3288 my $min = 1e6;#d# 3801sub tick {
3289 my $avg = 10;
3290$TICK_WATCHER = Event->timer (
3291 reentrant => 0,
3292 parked => 1,
3293 prio => 0,
3294 at => $NEXT_TICK || $TICK,
3295 data => WF_AUTOCANCEL,
3296 cb => sub {
3297 if ($Coro::current != $Coro::main) { 3802 if ($Coro::current != $Coro::main) {
3298 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3803 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3299 unless ++$bug_warning > 10; 3804 unless ++$bug_warning > 10;
3300 return; 3805 return;
3301 } 3806 }
3302 3807
3303 $NOW = $tick_start = Event::time;
3304
3305 cf::server_tick; # one server iteration 3808 cf::server_tick; # one server iteration
3306 3809
3307 0 && sync_job {#d# 3810 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3308 for(1..10) { 3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3309 my $t = Event::time; 3812 Coro::async_pool {
3310 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3813 $Coro::current->{desc} = "runtime saver";
3311 or die; 3814 write_runtime_sync
3312 3815 or warn "ERROR: unable to write runtime file: $!";
3313 $map->width (50);
3314 $map->height (50);
3315 $map->alloc;
3316 $map->_load_objects ("/tmp/x.map", 1);
3317 my $t = Event::time - $t;
3318
3319 #next unless $t < 0.0013;#d#
3320 if ($t < $min) {
3321 $min = $t;
3322 }
3323 $avg = $avg * 0.99 + $t * 0.01;
3324 }
3325 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3326 exit 0;
3327 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3328 }; 3816 };
3817 }
3329 3818
3330 $RUNTIME += $TICK;
3331 $NEXT_TICK += $TICK;
3332
3333 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3334 $NEXT_RUNTIME_WRITE = $NOW + 10;
3335 Coro::async_pool {
3336 write_runtime
3337 or warn "ERROR: unable to write runtime file: $!";
3338 };
3339 }
3340
3341# my $AFTER = Event::time;
3342# warn $AFTER - $NOW;#d#
3343
3344 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3819 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3345 $sig->send; 3820 $sig->send;
3346 } 3821 }
3347 while (my $sig = shift @WAIT_FOR_TICK) { 3822 while (my $sig = shift @WAIT_FOR_TICK) {
3348 $sig->send; 3823 $sig->send;
3349 } 3824 }
3350 3825
3351 $NOW = Event::time; 3826 $LOAD = ($NOW - $TICK_START) / $TICK;
3352
3353 # if we are delayed by four ticks or more, skip them all
3354 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3355
3356 $TICK_WATCHER->at ($NEXT_TICK);
3357 $TICK_WATCHER->start;
3358
3359 $LOAD = ($NOW - $tick_start) / $TICK;
3360 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3827 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3361 3828
3362 _post_tick; 3829 if (0) {
3363 3830 if ($NEXT_TICK) {
3364 3831 my $jitter = $TICK_START - $NEXT_TICK;
3832 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3833 warn "jitter $JITTER\n";#d#
3834 }
3365 }, 3835 }
3366); 3836}
3367 3837
3368{ 3838{
3369 BDB::max_poll_time $TICK * 0.1; 3839 # configure BDB
3370 $BDB_POLL_WATCHER = Event->io ( 3840
3371 reentrant => 0,
3372 fd => BDB::poll_fileno,
3373 poll => 'r',
3374 prio => 0,
3375 data => WF_AUTOCANCEL,
3376 cb => \&BDB::poll_cb,
3377 );
3378 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3379 3842 BDB::max_poll_reqs $TICK * 0.1;
3380 BDB::set_sync_prepare { 3843 $AnyEvent::BDB::WATCHER->priority (1);
3381 my $status;
3382 my $current = $Coro::current;
3383 (
3384 sub {
3385 $status = $!;
3386 $current->ready; undef $current;
3387 },
3388 sub {
3389 Coro::schedule while defined $current;
3390 $! = $status;
3391 },
3392 )
3393 };
3394 3844
3395 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3396 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3848 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3849 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3397 3852
3398 cf::sync_job { 3853 cf::sync_job {
3399 eval { 3854 eval {
3400 BDB::db_env_open 3855 BDB::db_env_open
3401 $DB_ENV, 3856 $DB_ENV,
3403 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3858 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3404 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3859 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3405 0666; 3860 0666;
3406 3861
3407 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3862 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3408
3409 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3410 $DB_ENV->set_lk_detect;
3411 }; 3863 };
3412 3864
3413 cf::cleanup "db_env_open(db): $@" if $@; 3865 cf::cleanup "db_env_open(db): $@" if $@;
3414 }; 3866 };
3415 } 3867 }
3868
3869 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3870 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3871 };
3872 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3873 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3874 };
3875 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3876 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3877 };
3416} 3878}
3417 3879
3418{ 3880{
3881 # configure IO::AIO
3882
3419 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3420
3421 undef $Coro::AIO::WATCHER;
3422 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3423 $AIO_POLL_WATCHER = Event->io ( 3885 undef $AnyEvent::AIO::WATCHER;
3424 reentrant => 0,
3425 data => WF_AUTOCANCEL,
3426 fd => IO::AIO::poll_fileno,
3427 poll => 'r',
3428 prio => 6,
3429 cb => \&IO::AIO::poll_cb,
3430 );
3431} 3886}
3432 3887
3433my $_log_backtrace; 3888my $_log_backtrace;
3434 3889
3435sub _log_backtrace { 3890sub _log_backtrace {
3439 3894
3440 # limit the # of concurrent backtraces 3895 # limit the # of concurrent backtraces
3441 if ($_log_backtrace < 2) { 3896 if ($_log_backtrace < 2) {
3442 ++$_log_backtrace; 3897 ++$_log_backtrace;
3443 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3444 my @bt = fork_call { 3901 my @bt = fork_call {
3445 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3446 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3447 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3904 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3448 or die "addr2line: $!"; 3905 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines