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.331 by root, Mon Aug 13 13:10:01 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 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
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 68
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
48 87
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 89
51our %COMMAND = (); 90our %COMMAND = ();
52our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
58our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
59 98
60our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
61our @EVENT; 100our @EVENT;
62 101
63our $CONFDIR = confdir; 102our $CONFDIR = confdir;
64our $DATADIR = datadir; 103our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
116our %RESOURCE;
74 117
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $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 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 120our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
82 122
123our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 125our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 126our $DB_ENV;
85 127
86our %CFG; 128our %CFG;
87 129
88our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 131our $RUNTIME;
132our $NOW;
90 133
91our %PLAYER; # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 135our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
94 137
95# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 140
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
101 145
102binmode STDOUT; 146binmode STDOUT;
103binmode STDERR; 147binmode STDERR;
104 148
105# read virtual server time, if available 149# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
110} 154}
111 155
112mkdir $_ 156mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 202
159The raw value load value from the last tick. 203The raw value load value from the last tick.
160 204
161=item %cf::CFG 205=item %cf::CFG
162 206
163Configuration for the server, loaded from C</etc/crossfire/config>, or 207Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 208from wherever your confdir points to.
165 209
166=item cf::wait_for_tick, cf::wait_for_tick_begin 210=item cf::wait_for_tick, cf::wait_for_tick_begin
167 211
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 212These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 230 $msg .= "\n"
187 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
188 232
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 234
191 utf8::encode $msg;
192 LOG llevError, $msg; 235 LOG llevError, $msg;
193 }; 236 };
194} 237}
238
239$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "=="
241
242 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d#
245 }#d#
246
247 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate
250};
251
252$SIG{__DIE__} = sub { }; #d#?
195 253
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 264for my $pkg (qw(
207 cf::global cf::attachable 265 cf::global cf::attachable
208 cf::object cf::object::player 266 cf::object cf::object::player
209 cf::client cf::player 267 cf::client cf::player
210 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
211 cf::map cf::party cf::region 270 cf::party cf::region
212)) { 271)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 273}
216 274
217$Event::DIED = sub { 275$EV::DIED = sub {
218 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
219}; 277};
220 278
221############################################################################# 279#############################################################################
222 280
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 303 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 304 $d
247 } || "[unable to dump $_[0]: '$@']"; 305 } || "[unable to dump $_[0]: '$@']";
248} 306}
249 307
250=item $ref = cf::from_json $json 308=item $ref = cf::decode_json $json
251 309
252Converts a JSON string into the corresponding perl data structure. 310Converts a JSON string into the corresponding perl data structure.
253 311
254=item $json = cf::to_json $ref 312=item $json = cf::encode_json $ref
255 313
256Converts a perl data structure into its JSON representation. 314Converts a perl data structure into its JSON representation.
257 315
258=cut 316=cut
259 317
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 319
262sub to_json ($) { $json_coder->encode ($_[0]) } 320sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 321sub decode_json($) { $json_coder->decode ($_[0]) }
264 322
265=item cf::lock_wait $string 323=item cf::lock_wait $string
266 324
267Wait until the given lock is available. See cf::lock_acquire. 325Wait until the given lock is available. See cf::lock_acquire.
268 326
271Wait until the given lock is available and then acquires it and returns 329Wait 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, 330a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 331for example when the coroutine gets canceled), the lock is automatically
274returned. 332returned.
275 333
334Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro.
336
276Lock names should begin with a unique identifier (for example, cf::map::find 337Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 338uses map_find and cf::map::load uses map_load).
278 339
279=item $locked = cf::lock_active $string 340=item $locked = cf::lock_active $string
280 341
281Return true if the lock is currently active, i.e. somebody has locked it. 342Return true if the lock is currently active, i.e. somebody has locked it.
282 343
283=cut 344=cut
284 345
285our %LOCK; 346our %LOCK;
347our %LOCKER;#d#
286 348
287sub lock_wait($) { 349sub lock_wait($) {
288 my ($key) = @_; 350 my ($key) = @_;
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
289 356
290 # wait for lock, if any 357 # wait for lock, if any
291 while ($LOCK{$key}) { 358 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 359 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 360 Coro::schedule;
299 366
300 # wait, to be sure we are not locked 367 # wait, to be sure we are not locked
301 lock_wait $key; 368 lock_wait $key;
302 369
303 $LOCK{$key} = []; 370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
304 372
305 Coro::guard { 373 Coro::guard {
374 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 375 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 376 $_->ready for @{ delete $LOCK{$key} };
308 } 377 }
309} 378}
310 379
313 382
314 ! ! $LOCK{$key} 383 ! ! $LOCK{$key}
315} 384}
316 385
317sub freeze_mainloop { 386sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 387 tick_inhibit_inc;
319 388
320 my $guard = Coro::guard { 389 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 390}
322 }; 391
323 $TICK_WATCHER->stop; 392=item cf::periodic $interval, $cb
324 $guard 393
394Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer.
396
397=cut
398
399sub periodic($$) {
400 my ($interval, $cb) = @_;
401
402 my $start = rand List::Util::min 180, $interval;
403
404 EV::periodic $start, $interval, 0, $cb
325} 405}
326 406
327=item cf::get_slot $time[, $priority[, $name]] 407=item cf::get_slot $time[, $priority[, $name]]
328 408
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 409Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 420our @SLOT_QUEUE;
341our $SLOT_QUEUE; 421our $SLOT_QUEUE;
342 422
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 423$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 424$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager");
426
345 my $signal = new Coro::Signal; 427 my $signal = new Coro::Signal;
346 428
347 while () { 429 while () {
348 next_job: 430 next_job:
349 my $avail = cf::till_tick; 431 my $avail = cf::till_tick;
357 } 439 }
358 } 440 }
359 } 441 }
360 442
361 if (@SLOT_QUEUE) { 443 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 444 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 445 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 446 $signal->wait;
365 } else { 447 } else {
366 Coro::schedule; 448 Coro::schedule;
367 } 449 }
368 } 450 }
369}; 451};
370 452
371sub get_slot($;$$) { 453sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
372 my ($time, $pri, $name) = @_; 456 my ($time, $pri, $name) = @_;
373 457
374 $time = $TICK * .6 if $time > $TICK * .6; 458 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 459 my $sig = new Coro::Signal;
376 460
390 474
391BEGIN { *async = \&Coro::async_pool } 475BEGIN { *async = \&Coro::async_pool }
392 476
393=item cf::sync_job { BLOCK } 477=item cf::sync_job { BLOCK }
394 478
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 479The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 480is 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 481partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 482acceptable.
399 483
400If it must be done, put the blocking parts into C<sync_job>. This will run 484If 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 485the given BLOCK in another coroutine while waiting for the result. The
406 490
407sub sync_job(&) { 491sub sync_job(&) {
408 my ($job) = @_; 492 my ($job) = @_;
409 493
410 if ($Coro::current == $Coro::main) { 494 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 495 my $time = EV::time;
412 496
413 # this is the main coro, too bad, we have to block 497 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 498 # till the operation succeeds, freezing the server :/
415 499
416 # TODO: use suspend/resume instead 500 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 501
418 my $freeze_guard = freeze_mainloop; 502 my $freeze_guard = freeze_mainloop;
419 503
420 my $busy = 1; 504 my $busy = 1;
421 my @res; 505 my @res;
422 506
423 (async { 507 (async {
508 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 509 @res = eval { $job->() };
425 warn $@ if $@; 510 warn $@ if $@;
426 undef $busy; 511 undef $busy;
427 })->prio (Coro::PRIO_MAX); 512 })->prio (Coro::PRIO_MAX);
428 513
429 while ($busy) { 514 while ($busy) {
430 Coro::cede or Event::one_event; 515 if (Coro::nready) {
516 Coro::cede_notself;
517 } else {
518 EV::loop EV::LOOP_ONESHOT;
431 } 519 }
520 }
432 521
433 $time = Event::time - $time; 522 my $time = EV::time - $time;
434 523
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 524 $TICK_START += $time; # do not account sync jobs to server load
439 525
440 wantarray ? @res : $res[0] 526 wantarray ? @res : $res[0]
441 } else { 527 } else {
442 # we are in another coroutine, how wonderful, everything just works 528 # we are in another coroutine, how wonderful, everything just works
443 529
468=item fork_call { }, $args 554=item fork_call { }, $args
469 555
470Executes the given code block with the given arguments in a seperate 556Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 557process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 558Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 559never block itself or use any form of event handling.
474 560
475=cut 561=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 562
486sub fork_call(&@) { 563sub fork_call(&@) {
487 my ($cb, @args) = @_; 564 my ($cb, @args) = @_;
488 565
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 566 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 567 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 568 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 569
494 if (my $pid = fork) { 570 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; 571 reset_signals;
508 local $SIG{__WARN__}; 572 &$cb
509 local $SIG{__DIE__}; 573 }, @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 574
516 eval { 575 wantarray ? @res : $res[-1]
517 close $fh1; 576}
518 577
519 my @res = eval { $cb->(@args) }; 578=item $coin = coin_from_name $name
520 579
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 580=cut
522 close $fh2;
523 };
524 581
525 warn $@ if $@; 582our %coin_alias = (
526 _exit 0; 583 "silver" => "silvercoin",
527 } 584 "silvercoin" => "silvercoin",
585 "silvercoins" => "silvercoin",
586 "gold" => "goldcoin",
587 "goldcoin" => "goldcoin",
588 "goldcoins" => "goldcoin",
589 "platinum" => "platinacoin",
590 "platinumcoin" => "platinacoin",
591 "platinumcoins" => "platinacoin",
592 "platina" => "platinacoin",
593 "platinacoin" => "platinacoin",
594 "platinacoins" => "platinacoin",
595 "royalty" => "royalty",
596 "royalties" => "royalty",
597);
598
599sub coin_from_name($) {
600 $coin_alias{$_[0]}
601 ? cf::arch::find $coin_alias{$_[0]}
602 : undef
528} 603}
529 604
530=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
531 606
532Returns a single value from the environment database. 607Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 609=item cf::db_put $family => $key => $value
535 610
536Stores the given C<$value> in the family. It can currently store binary 611Stores 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). 612data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 613
614=item $db = cf::db_table "name"
615
616Create and/or open a new database table. The string must not be "db" and must be unique
617within each server.
618
539=cut 619=cut
620
621sub db_table($) {
622 my ($name) = @_;
623 my $db = BDB::db_create $DB_ENV;
624
625 eval {
626 $db->set_flags (BDB::CHKSUM);
627
628 utf8::encode $name;
629 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
630 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
631 cf::cleanup "db_open(db): $!" if $!;
632 };
633 cf::cleanup "db_open(db): $@" if $@;
634
635 $db
636}
540 637
541our $DB; 638our $DB;
542 639
543sub db_init { 640sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 641 cf::sync_job {
548 eval { 642 $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 } 643 };
558} 644}
559 645
560sub db_get($$) { 646sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 647 my $key = "$_[0]/$_[1]";
562 648
612 if (1) { 698 if (1) {
613 $md5 = 699 $md5 =
614 join "\x00", 700 join "\x00",
615 $processversion, 701 $processversion,
616 map { 702 map {
617 Coro::cede; 703 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 704 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 705 } 0.. $#$src;
620 706
621 707
622 my $dbmd5 = db_get cache => "$id/md5"; 708 my $dbmd5 = db_get cache => "$id/md5";
660 746
661############################################################################# 747#############################################################################
662 748
663=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
664 750
665Many objects in crossfire are so-called attachable objects. That means you can 751Many objects in deliantra are so-called attachable objects. That means you can
666attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
668 754
669In the following description, CLASS can be any of C<global>, C<object> 755In 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 756C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 757Deliantra).
672 758
673=over 4 759=over 4
674 760
675=item $attachable->attach ($attachment, key => $value...) 761=item $attachable->attach ($attachment, key => $value...)
676 762
720=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
721 807
722Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
724 810
725Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
726that are attached at load/instantiate time, thus the need for a name. 812that are attached at load/instantiate time, thus the need for a name.
727 813
728These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
729 815
730=over 4 816=over 4
958 } 1044 }
959 1045
960 0 1046 0
961} 1047}
962 1048
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1049=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1050
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1052
967Generate an object-specific event with the given arguments. 1053Generate an object-specific event with the given arguments.
968 1054
974 1060
975=cut 1061=cut
976 1062
977############################################################################# 1063#############################################################################
978# object support 1064# object support
979#
980 1065
1066sub _object_equal($$);
1067sub _object_equal($$) {
1068 my ($a, $b) = @_;
1069
1070 return 0 unless (ref $a) eq (ref $b);
1071
1072 if ("HASH" eq ref $a) {
1073 my @ka = keys %$a;
1074 my @kb = keys %$b;
1075
1076 return 0 if @ka != @kb;
1077
1078 for (0 .. $#ka) {
1079 return 0 unless $ka[$_] eq $kb[$_];
1080 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1081 }
1082
1083 } elsif ("ARRAY" eq ref $a) {
1084
1085 return 0 if @$a != @$b;
1086
1087 for (0 .. $#$a) {
1088 return 0 unless _object_equal $a->[$_], $b->[$_];
1089 }
1090
1091 } elsif ($a ne $b) {
1092 return 0;
1093 }
1094
1095 1
1096}
1097
1098our $SLOW_MERGES;#d#
981sub _can_merge { 1099sub _can_merge {
982 my ($ob1, $ob2) = @_; 1100 my ($ob1, $ob2) = @_;
983 1101
984 local $Storable::canonical = 1; 1102 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1103
988 $fob1 eq $fob2 1104 # we do the slow way here
1105 return _object_equal $ob1, $ob2
989} 1106}
990 1107
991sub reattach { 1108sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1110 my ($obj) = @_;
994 1111
1112 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1113 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1114
997 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
998 1116
999 @$registry = (); 1117 @$registry = ();
1000 1118
1015cf::attachable->attach ( 1133cf::attachable->attach (
1016 prio => -1000000, 1134 prio => -1000000,
1017 on_instantiate => sub { 1135 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1136 my ($obj, $data) = @_;
1019 1137
1020 $data = from_json $data; 1138 $data = decode_json $data;
1021 1139
1022 for (@$data) { 1140 for (@$data) {
1023 my ($name, $args) = @$_; 1141 my ($name, $args) = @$_;
1024 1142
1025 $obj->attach ($name, %{$args || {} }); 1143 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1159sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1160 my ($filename, $rdata, $objs) = @_;
1043 1161
1044 sync_job { 1162 sync_job {
1045 if (length $$rdata) { 1163 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
1048 1167
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1172 aio_close $fh;
1054 1173
1055 if (@$objs) { 1174 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1180 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1182 }
1064 } else { 1183 } else {
1065 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
1066 } 1185 }
1071 } 1190 }
1072 } else { 1191 } else {
1073 aio_unlink $filename; 1192 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1193 aio_unlink "$filename.pst";
1075 } 1194 }
1076 } 1195 };
1077} 1196}
1078 1197
1079sub object_freezer_as_string { 1198sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1199 my ($rdata, $objs) = @_;
1081 1200
1093 or return; 1212 or return;
1094 1213
1095 unless (aio_stat "$filename.pst") { 1214 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1215 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1216 or return;
1217
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1218 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs};
1099 } 1220 }
1100 1221
1222 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1223 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1224 $decname, length $data, scalar @{$av || []};
1225
1103 return ($data, $av); 1226 ($data, $av)
1104} 1227}
1105 1228
1106=head2 COMMAND CALLBACKS 1229=head2 COMMAND CALLBACKS
1107 1230
1108=over 4 1231=over 4
1186 my ($type, $reply, @payload) = 1309 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1310 "ARRAY" eq ref $msg
1188 ? @$msg 1311 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1313
1314 my @reply;
1315
1191 if (my $cb = $EXTCMD{$type}) { 1316 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1317 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1318 }
1319
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1197 } else { 1323 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1325 }
1200 1326
1201 cf::override; 1327 cf::override;
1228 1354
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1357
1232 $ext{source} = 1358 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1235 . $source 1361 . $source
1236 . "\n};\n1"; 1362 . "\n};\n1";
1237 1363
1238 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1380 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1381 : "$v->{base}: extension inactive.\n";
1256 1382
1257 if (exists $v->{meta}{mandatory}) { 1383 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1384 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1385 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1386 }
1262 1387
1263 warn $msg; 1388 warn $msg;
1264 } 1389 }
1265 1390
1279 1404
1280=back 1405=back
1281 1406
1282=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1283 1408
1284Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1285 1410
1286=cut 1411=cut
1287 1412
1288package cf::player; 1413package cf::player;
1289 1414
1290use Coro::AIO; 1415use Coro::AIO;
1291 1416
1292=head3 cf::player 1417=head3 cf::player
1293 1418
1294=over 4 1419=over 4
1420
1421=item cf::player::num_playing
1422
1423Returns the official number of playing players, as per the Crossfire metaserver rules.
1424
1425=cut
1426
1427sub num_playing {
1428 scalar grep
1429 $_->ob->map
1430 && !$_->hidden
1431 && !$_->ob->flag (cf::FLAG_WIZ),
1432 cf::player::list
1433}
1295 1434
1296=item cf::player::find $login 1435=item cf::player::find $login
1297 1436
1298Returns the given player object, loading it if necessary (might block). 1437Returns the given player object, loading it if necessary (might block).
1299 1438
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1474 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1475 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1476 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1477 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1478
1340 my $pl = load_pl path $login 1479 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1480 or return;
1481
1482 my $pl = cf::player::load_pl $f
1483 or return;
1484
1485 local $cf::PLAYER_LOADING{$login} = $pl;
1486 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1343 } 1488 }
1344 } 1489 }
1345} 1490}
1346 1491
1355 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1356 1501
1357 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1359 1504
1505 cf::get_slot 0.01;
1506
1360 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1361 Coro::cede; 1508 cf::cede_to_tick;
1362} 1509}
1363 1510
1364sub new($) { 1511sub new($) {
1365 my ($login) = @_; 1512 my ($login) = @_;
1366 1513
1395 my ($pl) = @_; 1542 my ($pl) = @_;
1396 1543
1397 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1398 1545
1399 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1400 $pl->password ("*"); # this should lock out the player until we nuked the dir 1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1401 1548
1402 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1403 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1404 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1405 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1406 1555
1407 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1408 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
1444 or return []; 1593 or return [];
1445 1594
1446 my @logins; 1595 my @logins;
1447 1596
1448 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1598 my $path = path $login;
1599
1600 # a .pst is a dead give-away for a valid player
1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1606 }
1452 1607
1453 utf8::decode $login; 1608 utf8::decode $login;
1454 push @logins, $login; 1609 push @logins, $login;
1455 } 1610 }
1456 1611
1483 } 1638 }
1484 1639
1485 \@paths 1640 \@paths
1486} 1641}
1487 1642
1488=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1489 1644
1490Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1491
1492=cut
1493
1494sub expand_cfpod {
1495 ((my $self), (local $_)) = @_;
1496
1497 # escape & and <
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500
1501 # this is buggy, it needs to properly take care of nested <'s
1502
1503 1 while
1504 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/
1508 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1
1511 }ge
1512 # replace H<hint text>
1513 || s{H<([^\>]*)>}
1514 {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "")
1518 [$self->{hintmode}]
1519 }ge;
1520
1521 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g;
1523
1524 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines
1529
1530 $_
1531}
1532
1533sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode}
1536}
1537 1646
1538=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1539 1648
1540Sends an ext reply to the player. 1649Sends an ext reply to the player.
1541 1650
1542=cut 1651=cut
1543 1652
1544sub ext_reply($$@) { 1653sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1654 my ($self, $id, @msg) = @_;
1546 1655
1547 if ($self->ns->extcmd == 2) { 1656 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1657}
1555 1658
1556=item $player->ext_msg ($type, @msg) 1659=item $player->ext_msg ($type, @msg)
1557 1660
1558Sends an ext event to the client. 1661Sends an ext event to the client.
1614our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1615our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1616 1719
1617sub generate_random_map { 1720sub generate_random_map {
1618 my ($self, $rmp) = @_; 1721 my ($self, $rmp) = @_;
1722
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724
1619 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1620 $self->_create_random_map ( 1726 $self->_create_random_map (
1621 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1622 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1623 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1745 1851
1746# the temporary/swap location 1852# the temporary/swap location
1747sub save_path { 1853sub save_path {
1748 my ($self) = @_; 1854 my ($self) = @_;
1749 1855
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1752} 1858}
1753 1859
1754# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1755sub uniq_path { 1861sub uniq_path {
1756 my ($self) = @_; 1862 my ($self) = @_;
1757 1863
1758 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1759 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1760} 1866}
1761 1867
1762# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1763# all maps in C++... 1869# all maps in C++...
1786 1892
1787sub load_header_from($) { 1893sub load_header_from($) {
1788 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1789 1895
1790 utf8::encode $path; 1896 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1898 or return;
1899
1900 $self->_load_header ($f)
1901 or return;
1902
1903 local $MAP_LOADING{$self->{path}} = $self;
1904 $f->resolve_delayed_derefs;
1796 1905
1797 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1798 1907
1799 1 1908 1
1800} 1909}
1854sub find { 1963sub find {
1855 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1856 1965
1857 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1858 1967
1968 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1860 1970
1861 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1862 my $guard = cf::lock_acquire "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1863 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
1864 or return; 1976 or return;
1865 1977
1866 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
1867 1979
1869 or return; 1981 or return;
1870 1982
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
1987 undef $guard1;
1874 $map->reset; 1988 $map->reset;
1875 undef $guard;
1876 return find $path; 1989 return find $path;
1877 } 1990 }
1878 1991
1879 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
1880 } 1993 }
1889 local $self->{deny_reset} = 1; # loading can take a long time 2002 local $self->{deny_reset} = 1; # loading can take a long time
1890 2003
1891 my $path = $self->{path}; 2004 my $path = $self->{path};
1892 2005
1893 { 2006 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 2007 my $guard = cf::lock_acquire "map_data:$path";
1895 2008
2009 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2010 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2011
1898 $self->in_memory (cf::MAP_LOADING); 2012 $self->in_memory (cf::MAP_LOADING);
1899 2013
1900 $self->alloc; 2014 $self->alloc;
1901 2015
1902 $self->pre_load; 2016 $self->pre_load;
1903 Coro::cede; 2017 cf::cede_to_tick;
1904 2018
2019 my $f = new_from_file cf::object::thawer $self->{load_path};
2020 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 2021 $self->_load_objects ($f)
1906 or return; 2022 or return;
1907 2023
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
1909 if delete $self->{load_original}; 2025 if delete $self->{load_original};
1910 2026
1911 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 2028 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 2029 unless (aio_stat $uniq) {
2030 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 2031 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 2032 $self->_load_objects ($f);
2033 $f->resolve_delayed_derefs;
2034 }
1916 } 2035 }
1917 } 2036 }
1918 2037
1919 Coro::cede; 2038 $f->resolve_delayed_derefs;
2039
2040 cf::cede_to_tick;
1920 # now do the right thing for maps 2041 # now do the right thing for maps
1921 $self->link_multipart_objects; 2042 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 2043 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 2044 unless $self->difficulty;
1924 Coro::cede; 2045 cf::cede_to_tick;
1925 2046
1926 unless ($self->{deny_activate}) { 2047 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 2048 $self->decay_objects;
1928 $self->fix_auto_apply; 2049 $self->fix_auto_apply;
1929 $self->update_buttons; 2050 $self->update_buttons;
1930 Coro::cede; 2051 cf::cede_to_tick;
1931 $self->set_darkness_map; 2052 $self->set_darkness_map;
1932 Coro::cede; 2053 cf::cede_to_tick;
1933 $self->activate; 2054 $self->activate;
1934 } 2055 }
1935 2056
1936 $self->{last_save} = $cf::RUNTIME; 2057 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2058 $self->last_access ($cf::RUNTIME);
1938 2059
1939 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
1940 } 2061 }
1941 2062
1942 $self->post_load; 2063 $self->post_load;
1943} 2064}
1944 2065
1953 2074
1954 $self 2075 $self
1955} 2076}
1956 2077
1957# find and load all maps in the 3x3 area around a map 2078# find and load all maps in the 3x3 area around a map
1958sub load_diag { 2079sub load_neighbours {
1959 my ($map) = @_; 2080 my ($map) = @_;
1960 2081
1961 my @diag; # diagonal neighbours 2082 my @neigh; # diagonal neighbours
1962 2083
1963 for (0 .. 3) { 2084 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2085 my $neigh = $map->tile_path ($_)
1965 or next; 2086 or next;
1966 $neigh = find $neigh, $map 2087 $neigh = find $neigh, $map
1967 or next; 2088 or next;
1968 $neigh->load; 2089 $neigh->load;
1969 2090
2091 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2092 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2093 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2094 }
1973 2095
1974 for (@diag) { 2096 for (grep defined $_->[0], @neigh) {
2097 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2098 my $neigh = find $path, $origin
1976 or next; 2099 or next;
1977 $neigh->load; 2100 $neigh->load;
1978 } 2101 }
1979} 2102}
1980 2103
1985} 2108}
1986 2109
1987sub do_load_sync { 2110sub do_load_sync {
1988 my ($map) = @_; 2111 my ($map) = @_;
1989 2112
2113 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2114 if $Coro::current == $Coro::main;
2115
1990 cf::sync_job { $map->load }; 2116 cf::sync_job { $map->load };
1991} 2117}
1992 2118
1993our %MAP_PREFETCH; 2119our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2120our $MAP_PREFETCHER = undef;
1995 2121
1996sub find_async { 2122sub find_async {
1997 my ($path, $origin) = @_; 2123 my ($path, $origin, $load) = @_;
1998 2124
1999 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
2000 2126
2001 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2003 } 2129 }
2004 2130
2005 undef $MAP_PREFETCH{$path}; 2131 $MAP_PREFETCH{$path} |= $load;
2132
2006 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
2134 $Coro::current->{desc} = "map prefetcher";
2135
2007 while (%MAP_PREFETCH) { 2136 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2137 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2138 if (my $map = find $k) {
2010 $map->load; 2139 $map->load if $v;
2011 } 2140 }
2012 2141
2013 delete $MAP_PREFETCH{$path}; 2142 delete $MAP_PREFETCH{$k};
2014 } 2143 }
2015 } 2144 }
2016 undef $MAP_PREFETCHER; 2145 undef $MAP_PREFETCHER;
2017 }; 2146 };
2018 $MAP_PREFETCHER->prio (6); 2147 $MAP_PREFETCHER->prio (6);
2021} 2150}
2022 2151
2023sub save { 2152sub save {
2024 my ($self) = @_; 2153 my ($self) = @_;
2025 2154
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2156
2028 $self->{last_save} = $cf::RUNTIME; 2157 $self->{last_save} = $cf::RUNTIME;
2029 2158
2030 return unless $self->dirty; 2159 return unless $self->dirty;
2031 2160
2037 return if $self->{deny_save}; 2166 return if $self->{deny_save};
2038 2167
2039 local $self->{last_access} = $self->last_access;#d# 2168 local $self->{last_access} = $self->last_access;#d#
2040 2169
2041 cf::async { 2170 cf::async {
2171 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
2043 }; 2173 };
2174
2175 cf::get_slot 0.02;
2044 2176
2045 if ($uniq) { 2177 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2047 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2048 } else { 2180 } else {
2054 my ($self) = @_; 2186 my ($self) = @_;
2055 2187
2056 # save first because save cedes 2188 # save first because save cedes
2057 $self->save; 2189 $self->save;
2058 2190
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2192
2061 return if $self->players; 2193 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
2063 return if $self->{deny_save}; 2195 return if $self->{deny_save};
2064 2196
2197 $self->in_memory (cf::MAP_SWAPPED);
2198
2199 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2201 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2202}
2068 2203
2069sub reset_at { 2204sub reset_at {
2070 my ($self) = @_; 2205 my ($self) = @_;
2071 2206
2103 if $uniq; 2238 if $uniq;
2104 } 2239 }
2105 2240
2106 delete $cf::MAP{$self->path}; 2241 delete $cf::MAP{$self->path};
2107 2242
2243 $self->deactivate;
2244 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2245 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2246
2112 $self->unlink_save; 2247 $self->unlink_save;
2113 $self->destroy; 2248 $self->destroy;
2114} 2249}
2115 2250
2116my $nuke_counter = "aaaa"; 2251my $nuke_counter = "aaaa";
2117 2252
2118sub nuke { 2253sub nuke {
2119 my ($self) = @_; 2254 my ($self) = @_;
2120 2255
2256 {
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2121 delete $cf::MAP{$self->path}; 2259 delete $cf::MAP{$self->path};
2122 2260
2123 $self->unlink_save; 2261 $self->unlink_save;
2124 2262
2125 bless $self, "cf::map"; 2263 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2264 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2265 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2266 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2267 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2268
2131 $cf::MAP{$self->path} = $self; 2269 $cf::MAP{$self->path} = $self;
2270 }
2132 2271
2133 $self->reset; # polite request, might not happen 2272 $self->reset; # polite request, might not happen
2134} 2273}
2135 2274
2136=item $maps = cf::map::tmp_maps 2275=item $maps = cf::map::tmp_maps
2178 2317
2179sub unique_maps() { 2318sub unique_maps() {
2180 [ 2319 [
2181 map { 2320 map {
2182 utf8::decode $_; 2321 utf8::decode $_;
2183 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2184 ? normalise $_ 2325 : normalise $_
2185 : ()
2186 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2187 ] 2327 ]
2188} 2328}
2189 2329
2190package cf;
2191
2192=back 2330=back
2193 2331
2194=head3 cf::object 2332=head3 cf::object
2195 2333
2196=cut 2334=cut
2199 2337
2200=over 4 2338=over 4
2201 2339
2202=item $ob->inv_recursive 2340=item $ob->inv_recursive
2203 2341
2204Returns the inventory of the object _and_ their inventories, recursively. 2342Returns the inventory of the object I<and> their inventories, recursively,
2343but I<not> the object itself.
2205 2344
2206=cut 2345=cut
2207 2346
2208sub inv_recursive_; 2347sub inv_recursive_;
2209sub inv_recursive_ { 2348sub inv_recursive_ {
2212 2351
2213sub inv_recursive { 2352sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2215} 2354}
2216 2355
2356=item $ref = $ob->ref
2357
2358Creates and returns a persistent reference to an object that can be stored as a string.
2359
2360=item $ob = cf::object::deref ($refstring)
2361
2362returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2363even if the object actually exists. May block.
2364
2365=cut
2366
2367sub deref {
2368 my ($ref) = @_;
2369
2370 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2371 my ($uuid, $name) = ($1, $2);
2372 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2373 or return;
2374 $pl->ob->uuid eq $uuid
2375 or return;
2376
2377 $pl->ob
2378 } else {
2379 warn "$ref: cannot resolve object reference\n";
2380 undef
2381 }
2382}
2383
2217package cf; 2384package cf;
2218 2385
2219=back 2386=back
2220 2387
2221=head3 cf::object::player 2388=head3 cf::object::player
2227Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2394Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2228can be C<undef>. Does the right thing when the player is currently in a 2395can be C<undef>. Does the right thing when the player is currently in a
2229dialogue with the given NPC character. 2396dialogue with the given NPC character.
2230 2397
2231=cut 2398=cut
2399
2400our $SAY_CHANNEL = {
2401 id => "say",
2402 title => "Map",
2403 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2405};
2406
2407our $CHAT_CHANNEL = {
2408 id => "chat",
2409 title => "Chat",
2410 reply => "chat ",
2411 tooltip => "Player chat and shouts, global to the server.",
2412};
2232 2413
2233# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2234# with dialog boxes. 2415# with dialog boxes.
2235#TODO: the first argument must go, split into a $npc->reply_to ( method 2416#TODO: the first argument must go, split into a $npc->reply_to ( method
2236sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2248 my $dialog = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2250 2431
2251 } else { 2432 } else {
2252 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2253 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2254 } 2435 }
2255 } 2436 }
2256} 2437}
2257 2438
2258=item $object->send_msg ($channel, $msg, $color, [extra...]) 2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2283 2464
2284=item $player_object->enter_link 2465=item $player_object->enter_link
2285 2466
2286Freezes the player and moves him/her to a special map (C<{link}>). 2467Freezes the player and moves him/her to a special map (C<{link}>).
2287 2468
2288The player should be reasonably safe there for short amounts of time. You 2469The player should be reasonably safe there for short amounts of time (e.g.
2289I<MUST> call C<leave_link> as soon as possible, though. 2470for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link
2472map.
2290 2473
2291Will never block. 2474Will never block.
2292 2475
2293=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2294 2477
2349 # use -1 or undef as default coordinates, not 0, 0 2532 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2533 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2534 if $x <=0 && $y <= 0;
2352 2535
2353 $map->load; 2536 $map->load;
2354 $map->load_diag; 2537 $map->load_neighbours;
2355 2538
2356 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2357 $self->activate_recursive; 2541 $self->activate_recursive;
2358 2542
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2360 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2361} 2545}
2366her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2367that has to return the map if sucecssful, and then unfreezes the player on 2551that has to return the map if sucecssful, and then unfreezes the player on
2368the new (success) or old (failed) map position. In either case, $done will 2552the new (success) or old (failed) map position. In either case, $done will
2369be called at the end of this process. 2553be called at the end of this process.
2370 2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2557
2371=cut 2558=cut
2372 2559
2373our $GOTOGEN; 2560our $GOTOGEN;
2374 2561
2375sub cf::object::player::goto { 2562sub cf::object::player::goto {
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2567
2381 $self->enter_link; 2568 $self->enter_link;
2382 2569
2383 (async { 2570 (async {
2571 $Coro::current->{desc} = "player::goto $path $x $y";
2572
2573 # *tag paths override both path and x|y
2574 if ($path =~ /^\*(.*)$/) {
2575 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2576 my $ob = $obs[rand @obs];
2577
2578 # see if we actually can go there
2579 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2580 $ob = $obs[rand @obs];
2581 } else {
2582 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2583 }
2584 # else put us there anyways for now #d#
2585
2586 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2587 } else {
2588 ($path, $x, $y) = (undef, undef, undef);
2589 }
2590 }
2591
2384 my $map = eval { 2592 my $map = eval {
2385 my $map = cf::map::find $path; 2593 my $map = defined $path ? cf::map::find $path : undef;
2386 2594
2387 if ($map) { 2595 if ($map) {
2388 $map = $map->customise_for ($self); 2596 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2597 $map = $check->($map) if $check && $map;
2390 } else { 2598 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2600 }
2393 2601
2394 $map 2602 $map
2395 }; 2603 };
2396 2604
2432} 2640}
2433 2641
2434sub prepare_random_map { 2642sub prepare_random_map {
2435 my ($exit) = @_; 2643 my ($exit) = @_;
2436 2644
2437 my $guard = cf::lock_acquire "exit_prepare:$exit";
2438
2439 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2440 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2441 # that depends on the exit object 2647 # that depends on the exit object
2442 2648
2443 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2445 if ($exit->map) { 2651 if ($exit->map) {
2446 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2447 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2448 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2449 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2450 } 2658 }
2451 2659
2452 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2453 2661
2454 my $data = cf::to_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2455 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2456 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2457 2665
2458 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2459 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2460 undef $fh; 2668 undef $fh;
2461 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2462 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2463 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2464 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2465 } 2677 }
2466} 2678}
2467 2679
2468sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2469 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2470 2682
2471 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2472 2684
2473 if ($exit->slaying eq "/!") {
2474 #TODO: this should de-fi-ni-te-ly not be a sync-job
2475 # the problem is that $exit might not survive long enough
2476 # so it needs to be done right now, right here
2477 cf::sync_job { prepare_random_map $exit };
2478 }
2479
2480 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2481 my $hp = $exit->stats->hp;
2482 my $sp = $exit->stats->sp;
2483
2484 $self->enter_link; 2685 $self->enter_link;
2485 2686
2486 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED);
2489
2490 (async { 2687 (async {
2491 $self->deactivate_recursive; # just to be sure 2688 $Coro::current->{desc} = "enter_exit";
2689
2492 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2493 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2494 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2495 1; 2711 1
2496 }) { 2712 }) {
2497 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2498 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2499 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2500 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2501 2717
2502 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2532 2748
2533=cut 2749=cut
2534 2750
2751# non-persistent channels (usually the info channel)
2752our %CHANNEL = (
2753 "c/identify" => {
2754 id => "infobox",
2755 title => "Identify",
2756 reply => undef,
2757 tooltip => "Items recently identified",
2758 },
2759 "c/examine" => {
2760 id => "infobox",
2761 title => "Examine",
2762 reply => undef,
2763 tooltip => "Signs and other items you examined",
2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2807);
2808
2535sub cf::client::send_msg { 2809sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2811
2538 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2539 2814
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2816
2817 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel};
2820
2821 $self->ext_msg (channel_info => $channel)
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id};
2825
2542 if (ref $channel) { 2826 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2827 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2828 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2829 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2830 $self->ext_msg (channel_info => $channel)
2831 if $self->can_msg;
2547 } 2832 }
2548 2833
2549 $channel = $channel->{id}; 2834 $channel = $channel->{id};
2550 } 2835 }
2551 2836
2554 if ($self->can_msg) { 2839 if ($self->can_msg) {
2555 # default colour, mask it out 2840 # default colour, mask it out
2556 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2557 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2558 2843
2559 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2560 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2561 } else { 2860 } else {
2562 if ($color >= 0) { 2861 if ($color >= 0) {
2563 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2564 for ($msg) { 2863 for ($msg) {
2565 1 while 2864 1 while
2592=cut 2891=cut
2593 2892
2594sub cf::client::ext_msg($$@) { 2893sub cf::client::ext_msg($$@) {
2595 my ($self, $type, @msg) = @_; 2894 my ($self, $type, @msg) = @_;
2596 2895
2597 my $extcmd = $self->extcmd;
2598
2599 if ($extcmd == 2) { 2896 if ($self->extcmd == 2) {
2600 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2601 } elsif ($extcmd == 1) { # TODO: remove 2898 } elsif ($self->extcmd == 1) { # TODO: remove
2602 push @msg, msgtype => "event_$type"; 2899 push @msg, msgtype => "event_$type";
2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 }
2902}
2903
2904=item $client->ext_reply ($msgid, @msg)
2905
2906Sends an ext reply to the client.
2907
2908=cut
2909
2910sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_;
2912
2913 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id;
2603 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2604 } 2919 }
2605} 2920}
2606 2921
2607=item $success = $client->query ($flags, "text", \&cb) 2922=item $success = $client->query ($flags, "text", \&cb)
2669 my ($type, $reply, @payload) = 2984 my ($type, $reply, @payload) =
2670 "ARRAY" eq ref $msg 2985 "ARRAY" eq ref $msg
2671 ? @$msg 2986 ? @$msg
2672 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2987 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2673 2988
2989 my @reply;
2990
2674 if (my $cb = $EXTICMD{$type}) { 2991 if (my $cb = $EXTICMD{$type}) {
2675 my @reply = $cb->($ns, @payload); 2992 @reply = $cb->($ns, @payload);
2676
2677 $ns->ext_reply ($reply, @reply)
2678 if $reply;
2679 } 2993 }
2994
2995 $ns->ext_reply ($reply, @reply)
2996 if $reply;
2997
2680 } else { 2998 } else {
2681 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2999 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2682 } 3000 }
2683 3001
2684 cf::override; 3002 cf::override;
2744=pod 3062=pod
2745 3063
2746The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
2747 3065
2748 cf::object 3066 cf::object
2749 contr pay_amount pay_player map x y force_find force_add 3067 contr pay_amount pay_player map x y force_find force_add destroy
2750 insert remove name archname title slaying race 3068 insert remove name archname title slaying race decrease split
2751 3069
2752 cf::object::player 3070 cf::object::player
2753 player 3071 player
2754 3072
2755 cf::player 3073 cf::player
2760 3078
2761=cut 3079=cut
2762 3080
2763for ( 3081for (
2764 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2765 insert remove inv name archname title slaying race)], 3083 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)],
2766 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
2767 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
2768 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
2769) { 3088) {
2770 no strict 'refs'; 3089 no strict 'refs';
2846# the server's init and main functions 3165# the server's init and main functions
2847 3166
2848sub load_facedata($) { 3167sub load_facedata($) {
2849 my ($path) = @_; 3168 my ($path) = @_;
2850 3169
3170 # HACK to clear player env face cache, we need some signal framework
3171 # for this (global event?)
3172 %ext::player_env::MUSIC_FACE_CACHE = ();
3173
3174 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3175
2851 warn "loading facedata from $path\n"; 3176 warn "loading facedata from $path\n";
2852 3177
2853 my $facedata; 3178 my $facedata;
2854 0 < aio_load $path, $facedata 3179 0 < aio_load $path, $facedata
2855 or die "$path: $!"; 3180 or die "$path: $!";
2857 $facedata = Coro::Storable::thaw $facedata; 3182 $facedata = Coro::Storable::thaw $facedata;
2858 3183
2859 $facedata->{version} == 2 3184 $facedata->{version} == 2
2860 or cf::cleanup "$path: version mismatch, cannot proceed."; 3185 or cf::cleanup "$path: version mismatch, cannot proceed.";
2861 3186
3187 # patch in the exptable
3188 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3191 };
3192 cf::cede_to_tick;
3193
2862 { 3194 {
2863 my $faces = $facedata->{faceinfo}; 3195 my $faces = $facedata->{faceinfo};
2864 3196
2865 while (my ($face, $info) = each %$faces) { 3197 while (my ($face, $info) = each %$faces) {
2866 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3198 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199
2867 cf::face::set_visibility $idx, $info->{visibility}; 3200 cf::face::set_visibility $idx, $info->{visibility};
2868 cf::face::set_magicmap $idx, $info->{magicmap}; 3201 cf::face::set_magicmap $idx, $info->{magicmap};
2869 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2870 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2871 3204
2872 cf::cede_to_tick; 3205 cf::cede_to_tick;
2873 } 3206 }
2874 3207
2875 while (my ($face, $info) = each %$faces) { 3208 while (my ($face, $info) = each %$faces) {
2876 next unless $info->{smooth}; 3209 next unless $info->{smooth};
3210
2877 my $idx = cf::face::find $face 3211 my $idx = cf::face::find $face
2878 or next; 3212 or next;
3213
2879 if (my $smooth = cf::face::find $info->{smooth}) { 3214 if (my $smooth = cf::face::find $info->{smooth}) {
2880 cf::face::set_smooth $idx, $smooth; 3215 cf::face::set_smooth $idx, $smooth;
2881 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2882 } else { 3217 } else {
2883 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3218 warn "smooth face '$info->{smooth}' not found for face '$face'";
2900 3235
2901 { 3236 {
2902 # TODO: for gcfclient pleasure, we should give resources 3237 # TODO: for gcfclient pleasure, we should give resources
2903 # that gcfclient doesn't grok a >10000 face index. 3238 # that gcfclient doesn't grok a >10000 face index.
2904 my $res = $facedata->{resource}; 3239 my $res = $facedata->{resource};
2905 my $enc = JSON::XS->new->utf8->canonical;
2906
2907 my $soundconf = delete $res->{"res/sound.conf"};
2908 3240
2909 while (my ($name, $info) = each %$res) { 3241 while (my ($name, $info) = each %$res) {
2910 my $meta = $enc->encode ({ 3242 if (defined $info->{type}) {
2911 name => $name,
2912 %{ $info->{meta} || {} },
2913 });
2914
2915 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3243 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
2916 3245
2917 if ($info->{type} & 1) { 3246 if ($info->{type} & 1) {
2918 # prepend meta info 3247 # prepend meta info
2919 3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
2920 my $data = pack "(w/a*)*", $meta, $info->{data}; 3254 $data = pack "(w/a*)*", $meta, $info->{data};
2921 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3255 } else {
3256 $data = $info->{data};
3257 }
2922 3258
2923 cf::face::set_data $idx, 0, $data, $chk; 3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type};
2924 } else { 3261 } else {
2925 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3262 $RESOURCE{$name} = $info;
2926 } 3263 }
2927 3264
2928 cf::face::set_type $idx, $info->{type};
2929
2930 cf::cede_to_tick; 3265 cf::cede_to_tick;
2931 } 3266 }
2932
2933 if ($soundconf) {
2934 $soundconf = $enc->decode (delete $soundconf->{data});
2935
2936 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2937 my $sound = $soundconf->{compat}[$_]
2938 or next;
2939
2940 my $face = cf::face::find "sound/$sound->[1]";
2941 cf::sound::set $sound->[0] => $face;
2942 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2943 }
2944
2945 while (my ($k, $v) = each %{$soundconf->{event}}) {
2946 my $face = cf::face::find "sound/$v";
2947 cf::sound::set $k => $face;
2948 }
2949 }
2950 } 3267 }
3268
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2951 3270
2952 1 3271 1
2953} 3272}
3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
2954 3293
2955register_exticmd fx_want => sub { 3294register_exticmd fx_want => sub {
2956 my ($ns, $want) = @_; 3295 my ($ns, $want) = @_;
2957 3296
2958 while (my ($k, $v) = each %$want) { 3297 while (my ($k, $v) = each %$want) {
2959 $ns->fx_want ($k, $v); 3298 $ns->fx_want ($k, $v);
2960 } 3299 }
2961}; 3300};
2962 3301
3302sub load_resource_file($) {
3303 my $guard = lock_acquire "load_resource_file";
3304
3305 my $status = load_resource_file_ $_[0];
3306 get_slot 0.1, 100;
3307 cf::arch::commit_load;
3308
3309 $status
3310}
3311
2963sub reload_regions { 3312sub reload_regions {
3313 # HACK to clear player env face cache, we need some signal framework
3314 # for this (global event?)
3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3316
2964 load_resource_file "$MAPDIR/regions" 3317 load_resource_file "$MAPDIR/regions"
2965 or die "unable to load regions file\n"; 3318 or die "unable to load regions file\n";
2966 3319
2967 for (cf::region::list) { 3320 for (cf::region::list) {
2968 $_->{match} = qr/$_->{match}/ 3321 $_->{match} = qr/$_->{match}/
2976} 3329}
2977 3330
2978sub reload_archetypes { 3331sub reload_archetypes {
2979 load_resource_file "$DATADIR/archetypes" 3332 load_resource_file "$DATADIR/archetypes"
2980 or die "unable to load archetypes\n"; 3333 or die "unable to load archetypes\n";
2981 #d# NEED to laod twice to resolve forward references
2982 # this really needs to be done in an extra post-pass
2983 # (which needs to be synchronous, so solve it differently)
2984 load_resource_file "$DATADIR/archetypes"
2985 or die "unable to load archetypes\n";
2986} 3334}
2987 3335
2988sub reload_treasures { 3336sub reload_treasures {
2989 load_resource_file "$DATADIR/treasures" 3337 load_resource_file "$DATADIR/treasures"
2990 or die "unable to load treasurelists\n"; 3338 or die "unable to load treasurelists\n";
2991} 3339}
2992 3340
2993sub reload_resources { 3341sub reload_resources {
2994 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
2995 3343
3344 reload_facedata;
3345 reload_archetypes;
2996 reload_regions; 3346 reload_regions;
2997 reload_facedata;
2998 #reload_archetypes;#d#
2999 reload_archetypes;
3000 reload_treasures; 3347 reload_treasures;
3001 3348
3002 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
3003} 3350}
3004 3351
3005sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3006 reload_resources; 3357 reload_resources;
3007} 3358}
3008 3359
3009sub cfg_load { 3360sub reload_config {
3010 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
3011 or return; 3362 or return;
3012 3363
3013 local $/; 3364 local $/;
3014 *CFG = YAML::Syck::Load <$fh>; 3365 *CFG = YAML::Load <$fh>;
3015 3366
3016 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3017 3368
3018 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3019 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3025 }; 3376 };
3026 warn $@ if $@; 3377 warn $@ if $@;
3027 } 3378 }
3028} 3379}
3029 3380
3381sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!";
3384 flock $fh, &Fcntl::LOCK_EX
3385 or die "$PIDFILE: flock: $!";
3386 $fh
3387}
3388
3389# make sure only one server instance is running at any one time
3390sub atomic {
3391 my $fh = pidfile;
3392
3393 my $pid = <$fh>;
3394 kill 9, $pid if $pid > 0;
3395
3396 seek $fh, 0, 0;
3397 print $fh $$;
3398}
3399
3030sub main { 3400sub main {
3401 atomic;
3402
3031 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3032 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3033 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3034 (async { 3406 (async {
3035 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
3036 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3037 }; 3410 };
3038 3411
3039 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
3040 db_init; 3415 db_init;
3041 load_extensions; 3416 load_extensions;
3042 3417
3043 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE;
3422
3423 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425
3044 Event::loop; 3426 EV::loop;
3045} 3427}
3046 3428
3047############################################################################# 3429#############################################################################
3048# initialisation and cleanup 3430# initialisation and cleanup
3049 3431
3050# install some emergency cleanup handlers 3432# install some emergency cleanup handlers
3051BEGIN { 3433BEGIN {
3434 our %SIGWATCHER = ();
3052 for my $signal (qw(INT HUP TERM)) { 3435 for my $signal (qw(INT HUP TERM)) {
3053 Event->signal ( 3436 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3054 reentrant => 0,
3055 data => WF_AUTOCANCEL,
3056 signal => $signal,
3057 prio => 0,
3058 cb => sub {
3059 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
3060 },
3061 ); 3438 };
3062 } 3439 }
3063} 3440}
3064 3441
3065sub write_runtime { 3442sub write_runtime_sync {
3066 my $runtime = "$LOCALDIR/runtime";
3067
3068 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3069 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3070 3445
3071 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3072 3447
3073 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3074 3449
3075 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3076 or return; 3451 or return;
3077 3452
3078 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3079 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3080 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
3090 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3091 3466
3092 close $fh 3467 close $fh
3093 or return; 3468 or return;
3094 3469
3095 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3096 and return; 3471 and return;
3097 3472
3098 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3099 3474
3100 1 3475 1
3476}
3477
3478our $uuid_lock;
3479our $uuid_skip;
3480
3481sub write_uuid_sync($) {
3482 $uuid_skip ||= $_[0];
3483
3484 return if $uuid_lock;
3485 local $uuid_lock = 1;
3486
3487 my $uuid = "$LOCALDIR/uuid";
3488
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return;
3491
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3493 $uuid_skip = 0;
3494
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return;
3497
3498 # always fsync - this file is important
3499 aio_fsync $fh
3500 and return;
3501
3502 close $fh
3503 or return;
3504
3505 aio_rename "$uuid~", $uuid
3506 and return;
3507
3508 warn "uuid file written ($value).\n";
3509
3510 1
3511
3512}
3513
3514sub write_uuid($$) {
3515 my ($skip, $sync) = @_;
3516
3517 $sync ? write_uuid_sync $skip
3518 : async { write_uuid_sync $skip };
3101} 3519}
3102 3520
3103sub emergency_save() { 3521sub emergency_save() {
3104 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
3105 3523
3111 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3112 warn "begin emergency player save\n"; 3530 warn "begin emergency player save\n";
3113 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3114 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3115 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3116 $pl->save; 3535 $pl->save;
3117 } 3536 }
3118 warn "end emergency player save\n"; 3537 warn "end emergency player save\n";
3119 3538
3120 warn "begin emergency map save\n"; 3539 warn "begin emergency map save\n";
3126 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
3127 3546
3128 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
3129 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3130 warn "end emergency database checkpoint\n"; 3549 warn "end emergency database checkpoint\n";
3550
3551 warn "begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "end write uuid\n";
3131 }; 3554 };
3132 3555
3133 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
3134} 3557}
3135 3558
3136sub post_cleanup { 3559sub post_cleanup {
3137 my ($make_core) = @_; 3560 my ($make_core) = @_;
3138 3561
3139 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3140 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3141} 3567}
3568
3569# a safer delete_package, copied from Symbol
3570sub clear_package($) {
3571 my $pkg = shift;
3572
3573 # expand to full symbol table name if needed
3574 unless ($pkg =~ /^main::.*::$/) {
3575 $pkg = "main$pkg" if $pkg =~ /^::/;
3576 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3577 $pkg .= '::' unless $pkg =~ /::$/;
3578 }
3579
3580 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3581 my $stem_symtab = *{$stem}{HASH};
3582
3583 defined $stem_symtab and exists $stem_symtab->{$leaf}
3584 or return;
3585
3586 # clear all symbols
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 }
3592 warn "cleared package #$pkg\n";#d#
3593}
3594
3595our $RELOAD; # how many times to reload
3142 3596
3143sub do_reload_perl() { 3597sub do_reload_perl() {
3144 # can/must only be called in main 3598 # can/must only be called in main
3145 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3146 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3147 return; 3601 return;
3148 } 3602 }
3149 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3150 warn "reloading..."; 3607 warn "reloading...";
3151 3608
3152 warn "entering sync_job"; 3609 warn "entering sync_job";
3153 3610
3154 cf::sync_job { 3611 cf::sync_job {
3155 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3156 cf::emergency_save; 3613 cf::emergency_save;
3157 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3158 3615
3159 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3160 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3161 3618
3162 # if anything goes wrong in here, we should simply crash as we already saved 3619 # if anything goes wrong in here, we should simply crash as we already saved
3163 3620
3164 warn "cancelling all WF_AUTOCANCEL watchers";
3165 for (Event::all_watchers) {
3166 $_->cancel if $_->data & WF_AUTOCANCEL;
3167 }
3168
3169 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3170 for (;;) {
3171 BDB::flush;
3172 IO::AIO::flush;
3173 Coro::cede;
3174 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3175 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3176 }
3177
3178 ++$RELOAD;
3179
3180 warn "cancelling all extension coros";
3181 $_->cancel for values %EXT_CORO;
3182 %EXT_CORO = ();
3183
3184 warn "removing commands";
3185 %COMMAND = ();
3186
3187 warn "removing ext/exti commands";
3188 %EXTCMD = ();
3189 %EXTICMD = ();
3190
3191 warn "unloading/nuking all extensions";
3192 for my $pkg (@EXTS) {
3193 warn "... unloading $pkg";
3194
3195 if (my $cb = $pkg->can ("unload")) {
3196 eval {
3197 $cb->($pkg);
3198 1
3199 } or warn "$pkg unloaded, but with errors: $@";
3200 } 3624 }
3201 3625
3202 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3203 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3204 } 3628 %EXT_CORO = ();
3205 3629
3206 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3207 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3208 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3209 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3210 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3211 delete $INC{$k};
3212 3640
3213 $k =~ s/\.pm$//;
3214 $k =~ s/\//::/g;
3215
3216 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3217 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3218 } 3650 }
3219 3651
3220 Symbol::delete_package $k; 3652 warn "unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655
3656 warn "... unloading $k";
3657 delete $INC{$k};
3658
3659 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g;
3661
3662 if (my $cb = $k->can ("unload_module")) {
3663 $cb->();
3664 }
3665
3666 clear_package $k;
3221 } 3667 }
3222 3668
3223 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3224 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3225 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3226 3672
3227 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3228 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3229 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3230 3676
3231 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3232 # and global variables created in xs 3678 # and global variables created in xs
3233 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3234 3680
3235 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3236 3682
3237 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3238 require cf; 3684 require cf;
3239 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3240 3686
3241 warn "loading config and database again"; 3687 warn "loading config and database again";
3242 cf::cfg_load; 3688 cf::reload_config;
3243 3689
3244 warn "loading extensions"; 3690 warn "loading extensions";
3245 cf::load_extensions; 3691 cf::load_extensions;
3246 3692
3247 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3248 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3249 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3250 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3251 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3252 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3253 3699
3254 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3255 3701
3256 1 3702 1
3257 } or do { 3703 } or do {
3258 warn $@; 3704 warn $@;
3259 warn "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3260 exit 1;
3261 }; 3706 };
3262 3707
3263 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3264}; 3711};
3265 3712
3266our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3267 3714
3268sub reload_perl() { 3715sub reload_perl() {
3269 # doing reload synchronously and two reloads happen back-to-back, 3716 # doing reload synchronously and two reloads happen back-to-back,
3270 # coro crashes during coro_state_free->destroy here. 3717 # coro crashes during coro_state_free->destroy here.
3271 3718
3272 $RELOAD_WATCHER ||= Event->timer ( 3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3273 reentrant => 0,
3274 after => 0,
3275 data => WF_AUTOCANCEL,
3276 cb => sub {
3277 do_reload_perl; 3720 do_reload_perl;
3278 undef $RELOAD_WATCHER; 3721 undef $RELOAD_WATCHER;
3279 },
3280 ); 3722 };
3281} 3723}
3282 3724
3283register_command "reload" => sub { 3725register_command "reload" => sub {
3284 my ($who, $arg) = @_; 3726 my ($who, $arg) = @_;
3285 3727
3286 if ($who->flag (FLAG_WIZ)) { 3728 if ($who->flag (FLAG_WIZ)) {
3287 $who->message ("reloading server."); 3729 $who->message ("reloading server.");
3730 async {
3731 $Coro::current->{desc} = "perl_reload";
3288 async { reload_perl }; 3732 reload_perl;
3733 };
3289 } 3734 }
3290}; 3735};
3291 3736
3292unshift @INC, $LIBDIR; 3737unshift @INC, $LIBDIR;
3293 3738
3295 3740
3296our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3297our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3298 3743
3299sub wait_for_tick { 3744sub wait_for_tick {
3300 return unless $TICK_WATCHER->is_active;
3301 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3302 3746
3303 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3304 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3305 $signal->wait; 3749 $signal->wait;
3306} 3750}
3307 3751
3308sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3309 return unless $TICK_WATCHER->is_active;
3310 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3311 3754
3312 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3313 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3314 $signal->wait; 3757 $signal->wait;
3315} 3758}
3316 3759
3317 my $min = 1e6;#d# 3760sub tick {
3318 my $avg = 10;
3319$TICK_WATCHER = Event->timer (
3320 reentrant => 0,
3321 parked => 1,
3322 prio => 0,
3323 at => $NEXT_TICK || $TICK,
3324 data => WF_AUTOCANCEL,
3325 cb => sub {
3326 if ($Coro::current != $Coro::main) { 3761 if ($Coro::current != $Coro::main) {
3327 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3762 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3328 unless ++$bug_warning > 10; 3763 unless ++$bug_warning > 10;
3329 return; 3764 return;
3330 } 3765 }
3331 3766
3332 $NOW = $tick_start = Event::time;
3333
3334 cf::server_tick; # one server iteration 3767 cf::server_tick; # one server iteration
3335 3768
3336 0 && sync_job {#d# 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3337 for(1..10) { 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3338 my $t = Event::time; 3771 Coro::async_pool {
3339 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3772 $Coro::current->{desc} = "runtime saver";
3340 or die; 3773 write_runtime_sync
3341 3774 or warn "ERROR: unable to write runtime file: $!";
3342 $map->width (50);
3343 $map->height (50);
3344 $map->alloc;
3345 $map->_load_objects ("/tmp/x.map", 1);
3346 my $t = Event::time - $t;
3347
3348 #next unless $t < 0.0013;#d#
3349 if ($t < $min) {
3350 $min = $t;
3351 }
3352 $avg = $avg * 0.99 + $t * 0.01;
3353 }
3354 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3355 exit 0;
3356 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3357 }; 3775 };
3776 }
3358 3777
3359 $RUNTIME += $TICK;
3360 $NEXT_TICK += $TICK;
3361
3362 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3363 $NEXT_RUNTIME_WRITE = $NOW + 10;
3364 Coro::async_pool {
3365 write_runtime
3366 or warn "ERROR: unable to write runtime file: $!";
3367 };
3368 }
3369
3370# my $AFTER = Event::time;
3371# warn $AFTER - $NOW;#d#
3372
3373 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3374 $sig->send; 3779 $sig->send;
3375 } 3780 }
3376 while (my $sig = shift @WAIT_FOR_TICK) { 3781 while (my $sig = shift @WAIT_FOR_TICK) {
3377 $sig->send; 3782 $sig->send;
3378 } 3783 }
3379 3784
3380 $NOW = Event::time; 3785 $LOAD = ($NOW - $TICK_START) / $TICK;
3381
3382 # if we are delayed by four ticks or more, skip them all
3383 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3384
3385 $TICK_WATCHER->at ($NEXT_TICK);
3386 $TICK_WATCHER->start;
3387
3388 $LOAD = ($NOW - $tick_start) / $TICK;
3389 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3390 3787
3391 _post_tick; 3788 if (0) {
3392 3789 if ($NEXT_TICK) {
3393 3790 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d#
3793 }
3394 }, 3794 }
3395); 3795}
3396 3796
3397{ 3797{
3398 BDB::max_poll_time $TICK * 0.1; 3798 # configure BDB
3399 $BDB_POLL_WATCHER = Event->io ( 3799
3400 reentrant => 0,
3401 fd => BDB::poll_fileno,
3402 poll => 'r',
3403 prio => 0,
3404 data => WF_AUTOCANCEL,
3405 cb => \&BDB::poll_cb,
3406 );
3407 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3408 3801 BDB::max_poll_reqs $TICK * 0.1;
3409 BDB::set_sync_prepare { 3802 $AnyEvent::BDB::WATCHER->priority (1);
3410 my $status;
3411 my $current = $Coro::current;
3412 (
3413 sub {
3414 $status = $!;
3415 $current->ready; undef $current;
3416 },
3417 sub {
3418 Coro::schedule while defined $current;
3419 $! = $status;
3420 },
3421 )
3422 };
3423 3803
3424 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3425 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3808 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3426 3811
3427 cf::sync_job { 3812 cf::sync_job {
3428 eval { 3813 eval {
3429 BDB::db_env_open 3814 BDB::db_env_open
3430 $DB_ENV, 3815 $DB_ENV,
3432 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3817 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3433 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3818 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3434 0666; 3819 0666;
3435 3820
3436 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3821 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3437
3438 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3439 $DB_ENV->set_lk_detect;
3440 }; 3822 };
3441 3823
3442 cf::cleanup "db_env_open(db): $@" if $@; 3824 cf::cleanup "db_env_open(db): $@" if $@;
3443 }; 3825 };
3444 } 3826 }
3827
3828 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3829 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3830 };
3831 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3832 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3833 };
3834 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3835 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3836 };
3445} 3837}
3446 3838
3447{ 3839{
3840 # configure IO::AIO
3841
3448 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3449
3450 undef $Coro::AIO::WATCHER;
3451 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3452 $AIO_POLL_WATCHER = Event->io ( 3844 undef $AnyEvent::AIO::WATCHER;
3453 reentrant => 0,
3454 data => WF_AUTOCANCEL,
3455 fd => IO::AIO::poll_fileno,
3456 poll => 'r',
3457 prio => 6,
3458 cb => \&IO::AIO::poll_cb,
3459 );
3460} 3845}
3461 3846
3462my $_log_backtrace; 3847my $_log_backtrace;
3463 3848
3464sub _log_backtrace { 3849sub _log_backtrace {
3467 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3468 3853
3469 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3470 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3471 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3472 async { 3858 async {
3859 $Coro::current->{desc} = "abt $msg";
3860
3473 my @bt = fork_call { 3861 my @bt = fork_call {
3474 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
3475 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3863 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3476 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3864 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3477 or die "addr2line: $!"; 3865 or die "addr2line: $!";
3485 } 3873 }
3486 3874
3487 @funcs 3875 @funcs
3488 }; 3876 };
3489 3877
3490 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3491 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3492 --$_log_backtrace; 3881 --$_log_backtrace;
3493 }; 3882 };
3494 } else { 3883 } else {
3495 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines