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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.457 by root, Wed Oct 1 05:50:19 2008 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines