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.329 by root, Fri Aug 10 05:38:16 2007 UTC vs.
Revision 1.447 by root, Fri Sep 19 01:39:45 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines