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.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.465 by root, Thu Jan 8 00:54:55 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5; 56use Digest::MD5;
30use Fcntl; 57use Fcntl;
31use YAML::Syck (); 58use YAML ();
32use IO::AIO 2.32 (); 59use IO::AIO ();
33use Time::HiRes; 60use Time::HiRes;
34use Compress::LZF; 61use Compress::LZF;
35use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
36 65
37# configure various modules to our taste 66# configure various modules to our taste
38# 67#
39$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 76
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 78
52our %COMMAND = (); 79our %COMMAND = ();
53our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
56our %EXTCMD = (); 83our %EXTCMD = ();
57our %EXTICMD = (); 84our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
60 87
61our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 89our @EVENT;
63 90
64our $CONFDIR = confdir; 91our $CONFDIR = confdir;
65our $DATADIR = datadir; 92our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
75 106
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 109our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
83 111
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 115our $DB_ENV;
89 116
90our %CFG; 117our %CFG;
91 118
92our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 120our $RUNTIME;
121our $NOW;
94 122
95our (%PLAYER, %PLAYER_LOADING); # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 124our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
98 126
99# used to convert map paths into valid unix filenames by replacing / by ∕ 127# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 129
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
105 138
106binmode STDOUT; 139binmode STDOUT;
107binmode STDERR; 140binmode STDERR;
108 141
109# read virtual server time, if available 142# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
114} 147}
115 148
116mkdir $_ 149mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 195
163The raw value load value from the last tick. 196The raw value load value from the last tick.
164 197
165=item %cf::CFG 198=item %cf::CFG
166 199
167Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 201from wherever your confdir points to.
169 202
170=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
171 204
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 227
195 LOG llevError, $msg; 228 LOG llevError, $msg;
196 }; 229 };
197} 230}
231
232$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "=="
234
235 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d#
238 }#d#
239
240 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate
243};
244
245$SIG{__DIE__} = sub { }; #d#?
198 246
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 257for my $pkg (qw(
210 cf::global cf::attachable 258 cf::global cf::attachable
211 cf::object cf::object::player 259 cf::object cf::object::player
212 cf::client cf::player 260 cf::client cf::player
213 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
214 cf::map cf::party cf::region 263 cf::party cf::region
215)) { 264)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 266}
219 267
220$Event::DIED = sub { 268$EV::DIED = sub {
221 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
222}; 270};
223 271
224############################################################################# 272#############################################################################
225 273
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 297 $d
250 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
251} 299}
252 300
253=item $ref = cf::from_json $json 301=item $ref = cf::decode_json $json
254 302
255Converts a JSON string into the corresponding perl data structure. 303Converts a JSON string into the corresponding perl data structure.
256 304
257=item $json = cf::to_json $ref 305=item $json = cf::encode_json $ref
258 306
259Converts a perl data structure into its JSON representation. 307Converts a perl data structure into its JSON representation.
260 308
261=cut 309=cut
262 310
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 312
265sub to_json ($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
267 329
268=item cf::lock_wait $string 330=item cf::lock_wait $string
269 331
270Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
271 333
272=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
273 335
274Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
277returned. 339returned.
278 340
279Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 342deadlocked coro.
286 348
287Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
288 350
289=cut 351=cut
290 352
291our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 354
294sub lock_wait($) { 355sub lock_wait($) {
295 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 357}
308 358
309sub lock_acquire($) { 359sub lock_acquire($) {
310 my ($key) = @_; 360 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 361}
324 362
325sub lock_active($) { 363sub lock_active($) {
326 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 371}
336 }; 372
337 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
338 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
339} 386}
340 387
341=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
342 389
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 420 }
374 } 421 }
375 } 422 }
376 423
377 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 427 $signal->wait;
381 } else { 428 } else {
382 Coro::schedule; 429 Coro::schedule;
383 } 430 }
384 } 431 }
385}; 432};
386 433
387sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
388 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
389 438
390 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
392 441
406 455
407BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
408 457
409=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
410 459
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 463acceptable.
415 464
416If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
422 471
423sub sync_job(&) { 472sub sync_job(&) {
424 my ($job) = @_; 473 my ($job) = @_;
425 474
426 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 476 my $time = EV::time;
428 477
429 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
431 480
432 LOG llevError | logBacktrace, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
433 482
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
437 484
438 my $busy = 1; 485 my $busy = 1;
439 my @res; 486 my @res;
440 487
444 warn $@ if $@; 491 warn $@ if $@;
445 undef $busy; 492 undef $busy;
446 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
447 494
448 while ($busy) { 495 while ($busy) {
449 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
450 } 500 }
501 }
451 502
452 $time = Event::time - $time; 503 my $time = EV::time - $time;
453 504
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
458 506
459 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
460 } else { 508 } else {
461 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
462 510
487=item fork_call { }, $args 535=item fork_call { }, $args
488 536
489Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
493 541
494=cut 542=cut
495 543
496sub fork_call(&@) { 544sub fork_call(&@) {
497 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
504 reset_signals; 552 reset_signals;
505 &$cb 553 &$cb
506 }, @args; 554 }, @args;
507 555
508 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
509} 584}
510 585
511=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
512 587
513Returns a single value from the environment database. 588Returns a single value from the environment database.
652 727
653############################################################################# 728#############################################################################
654 729
655=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
656 731
657Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
658attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
660 735
661In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 738Deliantra).
664 739
665=over 4 740=over 4
666 741
667=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
668 743
712=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
713 788
714Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
716 791
717Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
718that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
719 794
720These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
721 796
722=over 4 797=over 4
950 } 1025 }
951 1026
952 0 1027 0
953} 1028}
954 1029
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1031
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1033
959Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
960 1035
966 1041
967=cut 1042=cut
968 1043
969############################################################################# 1044#############################################################################
970# object support 1045# object support
971#
972 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
973sub _can_merge { 1080sub _can_merge {
974 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
975 1082
976 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1084
980 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
981} 1087}
982 1088
983sub reattach { 1089sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1091 my ($obj) = @_;
986 1092
1093 # no longer needed after getting rid of delete_package?
987 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
988 1095
989 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
990 1097
991 @$registry = (); 1098 @$registry = ();
992 1099
1007cf::attachable->attach ( 1114cf::attachable->attach (
1008 prio => -1000000, 1115 prio => -1000000,
1009 on_instantiate => sub { 1116 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1011 1118
1012 $data = from_json $data; 1119 $data = decode_json $data;
1013 1120
1014 for (@$data) { 1121 for (@$data) {
1015 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1016 1123
1017 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1038 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1041 1148
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1046 close $fh; 1153 aio_close $fh;
1047 1154
1048 if (@$objs) { 1155 if (@$objs) {
1049 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1051 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1054 close $fh; 1161 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1163 }
1057 } else { 1164 } else {
1058 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1059 } 1166 }
1060 1167
1061 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1062 } else { 1172 } else {
1063 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1064 } 1174 }
1065 } else { 1175 } else {
1066 aio_unlink $filename; 1176 aio_unlink $filename;
1067 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1068 } 1178 }
1087 1197
1088 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1200 or return;
1091 1201
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1093 } 1204 }
1094 1205
1095 utf8::decode (my $decname = $filename); 1206 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1158 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1159 1270
1160 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1161} 1272}
1162 1273
1274use File::Glob ();
1275
1163cf::player->attach ( 1276cf::player->attach (
1164 on_command => sub { 1277 on_command => sub {
1165 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1166 1279
1167 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1199 1312
1200 cf::override; 1313 cf::override;
1201 }, 1314 },
1202); 1315);
1203 1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1329
1204sub load_extensions { 1330sub load_extensions {
1205 cf::sync_job { 1331 cf::sync_job {
1206 my %todo; 1332 my %todo;
1207 1333
1208 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
1227 1353
1228 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1229 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1230 1356
1231 $ext{source} = 1357 $ext{source} =
1232 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1233 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1234 . $source 1360 . $source
1235 . "\n};\n1"; 1361 . "\n};\n1";
1236 1362
1237 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1253 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1254 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1255 1381
1256 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1257 warn $msg; 1383 warn $msg;
1258 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1259 exit 1;
1260 } 1385 }
1261 1386
1262 warn $msg; 1387 warn $msg;
1263 } 1388 }
1264 1389
1278 1403
1279=back 1404=back
1280 1405
1281=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1282 1407
1283Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1284 1409
1285=cut 1410=cut
1286 1411
1287package cf::player; 1412package cf::player;
1288 1413
1331 1456
1332sub exists($) { 1457sub exists($) {
1333 my ($login) = @_; 1458 my ($login) = @_;
1334 1459
1335 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1336 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1337} 1462}
1338 1463
1339sub find($) { 1464sub find($) {
1340 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1341 my $login = $_[0]; 1466 my $login = $_[0];
1353 my $f = new_from_file cf::object::thawer path $login 1478 my $f = new_from_file cf::object::thawer path $login
1354 or return; 1479 or return;
1355 1480
1356 my $pl = cf::player::load_pl $f 1481 my $pl = cf::player::load_pl $f
1357 or return; 1482 or return;
1483
1358 local $cf::PLAYER_LOADING{$login} = $pl; 1484 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs; 1485 $f->resolve_delayed_derefs;
1360 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1361 } 1487 }
1362 } 1488 }
1372 1498
1373 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1374 1500
1375 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1376 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1503
1504 cf::get_slot 0.01;
1377 1505
1378 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1379 cf::cede_to_tick; 1507 cf::cede_to_tick;
1380} 1508}
1381 1509
1413 my ($pl) = @_; 1541 my ($pl) = @_;
1414 1542
1415 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1416 1544
1417 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1418 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1419 1547
1420 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1421 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1422 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1423 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1424 1554
1425 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1426 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1465 1595
1466 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1467 my $path = path $login; 1597 my $path = path $login;
1468 1598
1469 # a .pst is a dead give-away for a valid player 1599 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") { 1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1472 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1473 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 } 1605 }
1475 1606
1506 } 1637 }
1507 1638
1508 \@paths 1639 \@paths
1509} 1640}
1510 1641
1511=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1512 1643
1513Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1514
1515=cut
1516
1517sub expand_cfpod {
1518 ((my $self), (local $_)) = @_;
1519
1520 # escape & and <
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523
1524 # this is buggy, it needs to properly take care of nested <'s
1525
1526 1 while
1527 # replace B<>, I<>, U<> etc.
1528 s/B<([^\>]*)>/<b>$1<\/b>/
1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1532 # replace G<male|female> tags
1533 || s{G<([^>|]*)\|([^>]*)>}{
1534 $self->gender ? $2 : $1
1535 }ge
1536 # replace H<hint text>
1537 || s{H<([^\>]*)>}
1538 {
1539 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "")
1542 [$self->{hintmode}]
1543 }ge;
1544
1545 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g;
1547
1548 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines
1553
1554 $_
1555}
1556
1557sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode}
1560}
1561 1645
1562=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1563 1647
1564Sends an ext reply to the player. 1648Sends an ext reply to the player.
1565 1649
1632our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1633our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1634 1718
1635sub generate_random_map { 1719sub generate_random_map {
1636 my ($self, $rmp) = @_; 1720 my ($self, $rmp) = @_;
1721
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723
1637 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1638 $self->_create_random_map ( 1725 $self->_create_random_map (
1639 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1640 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1641 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1763 1850
1764# the temporary/swap location 1851# the temporary/swap location
1765sub save_path { 1852sub save_path {
1766 my ($self) = @_; 1853 my ($self) = @_;
1767 1854
1768 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1769 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1770} 1857}
1771 1858
1772# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1773sub uniq_path { 1860sub uniq_path {
1774 my ($self) = @_; 1861 my ($self) = @_;
1775 1862
1776 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1777 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1778}
1779
1780# and all this just because we cannot iterate over
1781# all maps in C++...
1782sub change_all_map_light {
1783 my ($change) = @_;
1784
1785 $_->change_map_light ($change)
1786 for grep $_->outdoor, values %cf::MAP;
1787} 1865}
1788 1866
1789sub decay_objects { 1867sub decay_objects {
1790 my ($self) = @_; 1868 my ($self) = @_;
1791 1869
1875sub find { 1953sub find {
1876 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1877 1955
1878 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1879 1957
1880 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1881 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1882 1960
1883 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1886
1887 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1888 or return; 1963 or return;
1889 1964
1890 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1891 1966
1893 or return; 1968 or return;
1894 1969
1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1896 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1897 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1898 undef $guard1; 1974 undef $guard1;
1899 undef $guard2;
1900 $map->reset; 1975 $map->reset;
1901 return find $path; 1976 return find $path;
1902 } 1977 }
1903 1978
1904 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1931 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block; 2007 $f->skip_block;
1933 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
1934 or return; 2009 or return;
1935 2010
1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1937 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1938 2013
1939 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1940 utf8::encode $uniq; 2015 utf8::encode $uniq;
1941 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
1959 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1960 $self->decay_objects; 2035 $self->decay_objects;
1961 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1962 $self->update_buttons; 2037 $self->update_buttons;
1963 cf::cede_to_tick; 2038 cf::cede_to_tick;
1964 $self->set_darkness_map;
1965 cf::cede_to_tick;
1966 $self->activate; 2039 $self->activate;
1967 } 2040 }
1968 2041
1969 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME); 2043 $self->last_access ($cf::RUNTIME);
1971 2044
1972 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
1973 } 2046 }
1974 2047
1975 $self->post_load; 2048 $self->post_load;
1976} 2049}
1977 2050
2035 my ($path, $origin, $load) = @_; 2108 my ($path, $origin, $load) = @_;
2036 2109
2037 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
2038 2111
2039 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2041 } 2114 }
2042 2115
2043 $MAP_PREFETCH{$path} |= $load; 2116 $MAP_PREFETCH{$path} |= $load;
2044 2117
2045 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2082 cf::async { 2155 cf::async {
2083 $Coro::current->{desc} = "map player save"; 2156 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
2085 }; 2158 };
2086 2159
2160 cf::get_slot 0.02;
2161
2087 if ($uniq) { 2162 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2165 } else {
2091 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2099 $self->save; 2174 $self->save;
2100 2175
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2177
2103 return if $self->players; 2178 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2106 2181
2107 $self->in_memory (cf::MAP_SWAPPED); 2182 $self->in_memory (cf::MAP_SWAPPED);
2108 2183
2109 $self->deactivate; 2184 $self->deactivate;
2227 2302
2228sub unique_maps() { 2303sub unique_maps() {
2229 [ 2304 [
2230 map { 2305 map {
2231 utf8::decode $_; 2306 utf8::decode $_;
2232 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
2233 ? normalise $_ 2310 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2312 ]
2237} 2313}
2238 2314
2239package cf;
2240
2241=back 2315=back
2242 2316
2243=head3 cf::object 2317=head3 cf::object
2244 2318
2245=cut 2319=cut
2248 2322
2249=over 4 2323=over 4
2250 2324
2251=item $ob->inv_recursive 2325=item $ob->inv_recursive
2252 2326
2253Returns the inventory of the object _and_ their inventories, recursively. 2327Returns the inventory of the object I<and> their inventories, recursively,
2328but I<not> the object itself.
2254 2329
2255=cut 2330=cut
2256 2331
2257sub inv_recursive_; 2332sub inv_recursive_;
2258sub inv_recursive_ { 2333sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2264} 2339}
2265 2340
2266=item $ref = $ob->ref 2341=item $ref = $ob->ref
2267 2342
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2343Creates and returns a persistent reference to an object that can be stored as a string.
2269 2344
2270=item $ob = cf::object::deref ($refstring) 2345=item $ob = cf::object::deref ($refstring)
2271 2346
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2348even if the object actually exists. May block.
2305can be C<undef>. Does the right thing when the player is currently in a 2380can be C<undef>. Does the right thing when the player is currently in a
2306dialogue with the given NPC character. 2381dialogue with the given NPC character.
2307 2382
2308=cut 2383=cut
2309 2384
2385our $SAY_CHANNEL = {
2386 id => "say",
2387 title => "Map",
2388 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2390};
2391
2392our $CHAT_CHANNEL = {
2393 id => "chat",
2394 title => "Chat",
2395 reply => "chat ",
2396 tooltip => "Player chat and shouts, global to the server.",
2397};
2398
2310# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2311# with dialog boxes. 2400# with dialog boxes.
2312#TODO: the first argument must go, split into a $npc->reply_to ( method 2401#TODO: the first argument must go, split into a $npc->reply_to ( method
2313sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
2314 my ($self, $npc, $msg, $flags) = @_; 2403 my ($self, $npc, $msg, $flags) = @_;
2325 my $dialog = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2326 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2327 2416
2328 } else { 2417 } else {
2329 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2330 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2331 } 2420 }
2332 } 2421 }
2333} 2422}
2334 2423
2335=item $object->send_msg ($channel, $msg, $color, [extra...]) 2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2360 2449
2361=item $player_object->enter_link 2450=item $player_object->enter_link
2362 2451
2363Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2364 2453
2365The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2366I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2367 2458
2368Will never block. 2459Will never block.
2369 2460
2370=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2371 2462
2429 2520
2430 $map->load; 2521 $map->load;
2431 $map->load_neighbours; 2522 $map->load_neighbours;
2432 2523
2433 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2434 $self->activate_recursive; 2526 $self->activate_recursive;
2435 2527
2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2437 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2438} 2530}
2442Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2443her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2444that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2445the new (success) or old (failed) map position. In either case, $done will 2537the new (success) or old (failed) map position. In either case, $done will
2446be called at the end of this process. 2538be called at the end of this process.
2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2447 2542
2448=cut 2543=cut
2449 2544
2450our $GOTOGEN; 2545our $GOTOGEN;
2451 2546
2530} 2625}
2531 2626
2532sub prepare_random_map { 2627sub prepare_random_map {
2533 my ($exit) = @_; 2628 my ($exit) = @_;
2534 2629
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2632 # that depends on the exit object
2540 2633
2541 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2636 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2548 } 2643 }
2549 2644
2550 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2551 2646
2552 my $data = cf::to_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2555 2650
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2653 undef $fh;
2559 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2560 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2563 } 2662 }
2564} 2663}
2565 2664
2566sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2568 2667
2569 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2570 2669
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2670 $self->enter_link;
2583 2671
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2672 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2673 $Coro::current->{desc} = "enter_exit";
2590 2674
2591 $self->deactivate_recursive; # just to be sure
2592 unless (eval { 2675 unless (eval {
2676 $self->deactivate_recursive; # just to be sure
2677
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2687 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp;
2689
2593 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2594 2691
2692 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y)
2694 if $exit->flag (cf::FLAG_DAMNED);
2695
2595 1; 2696 1
2596 }) { 2697 }) {
2597 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2598 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2599 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2600 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2601 2702
2602 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
2630the message, with C<log> being the default. If C<$color> is negative, suppress 2731the message, with C<log> being the default. If C<$color> is negative, suppress
2631the message unless the client supports the msg packet. 2732the message unless the client supports the msg packet.
2632 2733
2633=cut 2734=cut
2634 2735
2736# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2737our %CHANNEL = (
2636 "c/identify" => { 2738 "c/identify" => {
2637 id => "infobox", 2739 id => "infobox",
2638 title => "Identify", 2740 title => "Identify",
2639 reply => undef, 2741 reply => undef,
2643 id => "infobox", 2745 id => "infobox",
2644 title => "Examine", 2746 title => "Examine",
2645 reply => undef, 2747 reply => undef,
2646 tooltip => "Signs and other items you examined", 2748 tooltip => "Signs and other items you examined",
2647 }, 2749 },
2750 "c/book" => {
2751 id => "infobox",
2752 title => "Book",
2753 reply => undef,
2754 tooltip => "The contents of a note or book",
2755 },
2648 "c/lookat" => { 2756 "c/lookat" => {
2649 id => "infobox", 2757 id => "infobox",
2650 title => "Look", 2758 title => "Look",
2651 reply => undef, 2759 reply => undef,
2652 tooltip => "What you saw there", 2760 tooltip => "What you saw there",
2653 }, 2761 },
2762 "c/who" => {
2763 id => "infobox",
2764 title => "Players",
2765 reply => undef,
2766 tooltip => "Shows players who are currently online",
2767 },
2768 "c/body" => {
2769 id => "infobox",
2770 title => "Body Parts",
2771 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available",
2773 },
2774 "c/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2780 "c/skills" => {
2781 id => "infobox",
2782 title => "Skills",
2783 reply => undef,
2784 tooltip => "Shows your experience per skill and item power",
2785 },
2786 "c/resistances" => {
2787 id => "infobox",
2788 title => "Resistances",
2789 reply => undef,
2790 tooltip => "Shows your resistances",
2791 },
2792 "c/pets" => {
2793 id => "infobox",
2794 title => "Pets",
2795 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet",
2797 },
2798 "c/uptime" => {
2799 id => "infobox",
2800 title => "Uptime",
2801 reply => undef,
2802 tooltip => "How long the server has been running since last restart",
2803 },
2804 "c/mapinfo" => {
2805 id => "infobox",
2806 title => "Map Info",
2807 reply => undef,
2808 tooltip => "Information related to the maps",
2809 },
2810 "c/party" => {
2811 id => "party",
2812 title => "Party",
2813 reply => "gsay ",
2814 tooltip => "Messages and chat related to your party",
2815 },
2816 "c/death" => {
2817 id => "death",
2818 title => "Death",
2819 reply => undef,
2820 tooltip => "Reason for and more info about your most recent death",
2821 },
2822 "c/say" => $SAY_CHANNEL,
2823 "c/chat" => $CHAT_CHANNEL,
2654); 2824);
2655 2825
2656sub cf::client::send_msg { 2826sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2658 2828
2659 $msg = $self->pl->expand_cfpod ($msg); 2829 $msg = $self->pl->expand_cfpod ($msg)
2830 unless $color & cf::NDI_VERBATIM;
2660 2831
2661 $color &= cf::NDI_CLIENT_MASK; # just in case... 2832 $color &= cf::NDI_CLIENT_MASK; # just in case...
2662 2833
2663 # check predefined channels, for the benefit of C 2834 # check predefined channels, for the benefit of C
2664 if ($CHANNEL{$channel}) { 2835 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel}; 2836 $channel = $CHANNEL{$channel};
2666 2837
2667 $self->ext_msg (channel_info => $channel) 2838 $self->ext_msg (channel_info => $channel);
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id}; 2839 $channel = $channel->{id};
2671 2840
2672 } elsif (ref $channel) { 2841 } elsif (ref $channel) {
2673 # send meta info to client, if not yet sent 2842 # send meta info to client, if not yet sent
2674 unless (exists $self->{channel}{$channel->{id}}) { 2843 unless (exists $self->{channel}{$channel->{id}}) {
2675 $self->{channel}{$channel->{id}} = $channel; 2844 $self->{channel}{$channel->{id}} = $channel;
2676 $self->ext_msg (channel_info => $channel) 2845 $self->ext_msg (channel_info => $channel);
2677 if $self->can_msg;
2678 } 2846 }
2679 2847
2680 $channel = $channel->{id}; 2848 $channel = $channel->{id};
2681 } 2849 }
2682 2850
2683 return unless @extra || length $msg; 2851 return unless @extra || length $msg;
2684 2852
2685 if ($self->can_msg) {
2686 # default colour, mask it out 2853 # default colour, mask it out
2687 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2688 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2689 2856
2690 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2691 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2692 } else { 2860 );
2693 if ($color >= 0) {
2694 # replace some tags by gcfclient-compatible ones
2695 for ($msg) {
2696 1 while
2697 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2698 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2699 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2700 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2701 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2702 }
2703 2861
2704 $color &= cf::NDI_COLOR_MASK; 2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2705 2865
2706 utf8::encode $msg; 2866 # split very large packets
2707 2867 if (8192 < length $pkt and $self->{can_lzf}) {
2708 if (0 && $msg =~ /\[/) { 2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2709 # COMMAND/INFO 2869 $pkt = "frag";
2710 $self->send_packet ("drawextinfo $color 10 8 $msg")
2711 } else {
2712 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2713 $self->send_packet ("drawinfo $color $msg")
2714 }
2715 }
2716 } 2870 }
2871
2872 $self->send_packet ($pkt);
2717} 2873}
2718 2874
2719=item $client->ext_msg ($type, @msg) 2875=item $client->ext_msg ($type, @msg)
2720 2876
2721Sends an ext event to the client. 2877Sends an ext event to the client.
2894=pod 3050=pod
2895 3051
2896The following functions and methods are available within a safe environment: 3052The following functions and methods are available within a safe environment:
2897 3053
2898 cf::object 3054 cf::object
2899 contr pay_amount pay_player map x y force_find force_add 3055 contr pay_amount pay_player map x y force_find force_add destroy
2900 insert remove name archname title slaying race decrease_ob_nr 3056 insert remove name archname title slaying race decrease split
2901 3057
2902 cf::object::player 3058 cf::object::player
2903 player 3059 player
2904 3060
2905 cf::player 3061 cf::player
2910 3066
2911=cut 3067=cut
2912 3068
2913for ( 3069for (
2914 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2915 insert remove inv name archname title slaying race 3071 insert remove inv nrof name archname title slaying race
2916 decrease_ob_nr)], 3072 decrease split destroy change_exp)],
2917 ["cf::object::player" => qw(player)], 3073 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3074 ["cf::player" => qw(peaceful)],
2919 ["cf::map" => qw(trigger)], 3075 ["cf::map" => qw(trigger)],
2920) { 3076) {
2921 no strict 'refs'; 3077 no strict 'refs';
3026 { 3182 {
3027 my $faces = $facedata->{faceinfo}; 3183 my $faces = $facedata->{faceinfo};
3028 3184
3029 while (my ($face, $info) = each %$faces) { 3185 while (my ($face, $info) = each %$faces) {
3030 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3186 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187
3031 cf::face::set_visibility $idx, $info->{visibility}; 3188 cf::face::set_visibility $idx, $info->{visibility};
3032 cf::face::set_magicmap $idx, $info->{magicmap}; 3189 cf::face::set_magicmap $idx, $info->{magicmap};
3033 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3034 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3035 3192
3036 cf::cede_to_tick; 3193 cf::cede_to_tick;
3037 } 3194 }
3038 3195
3039 while (my ($face, $info) = each %$faces) { 3196 while (my ($face, $info) = each %$faces) {
3040 next unless $info->{smooth}; 3197 next unless $info->{smooth};
3198
3041 my $idx = cf::face::find $face 3199 my $idx = cf::face::find $face
3042 or next; 3200 or next;
3201
3043 if (my $smooth = cf::face::find $info->{smooth}) { 3202 if (my $smooth = cf::face::find $info->{smooth}) {
3044 cf::face::set_smooth $idx, $smooth; 3203 cf::face::set_smooth $idx, $smooth;
3045 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3204 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046 } else { 3205 } else {
3047 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3206 warn "smooth face '$info->{smooth}' not found for face '$face'";
3065 { 3224 {
3066 # TODO: for gcfclient pleasure, we should give resources 3225 # TODO: for gcfclient pleasure, we should give resources
3067 # that gcfclient doesn't grok a >10000 face index. 3226 # that gcfclient doesn't grok a >10000 face index.
3068 my $res = $facedata->{resource}; 3227 my $res = $facedata->{resource};
3069 3228
3070 my $soundconf = delete $res->{"res/sound.conf"};
3071
3072 while (my ($name, $info) = each %$res) { 3229 while (my ($name, $info) = each %$res) {
3230 if (defined $info->{type}) {
3073 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3231 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data; 3232 my $data;
3075 3233
3076 if ($info->{type} & 1) { 3234 if ($info->{type} & 1) {
3077 # prepend meta info 3235 # prepend meta info
3078 3236
3079 my $meta = $enc->encode ({ 3237 my $meta = $enc->encode ({
3080 name => $name, 3238 name => $name,
3081 %{ $info->{meta} || {} }, 3239 %{ $info->{meta} || {} },
3082 }); 3240 });
3083 3241
3084 $data = pack "(w/a*)*", $meta, $info->{data}; 3242 $data = pack "(w/a*)*", $meta, $info->{data};
3243 } else {
3244 $data = $info->{data};
3245 }
3246
3247 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3248 cf::face::set_type $idx, $info->{type};
3085 } else { 3249 } else {
3086 $data = $info->{data}; 3250 $RESOURCE{$name} = $info;
3087 } 3251 }
3088 3252
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
3092 cf::cede_to_tick; 3253 cf::cede_to_tick;
3093 } 3254 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
3112 } 3255 }
3256
3257 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113 3258
3114 1 3259 1
3115} 3260}
3261
3262cf::global->attach (on_resource_update => sub {
3263 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3264 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3265
3266 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3267 my $sound = $soundconf->{compat}[$_]
3268 or next;
3269
3270 my $face = cf::face::find "sound/$sound->[1]";
3271 cf::sound::set $sound->[0] => $face;
3272 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3273 }
3274
3275 while (my ($k, $v) = each %{$soundconf->{event}}) {
3276 my $face = cf::face::find "sound/$v";
3277 cf::sound::set $k => $face;
3278 }
3279 }
3280});
3116 3281
3117register_exticmd fx_want => sub { 3282register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_; 3283 my ($ns, $want) = @_;
3119 3284
3120 while (my ($k, $v) = each %$want) { 3285 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v); 3286 $ns->fx_want ($k, $v);
3122 } 3287 }
3123}; 3288};
3289
3290sub load_resource_file($) {
3291 my $guard = lock_acquire "load_resource_file";
3292
3293 my $status = load_resource_file_ $_[0];
3294 get_slot 0.1, 100;
3295 cf::arch::commit_load;
3296
3297 $status
3298}
3124 3299
3125sub reload_regions { 3300sub reload_regions {
3126 # HACK to clear player env face cache, we need some signal framework 3301 # HACK to clear player env face cache, we need some signal framework
3127 # for this (global event?) 3302 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = (); 3303 %ext::player_env::MUSIC_FACE_CACHE = ();
3142} 3317}
3143 3318
3144sub reload_archetypes { 3319sub reload_archetypes {
3145 load_resource_file "$DATADIR/archetypes" 3320 load_resource_file "$DATADIR/archetypes"
3146 or die "unable to load archetypes\n"; 3321 or die "unable to load archetypes\n";
3147 #d# NEED to laod twice to resolve forward references
3148 # this really needs to be done in an extra post-pass
3149 # (which needs to be synchronous, so solve it differently)
3150 load_resource_file "$DATADIR/archetypes"
3151 or die "unable to load archetypes\n";
3152} 3322}
3153 3323
3154sub reload_treasures { 3324sub reload_treasures {
3155 load_resource_file "$DATADIR/treasures" 3325 load_resource_file "$DATADIR/treasures"
3156 or die "unable to load treasurelists\n"; 3326 or die "unable to load treasurelists\n";
3157} 3327}
3158 3328
3159sub reload_resources { 3329sub reload_resources {
3160 warn "reloading resource files...\n"; 3330 warn "reloading resource files...\n";
3161 3331
3332 reload_facedata;
3333 reload_archetypes;
3162 reload_regions; 3334 reload_regions;
3163 reload_facedata;
3164 #reload_archetypes;#d#
3165 reload_archetypes;
3166 reload_treasures; 3335 reload_treasures;
3167 3336
3168 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
3169}
3170
3171sub init {
3172 reload_resources;
3173} 3338}
3174 3339
3175sub reload_config { 3340sub reload_config {
3176 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3177 or return; 3342 or return;
3178 3343
3179 local $/; 3344 local $/;
3180 *CFG = YAML::Syck::Load <$fh>; 3345 *CFG = YAML::Load <$fh>;
3181 3346
3182 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3183 3348
3184 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3185 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3191 }; 3356 };
3192 warn $@ if $@; 3357 warn $@ if $@;
3193 } 3358 }
3194} 3359}
3195 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3196sub main { 3380sub main {
3381 cf::init_globals; # initialise logging
3382
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394
3197 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3199 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3200 (async { 3398 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3400 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3204 }; 3402 };
3205 3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 cf::sync_job {
3407 reload_resources;
3206 reload_config; 3408 reload_config;
3207 db_init; 3409 db_init;
3410
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid;
3414 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills;
3417
3418 cf::init_beforeplay;
3419
3420 atomic;
3421
3208 load_extensions; 3422 load_extensions;
3209 3423
3210 $TICK_WATCHER->start; 3424 utime time, time, $RUNTIMEFILE;
3425
3426 # no (long-running) fork's whatsoever before this point(!)
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428
3429 (pop @POST_INIT)->(0) while @POST_INIT;
3430 };
3431
3211 Event::loop; 3432 EV::loop;
3212} 3433}
3213 3434
3214############################################################################# 3435#############################################################################
3215# initialisation and cleanup 3436# initialisation and cleanup
3216 3437
3217# install some emergency cleanup handlers 3438# install some emergency cleanup handlers
3218BEGIN { 3439BEGIN {
3440 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3441 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3442 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3221 reentrant => 0,
3222 data => WF_AUTOCANCEL,
3223 signal => $signal,
3224 prio => 0,
3225 cb => sub {
3226 cf::cleanup "SIG$signal"; 3443 cf::cleanup "SIG$signal";
3227 },
3228 ); 3444 };
3229 } 3445 }
3230} 3446}
3231 3447
3232sub write_runtime { 3448sub write_runtime_sync {
3233 my $runtime = "$LOCALDIR/runtime";
3234
3235 # first touch the runtime file to show we are still running: 3449 # first touch the runtime file to show we are still running:
3236 # the fsync below can take a very very long time. 3450 # the fsync below can take a very very long time.
3237 3451
3238 IO::AIO::aio_utime $runtime, undef, undef; 3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3239 3453
3240 my $guard = cf::lock_acquire "write_runtime"; 3454 my $guard = cf::lock_acquire "write_runtime";
3241 3455
3242 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3243 or return; 3457 or return;
3244 3458
3245 my $value = $cf::RUNTIME + 90 + 10; 3459 my $value = $cf::RUNTIME + 90 + 10;
3246 # 10 is the runtime save interval, for a monotonic clock 3460 # 10 is the runtime save interval, for a monotonic clock
3247 # 60 allows for the watchdog to kill the server. 3461 # 60 allows for the watchdog to kill the server.
3257 aio_utime $fh, undef, undef; 3471 aio_utime $fh, undef, undef;
3258 3472
3259 close $fh 3473 close $fh
3260 or return; 3474 or return;
3261 3475
3262 aio_rename "$runtime~", $runtime 3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3263 and return; 3477 and return;
3264 3478
3265 warn "runtime file written.\n"; 3479 warn "runtime file written.\n";
3266 3480
3267 1 3481 1
3482}
3483
3484our $uuid_lock;
3485our $uuid_skip;
3486
3487sub write_uuid_sync($) {
3488 $uuid_skip ||= $_[0];
3489
3490 return if $uuid_lock;
3491 local $uuid_lock = 1;
3492
3493 my $uuid = "$LOCALDIR/uuid";
3494
3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3496 or return;
3497
3498 my $value = uuid_seq uuid_cur;
3499
3500 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n";
3502 return;
3503 }
3504
3505 my $value = uuid_str $value + $uuid_skip;
3506 $uuid_skip = 0;
3507
3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3509 and return;
3510
3511 # always fsync - this file is important
3512 aio_fsync $fh
3513 and return;
3514
3515 close $fh
3516 or return;
3517
3518 aio_rename "$uuid~", $uuid
3519 and return;
3520
3521 warn "uuid file written ($value).\n";
3522
3523 1
3524
3525}
3526
3527sub write_uuid($$) {
3528 my ($skip, $sync) = @_;
3529
3530 $sync ? write_uuid_sync $skip
3531 : async { write_uuid_sync $skip };
3268} 3532}
3269 3533
3270sub emergency_save() { 3534sub emergency_save() {
3271 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
3272 3536
3273 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
3274 3538
3275 cf::sync_job { 3539 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544
3276 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
3277 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
3278 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
3280 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3551 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3553 $pl->save;
3284 } 3554 }
3285 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
3286 3556
3287 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
3288 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
3289 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
3290 $map->valid or next; 3560 $map->valid or next;
3291 $map->save; 3561 $map->save;
3292 } 3562 }
3293 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
3294 3564
3295 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
3296 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3297 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3568
3569 warn "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1;
3571 warn "emergency_perl_save: end write uuid\n";
3298 }; 3572 };
3299 3573
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3300 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
3301} 3580}
3302 3581
3303sub post_cleanup { 3582sub post_cleanup {
3304 my ($make_core) = @_; 3583 my ($make_core) = @_;
3305 3584
3306 warn Carp::longmess "post_cleanup backtrace" 3585 warn Carp::longmess "post_cleanup backtrace"
3307 if $make_core; 3586 if $make_core;
3587
3588 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$;
3590}
3591
3592# a safer delete_package, copied from Symbol
3593sub clear_package($) {
3594 my $pkg = shift;
3595
3596 # expand to full symbol table name if needed
3597 unless ($pkg =~ /^main::.*::$/) {
3598 $pkg = "main$pkg" if $pkg =~ /^::/;
3599 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3600 $pkg .= '::' unless $pkg =~ /::$/;
3601 }
3602
3603 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3604 my $stem_symtab = *{$stem}{HASH};
3605
3606 defined $stem_symtab and exists $stem_symtab->{$leaf}
3607 or return;
3608
3609 # clear all symbols
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 }
3615 warn "cleared package $pkg\n";#d#
3308} 3616}
3309 3617
3310sub do_reload_perl() { 3618sub do_reload_perl() {
3311 # can/must only be called in main 3619 # can/must only be called in main
3312 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3313 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
3314 return; 3622 return;
3315 } 3623 }
3316 3624
3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3628
3629 while ($RELOAD) {
3317 warn "reloading..."; 3630 warn "reloading...";
3318 3631
3319 warn "entering sync_job"; 3632 warn "entering sync_job";
3320 3633
3321 cf::sync_job { 3634 cf::sync_job {
3322 cf::write_runtime; # external watchdog should not bark 3635 cf::write_runtime_sync; # external watchdog should not bark
3323 cf::emergency_save; 3636 cf::emergency_save;
3324 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3325 3638
3326 warn "syncing database to disk"; 3639 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV; 3640 BDB::db_env_txn_checkpoint $DB_ENV;
3328 3641
3329 # if anything goes wrong in here, we should simply crash as we already saved 3642 # if anything goes wrong in here, we should simply crash as we already saved
3330 3643
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335
3336 warn "flushing outstanding aio requests"; 3644 warn "flushing outstanding aio requests";
3337 for (;;) {
3338 BDB::flush;
3339 IO::AIO::flush;
3340 Coro::cede;
3341 last unless IO::AIO::nreqs || BDB::nreqs; 3645 while (IO::AIO::nreqs || BDB::nreqs) {
3342 warn "iterate..."; 3646 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3343 }
3344
3345 ++$RELOAD;
3346
3347 warn "cancelling all extension coros";
3348 $_->cancel for values %EXT_CORO;
3349 %EXT_CORO = ();
3350
3351 warn "removing commands";
3352 %COMMAND = ();
3353
3354 warn "removing ext/exti commands";
3355 %EXTCMD = ();
3356 %EXTICMD = ();
3357
3358 warn "unloading/nuking all extensions";
3359 for my $pkg (@EXTS) {
3360 warn "... unloading $pkg";
3361
3362 if (my $cb = $pkg->can ("unload")) {
3363 eval {
3364 $cb->($pkg);
3365 1
3366 } or warn "$pkg unloaded, but with errors: $@";
3367 } 3647 }
3368 3648
3369 warn "... nuking $pkg"; 3649 warn "cancelling all extension coros";
3370 Symbol::delete_package $pkg; 3650 $_->cancel for values %EXT_CORO;
3371 } 3651 %EXT_CORO = ();
3372 3652
3373 warn "unloading all perl modules loaded from $LIBDIR"; 3653 warn "removing commands";
3374 while (my ($k, $v) = each %INC) { 3654 %COMMAND = ();
3375 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3376 3655
3656 warn "removing ext/exti commands";
3657 %EXTCMD = ();
3658 %EXTICMD = ();
3659
3660 warn "unloading/nuking all extensions";
3661 for my $pkg (@EXTS) {
3377 warn "... unloading $k"; 3662 warn "... unloading $pkg";
3378 delete $INC{$k};
3379 3663
3380 $k =~ s/\.pm$//;
3381 $k =~ s/\//::/g;
3382
3383 if (my $cb = $k->can ("unload_module")) { 3664 if (my $cb = $pkg->can ("unload")) {
3665 eval {
3384 $cb->(); 3666 $cb->($pkg);
3667 1
3668 } or warn "$pkg unloaded, but with errors: $@";
3669 }
3670
3671 warn "... clearing $pkg";
3672 clear_package $pkg;
3385 } 3673 }
3386 3674
3387 Symbol::delete_package $k; 3675 warn "unloading all perl modules loaded from $LIBDIR";
3676 while (my ($k, $v) = each %INC) {
3677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3678
3679 warn "... unloading $k";
3680 delete $INC{$k};
3681
3682 $k =~ s/\.pm$//;
3683 $k =~ s/\//::/g;
3684
3685 if (my $cb = $k->can ("unload_module")) {
3686 $cb->();
3687 }
3688
3689 clear_package $k;
3388 } 3690 }
3389 3691
3390 warn "getting rid of safe::, as good as possible"; 3692 warn "getting rid of safe::, as good as possible";
3391 Symbol::delete_package "safe::$_" 3693 clear_package "safe::$_"
3392 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3393 3695
3394 warn "unloading cf.pm \"a bit\""; 3696 warn "unloading cf.pm \"a bit\"";
3395 delete $INC{"cf.pm"}; 3697 delete $INC{"cf.pm"};
3396 delete $INC{"cf/pod.pm"}; 3698 delete $INC{"cf/pod.pm"};
3397 3699
3398 # don't, removes xs symbols, too, 3700 # don't, removes xs symbols, too,
3399 # and global variables created in xs 3701 # and global variables created in xs
3400 #Symbol::delete_package __PACKAGE__; 3702 #clear_package __PACKAGE__;
3401 3703
3402 warn "unload completed, starting to reload now"; 3704 warn "unload completed, starting to reload now";
3403 3705
3404 warn "reloading cf.pm"; 3706 warn "reloading cf.pm";
3405 require cf; 3707 require cf;
3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3407 3709
3408 warn "loading config and database again"; 3710 warn "loading config and database again";
3409 cf::reload_config; 3711 cf::reload_config;
3410 3712
3411 warn "loading extensions"; 3713 warn "loading extensions";
3412 cf::load_extensions; 3714 cf::load_extensions;
3413 3715
3716 if ($REATTACH_ON_RELOAD) {
3414 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
3415 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
3416 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
3417 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
3418 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
3419 reattach $_ for values %PLAYER; 3722 reattach $_ for values %PLAYER;
3723 }
3420 3724
3725 warn "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3727
3421 warn "leaving sync_job"; 3728 warn "leaving sync_job";
3422 3729
3423 1 3730 1
3424 } or do { 3731 } or do {
3425 warn $@; 3732 warn $@;
3426 warn "error while reloading, exiting."; 3733 cf::cleanup "error while reloading, exiting.";
3427 exit 1;
3428 }; 3734 };
3429 3735
3430 warn "reloaded"; 3736 warn "reloaded";
3737 --$RELOAD;
3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3431}; 3742};
3432 3743
3433our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3434 3745
3435sub reload_perl() { 3746sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3438 3749
3439 $RELOAD_WATCHER ||= Event->timer ( 3750 $RELOAD_WATCHER ||= cf::async {
3440 reentrant => 0, 3751 Coro::AIO::aio_wait cache_extensions;
3441 after => 0, 3752
3442 data => WF_AUTOCANCEL, 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3443 cb => sub {
3444 do_reload_perl; 3754 do_reload_perl;
3445 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3446 }, 3756 };
3447 ); 3757 };
3448} 3758}
3449 3759
3450register_command "reload" => sub { 3760register_command "reload" => sub {
3451 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;
3452 3762
3465 3775
3466our @WAIT_FOR_TICK; 3776our @WAIT_FOR_TICK;
3467our @WAIT_FOR_TICK_BEGIN; 3777our @WAIT_FOR_TICK_BEGIN;
3468 3778
3469sub wait_for_tick { 3779sub wait_for_tick {
3470 return unless $TICK_WATCHER->is_active;
3471 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3472 3781
3473 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3474 push @WAIT_FOR_TICK, $signal; 3783 push @WAIT_FOR_TICK, $signal;
3475 $signal->wait; 3784 $signal->wait;
3476} 3785}
3477 3786
3478sub wait_for_tick_begin { 3787sub wait_for_tick_begin {
3479 return unless $TICK_WATCHER->is_active;
3480 return if $Coro::current == $Coro::main; 3788 return if tick_inhibit || $Coro::current == $Coro::main;
3481 3789
3482 my $signal = new Coro::Signal; 3790 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 3791 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 3792 $signal->wait;
3485} 3793}
3486 3794
3487$TICK_WATCHER = Event->timer ( 3795sub tick {
3488 reentrant => 0,
3489 parked => 1,
3490 prio => 0,
3491 at => $NEXT_TICK || $TICK,
3492 data => WF_AUTOCANCEL,
3493 cb => sub {
3494 if ($Coro::current != $Coro::main) { 3796 if ($Coro::current != $Coro::main) {
3495 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3797 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3496 unless ++$bug_warning > 10; 3798 unless ++$bug_warning > 10;
3497 return; 3799 return;
3498 } 3800 }
3499 3801
3500 $NOW = $tick_start = Event::time;
3501
3502 cf::server_tick; # one server iteration 3802 cf::server_tick; # one server iteration
3503 3803
3504 $RUNTIME += $TICK;
3505 $NEXT_TICK += $TICK;
3506
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3804 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 3805 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509 Coro::async_pool { 3806 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 3807 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 3808 write_runtime_sync
3512 or warn "ERROR: unable to write runtime file: $!"; 3809 or warn "ERROR: unable to write runtime file: $!";
3513 };
3514 } 3810 };
3811 }
3515 3812
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3813 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 3814 $sig->send;
3518 } 3815 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 3816 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 3817 $sig->send;
3521 } 3818 }
3522 3819
3523 $NOW = Event::time; 3820 $LOAD = ($NOW - $TICK_START) / $TICK;
3524
3525 # if we are delayed by four ticks or more, skip them all
3526 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528 $TICK_WATCHER->at ($NEXT_TICK);
3529 $TICK_WATCHER->start;
3530
3531 $LOAD = ($NOW - $tick_start) / $TICK;
3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3821 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 3822
3534 _post_tick; 3823 if (0) {
3824 if ($NEXT_TICK) {
3825 my $jitter = $TICK_START - $NEXT_TICK;
3826 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3827 warn "jitter $JITTER\n";#d#
3828 }
3535 }, 3829 }
3536); 3830}
3537 3831
3538{ 3832{
3833 # configure BDB
3834
3539 BDB::min_parallel 8; 3835 BDB::min_parallel 8;
3540 BDB::max_poll_time $TICK * 0.1; 3836 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io ( 3837 $AnyEvent::BDB::WATCHER->priority (1);
3542 reentrant => 0,
3543 fd => BDB::poll_fileno,
3544 poll => 'r',
3545 prio => 0,
3546 data => WF_AUTOCANCEL,
3547 cb => \&BDB::poll_cb,
3548 );
3549
3550 BDB::set_sync_prepare {
3551 my $status;
3552 my $current = $Coro::current;
3553 (
3554 sub {
3555 $status = $!;
3556 $current->ready; undef $current;
3557 },
3558 sub {
3559 Coro::schedule while defined $current;
3560 $! = $status;
3561 },
3562 )
3563 };
3564 3838
3565 unless ($DB_ENV) { 3839 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 3840 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3841 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3568 | BDB::LOG_AUTOREMOVE, 1); 3842 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3843 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3844 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3845 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3571 3846
3572 cf::sync_job { 3847 cf::sync_job {
3573 eval { 3848 eval {
3583 3858
3584 cf::cleanup "db_env_open(db): $@" if $@; 3859 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 3860 };
3586 } 3861 }
3587 3862
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 3863 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3864 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 3865 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3866 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3867 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 3868 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 3869 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3870 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 3871 };
3618} 3872}
3619 3873
3620{ 3874{
3875 # configure IO::AIO
3876
3621 IO::AIO::min_parallel 8; 3877 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 3878 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io ( 3879 undef $AnyEvent::AIO::WATCHER;
3626 reentrant => 0,
3627 data => WF_AUTOCANCEL,
3628 fd => IO::AIO::poll_fileno,
3629 poll => 'r',
3630 prio => 0,
3631 cb => \&IO::AIO::poll_cb,
3632 );
3633} 3880}
3634 3881
3635my $_log_backtrace; 3882my $_log_backtrace;
3636 3883
3637sub _log_backtrace { 3884sub _log_backtrace {
3640 $msg =~ s/\n//; 3887 $msg =~ s/\n//;
3641 3888
3642 # limit the # of concurrent backtraces 3889 # limit the # of concurrent backtraces
3643 if ($_log_backtrace < 2) { 3890 if ($_log_backtrace < 2) {
3644 ++$_log_backtrace; 3891 ++$_log_backtrace;
3892 my $perl_bt = Carp::longmess $msg;
3645 async { 3893 async {
3646 $Coro::current->{desc} = "abt $msg"; 3894 $Coro::current->{desc} = "abt $msg";
3647 3895
3648 my @bt = fork_call { 3896 my @bt = fork_call {
3649 @addr = map { sprintf "%x", $_ } @addr; 3897 @addr = map { sprintf "%x", $_ } @addr;
3660 } 3908 }
3661 3909
3662 @funcs 3910 @funcs
3663 }; 3911 };
3664 3912
3665 LOG llevInfo, "[ABT] $msg\n"; 3913 LOG llevInfo, "[ABT] $perl_bt\n";
3914 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3666 LOG llevInfo, "[ABT] $_\n" for @bt; 3915 LOG llevInfo, "[ABT] $_\n" for @bt;
3667 --$_log_backtrace; 3916 --$_log_backtrace;
3668 }; 3917 };
3669 } else { 3918 } else {
3670 LOG llevInfo, "[ABT] $msg\n"; 3919 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines