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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines