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.387 by root, Mon Oct 15 23:49:10 2007 UTC vs.
Revision 1.471 by root, Mon Apr 27 01:38:48 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 qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
37use Guard ();
15use Coro 4.1 (); 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.51 (); 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 on
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
117our @EXTRA_MODULES = qw(pod mapscript);
118
90our %CFG; 119our %CFG;
91 120
92our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 122our $RUNTIME;
123our $NOW;
94 124
95our (%PLAYER, %PLAYER_LOADING); # all users 125our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 126our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 127our $LINK_MAP; # the special {link} map, which is always available
98 128
99# used to convert map paths into valid unix filenames by replacing / by ∕ 129# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 131
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
105 140
106binmode STDOUT; 141binmode STDOUT;
107binmode STDERR; 142binmode STDERR;
108 143
109# read virtual server time, if available 144# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
114} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
115 152
116mkdir $_ 153mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 155
119our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
162 199
163The raw value load value from the last tick. 200The raw value load value from the last tick.
164 201
165=item %cf::CFG 202=item %cf::CFG
166 203
167Configuration for the server, loaded from C</etc/crossfire/config>, or 204Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 205from wherever your confdir points to.
169 206
170=item cf::wait_for_tick, cf::wait_for_tick_begin 207=item cf::wait_for_tick, cf::wait_for_tick_begin
171 208
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 209These 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; 230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 231
195 LOG llevError, $msg; 232 LOG llevError, $msg;
196 }; 233 };
197} 234}
235
236$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "=="
238
239 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d#
242 }#d#
243
244 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate
247};
248
249$SIG{__DIE__} = sub { }; #d#?
198 250
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 261for my $pkg (qw(
210 cf::global cf::attachable 262 cf::global cf::attachable
211 cf::object cf::object::player 263 cf::object cf::object::player
212 cf::client cf::player 264 cf::client cf::player
213 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
214 cf::map cf::party cf::region 267 cf::party cf::region
215)) { 268)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 270}
219 271
220$Event::DIED = sub { 272$EV::DIED = sub {
221 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
222}; 274};
223 275
224############################################################################# 276#############################################################################
225 277
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 301 $d
250 } || "[unable to dump $_[0]: '$@']"; 302 } || "[unable to dump $_[0]: '$@']";
251} 303}
252 304
253=item $ref = cf::from_json $json 305=item $ref = cf::decode_json $json
254 306
255Converts a JSON string into the corresponding perl data structure. 307Converts a JSON string into the corresponding perl data structure.
256 308
257=item $json = cf::to_json $ref 309=item $json = cf::encode_json $ref
258 310
259Converts a perl data structure into its JSON representation. 311Converts a perl data structure into its JSON representation.
260 312
261=cut 313=cut
262 314
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 316
265sub to_json ($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
267 333
268=item cf::lock_wait $string 334=item cf::lock_wait $string
269 335
270Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
271 337
272=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
273 339
274Wait until the given lock is available and then acquires it and returns 340Wait 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, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
277returned. 343returned.
278 344
279Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 346deadlocked coro.
286 352
287Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
288 354
289=cut 355=cut
290 356
291our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 358
294sub lock_wait($) { 359sub lock_wait($) {
295 my ($key) = @_; 360 $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} 361}
308 362
309sub lock_acquire($) { 363sub lock_acquire($) {
310 my ($key) = @_; 364 $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} 365}
324 366
325sub lock_active($) { 367sub lock_active($) {
326 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 369}
330 370
331sub freeze_mainloop { 371sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 372 tick_inhibit_inc;
333 373
334 my $guard = Coro::guard { 374 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 375}
336 }; 376
337 $TICK_WATCHER->stop; 377=item cf::periodic $interval, $cb
338 $guard 378
379Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer.
381
382=cut
383
384sub periodic($$) {
385 my ($interval, $cb) = @_;
386
387 my $start = rand List::Util::min 180, $interval;
388
389 EV::periodic $start, $interval, 0, $cb
339} 390}
340 391
341=item cf::get_slot $time[, $priority[, $name]] 392=item cf::get_slot $time[, $priority[, $name]]
342 393
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 394Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 434 }
384 } 435 }
385}; 436};
386 437
387sub get_slot($;$$) { 438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
388 my ($time, $pri, $name) = @_; 441 my ($time, $pri, $name) = @_;
389 442
390 $time = $TICK * .6 if $time > $TICK * .6; 443 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 444 my $sig = new Coro::Signal;
392 445
406 459
407BEGIN { *async = \&Coro::async_pool } 460BEGIN { *async = \&Coro::async_pool }
408 461
409=item cf::sync_job { BLOCK } 462=item cf::sync_job { BLOCK }
410 463
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 464The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 465is 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 466partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 467acceptable.
415 468
416If it must be done, put the blocking parts into C<sync_job>. This will run 469If 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 470the given BLOCK in another coroutine while waiting for the result. The
422 475
423sub sync_job(&) { 476sub sync_job(&) {
424 my ($job) = @_; 477 my ($job) = @_;
425 478
426 if ($Coro::current == $Coro::main) { 479 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 480 my $time = EV::time;
428 481
429 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
431 484
432 LOG llevError, Carp::longmess "sync job";#d# 485 LOG llevError, Carp::longmess "sync job";#d#
433 486
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
437 488
438 my $busy = 1; 489 my $busy = 1;
439 my @res; 490 my @res;
440 491
447 498
448 while ($busy) { 499 while ($busy) {
449 if (Coro::nready) { 500 if (Coro::nready) {
450 Coro::cede_notself; 501 Coro::cede_notself;
451 } else { 502 } else {
452 Event::one_event; 503 EV::loop EV::LOOP_ONESHOT;
453 } 504 }
454 } 505 }
455 506
456 $time = Event::time - $time; 507 my $time = EV::time - $time;
457 508
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
462 510
463 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
464 } else { 512 } else {
465 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
466 514
491=item fork_call { }, $args 539=item fork_call { }, $args
492 540
493Executes the given code block with the given arguments in a seperate 541Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 542process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 543Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 544never block itself or use any form of event handling.
497 545
498=cut 546=cut
499 547
500sub fork_call(&@) { 548sub fork_call(&@) {
501 my ($cb, @args) = @_; 549 my ($cb, @args) = @_;
508 reset_signals; 556 reset_signals;
509 &$cb 557 &$cb
510 }, @args; 558 }, @args;
511 559
512 wantarray ? @res : $res[-1] 560 wantarray ? @res : $res[-1]
561}
562
563=item $coin = coin_from_name $name
564
565=cut
566
567our %coin_alias = (
568 "silver" => "silvercoin",
569 "silvercoin" => "silvercoin",
570 "silvercoins" => "silvercoin",
571 "gold" => "goldcoin",
572 "goldcoin" => "goldcoin",
573 "goldcoins" => "goldcoin",
574 "platinum" => "platinacoin",
575 "platinumcoin" => "platinacoin",
576 "platinumcoins" => "platinacoin",
577 "platina" => "platinacoin",
578 "platinacoin" => "platinacoin",
579 "platinacoins" => "platinacoin",
580 "royalty" => "royalty",
581 "royalties" => "royalty",
582);
583
584sub coin_from_name($) {
585 $coin_alias{$_[0]}
586 ? cf::arch::find $coin_alias{$_[0]}
587 : undef
513} 588}
514 589
515=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
516 591
517Returns a single value from the environment database. 592Returns a single value from the environment database.
656 731
657############################################################################# 732#############################################################################
658 733
659=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
660 735
661Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
664 739
665In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
666C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 742Deliantra).
668 743
669=over 4 744=over 4
670 745
671=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
672 747
716=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
717 792
718Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
720 795
721Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
723 798
724These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
725 800
726=over 4 801=over 4
954 } 1029 }
955 1030
956 0 1031 0
957} 1032}
958 1033
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1035
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1037
963Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
964 1039
1017 1092
1018sub reattach { 1093sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1095 my ($obj) = @_;
1021 1096
1097 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1098 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1099
1024 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
1025 1101
1026 @$registry = (); 1102 @$registry = ();
1027 1103
1042cf::attachable->attach ( 1118cf::attachable->attach (
1043 prio => -1000000, 1119 prio => -1000000,
1044 on_instantiate => sub { 1120 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
1046 1122
1047 $data = from_json $data; 1123 $data = decode_json $data;
1048 1124
1049 for (@$data) { 1125 for (@$data) {
1050 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
1051 1127
1052 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1149 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1076 1152
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1157 aio_close $fh;
1082 1158
1083 if (@$objs) { 1159 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1165 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1167 }
1092 } else { 1168 } else {
1093 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1094 } 1170 }
1095 1171
1096 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1176 } else {
1098 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1099 } 1178 }
1100 } else { 1179 } else {
1101 aio_unlink $filename; 1180 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1103 } 1182 }
1122 1201
1123 unless (aio_stat "$filename.pst") { 1202 unless (aio_stat "$filename.pst") {
1124 (aio_load "$filename.pst", $av) >= 0 1203 (aio_load "$filename.pst", $av) >= 0
1125 or return; 1204 or return;
1126 1205
1127 my $st = eval { Coro::Storable::thaw $av } 1206 my $st = eval { Coro::Storable::thaw $av };
1128 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1129 $av = $st->{objs}; 1207 $av = $st->{objs};
1130 } 1208 }
1131 1209
1132 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1133 warn sprintf "loading %s (%d,%d)\n", 1211 warn sprintf "loading %s (%d,%d)\n",
1195 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1196 1274
1197 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1198} 1276}
1199 1277
1278use File::Glob ();
1279
1200cf::player->attach ( 1280cf::player->attach (
1201 on_command => sub { 1281 on_command => sub {
1202 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1203 1283
1204 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
1236 1316
1237 cf::override; 1317 cf::override;
1238 }, 1318 },
1239); 1319);
1240 1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1333
1241sub load_extensions { 1334sub load_extensions {
1242 cf::sync_job { 1335 cf::sync_job {
1243 my %todo; 1336 my %todo;
1244 1337
1245 for my $path (<$LIBDIR/*.ext>) { 1338 for my $path (<$LIBDIR/*.ext>) {
1264 1357
1265 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1266 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1267 1360
1268 $ext{source} = 1361 $ext{source} =
1269 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1270 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1271 . $source 1364 . $source
1272 . "\n};\n1"; 1365 . "\n};\n1";
1273 1366
1274 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
1290 my $msg = $@ ? "$v->{path}: $@\n" 1383 my $msg = $@ ? "$v->{path}: $@\n"
1291 : "$v->{base}: extension inactive.\n"; 1384 : "$v->{base}: extension inactive.\n";
1292 1385
1293 if (exists $v->{meta}{mandatory}) { 1386 if (exists $v->{meta}{mandatory}) {
1294 warn $msg; 1387 warn $msg;
1295 warn "mandatory extension failed to load, exiting.\n"; 1388 cf::cleanup "mandatory extension failed to load, exiting.";
1296 exit 1;
1297 } 1389 }
1298 1390
1299 warn $msg; 1391 warn $msg;
1300 } 1392 }
1301 1393
1315 1407
1316=back 1408=back
1317 1409
1318=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1319 1411
1320Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1321 1413
1322=cut 1414=cut
1323 1415
1324package cf::player; 1416package cf::player;
1325 1417
1368 1460
1369sub exists($) { 1461sub exists($) {
1370 my ($login) = @_; 1462 my ($login) = @_;
1371 1463
1372 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1373 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1374} 1466}
1375 1467
1376sub find($) { 1468sub find($) {
1377 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1378 my $login = $_[0]; 1470 my $login = $_[0];
1390 my $f = new_from_file cf::object::thawer path $login 1482 my $f = new_from_file cf::object::thawer path $login
1391 or return; 1483 or return;
1392 1484
1393 my $pl = cf::player::load_pl $f 1485 my $pl = cf::player::load_pl $f
1394 or return; 1486 or return;
1487
1395 local $cf::PLAYER_LOADING{$login} = $pl; 1488 local $cf::PLAYER_LOADING{$login} = $pl;
1396 $f->resolve_delayed_derefs; 1489 $f->resolve_delayed_derefs;
1397 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1398 } 1491 }
1399 } 1492 }
1409 1502
1410 return if $pl->{deny_save}; 1503 return if $pl->{deny_save};
1411 1504
1412 aio_mkdir playerdir $pl, 0770; 1505 aio_mkdir playerdir $pl, 0770;
1413 $pl->{last_save} = $cf::RUNTIME; 1506 $pl->{last_save} = $cf::RUNTIME;
1507
1508 cf::get_slot 0.01;
1414 1509
1415 $pl->save_pl ($path); 1510 $pl->save_pl ($path);
1416 cf::cede_to_tick; 1511 cf::cede_to_tick;
1417} 1512}
1418 1513
1450 my ($pl) = @_; 1545 my ($pl) = @_;
1451 1546
1452 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1453 1548
1454 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1455 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1456 1551
1457 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1458 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1459 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1460 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1461 1558
1462 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1463 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
1502 1599
1503 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1504 my $path = path $login; 1601 my $path = path $login;
1505 1602
1506 # a .pst is a dead give-away for a valid player 1603 # a .pst is a dead give-away for a valid player
1507 unless (-e "$path.pst") { 1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1508 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1509 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1510 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1511 } 1609 }
1512 1610
1543 } 1641 }
1544 1642
1545 \@paths 1643 \@paths
1546} 1644}
1547 1645
1548=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1549 1647
1550Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1551
1552=cut
1553
1554sub expand_cfpod {
1555 ((my $self), (local $_)) = @_;
1556
1557 # escape & and <
1558 s/&/&amp;/g;
1559 s/(?<![BIUGHT])</&lt;/g;
1560
1561 # this is buggy, it needs to properly take care of nested <'s
1562
1563 1 while
1564 # replace B<>, I<>, U<> etc.
1565 s/B<([^\>]*)>/<b>$1<\/b>/
1566 || s/I<([^\>]*)>/<i>$1<\/i>/
1567 || s/U<([^\>]*)>/<u>$1<\/u>/
1568 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1569 # replace G<male|female> tags
1570 || s{G<([^>|]*)\|([^>]*)>}{
1571 $self->gender ? $2 : $1
1572 }ge
1573 # replace H<hint text>
1574 || s{H<([^\>]*)>}
1575 {
1576 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1577 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1578 "")
1579 [$self->{hintmode}]
1580 }ge;
1581
1582 # create single paragraphs (very hackish)
1583 s/(?<=\S)\n(?=\w)/ /g;
1584
1585 # compress some whitespace
1586 s/\s+\n/\n/g; # ws line-ends
1587 s/\n\n+/\n/g; # double lines
1588 s/^\n+//; # beginning lines
1589 s/\n+$//; # ending lines
1590
1591 $_
1592}
1593
1594sub hintmode {
1595 $_[0]{hintmode} = $_[1] if @_ > 1;
1596 $_[0]{hintmode}
1597}
1598 1649
1599=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1600 1651
1601Sends an ext reply to the player. 1652Sends an ext reply to the player.
1602 1653
1669our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1670our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1671 1722
1672sub generate_random_map { 1723sub generate_random_map {
1673 my ($self, $rmp) = @_; 1724 my ($self, $rmp) = @_;
1725
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727
1674 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1675 $self->_create_random_map ( 1729 $self->_create_random_map (
1676 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1677 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1678 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1800 1854
1801# the temporary/swap location 1855# the temporary/swap location
1802sub save_path { 1856sub save_path {
1803 my ($self) = @_; 1857 my ($self) = @_;
1804 1858
1805 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1806 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1807} 1861}
1808 1862
1809# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1810sub uniq_path { 1864sub uniq_path {
1811 my ($self) = @_; 1865 my ($self) = @_;
1812 1866
1813 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1814 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1815}
1816
1817# and all this just because we cannot iterate over
1818# all maps in C++...
1819sub change_all_map_light {
1820 my ($change) = @_;
1821
1822 $_->change_map_light ($change)
1823 for grep $_->outdoor, values %cf::MAP;
1824} 1869}
1825 1870
1826sub decay_objects { 1871sub decay_objects {
1827 my ($self) = @_; 1872 my ($self) = @_;
1828 1873
1912sub find { 1957sub find {
1913 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1914 1959
1915 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1916 1961
1917 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1918 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1919 1964
1920 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1921 my $guard1 = cf::lock_acquire "map_find:$path";
1922 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1923
1924 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1925 or return; 1967 or return;
1926 1968
1927 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1928 1970
1930 or return; 1972 or return;
1931 1973
1932 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1933 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
1934 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
1935 undef $guard1; 1978 undef $guard1;
1936 undef $guard2;
1937 $map->reset; 1979 $map->reset;
1938 return find $path; 1980 return find $path;
1939 } 1981 }
1940 1982
1941 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
1968 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
1969 $f->skip_block; 2011 $f->skip_block;
1970 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
1971 or return; 2013 or return;
1972 2014
1973 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
1974 if delete $self->{load_original}; 2016 if delete $self->{load_original};
1975 2017
1976 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
1977 utf8::encode $uniq; 2019 utf8::encode $uniq;
1978 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
1996 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
1997 $self->decay_objects; 2039 $self->decay_objects;
1998 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
1999 $self->update_buttons; 2041 $self->update_buttons;
2000 cf::cede_to_tick; 2042 cf::cede_to_tick;
2001 $self->set_darkness_map;
2002 cf::cede_to_tick;
2003 $self->activate; 2043 $self->activate;
2004 } 2044 }
2005 2045
2006 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
2007 $self->last_access ($cf::RUNTIME); 2047 $self->last_access ($cf::RUNTIME);
2008 2048
2009 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
2010 } 2050 }
2011 2051
2012 $self->post_load; 2052 $self->post_load;
2013} 2053}
2014 2054
2072 my ($path, $origin, $load) = @_; 2112 my ($path, $origin, $load) = @_;
2073 2113
2074 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
2075 2115
2076 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
2077 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2078 } 2118 }
2079 2119
2080 $MAP_PREFETCH{$path} |= $load; 2120 $MAP_PREFETCH{$path} |= $load;
2081 2121
2082 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2119 cf::async { 2159 cf::async {
2120 $Coro::current->{desc} = "map player save"; 2160 $Coro::current->{desc} = "map player save";
2121 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
2122 }; 2162 };
2123 2163
2164 cf::get_slot 0.02;
2165
2124 if ($uniq) { 2166 if ($uniq) {
2125 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2126 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2127 } else { 2169 } else {
2128 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2136 $self->save; 2178 $self->save;
2137 2179
2138 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2139 2181
2140 return if $self->players; 2182 return if $self->players;
2141 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
2142 return if $self->{deny_save}; 2184 return if $self->{deny_save};
2143 2185
2144 $self->in_memory (cf::MAP_SWAPPED); 2186 $self->in_memory (cf::MAP_SWAPPED);
2145 2187
2146 $self->deactivate; 2188 $self->deactivate;
2264 2306
2265sub unique_maps() { 2307sub unique_maps() {
2266 [ 2308 [
2267 map { 2309 map {
2268 utf8::decode $_; 2310 utf8::decode $_;
2269 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2270 ? normalise $_ 2314 : normalise $_
2271 : ()
2272 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2273 ] 2316 ]
2274} 2317}
2275 2318
2276package cf;
2277
2278=back 2319=back
2279 2320
2280=head3 cf::object 2321=head3 cf::object
2281 2322
2282=cut 2323=cut
2285 2326
2286=over 4 2327=over 4
2287 2328
2288=item $ob->inv_recursive 2329=item $ob->inv_recursive
2289 2330
2290Returns the inventory of the object _and_ their inventories, recursively. 2331Returns the inventory of the object I<and> their inventories, recursively,
2332but I<not> the object itself.
2291 2333
2292=cut 2334=cut
2293 2335
2294sub inv_recursive_; 2336sub inv_recursive_;
2295sub inv_recursive_ { 2337sub inv_recursive_ {
2300 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2301} 2343}
2302 2344
2303=item $ref = $ob->ref 2345=item $ref = $ob->ref
2304 2346
2305creates and returns a persistent reference to an objetc that can be stored as a string. 2347Creates and returns a persistent reference to an object that can be stored as a string.
2306 2348
2307=item $ob = cf::object::deref ($refstring) 2349=item $ob = cf::object::deref ($refstring)
2308 2350
2309returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2351returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2310even if the object actually exists. May block. 2352even if the object actually exists. May block.
2342can be C<undef>. Does the right thing when the player is currently in a 2384can be C<undef>. Does the right thing when the player is currently in a
2343dialogue with the given NPC character. 2385dialogue with the given NPC character.
2344 2386
2345=cut 2387=cut
2346 2388
2389our $SAY_CHANNEL = {
2390 id => "say",
2391 title => "Map",
2392 reply => "say ",
2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2394};
2395
2396our $CHAT_CHANNEL = {
2397 id => "chat",
2398 title => "Chat",
2399 reply => "chat ",
2400 tooltip => "Player chat and shouts, global to the server.",
2401};
2402
2347# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2348# with dialog boxes. 2404# with dialog boxes.
2349#TODO: the first argument must go, split into a $npc->reply_to ( method 2405#TODO: the first argument must go, split into a $npc->reply_to ( method
2350sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2351 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
2362 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2363 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2364 2420
2365 } else { 2421 } else {
2366 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2367 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2368 } 2424 }
2369 } 2425 }
2370} 2426}
2371 2427
2372=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2397 2453
2398=item $player_object->enter_link 2454=item $player_object->enter_link
2399 2455
2400Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2401 2457
2402The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2403I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2404 2462
2405Will never block. 2463Will never block.
2406 2464
2407=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2408 2466
2466 2524
2467 $map->load; 2525 $map->load;
2468 $map->load_neighbours; 2526 $map->load_neighbours;
2469 2527
2470 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2471 $self->activate_recursive; 2530 $self->activate_recursive;
2472 2531
2473 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2474 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2475} 2534}
2479Moves the player to the given map-path and coordinates by first freezing 2538Moves the player to the given map-path and coordinates by first freezing
2480her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2481that has to return the map if sucecssful, and then unfreezes the player on 2540that has to return the map if sucecssful, and then unfreezes the player on
2482the new (success) or old (failed) map position. In either case, $done will 2541the new (success) or old (failed) map position. In either case, $done will
2483be called at the end of this process. 2542be called at the end of this process.
2543
2544Note that $check will be called with a potentially non-loaded map, so if
2545it needs a loaded map it has to call C<< ->load >>.
2484 2546
2485=cut 2547=cut
2486 2548
2487our $GOTOGEN; 2549our $GOTOGEN;
2488 2550
2567} 2629}
2568 2630
2569sub prepare_random_map { 2631sub prepare_random_map {
2570 my ($exit) = @_; 2632 my ($exit) = @_;
2571 2633
2572 my $guard = cf::lock_acquire "exit_prepare:$exit";
2573
2574 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2575 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2576 # that depends on the exit object 2636 # that depends on the exit object
2577 2637
2578 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
2580 if ($exit->map) { 2640 if ($exit->map) {
2581 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2582 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2583 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2584 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2585 } 2647 }
2586 2648
2587 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2588 2650
2589 my $data = cf::to_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2590 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2591 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2592 2654
2593 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2594 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2595 undef $fh; 2657 undef $fh;
2596 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2597 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2598 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2599 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2600 } 2666 }
2601} 2667}
2602 2668
2603sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2604 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2605 2671
2606 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2607 2673
2608 if ($exit->slaying eq "/!") {
2609 #TODO: this should de-fi-ni-te-ly not be a sync-job
2610 # the problem is that $exit might not survive long enough
2611 # so it needs to be done right now, right here
2612 cf::sync_job { prepare_random_map $exit };
2613 }
2614
2615 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2616 my $hp = $exit->stats->hp;
2617 my $sp = $exit->stats->sp;
2618
2619 $self->enter_link; 2674 $self->enter_link;
2620 2675
2621 # if exit is damned, update players death & WoR home-position
2622 $self->contr->savebed ($slaying, $hp, $sp)
2623 if $exit->flag (FLAG_DAMNED);
2624
2625 (async { 2676 (async {
2626 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2677 $Coro::current->{desc} = "enter_exit";
2627 2678
2628 $self->deactivate_recursive; # just to be sure
2629 unless (eval { 2679 unless (eval {
2680 $self->deactivate_recursive; # just to be sure
2681
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2691 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp;
2693
2630 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2631 2695
2696 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y)
2698 if $exit->flag (cf::FLAG_DAMNED);
2699
2632 1; 2700 1
2633 }) { 2701 }) {
2634 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2635 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2636 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2637 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2638 2706
2639 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
2667the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2668the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2669 2737
2670=cut 2738=cut
2671 2739
2740# non-persistent channels (usually the info channel)
2672our %CHANNEL = ( 2741our %CHANNEL = (
2673 "c/identify" => { 2742 "c/identify" => {
2674 id => "infobox", 2743 id => "infobox",
2675 title => "Identify", 2744 title => "Identify",
2676 reply => undef, 2745 reply => undef,
2680 id => "infobox", 2749 id => "infobox",
2681 title => "Examine", 2750 title => "Examine",
2682 reply => undef, 2751 reply => undef,
2683 tooltip => "Signs and other items you examined", 2752 tooltip => "Signs and other items you examined",
2684 }, 2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2685 "c/lookat" => { 2760 "c/lookat" => {
2686 id => "infobox", 2761 id => "infobox",
2687 title => "Look", 2762 title => "Look",
2688 reply => undef, 2763 reply => undef,
2689 tooltip => "What you saw there", 2764 tooltip => "What you saw there",
2690 }, 2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/perceiveself" => {
2809 id => "infobox",
2810 title => "Perceive Self",
2811 reply => undef,
2812 tooltip => "You gained detailed knowledge about yourself",
2813 },
2814 "c/uptime" => {
2815 id => "infobox",
2816 title => "Uptime",
2817 reply => undef,
2818 tooltip => "How long the server has been running since last restart",
2819 },
2820 "c/mapinfo" => {
2821 id => "infobox",
2822 title => "Map Info",
2823 reply => undef,
2824 tooltip => "Information related to the maps",
2825 },
2826 "c/party" => {
2827 id => "party",
2828 title => "Party",
2829 reply => "gsay ",
2830 tooltip => "Messages and chat related to your party",
2831 },
2832 "c/death" => {
2833 id => "death",
2834 title => "Death",
2835 reply => undef,
2836 tooltip => "Reason for and more info about your most recent death",
2837 },
2838 "c/say" => $SAY_CHANNEL,
2839 "c/chat" => $CHAT_CHANNEL,
2691); 2840);
2692 2841
2693sub cf::client::send_msg { 2842sub cf::client::send_msg {
2694 my ($self, $channel, $msg, $color, @extra) = @_; 2843 my ($self, $channel, $msg, $color, @extra) = @_;
2695 2844
2696 $msg = $self->pl->expand_cfpod ($msg); 2845 $msg = $self->pl->expand_cfpod ($msg)
2846 unless $color & cf::NDI_VERBATIM;
2697 2847
2698 $color &= cf::NDI_CLIENT_MASK; # just in case... 2848 $color &= cf::NDI_CLIENT_MASK; # just in case...
2699 2849
2700 # check predefined channels, for the benefit of C 2850 # check predefined channels, for the benefit of C
2701 if ($CHANNEL{$channel}) { 2851 if ($CHANNEL{$channel}) {
2702 $channel = $CHANNEL{$channel}; 2852 $channel = $CHANNEL{$channel};
2703 2853
2704 $self->ext_msg (channel_info => $channel) 2854 $self->ext_msg (channel_info => $channel);
2705 if $self->can_msg;
2706
2707 $channel = $channel->{id}; 2855 $channel = $channel->{id};
2708 2856
2709 } elsif (ref $channel) { 2857 } elsif (ref $channel) {
2710 # send meta info to client, if not yet sent 2858 # send meta info to client, if not yet sent
2711 unless (exists $self->{channel}{$channel->{id}}) { 2859 unless (exists $self->{channel}{$channel->{id}}) {
2712 $self->{channel}{$channel->{id}} = $channel; 2860 $self->{channel}{$channel->{id}} = $channel;
2713 $self->ext_msg (channel_info => $channel) 2861 $self->ext_msg (channel_info => $channel);
2714 if $self->can_msg;
2715 } 2862 }
2716 2863
2717 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2718 } 2865 }
2719 2866
2720 return unless @extra || length $msg; 2867 return unless @extra || length $msg;
2721 2868
2722 if ($self->can_msg) {
2723 # default colour, mask it out 2869 # default colour, mask it out
2724 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2725 if $color & cf::NDI_DEF; 2871 if $color & cf::NDI_DEF;
2726 2872
2727 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2873 my $pkt = "msg "
2874 . $self->{json_coder}->encode (
2728 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2729 } else { 2876 );
2730 if ($color >= 0) {
2731 # replace some tags by gcfclient-compatible ones
2732 for ($msg) {
2733 1 while
2734 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2735 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2736 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2737 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2738 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2739 }
2740 2877
2741 $color &= cf::NDI_COLOR_MASK; 2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2742 2881
2743 utf8::encode $msg; 2882 # split very large packets
2744 2883 if (8192 < length $pkt and $self->{can_lzf}) {
2745 if (0 && $msg =~ /\[/) { 2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2746 # COMMAND/INFO 2885 $pkt = "frag";
2747 $self->send_packet ("drawextinfo $color 10 8 $msg")
2748 } else {
2749 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2750 $self->send_packet ("drawinfo $color $msg")
2751 }
2752 }
2753 } 2886 }
2887
2888 $self->send_packet ($pkt);
2754} 2889}
2755 2890
2756=item $client->ext_msg ($type, @msg) 2891=item $client->ext_msg ($type, @msg)
2757 2892
2758Sends an ext event to the client. 2893Sends an ext event to the client.
2932 3067
2933The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2934 3069
2935 cf::object 3070 cf::object
2936 contr pay_amount pay_player map x y force_find force_add destroy 3071 contr pay_amount pay_player map x y force_find force_add destroy
2937 insert remove name archname title slaying race decrease_ob_nr 3072 insert remove name archname title slaying race decrease split
3073 value
2938 3074
2939 cf::object::player 3075 cf::object::player
2940 player 3076 player
2941 3077
2942 cf::player 3078 cf::player
2947 3083
2948=cut 3084=cut
2949 3085
2950for ( 3086for (
2951 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3087 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2952 insert remove inv name archname title slaying race 3088 insert remove inv nrof name archname title slaying race
2953 decrease_ob_nr destroy)], 3089 decrease split destroy change_exp value msg lore send_msg)],
2954 ["cf::object::player" => qw(player)], 3090 ["cf::object::player" => qw(player)],
2955 ["cf::player" => qw(peaceful)], 3091 ["cf::player" => qw(peaceful send_msg)],
2956 ["cf::map" => qw(trigger)], 3092 ["cf::map" => qw(trigger)],
2957) { 3093) {
2958 no strict 'refs'; 3094 no strict 'refs';
2959 my ($pkg, @funs) = @$_; 3095 my ($pkg, @funs) = @$_;
2960 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2977 my ($code, %vars) = @_; 3113 my ($code, %vars) = @_;
2978 3114
2979 my $qcode = $code; 3115 my $qcode = $code;
2980 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2981 $qcode =~ s/\n/\\n/g; 3117 $qcode =~ s/\n/\\n/g;
3118
3119 %vars = (_dummy => 0) unless %vars;
2982 3120
2983 local $_; 3121 local $_;
2984 local @safe::cf::_safe_eval_args = values %vars; 3122 local @safe::cf::_safe_eval_args = values %vars;
2985 3123
2986 my $eval = 3124 my $eval =
3063 { 3201 {
3064 my $faces = $facedata->{faceinfo}; 3202 my $faces = $facedata->{faceinfo};
3065 3203
3066 while (my ($face, $info) = each %$faces) { 3204 while (my ($face, $info) = each %$faces) {
3067 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3205 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206
3068 cf::face::set_visibility $idx, $info->{visibility}; 3207 cf::face::set_visibility $idx, $info->{visibility};
3069 cf::face::set_magicmap $idx, $info->{magicmap}; 3208 cf::face::set_magicmap $idx, $info->{magicmap};
3070 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3071 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3072 3211
3073 cf::cede_to_tick; 3212 cf::cede_to_tick;
3074 } 3213 }
3075 3214
3076 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
3077 next unless $info->{smooth}; 3216 next unless $info->{smooth};
3217
3078 my $idx = cf::face::find $face 3218 my $idx = cf::face::find $face
3079 or next; 3219 or next;
3220
3080 if (my $smooth = cf::face::find $info->{smooth}) { 3221 if (my $smooth = cf::face::find $info->{smooth}) {
3081 cf::face::set_smooth $idx, $smooth; 3222 cf::face::set_smooth $idx, $smooth;
3082 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3083 } else { 3224 } else {
3084 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3225 warn "smooth face '$info->{smooth}' not found for face '$face'";
3102 { 3243 {
3103 # TODO: for gcfclient pleasure, we should give resources 3244 # TODO: for gcfclient pleasure, we should give resources
3104 # that gcfclient doesn't grok a >10000 face index. 3245 # that gcfclient doesn't grok a >10000 face index.
3105 my $res = $facedata->{resource}; 3246 my $res = $facedata->{resource};
3106 3247
3107 my $soundconf = delete $res->{"res/sound.conf"};
3108
3109 while (my ($name, $info) = each %$res) { 3248 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) {
3110 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3250 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3111 my $data; 3251 my $data;
3112 3252
3113 if ($info->{type} & 1) { 3253 if ($info->{type} & 1) {
3114 # prepend meta info 3254 # prepend meta info
3115 3255
3116 my $meta = $enc->encode ({ 3256 my $meta = $enc->encode ({
3117 name => $name, 3257 name => $name,
3118 %{ $info->{meta} || {} }, 3258 %{ $info->{meta} || {} },
3119 }); 3259 });
3120 3260
3121 $data = pack "(w/a*)*", $meta, $info->{data}; 3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type};
3122 } else { 3268 } else {
3123 $data = $info->{data}; 3269 $RESOURCE{$name} = $info;
3124 } 3270 }
3125 3271
3126 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3127 cf::face::set_type $idx, $info->{type};
3128
3129 cf::cede_to_tick; 3272 cf::cede_to_tick;
3130 } 3273 }
3131
3132 if ($soundconf) {
3133 $soundconf = $enc->decode (delete $soundconf->{data});
3134
3135 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3136 my $sound = $soundconf->{compat}[$_]
3137 or next;
3138
3139 my $face = cf::face::find "sound/$sound->[1]";
3140 cf::sound::set $sound->[0] => $face;
3141 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3142 }
3143
3144 while (my ($k, $v) = each %{$soundconf->{event}}) {
3145 my $face = cf::face::find "sound/$v";
3146 cf::sound::set $k => $face;
3147 }
3148 }
3149 } 3274 }
3275
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3150 3277
3151 1 3278 1
3152} 3279}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3153 3300
3154register_exticmd fx_want => sub { 3301register_exticmd fx_want => sub {
3155 my ($ns, $want) = @_; 3302 my ($ns, $want) = @_;
3156 3303
3157 while (my ($k, $v) = each %$want) { 3304 while (my ($k, $v) = each %$want) {
3158 $ns->fx_want ($k, $v); 3305 $ns->fx_want ($k, $v);
3159 } 3306 }
3160}; 3307};
3308
3309sub load_resource_file($) {
3310 my $guard = lock_acquire "load_resource_file";
3311
3312 my $status = load_resource_file_ $_[0];
3313 get_slot 0.1, 100;
3314 cf::arch::commit_load;
3315
3316 $status
3317}
3161 3318
3162sub reload_regions { 3319sub reload_regions {
3163 # HACK to clear player env face cache, we need some signal framework 3320 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?) 3321 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = (); 3322 %ext::player_env::MUSIC_FACE_CACHE = ();
3179} 3336}
3180 3337
3181sub reload_archetypes { 3338sub reload_archetypes {
3182 load_resource_file "$DATADIR/archetypes" 3339 load_resource_file "$DATADIR/archetypes"
3183 or die "unable to load archetypes\n"; 3340 or die "unable to load archetypes\n";
3184 #d# NEED to laod twice to resolve forward references
3185 # this really needs to be done in an extra post-pass
3186 # (which needs to be synchronous, so solve it differently)
3187 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n";
3189} 3341}
3190 3342
3191sub reload_treasures { 3343sub reload_treasures {
3192 load_resource_file "$DATADIR/treasures" 3344 load_resource_file "$DATADIR/treasures"
3193 or die "unable to load treasurelists\n"; 3345 or die "unable to load treasurelists\n";
3194} 3346}
3195 3347
3196sub reload_resources { 3348sub reload_resources {
3197 warn "reloading resource files...\n"; 3349 warn "reloading resource files...\n";
3198 3350
3351 reload_facedata;
3352 reload_archetypes;
3199 reload_regions; 3353 reload_regions;
3200 reload_facedata;
3201 #reload_archetypes;#d#
3202 reload_archetypes;
3203 reload_treasures; 3354 reload_treasures;
3204 3355
3205 warn "finished reloading resource files\n"; 3356 warn "finished reloading resource files\n";
3206}
3207
3208sub init {
3209 reload_resources;
3210} 3357}
3211 3358
3212sub reload_config { 3359sub reload_config {
3213 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
3214 or return; 3361 or return;
3215 3362
3216 local $/; 3363 local $/;
3217 *CFG = YAML::Syck::Load <$fh>; 3364 *CFG = YAML::Load <$fh>;
3218 3365
3219 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3220 3367
3221 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3222 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3228 }; 3375 };
3229 warn $@ if $@; 3376 warn $@ if $@;
3230 } 3377 }
3231} 3378}
3232 3379
3380sub pidfile() {
3381 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3382 or die "$PIDFILE: $!";
3383 flock $fh, &Fcntl::LOCK_EX
3384 or die "$PIDFILE: flock: $!";
3385 $fh
3386}
3387
3388# make sure only one server instance is running at any one time
3389sub atomic {
3390 my $fh = pidfile;
3391
3392 my $pid = <$fh>;
3393 kill 9, $pid if $pid > 0;
3394
3395 seek $fh, 0, 0;
3396 print $fh $$;
3397}
3398
3233sub main { 3399sub main {
3400 cf::init_globals; # initialise logging
3401
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413
3234 # we must not ever block the main coroutine 3414 # we must not ever block the main coroutine
3235 local $Coro::idle = sub { 3415 local $Coro::idle = sub {
3236 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3416 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3237 (async { 3417 (async {
3238 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3418 $Coro::current->{desc} = "IDLE BUG HANDLER";
3239 Event::one_event; 3419 EV::loop EV::LOOP_ONESHOT;
3240 })->prio (Coro::PRIO_MAX); 3420 })->prio (Coro::PRIO_MAX);
3241 }; 3421 };
3242 3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3425 cf::sync_job {
3426 reload_resources;
3243 reload_config; 3427 reload_config;
3244 db_init; 3428 db_init;
3429
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid;
3433 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills;
3436
3437 cf::init_beforeplay;
3438
3439 atomic;
3440
3245 load_extensions; 3441 load_extensions;
3246 3442
3247 $TICK_WATCHER->start; 3443 utime time, time, $RUNTIMEFILE;
3444
3445 # no (long-running) fork's whatsoever before this point(!)
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447
3448 (pop @POST_INIT)->(0) while @POST_INIT;
3449 };
3450
3248 Event::loop; 3451 EV::loop;
3249} 3452}
3250 3453
3251############################################################################# 3454#############################################################################
3252# initialisation and cleanup 3455# initialisation and cleanup
3253 3456
3254# install some emergency cleanup handlers 3457# install some emergency cleanup handlers
3255BEGIN { 3458BEGIN {
3459 our %SIGWATCHER = ();
3256 for my $signal (qw(INT HUP TERM)) { 3460 for my $signal (qw(INT HUP TERM)) {
3257 Event->signal ( 3461 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3258 reentrant => 0,
3259 data => WF_AUTOCANCEL,
3260 signal => $signal,
3261 prio => 0,
3262 cb => sub {
3263 cf::cleanup "SIG$signal"; 3462 cf::cleanup "SIG$signal";
3264 },
3265 ); 3463 };
3266 } 3464 }
3267} 3465}
3268 3466
3269sub write_runtime { 3467sub write_runtime_sync {
3270 my $runtime = "$LOCALDIR/runtime";
3271
3272 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3273 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3274 3470
3275 IO::AIO::aio_utime $runtime, undef, undef; 3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3276 3472
3277 my $guard = cf::lock_acquire "write_runtime"; 3473 my $guard = cf::lock_acquire "write_runtime";
3278 3474
3279 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3280 or return; 3476 or return;
3281 3477
3282 my $value = $cf::RUNTIME + 90 + 10; 3478 my $value = $cf::RUNTIME + 90 + 10;
3283 # 10 is the runtime save interval, for a monotonic clock 3479 # 10 is the runtime save interval, for a monotonic clock
3284 # 60 allows for the watchdog to kill the server. 3480 # 60 allows for the watchdog to kill the server.
3294 aio_utime $fh, undef, undef; 3490 aio_utime $fh, undef, undef;
3295 3491
3296 close $fh 3492 close $fh
3297 or return; 3493 or return;
3298 3494
3299 aio_rename "$runtime~", $runtime 3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3300 and return; 3496 and return;
3301 3497
3302 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3303 3499
3304 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_seq uuid_cur;
3518
3519 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n";
3521 return;
3522 }
3523
3524 my $value = uuid_str $value + $uuid_skip;
3525 $uuid_skip = 0;
3526
3527 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3528 and return;
3529
3530 # always fsync - this file is important
3531 aio_fsync $fh
3532 and return;
3533
3534 close $fh
3535 or return;
3536
3537 aio_rename "$uuid~", $uuid
3538 and return;
3539
3540 warn "uuid file written ($value).\n";
3541
3542 1
3543
3544}
3545
3546sub write_uuid($$) {
3547 my ($skip, $sync) = @_;
3548
3549 $sync ? write_uuid_sync $skip
3550 : async { write_uuid_sync $skip };
3305} 3551}
3306 3552
3307sub emergency_save() { 3553sub emergency_save() {
3308 my $freeze_guard = cf::freeze_mainloop; 3554 my $freeze_guard = cf::freeze_mainloop;
3309 3555
3310 warn "enter emergency perl save\n"; 3556 warn "emergency_perl_save: enter\n";
3311 3557
3312 cf::sync_job { 3558 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563
3313 # use a peculiar iteration method to avoid tripping on perl 3564 # use a peculiar iteration method to avoid tripping on perl
3314 # refcount bugs in for. also avoids problems with players 3565 # refcount bugs in for. also avoids problems with players
3315 # and maps saved/destroyed asynchronously. 3566 # and maps saved/destroyed asynchronously.
3316 warn "begin emergency player save\n"; 3567 warn "emergency_perl_save: begin player save\n";
3317 for my $login (keys %cf::PLAYER) { 3568 for my $login (keys %cf::PLAYER) {
3318 my $pl = $cf::PLAYER{$login} or next; 3569 my $pl = $cf::PLAYER{$login} or next;
3319 $pl->valid or next; 3570 $pl->valid or next;
3320 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3321 $pl->save; 3572 $pl->save;
3322 } 3573 }
3323 warn "end emergency player save\n"; 3574 warn "emergency_perl_save: end player save\n";
3324 3575
3325 warn "begin emergency map save\n"; 3576 warn "emergency_perl_save: begin map save\n";
3326 for my $path (keys %cf::MAP) { 3577 for my $path (keys %cf::MAP) {
3327 my $map = $cf::MAP{$path} or next; 3578 my $map = $cf::MAP{$path} or next;
3328 $map->valid or next; 3579 $map->valid or next;
3329 $map->save; 3580 $map->save;
3330 } 3581 }
3331 warn "end emergency map save\n"; 3582 warn "emergency_perl_save: end map save\n";
3332 3583
3333 warn "begin emergency database checkpoint\n"; 3584 warn "emergency_perl_save: begin database checkpoint\n";
3334 BDB::db_env_txn_checkpoint $DB_ENV; 3585 BDB::db_env_txn_checkpoint $DB_ENV;
3335 warn "end emergency database checkpoint\n"; 3586 warn "emergency_perl_save: end database checkpoint\n";
3587
3588 warn "emergency_perl_save: begin write uuid\n";
3589 write_uuid_sync 1;
3590 warn "emergency_perl_save: end write uuid\n";
3336 }; 3591 };
3337 3592
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3338 warn "leave emergency perl save\n"; 3598 warn "emergency_perl_save: leave\n";
3339} 3599}
3340 3600
3341sub post_cleanup { 3601sub post_cleanup {
3342 my ($make_core) = @_; 3602 my ($make_core) = @_;
3343 3603
3344 warn Carp::longmess "post_cleanup backtrace" 3604 warn Carp::longmess "post_cleanup backtrace"
3345 if $make_core; 3605 if $make_core;
3606
3607 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$;
3609}
3610
3611# a safer delete_package, copied from Symbol
3612sub clear_package($) {
3613 my $pkg = shift;
3614
3615 # expand to full symbol table name if needed
3616 unless ($pkg =~ /^main::.*::$/) {
3617 $pkg = "main$pkg" if $pkg =~ /^::/;
3618 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3619 $pkg .= '::' unless $pkg =~ /::$/;
3620 }
3621
3622 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3623 my $stem_symtab = *{$stem}{HASH};
3624
3625 defined $stem_symtab and exists $stem_symtab->{$leaf}
3626 or return;
3627
3628 # clear all symbols
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 }
3634 warn "cleared package $pkg\n";#d#
3346} 3635}
3347 3636
3348sub do_reload_perl() { 3637sub do_reload_perl() {
3349 # can/must only be called in main 3638 # can/must only be called in main
3350 if ($Coro::current != $Coro::main) { 3639 if ($Coro::current != $Coro::main) {
3351 warn "can only reload from main coroutine"; 3640 warn "can only reload from main coroutine";
3352 return; 3641 return;
3353 } 3642 }
3354 3643
3644 return if $RELOAD++;
3645
3646 my $t1 = EV::time;
3647
3648 while ($RELOAD) {
3355 warn "reloading..."; 3649 warn "reloading...";
3356 3650
3357 warn "entering sync_job"; 3651 warn "entering sync_job";
3358 3652
3359 cf::sync_job { 3653 cf::sync_job {
3360 cf::write_runtime; # external watchdog should not bark 3654 cf::write_runtime_sync; # external watchdog should not bark
3361 cf::emergency_save; 3655 cf::emergency_save;
3362 cf::write_runtime; # external watchdog should not bark 3656 cf::write_runtime_sync; # external watchdog should not bark
3363 3657
3364 warn "syncing database to disk"; 3658 warn "syncing database to disk";
3365 BDB::db_env_txn_checkpoint $DB_ENV; 3659 BDB::db_env_txn_checkpoint $DB_ENV;
3366 3660
3367 # if anything goes wrong in here, we should simply crash as we already saved 3661 # if anything goes wrong in here, we should simply crash as we already saved
3368 3662
3369 warn "cancelling all WF_AUTOCANCEL watchers";
3370 for (Event::all_watchers) {
3371 $_->cancel if $_->data & WF_AUTOCANCEL;
3372 }
3373
3374 warn "flushing outstanding aio requests"; 3663 warn "flushing outstanding aio requests";
3375 for (;;) {
3376 BDB::flush;
3377 IO::AIO::flush;
3378 Coro::cede_notself;
3379 last unless IO::AIO::nreqs || BDB::nreqs; 3664 while (IO::AIO::nreqs || BDB::nreqs) {
3380 warn "iterate..."; 3665 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3381 }
3382
3383 ++$RELOAD;
3384
3385 warn "cancelling all extension coros";
3386 $_->cancel for values %EXT_CORO;
3387 %EXT_CORO = ();
3388
3389 warn "removing commands";
3390 %COMMAND = ();
3391
3392 warn "removing ext/exti commands";
3393 %EXTCMD = ();
3394 %EXTICMD = ();
3395
3396 warn "unloading/nuking all extensions";
3397 for my $pkg (@EXTS) {
3398 warn "... unloading $pkg";
3399
3400 if (my $cb = $pkg->can ("unload")) {
3401 eval {
3402 $cb->($pkg);
3403 1
3404 } or warn "$pkg unloaded, but with errors: $@";
3405 } 3666 }
3406 3667
3407 warn "... nuking $pkg"; 3668 warn "cancelling all extension coros";
3408 Symbol::delete_package $pkg; 3669 $_->cancel for values %EXT_CORO;
3409 } 3670 %EXT_CORO = ();
3410 3671
3411 warn "unloading all perl modules loaded from $LIBDIR"; 3672 warn "removing commands";
3412 while (my ($k, $v) = each %INC) { 3673 %COMMAND = ();
3413 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3414 3674
3675 warn "removing ext/exti commands";
3676 %EXTCMD = ();
3677 %EXTICMD = ();
3678
3679 warn "unloading/nuking all extensions";
3680 for my $pkg (@EXTS) {
3415 warn "... unloading $k"; 3681 warn "... unloading $pkg";
3416 delete $INC{$k};
3417 3682
3418 $k =~ s/\.pm$//;
3419 $k =~ s/\//::/g;
3420
3421 if (my $cb = $k->can ("unload_module")) { 3683 if (my $cb = $pkg->can ("unload")) {
3684 eval {
3422 $cb->(); 3685 $cb->($pkg);
3686 1
3687 } or warn "$pkg unloaded, but with errors: $@";
3688 }
3689
3690 warn "... clearing $pkg";
3691 clear_package $pkg;
3423 } 3692 }
3424 3693
3425 Symbol::delete_package $k; 3694 warn "unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697
3698 warn "... unloading $k";
3699 delete $INC{$k};
3700
3701 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g;
3703
3704 if (my $cb = $k->can ("unload_module")) {
3705 $cb->();
3706 }
3707
3708 clear_package $k;
3426 } 3709 }
3427 3710
3428 warn "getting rid of safe::, as good as possible"; 3711 warn "getting rid of safe::, as good as possible";
3429 Symbol::delete_package "safe::$_" 3712 clear_package "safe::$_"
3430 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3431 3714
3432 warn "unloading cf.pm \"a bit\""; 3715 warn "unloading cf.pm \"a bit\"";
3433 delete $INC{"cf.pm"}; 3716 delete $INC{"cf.pm"};
3434 delete $INC{"cf/pod.pm"}; 3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3435 3718
3436 # don't, removes xs symbols, too, 3719 # don't, removes xs symbols, too,
3437 # and global variables created in xs 3720 # and global variables created in xs
3438 #Symbol::delete_package __PACKAGE__; 3721 #clear_package __PACKAGE__;
3439 3722
3440 warn "unload completed, starting to reload now"; 3723 warn "unload completed, starting to reload now";
3441 3724
3442 warn "reloading cf.pm"; 3725 warn "reloading cf.pm";
3443 require cf; 3726 require cf;
3444 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3445 3728
3446 warn "loading config and database again"; 3729 warn "loading config and database again";
3447 cf::reload_config; 3730 cf::reload_config;
3448 3731
3449 warn "loading extensions"; 3732 warn "loading extensions";
3450 cf::load_extensions; 3733 cf::load_extensions;
3451 3734
3735 if ($REATTACH_ON_RELOAD) {
3452 warn "reattaching attachments to objects/players"; 3736 warn "reattaching attachments to objects/players";
3453 _global_reattach; # objects, sockets 3737 _global_reattach; # objects, sockets
3454 warn "reattaching attachments to maps"; 3738 warn "reattaching attachments to maps";
3455 reattach $_ for values %MAP; 3739 reattach $_ for values %MAP;
3456 warn "reattaching attachments to players"; 3740 warn "reattaching attachments to players";
3457 reattach $_ for values %PLAYER; 3741 reattach $_ for values %PLAYER;
3742 }
3458 3743
3744 warn "running post_init jobs";
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3746
3459 warn "leaving sync_job"; 3747 warn "leaving sync_job";
3460 3748
3461 1 3749 1
3462 } or do { 3750 } or do {
3463 warn $@; 3751 warn $@;
3464 warn "error while reloading, exiting."; 3752 cf::cleanup "error while reloading, exiting.";
3465 exit 1;
3466 }; 3753 };
3467 3754
3468 warn "reloaded"; 3755 warn "reloaded";
3756 --$RELOAD;
3757 }
3758
3759 $t1 = EV::time - $t1;
3760 warn "reload completed in ${t1}s\n";
3469}; 3761};
3470 3762
3471our $RELOAD_WATCHER; # used only during reload 3763our $RELOAD_WATCHER; # used only during reload
3472 3764
3473sub reload_perl() { 3765sub reload_perl() {
3474 # doing reload synchronously and two reloads happen back-to-back, 3766 # doing reload synchronously and two reloads happen back-to-back,
3475 # coro crashes during coro_state_free->destroy here. 3767 # coro crashes during coro_state_free->destroy here.
3476 3768
3477 $RELOAD_WATCHER ||= Event->timer ( 3769 $RELOAD_WATCHER ||= cf::async {
3478 reentrant => 0, 3770 Coro::AIO::aio_wait cache_extensions;
3479 after => 0, 3771
3480 data => WF_AUTOCANCEL, 3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3481 cb => sub {
3482 do_reload_perl; 3773 do_reload_perl;
3483 undef $RELOAD_WATCHER; 3774 undef $RELOAD_WATCHER;
3484 }, 3775 };
3485 ); 3776 };
3486} 3777}
3487 3778
3488register_command "reload" => sub { 3779register_command "reload" => sub {
3489 my ($who, $arg) = @_; 3780 my ($who, $arg) = @_;
3490 3781
3503 3794
3504our @WAIT_FOR_TICK; 3795our @WAIT_FOR_TICK;
3505our @WAIT_FOR_TICK_BEGIN; 3796our @WAIT_FOR_TICK_BEGIN;
3506 3797
3507sub wait_for_tick { 3798sub wait_for_tick {
3508 return unless $TICK_WATCHER->is_active;
3509 return if $Coro::current == $Coro::main; 3799 return if tick_inhibit || $Coro::current == $Coro::main;
3510 3800
3511 my $signal = new Coro::Signal; 3801 my $signal = new Coro::Signal;
3512 push @WAIT_FOR_TICK, $signal; 3802 push @WAIT_FOR_TICK, $signal;
3513 $signal->wait; 3803 $signal->wait;
3514} 3804}
3515 3805
3516sub wait_for_tick_begin { 3806sub wait_for_tick_begin {
3517 return unless $TICK_WATCHER->is_active;
3518 return if $Coro::current == $Coro::main; 3807 return if tick_inhibit || $Coro::current == $Coro::main;
3519 3808
3520 my $signal = new Coro::Signal; 3809 my $signal = new Coro::Signal;
3521 push @WAIT_FOR_TICK_BEGIN, $signal; 3810 push @WAIT_FOR_TICK_BEGIN, $signal;
3522 $signal->wait; 3811 $signal->wait;
3523} 3812}
3524 3813
3525$TICK_WATCHER = Event->timer ( 3814sub tick {
3526 reentrant => 0,
3527 parked => 1,
3528 prio => 0,
3529 at => $NEXT_TICK || $TICK,
3530 data => WF_AUTOCANCEL,
3531 cb => sub {
3532 if ($Coro::current != $Coro::main) { 3815 if ($Coro::current != $Coro::main) {
3533 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3816 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3534 unless ++$bug_warning > 10; 3817 unless ++$bug_warning > 10;
3535 return; 3818 return;
3536 } 3819 }
3537 3820
3538 $NOW = $tick_start = Event::time;
3539
3540 cf::server_tick; # one server iteration 3821 cf::server_tick; # one server iteration
3541 3822
3542 $RUNTIME += $TICK;
3543 $NEXT_TICK += $TICK;
3544
3545 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3823 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3546 $NEXT_RUNTIME_WRITE = $NOW + 10; 3824 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3547 Coro::async_pool { 3825 Coro::async_pool {
3548 $Coro::current->{desc} = "runtime saver"; 3826 $Coro::current->{desc} = "runtime saver";
3549 write_runtime 3827 write_runtime_sync
3550 or warn "ERROR: unable to write runtime file: $!"; 3828 or warn "ERROR: unable to write runtime file: $!";
3551 };
3552 } 3829 };
3830 }
3553 3831
3554 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3555 $sig->send; 3833 $sig->send;
3556 } 3834 }
3557 while (my $sig = shift @WAIT_FOR_TICK) { 3835 while (my $sig = shift @WAIT_FOR_TICK) {
3558 $sig->send; 3836 $sig->send;
3559 } 3837 }
3560 3838
3561 $NOW = Event::time; 3839 $LOAD = ($NOW - $TICK_START) / $TICK;
3562
3563 # if we are delayed by four ticks or more, skip them all
3564 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3565
3566 $TICK_WATCHER->at ($NEXT_TICK);
3567 $TICK_WATCHER->start;
3568
3569 $LOAD = ($NOW - $tick_start) / $TICK;
3570 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3840 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3571 3841
3572 _post_tick; 3842 if (0) {
3843 if ($NEXT_TICK) {
3844 my $jitter = $TICK_START - $NEXT_TICK;
3845 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3846 warn "jitter $JITTER\n";#d#
3847 }
3573 }, 3848 }
3574); 3849}
3575 3850
3576{ 3851{
3852 # configure BDB
3853
3577 BDB::min_parallel 8; 3854 BDB::min_parallel 8;
3578 BDB::max_poll_time $TICK * 0.1; 3855 BDB::max_poll_reqs $TICK * 0.1;
3579 $BDB_POLL_WATCHER = Event->io ( 3856 $AnyEvent::BDB::WATCHER->priority (1);
3580 reentrant => 0,
3581 fd => BDB::poll_fileno,
3582 poll => 'r',
3583 prio => 0,
3584 data => WF_AUTOCANCEL,
3585 cb => \&BDB::poll_cb,
3586 );
3587
3588 BDB::set_sync_prepare {
3589 my $status;
3590 my $current = $Coro::current;
3591 (
3592 sub {
3593 $status = $!;
3594 $current->ready; undef $current;
3595 },
3596 sub {
3597 Coro::schedule while defined $current;
3598 $! = $status;
3599 },
3600 )
3601 };
3602 3857
3603 unless ($DB_ENV) { 3858 unless ($DB_ENV) {
3604 $DB_ENV = BDB::db_env_create; 3859 $DB_ENV = BDB::db_env_create;
3605 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3860 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3606 | BDB::LOG_AUTOREMOVE, 1); 3861 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3862 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3607 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3863 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3608 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3864 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3609 3865
3610 cf::sync_job { 3866 cf::sync_job {
3611 eval { 3867 eval {
3621 3877
3622 cf::cleanup "db_env_open(db): $@" if $@; 3878 cf::cleanup "db_env_open(db): $@" if $@;
3623 }; 3879 };
3624 } 3880 }
3625 3881
3626 $BDB_DEADLOCK_WATCHER = Event->timer ( 3882 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3627 after => 3,
3628 interval => 1,
3629 hard => 1,
3630 prio => 0,
3631 data => WF_AUTOCANCEL,
3632 cb => sub {
3633 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3883 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3634 },
3635 ); 3884 };
3636 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3885 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3637 after => 11,
3638 interval => 60,
3639 hard => 1,
3640 prio => 0,
3641 data => WF_AUTOCANCEL,
3642 cb => sub {
3643 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3886 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3644 },
3645 ); 3887 };
3646 $BDB_TRICKLE_WATCHER = Event->timer ( 3888 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3647 after => 5,
3648 interval => 10,
3649 hard => 1,
3650 prio => 0,
3651 data => WF_AUTOCANCEL,
3652 cb => sub {
3653 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3889 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3654 },
3655 ); 3890 };
3656} 3891}
3657 3892
3658{ 3893{
3894 # configure IO::AIO
3895
3659 IO::AIO::min_parallel 8; 3896 IO::AIO::min_parallel 8;
3660
3661 undef $Coro::AIO::WATCHER;
3662 IO::AIO::max_poll_time $TICK * 0.1; 3897 IO::AIO::max_poll_time $TICK * 0.1;
3663 $AIO_POLL_WATCHER = Event->io ( 3898 undef $AnyEvent::AIO::WATCHER;
3664 reentrant => 0,
3665 data => WF_AUTOCANCEL,
3666 fd => IO::AIO::poll_fileno,
3667 poll => 'r',
3668 prio => 0,
3669 cb => \&IO::AIO::poll_cb,
3670 );
3671} 3899}
3672 3900
3673my $_log_backtrace; 3901my $_log_backtrace;
3674 3902
3675sub _log_backtrace { 3903sub _log_backtrace {
3678 $msg =~ s/\n//; 3906 $msg =~ s/\n//;
3679 3907
3680 # limit the # of concurrent backtraces 3908 # limit the # of concurrent backtraces
3681 if ($_log_backtrace < 2) { 3909 if ($_log_backtrace < 2) {
3682 ++$_log_backtrace; 3910 ++$_log_backtrace;
3911 my $perl_bt = Carp::longmess $msg;
3683 async { 3912 async {
3684 $Coro::current->{desc} = "abt $msg"; 3913 $Coro::current->{desc} = "abt $msg";
3685 3914
3686 my @bt = fork_call { 3915 my @bt = fork_call {
3687 @addr = map { sprintf "%x", $_ } @addr; 3916 @addr = map { sprintf "%x", $_ } @addr;
3698 } 3927 }
3699 3928
3700 @funcs 3929 @funcs
3701 }; 3930 };
3702 3931
3703 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $perl_bt\n";
3933 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3704 LOG llevInfo, "[ABT] $_\n" for @bt; 3934 LOG llevInfo, "[ABT] $_\n" for @bt;
3705 --$_log_backtrace; 3935 --$_log_backtrace;
3706 }; 3936 };
3707 } else { 3937 } else {
3708 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $msg\n";
3709 LOG llevInfo, "[ABT] [suppressed]\n"; 3939 LOG llevInfo, "[ABT] [suppressed]\n";
3710 } 3940 }
3711} 3941}
3712 3942
3713# load additional modules 3943# load additional modules
3714use cf::pod; 3944require "cf/$_.pm" for @EXTRA_MODULES;
3715 3945
3716END { cf::emergency_save } 3946END { cf::emergency_save }
3717 3947
37181 39481
3719 3949

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines