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.391 by root, Fri Oct 26 04:22:05 2007 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 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 if ($cf::USE_FSYNC) {
1157 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1158 aio_fsync $fh;
1159 }
1081 close $fh; 1160 aio_close $fh;
1082 1161
1083 if (@$objs) { 1162 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1167 if ($cf::USE_FSYNC) {
1168 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1169 aio_fsync $fh;
1170 }
1089 close $fh; 1171 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1173 }
1092 } else { 1174 } else {
1093 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
1094 } 1176 }
1095 1177
1096 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1182 } else {
1098 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1099 } 1184 }
1100 } else { 1185 } else {
1101 aio_unlink $filename; 1186 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1103 } 1188 }
1194 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1195 1280
1196 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1197} 1282}
1198 1283
1284use File::Glob ();
1285
1199cf::player->attach ( 1286cf::player->attach (
1200 on_command => sub { 1287 on_command => sub {
1201 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1202 1289
1203 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
1235 1322
1236 cf::override; 1323 cf::override;
1237 }, 1324 },
1238); 1325);
1239 1326
1327# "readahead" all extensions
1328sub cache_extensions {
1329 my $grp = IO::AIO::aio_group;
1330
1331 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1332 for (grep /\.ext$/, @{$_[0]}) {
1333 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1334 }
1335 };
1336
1337 $grp
1338}
1339
1240sub load_extensions { 1340sub load_extensions {
1241 cf::sync_job { 1341 cf::sync_job {
1242 my %todo; 1342 my %todo;
1243 1343
1244 for my $path (<$LIBDIR/*.ext>) { 1344 for my $path (<$LIBDIR/*.ext>) {
1263 1363
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1366
1267 $ext{source} = 1367 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1369 . "#line 1 \"$path\"\n{\n"
1270 . $source 1370 . $source
1271 . "\n};\n1"; 1371 . "\n};\n1";
1272 1372
1273 $todo{$base} = \%ext; 1373 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1389 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1390 : "$v->{base}: extension inactive.\n";
1291 1391
1292 if (exists $v->{meta}{mandatory}) { 1392 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1393 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1394 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1395 }
1297 1396
1298 warn $msg; 1397 warn $msg;
1299 } 1398 }
1300 1399
1314 1413
1315=back 1414=back
1316 1415
1317=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1318 1417
1319Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1320 1419
1321=cut 1420=cut
1322 1421
1323package cf::player; 1422package cf::player;
1324 1423
1367 1466
1368sub exists($) { 1467sub exists($) {
1369 my ($login) = @_; 1468 my ($login) = @_;
1370 1469
1371 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1373} 1472}
1374 1473
1375sub find($) { 1474sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1476 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1488 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1489 or return;
1391 1490
1392 my $pl = cf::player::load_pl $f 1491 my $pl = cf::player::load_pl $f
1393 or return; 1492 or return;
1493
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1494 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1495 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1496 $cf::PLAYER{$login} = $pl
1397 } 1497 }
1398 } 1498 }
1408 1508
1409 return if $pl->{deny_save}; 1509 return if $pl->{deny_save};
1410 1510
1411 aio_mkdir playerdir $pl, 0770; 1511 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1512 $pl->{last_save} = $cf::RUNTIME;
1513
1514 cf::get_slot 0.01;
1413 1515
1414 $pl->save_pl ($path); 1516 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1517 cf::cede_to_tick;
1416} 1518}
1417 1519
1449 my ($pl) = @_; 1551 my ($pl) = @_;
1450 1552
1451 my $name = $pl->ob->name; 1553 my $name = $pl->ob->name;
1452 1554
1453 $pl->{deny_save} = 1; 1555 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1556 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1557
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1559 $pl->deactivate;
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1562 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1563 $pl->ns->destroy if $pl->ns;
1460 1564
1461 my $path = playerdir $pl; 1565 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1566 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1605
1502 for my $login (@$dirs) { 1606 for my $login (@$dirs) {
1503 my $path = path $login; 1607 my $path = path $login;
1504 1608
1505 # a .pst is a dead give-away for a valid player 1609 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1610 # if no pst file found, open and chekc for blocked users
1611 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1612 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1613 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1614 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1615 }
1511 1616
1542 } 1647 }
1543 1648
1544 \@paths 1649 \@paths
1545} 1650}
1546 1651
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1653
1549Expand crossfire pod fragments into protocol xml. 1654Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1563sub expand_cfpod {
1564 my ($self, $pod) = @_;
1565
1566 my $xml;
1567
1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1571
1572 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g;
1574
1575 $xml .= $group;
1576 } elsif ($pod =~ m%\G
1577 ([BCGHITU])
1578 <
1579 (?:
1580 ([^<>]*) (?{ $group = $^N })
1581 | < $interior >
1582 )
1583 >
1584 %gcsx
1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1605 "")
1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1617
1618 for ($xml) {
1619 # create single paragraphs (very hackish)
1620 s/(?<=\S)\n(?=\w)/ /g;
1621
1622 # compress some whitespace
1623 s/\s+\n/\n/g; # ws line-ends
1624 s/\n\n+/\n/g; # double lines
1625 s/^\n+//; # beginning lines
1626 s/\n+$//; # ending lines
1627 }
1628
1629 $xml
1630}
1631
1632sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode}
1635}
1636 1655
1637=item $player->ext_reply ($msgid, @msg) 1656=item $player->ext_reply ($msgid, @msg)
1638 1657
1639Sends an ext reply to the player. 1658Sends an ext reply to the player.
1640 1659
1707our $MAX_RESET = 3600; 1726our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1727our $DEFAULT_RESET = 3000;
1709 1728
1710sub generate_random_map { 1729sub generate_random_map {
1711 my ($self, $rmp) = @_; 1730 my ($self, $rmp) = @_;
1731
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733
1712 # mit "rum" bekleckern, nicht 1734 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1735 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1838 1860
1839# the temporary/swap location 1861# the temporary/swap location
1840sub save_path { 1862sub save_path {
1841 my ($self) = @_; 1863 my ($self) = @_;
1842 1864
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1866 "$TMPDIR/$path.map"
1845} 1867}
1846 1868
1847# the unique path, undef == no special unique path 1869# the unique path, undef == no special unique path
1848sub uniq_path { 1870sub uniq_path {
1849 my ($self) = @_; 1871 my ($self) = @_;
1850 1872
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1853}
1854
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862} 1875}
1863 1876
1864sub decay_objects { 1877sub decay_objects {
1865 my ($self) = @_; 1878 my ($self) = @_;
1866 1879
1950sub find { 1963sub find {
1951 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1952 1965
1953 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1954 1967
1955 cf::lock_wait "map_data:$path";#d#remove 1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1970
1958 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1962 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1963 or return; 1973 or return;
1964 1974
1965 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1966 1976
1968 or return; 1978 or return;
1969 1979
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1980 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 1981 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 1982 #$cf::WAIT_FOR_TICK->wait;
1983 undef $guard2;
1973 undef $guard1; 1984 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 1985 $map->reset;
1976 return find $path; 1986 return find $path;
1977 } 1987 }
1978 1988
1979 $cf::MAP{$path} = $map 1989 $cf::MAP{$path} = $map
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2016 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2017 $f->skip_block;
2008 $self->_load_objects ($f) 2018 $self->_load_objects ($f)
2009 or return; 2019 or return;
2010 2020
2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2021 $self->post_load_original
2012 if delete $self->{load_original}; 2022 if delete $self->{load_original};
2013 2023
2014 if (my $uniq = $self->uniq_path) { 2024 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2025 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2026 unless (aio_stat $uniq) {
2034 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2045 $self->decay_objects;
2036 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
2037 $self->update_buttons; 2047 $self->update_buttons;
2038 cf::cede_to_tick; 2048 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2049 $self->activate;
2042 } 2050 }
2043 2051
2044 $self->{last_save} = $cf::RUNTIME; 2052 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2053 $self->last_access ($cf::RUNTIME);
2046 2054
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2055 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2056 }
2049 2057
2050 $self->post_load; 2058 $self->post_load;
2051} 2059}
2052 2060
2110 my ($path, $origin, $load) = @_; 2118 my ($path, $origin, $load) = @_;
2111 2119
2112 $path = normalise $path, $origin && $origin->{path}; 2120 $path = normalise $path, $origin && $origin->{path};
2113 2121
2114 if (my $map = $cf::MAP{$path}) { 2122 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2124 }
2117 2125
2118 $MAP_PREFETCH{$path} |= $load; 2126 $MAP_PREFETCH{$path} |= $load;
2119 2127
2120 $MAP_PREFETCHER ||= cf::async { 2128 $MAP_PREFETCHER ||= cf::async {
2157 cf::async { 2165 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2166 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2167 $_->contr->save for $self->players;
2160 }; 2168 };
2161 2169
2170 cf::get_slot 0.02;
2171
2162 if ($uniq) { 2172 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2173 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2174 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2175 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2176 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2174 $self->save; 2184 $self->save;
2175 2185
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2186 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2187
2178 return if $self->players; 2188 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY; 2189 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2190 return if $self->{deny_save};
2181 2191
2182 $self->in_memory (cf::MAP_SWAPPED); 2192 $self->in_memory (cf::MAP_SWAPPED);
2183 2193
2184 $self->deactivate; 2194 $self->deactivate;
2302 2312
2303sub unique_maps() { 2313sub unique_maps() {
2304 [ 2314 [
2305 map { 2315 map {
2306 utf8::decode $_; 2316 utf8::decode $_;
2307 /\.map$/ 2317 s/\.map$//; # TODO future compatibility hack
2318 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2319 ? ()
2308 ? normalise $_ 2320 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2321 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2322 ]
2312} 2323}
2313 2324
2314package cf;
2315
2316=back 2325=back
2317 2326
2318=head3 cf::object 2327=head3 cf::object
2319 2328
2320=cut 2329=cut
2323 2332
2324=over 4 2333=over 4
2325 2334
2326=item $ob->inv_recursive 2335=item $ob->inv_recursive
2327 2336
2328Returns the inventory of the object _and_ their inventories, recursively. 2337Returns the inventory of the object I<and> their inventories, recursively,
2338but I<not> the object itself.
2329 2339
2330=cut 2340=cut
2331 2341
2332sub inv_recursive_; 2342sub inv_recursive_;
2333sub inv_recursive_ { 2343sub inv_recursive_ {
2338 inv_recursive_ inv $_[0] 2348 inv_recursive_ inv $_[0]
2339} 2349}
2340 2350
2341=item $ref = $ob->ref 2351=item $ref = $ob->ref
2342 2352
2343creates and returns a persistent reference to an objetc that can be stored as a string. 2353Creates and returns a persistent reference to an object that can be stored as a string.
2344 2354
2345=item $ob = cf::object::deref ($refstring) 2355=item $ob = cf::object::deref ($refstring)
2346 2356
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2357returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block. 2358even if the object actually exists. May block.
2380can be C<undef>. Does the right thing when the player is currently in a 2390can be C<undef>. Does the right thing when the player is currently in a
2381dialogue with the given NPC character. 2391dialogue with the given NPC character.
2382 2392
2383=cut 2393=cut
2384 2394
2395our $SAY_CHANNEL = {
2396 id => "say",
2397 title => "Map",
2398 reply => "say ",
2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2400};
2401
2402our $CHAT_CHANNEL = {
2403 id => "chat",
2404 title => "Chat",
2405 reply => "chat ",
2406 tooltip => "Player chat and shouts, global to the server.",
2407};
2408
2385# rough implementation of a future "reply" method that works 2409# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2410# with dialog boxes.
2387#TODO: the first argument must go, split into a $npc->reply_to ( method 2411#TODO: the first argument must go, split into a $npc->reply_to ( method
2388sub cf::object::player::reply($$$;$) { 2412sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2413 my ($self, $npc, $msg, $flags) = @_;
2400 my $dialog = $pl->{npc_dialog}; 2424 my $dialog = $pl->{npc_dialog};
2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2425 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2402 2426
2403 } else { 2427 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2428 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2429 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2430 }
2407 } 2431 }
2408} 2432}
2409 2433
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2434=item $object->send_msg ($channel, $msg, $color, [extra...])
2435 2459
2436=item $player_object->enter_link 2460=item $player_object->enter_link
2437 2461
2438Freezes the player and moves him/her to a special map (C<{link}>). 2462Freezes the player and moves him/her to a special map (C<{link}>).
2439 2463
2440The player should be reasonably safe there for short amounts of time. You 2464The player should be reasonably safe there for short amounts of time (e.g.
2441I<MUST> call C<leave_link> as soon as possible, though. 2465for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link
2467map.
2442 2468
2443Will never block. 2469Will never block.
2444 2470
2445=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
2446 2472
2504 2530
2505 $map->load; 2531 $map->load;
2506 $map->load_neighbours; 2532 $map->load_neighbours;
2507 2533
2508 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2509 $self->activate_recursive; 2536 $self->activate_recursive;
2510 2537
2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2512 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2513} 2540}
2517Moves the player to the given map-path and coordinates by first freezing 2544Moves the player to the given map-path and coordinates by first freezing
2518her, loading and preparing them map, calling the provided $check callback 2545her, loading and preparing them map, calling the provided $check callback
2519that has to return the map if sucecssful, and then unfreezes the player on 2546that has to return the map if sucecssful, and then unfreezes the player on
2520the new (success) or old (failed) map position. In either case, $done will 2547the new (success) or old (failed) map position. In either case, $done will
2521be called at the end of this process. 2548be called at the end of this process.
2549
2550Note that $check will be called with a potentially non-loaded map, so if
2551it needs a loaded map it has to call C<< ->load >>.
2522 2552
2523=cut 2553=cut
2524 2554
2525our $GOTOGEN; 2555our $GOTOGEN;
2526 2556
2605} 2635}
2606 2636
2607sub prepare_random_map { 2637sub prepare_random_map {
2608 my ($exit) = @_; 2638 my ($exit) = @_;
2609 2639
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2640 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2641 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2642 # that depends on the exit object
2615 2643
2616 my $rmp = parse_random_map_params $exit->msg; 2644 my $rmp = parse_random_map_params $exit->msg;
2618 if ($exit->map) { 2646 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2647 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2648 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2649 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2650 $rmp->{origin_y} = $exit->y;
2651
2652 $exit->map->touch;
2623 } 2653 }
2624 2654
2625 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2626 2656
2627 my $data = cf::to_json $rmp; 2657 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2630 2660
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2663 undef $fh;
2634 aio_rename "$meta~", $meta; 2664 aio_rename "$meta~", $meta;
2635 2665
2666 my $slaying = "?random/$md5";
2667
2668 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2669 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2670 $exit->msg (undef);
2671 }
2638 } 2672 }
2639} 2673}
2640 2674
2641sub cf::object::player::enter_exit { 2675sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2676 my ($self, $exit) = @_;
2643 2677
2644 return unless $self->type == cf::PLAYER; 2678 return unless $self->type == cf::PLAYER;
2645 2679
2646 if ($exit->slaying eq "/!") {
2647 #TODO: this should de-fi-ni-te-ly not be a sync-job
2648 # the problem is that $exit might not survive long enough
2649 # so it needs to be done right now, right here
2650 cf::sync_job { prepare_random_map $exit };
2651 }
2652
2653 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2654 my $hp = $exit->stats->hp;
2655 my $sp = $exit->stats->sp;
2656
2657 $self->enter_link; 2680 $self->enter_link;
2658 2681
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2663 (async { 2682 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2683 $Coro::current->{desc} = "enter_exit";
2665 2684
2666 $self->deactivate_recursive; # just to be sure
2667 unless (eval { 2685 unless (eval {
2686 $self->deactivate_recursive; # just to be sure
2687
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2697 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp;
2699
2668 $self->goto ($slaying, $hp, $sp); 2700 $self->goto ($map, $x, $y);
2669 2701
2702 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y)
2704 if $exit->flag (cf::FLAG_DAMNED);
2705
2670 1; 2706 1
2671 }) { 2707 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2673 . "I'll try to bring you back to the map you were before. " 2709 . "I'll try to bring you back to the map you were before. "
2674 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2676 2712
2677 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
2743 id => "infobox", 2779 id => "infobox",
2744 title => "Body Parts", 2780 title => "Body Parts",
2745 reply => undef, 2781 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available", 2782 tooltip => "Shows which body parts you posess and are available",
2747 }, 2783 },
2784 "c/statistics" => {
2785 id => "infobox",
2786 title => "Statistics",
2787 reply => undef,
2788 tooltip => "Shows your primary statistics",
2789 },
2790 "c/skills" => {
2791 id => "infobox",
2792 title => "Skills",
2793 reply => undef,
2794 tooltip => "Shows your experience per skill and item power",
2795 },
2796 "c/shopitems" => {
2797 id => "infobox",
2798 title => "Shop Items",
2799 reply => undef,
2800 tooltip => "Shows the items currently for sale in this shop",
2801 },
2802 "c/resistances" => {
2803 id => "infobox",
2804 title => "Resistances",
2805 reply => undef,
2806 tooltip => "Shows your resistances",
2807 },
2808 "c/pets" => {
2809 id => "infobox",
2810 title => "Pets",
2811 reply => undef,
2812 tooltip => "Shows information abotu your pets/a specific pet",
2813 },
2814 "c/perceiveself" => {
2815 id => "infobox",
2816 title => "Perceive Self",
2817 reply => undef,
2818 tooltip => "You gained detailed knowledge about yourself",
2819 },
2748 "c/uptime" => { 2820 "c/uptime" => {
2749 id => "infobox", 2821 id => "infobox",
2750 title => "Uptime", 2822 title => "Uptime",
2751 reply => undef, 2823 reply => undef,
2752 tooltip => "How long the server has been running since last restart", 2824 tooltip => "How long the server has been running since last restart",
2755 id => "infobox", 2827 id => "infobox",
2756 title => "Map Info", 2828 title => "Map Info",
2757 reply => undef, 2829 reply => undef,
2758 tooltip => "Information related to the maps", 2830 tooltip => "Information related to the maps",
2759 }, 2831 },
2832 "c/party" => {
2833 id => "party",
2834 title => "Party",
2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party",
2837 },
2838 "c/death" => {
2839 id => "death",
2840 title => "Death",
2841 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death",
2843 },
2844 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL,
2760); 2846);
2761 2847
2762sub cf::client::send_msg { 2848sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2764 2850
2765 $msg = $self->pl->expand_cfpod ($msg); 2851 $msg = $self->pl->expand_cfpod ($msg)
2852 unless $color & cf::NDI_VERBATIM;
2766 2853
2767 $color &= cf::NDI_CLIENT_MASK; # just in case... 2854 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768 2855
2769 # check predefined channels, for the benefit of C 2856 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) { 2857 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel}; 2858 $channel = $CHANNEL{$channel};
2772 2859
2773 $self->ext_msg (channel_info => $channel) 2860 $self->ext_msg (channel_info => $channel);
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id}; 2861 $channel = $channel->{id};
2777 2862
2778 } elsif (ref $channel) { 2863 } elsif (ref $channel) {
2779 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2780 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2781 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2782 $self->ext_msg (channel_info => $channel) 2867 $self->ext_msg (channel_info => $channel);
2783 if $self->can_msg;
2784 } 2868 }
2785 2869
2786 $channel = $channel->{id}; 2870 $channel = $channel->{id};
2787 } 2871 }
2788 2872
2789 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2790 2874
2791 if ($self->can_msg) {
2792 # default colour, mask it out 2875 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF; 2877 if $color & cf::NDI_DEF;
2795 2878
2796 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2879 my $pkt = "msg "
2880 . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2798 } else { 2882 );
2799 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones
2801 for ($msg) {
2802 1 while
2803 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2804 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2805 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2806 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2808 }
2809 2883
2810 $color &= cf::NDI_COLOR_MASK; 2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2811 2887
2812 utf8::encode $msg; 2888 # split very large packets
2813 2889 if (8192 < length $pkt and $self->{can_lzf}) {
2814 if (0 && $msg =~ /\[/) { 2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2815 # COMMAND/INFO 2891 $pkt = "frag";
2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2817 } else {
2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2819 $self->send_packet ("drawinfo $color $msg")
2820 }
2821 }
2822 } 2892 }
2893
2894 $self->send_packet ($pkt);
2823} 2895}
2824 2896
2825=item $client->ext_msg ($type, @msg) 2897=item $client->ext_msg ($type, @msg)
2826 2898
2827Sends an ext event to the client. 2899Sends an ext event to the client.
3001 3073
3002The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3003 3075
3004 cf::object 3076 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
3079 value
3007 3080
3008 cf::object::player 3081 cf::object::player
3009 player 3082 player
3010 3083
3011 cf::player 3084 cf::player
3016 3089
3017=cut 3090=cut
3018 3091
3019for ( 3092for (
3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3093 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race 3094 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3095 decrease split destroy change_exp value msg lore send_msg)],
3023 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
3025 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
3026) { 3099) {
3027 no strict 'refs'; 3100 no strict 'refs';
3028 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
3029 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
3047 3120
3048 my $qcode = $code; 3121 my $qcode = $code;
3049 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3050 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
3051 3126
3052 local $_; 3127 local $_;
3053 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
3054 3129
3055 my $eval = 3130 my $eval =
3132 { 3207 {
3133 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
3134 3209
3135 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
3137 cf::face::set_visibility $idx, $info->{visibility}; 3213 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3214 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3141 3217
3142 cf::cede_to_tick; 3218 cf::cede_to_tick;
3143 } 3219 }
3144 3220
3145 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
3147 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
3148 or next; 3225 or next;
3226
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3228 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3230 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
3171 { 3249 {
3172 # TODO: for gcfclient pleasure, we should give resources 3250 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index. 3251 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3252 my $res = $facedata->{resource};
3175 3253
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3254 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data; 3257 my $data;
3181 3258
3182 if ($info->{type} & 1) { 3259 if ($info->{type} & 1) {
3183 # prepend meta info 3260 # prepend meta info
3184 3261
3185 my $meta = $enc->encode ({ 3262 my $meta = $enc->encode ({
3186 name => $name, 3263 name => $name,
3187 %{ $info->{meta} || {} }, 3264 %{ $info->{meta} || {} },
3188 }); 3265 });
3189 3266
3190 $data = pack "(w/a*)*", $meta, $info->{data}; 3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type};
3191 } else { 3274 } else {
3192 $data = $info->{data}; 3275 $RESOURCE{$name} = $info;
3193 } 3276 }
3194 3277
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick; 3278 cf::cede_to_tick;
3199 } 3279 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 } 3280 }
3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3283
3220 1 3284 1
3221} 3285}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3222 3306
3223register_exticmd fx_want => sub { 3307register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3308 my ($ns, $want) = @_;
3225 3309
3226 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
3228 } 3312 }
3229}; 3313};
3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3230 3324
3231sub reload_regions { 3325sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3326 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3327 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3248} 3342}
3249 3343
3250sub reload_archetypes { 3344sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258} 3347}
3259 3348
3260sub reload_treasures { 3349sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
3263} 3352}
3264 3353
3265sub reload_resources { 3354sub reload_resources {
3266 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
3267 3356
3357 reload_facedata;
3358 reload_archetypes;
3268 reload_regions; 3359 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3360 reload_treasures;
3273 3361
3274 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3275}
3276
3277sub init {
3278 reload_resources;
3279} 3363}
3280 3364
3281sub reload_config { 3365sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3367 or return;
3284 3368
3285 local $/; 3369 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
3287 3371
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3373
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3291 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3297 }; 3381 };
3298 warn $@ if $@; 3382 warn $@ if $@;
3299 } 3383 }
3300} 3384}
3301 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
3302sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419
3303 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3422 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3423 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3425 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
3310 }; 3427 };
3311 3428
3429 evthread_start IO::AIO::poll_fileno;
3430
3431 cf::sync_job {
3432 reload_resources;
3312 reload_config; 3433 reload_config;
3313 db_init; 3434 db_init;
3435
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid;
3439 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills;
3442
3443 cf::init_beforeplay;
3444
3445 atomic;
3446
3314 load_extensions; 3447 load_extensions;
3315 3448
3316 $TICK_WATCHER->start; 3449 utime time, time, $RUNTIMEFILE;
3450
3451 # no (long-running) fork's whatsoever before this point(!)
3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453
3454 (pop @POST_INIT)->(0) while @POST_INIT;
3455 };
3456
3317 Event::loop; 3457 EV::loop;
3318} 3458}
3319 3459
3320############################################################################# 3460#############################################################################
3321# initialisation and cleanup 3461# initialisation and cleanup
3322 3462
3323# install some emergency cleanup handlers 3463# install some emergency cleanup handlers
3324BEGIN { 3464BEGIN {
3465 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3466 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3467 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3327 reentrant => 0,
3328 data => WF_AUTOCANCEL,
3329 signal => $signal,
3330 prio => 0,
3331 cb => sub {
3332 cf::cleanup "SIG$signal"; 3468 cf::cleanup "SIG$signal";
3333 },
3334 ); 3469 };
3335 } 3470 }
3336} 3471}
3337 3472
3338sub write_runtime { 3473sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime";
3340
3341 # first touch the runtime file to show we are still running: 3474 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3475 # the fsync below can take a very very long time.
3343 3476
3344 IO::AIO::aio_utime $runtime, undef, undef; 3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3345 3478
3346 my $guard = cf::lock_acquire "write_runtime"; 3479 my $guard = cf::lock_acquire "write_runtime";
3347 3480
3348 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3349 or return; 3482 or return;
3350 3483
3351 my $value = $cf::RUNTIME + 90 + 10; 3484 my $value = $cf::RUNTIME + 90 + 10;
3352 # 10 is the runtime save interval, for a monotonic clock 3485 # 10 is the runtime save interval, for a monotonic clock
3353 # 60 allows for the watchdog to kill the server. 3486 # 60 allows for the watchdog to kill the server.
3363 aio_utime $fh, undef, undef; 3496 aio_utime $fh, undef, undef;
3364 3497
3365 close $fh 3498 close $fh
3366 or return; 3499 or return;
3367 3500
3368 aio_rename "$runtime~", $runtime 3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3369 and return; 3502 and return;
3370 3503
3371 warn "runtime file written.\n"; 3504 warn "runtime file written.\n";
3372 3505
3373 1 3506 1
3507}
3508
3509our $uuid_lock;
3510our $uuid_skip;
3511
3512sub write_uuid_sync($) {
3513 $uuid_skip ||= $_[0];
3514
3515 return if $uuid_lock;
3516 local $uuid_lock = 1;
3517
3518 my $uuid = "$LOCALDIR/uuid";
3519
3520 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3521 or return;
3522
3523 my $value = uuid_seq uuid_cur;
3524
3525 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n";
3527 return;
3528 }
3529
3530 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0;
3532
3533 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3534 and return;
3535
3536 # always fsync - this file is important
3537 aio_fsync $fh
3538 and return;
3539
3540 close $fh
3541 or return;
3542
3543 aio_rename "$uuid~", $uuid
3544 and return;
3545
3546 warn "uuid file written ($value).\n";
3547
3548 1
3549
3550}
3551
3552sub write_uuid($$) {
3553 my ($skip, $sync) = @_;
3554
3555 $sync ? write_uuid_sync $skip
3556 : async { write_uuid_sync $skip };
3374} 3557}
3375 3558
3376sub emergency_save() { 3559sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
3378 3561
3379 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
3380 3563
3381 cf::sync_job { 3564 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569
3382 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
3383 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
3384 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
3385 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
3386 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
3387 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
3388 $pl->valid or next; 3576 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3390 $pl->save; 3578 $pl->save;
3391 } 3579 }
3392 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
3393 3581
3394 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
3395 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
3396 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
3397 $map->valid or next; 3585 $map->valid or next;
3398 $map->save; 3586 $map->save;
3399 } 3587 }
3400 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
3401 3589
3402 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
3404 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3593
3594 warn "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n";
3405 }; 3597 };
3406 3598
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3407 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
3408} 3605}
3409 3606
3410sub post_cleanup { 3607sub post_cleanup {
3411 my ($make_core) = @_; 3608 my ($make_core) = @_;
3412 3609
3413 warn Carp::longmess "post_cleanup backtrace" 3610 warn Carp::longmess "post_cleanup backtrace"
3414 if $make_core; 3611 if $make_core;
3612
3613 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$;
3615}
3616
3617# a safer delete_package, copied from Symbol
3618sub clear_package($) {
3619 my $pkg = shift;
3620
3621 # expand to full symbol table name if needed
3622 unless ($pkg =~ /^main::.*::$/) {
3623 $pkg = "main$pkg" if $pkg =~ /^::/;
3624 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3625 $pkg .= '::' unless $pkg =~ /::$/;
3626 }
3627
3628 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3629 my $stem_symtab = *{$stem}{HASH};
3630
3631 defined $stem_symtab and exists $stem_symtab->{$leaf}
3632 or return;
3633
3634 # clear all symbols
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 }
3640 warn "cleared package $pkg\n";#d#
3415} 3641}
3416 3642
3417sub do_reload_perl() { 3643sub do_reload_perl() {
3418 # can/must only be called in main 3644 # can/must only be called in main
3419 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
3420 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
3421 return; 3647 return;
3422 } 3648 }
3423 3649
3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3653
3654 while ($RELOAD) {
3424 warn "reloading..."; 3655 warn "reloading...";
3425 3656
3426 warn "entering sync_job"; 3657 warn "entering sync_job";
3427 3658
3428 cf::sync_job { 3659 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3660 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3661 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3662 cf::write_runtime_sync; # external watchdog should not bark
3432 3663
3433 warn "syncing database to disk"; 3664 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3665 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3666
3436 # if anything goes wrong in here, we should simply crash as we already saved 3667 # if anything goes wrong in here, we should simply crash as we already saved
3437 3668
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442
3443 warn "flushing outstanding aio requests"; 3669 warn "flushing outstanding aio requests";
3444 for (;;) {
3445 BDB::flush;
3446 IO::AIO::flush;
3447 Coro::cede_notself;
3448 last unless IO::AIO::nreqs || BDB::nreqs; 3670 while (IO::AIO::nreqs || BDB::nreqs) {
3449 warn "iterate..."; 3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3450 }
3451
3452 ++$RELOAD;
3453
3454 warn "cancelling all extension coros";
3455 $_->cancel for values %EXT_CORO;
3456 %EXT_CORO = ();
3457
3458 warn "removing commands";
3459 %COMMAND = ();
3460
3461 warn "removing ext/exti commands";
3462 %EXTCMD = ();
3463 %EXTICMD = ();
3464
3465 warn "unloading/nuking all extensions";
3466 for my $pkg (@EXTS) {
3467 warn "... unloading $pkg";
3468
3469 if (my $cb = $pkg->can ("unload")) {
3470 eval {
3471 $cb->($pkg);
3472 1
3473 } or warn "$pkg unloaded, but with errors: $@";
3474 } 3672 }
3475 3673
3476 warn "... nuking $pkg"; 3674 warn "cancelling all extension coros";
3477 Symbol::delete_package $pkg; 3675 $_->cancel for values %EXT_CORO;
3478 } 3676 %EXT_CORO = ();
3479 3677
3480 warn "unloading all perl modules loaded from $LIBDIR"; 3678 warn "removing commands";
3481 while (my ($k, $v) = each %INC) { 3679 %COMMAND = ();
3482 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483 3680
3681 warn "removing ext/exti commands";
3682 %EXTCMD = ();
3683 %EXTICMD = ();
3684
3685 warn "unloading/nuking all extensions";
3686 for my $pkg (@EXTS) {
3484 warn "... unloading $k"; 3687 warn "... unloading $pkg";
3485 delete $INC{$k};
3486 3688
3487 $k =~ s/\.pm$//;
3488 $k =~ s/\//::/g;
3489
3490 if (my $cb = $k->can ("unload_module")) { 3689 if (my $cb = $pkg->can ("unload")) {
3690 eval {
3491 $cb->(); 3691 $cb->($pkg);
3692 1
3693 } or warn "$pkg unloaded, but with errors: $@";
3694 }
3695
3696 warn "... clearing $pkg";
3697 clear_package $pkg;
3492 } 3698 }
3493 3699
3494 Symbol::delete_package $k; 3700 warn "unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703
3704 warn "... unloading $k";
3705 delete $INC{$k};
3706
3707 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g;
3709
3710 if (my $cb = $k->can ("unload_module")) {
3711 $cb->();
3712 }
3713
3714 clear_package $k;
3495 } 3715 }
3496 3716
3497 warn "getting rid of safe::, as good as possible"; 3717 warn "getting rid of safe::, as good as possible";
3498 Symbol::delete_package "safe::$_" 3718 clear_package "safe::$_"
3499 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3500 3720
3501 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3502 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3504 3724
3505 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3506 # and global variables created in xs 3726 # and global variables created in xs
3507 #Symbol::delete_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3508 3728
3509 warn "unload completed, starting to reload now"; 3729 warn "unload completed, starting to reload now";
3510 3730
3511 warn "reloading cf.pm"; 3731 warn "reloading cf.pm";
3512 require cf; 3732 require cf;
3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3514 3734
3515 warn "loading config and database again"; 3735 warn "loading config and database again";
3516 cf::reload_config; 3736 cf::reload_config;
3517 3737
3518 warn "loading extensions"; 3738 warn "loading extensions";
3519 cf::load_extensions; 3739 cf::load_extensions;
3520 3740
3741 if ($REATTACH_ON_RELOAD) {
3521 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3522 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3523 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3524 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3525 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3526 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3527 3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752
3528 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3529 3754
3530 1 3755 1
3531 } or do { 3756 } or do {
3532 warn $@; 3757 warn $@;
3533 warn "error while reloading, exiting."; 3758 cf::cleanup "error while reloading, exiting.";
3534 exit 1;
3535 }; 3759 };
3536 3760
3537 warn "reloaded"; 3761 warn "reloaded";
3762 --$RELOAD;
3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3538}; 3767};
3539 3768
3540our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3541 3770
3542sub reload_perl() { 3771sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3545 3774
3546 $RELOAD_WATCHER ||= Event->timer ( 3775 $RELOAD_WATCHER ||= cf::async {
3547 reentrant => 0, 3776 Coro::AIO::aio_wait cache_extensions;
3548 after => 0, 3777
3549 data => WF_AUTOCANCEL, 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3550 cb => sub {
3551 do_reload_perl; 3779 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3553 }, 3781 };
3554 ); 3782 };
3555} 3783}
3556 3784
3557register_command "reload" => sub { 3785register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
3559 3787
3572 3800
3573our @WAIT_FOR_TICK; 3801our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3802our @WAIT_FOR_TICK_BEGIN;
3575 3803
3576sub wait_for_tick { 3804sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3805 return if tick_inhibit || $Coro::current == $Coro::main;
3579 3806
3580 my $signal = new Coro::Signal; 3807 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3808 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3809 $signal->wait;
3583} 3810}
3584 3811
3585sub wait_for_tick_begin { 3812sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3813 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3814
3589 my $signal = new Coro::Signal; 3815 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3816 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3817 $signal->wait;
3592} 3818}
3593 3819
3594$TICK_WATCHER = Event->timer ( 3820sub tick {
3595 reentrant => 0,
3596 parked => 1,
3597 prio => 0,
3598 at => $NEXT_TICK || $TICK,
3599 data => WF_AUTOCANCEL,
3600 cb => sub {
3601 if ($Coro::current != $Coro::main) { 3821 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 3823 unless ++$bug_warning > 10;
3604 return; 3824 return;
3605 } 3825 }
3606 3826
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 3827 cf::server_tick; # one server iteration
3610 3828
3611 $RUNTIME += $TICK;
3612 $NEXT_TICK += $TICK;
3613
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3829 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3831 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3832 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3833 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 3834 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3835 };
3836 }
3622 3837
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 3839 $sig->send;
3625 } 3840 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 3841 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 3842 $sig->send;
3628 } 3843 }
3629 3844
3630 $NOW = Event::time; 3845 $LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632 # if we are delayed by four ticks or more, skip them all
3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635 $TICK_WATCHER->at ($NEXT_TICK);
3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 3847
3641 _post_tick; 3848 if (0) {
3849 if ($NEXT_TICK) {
3850 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d#
3853 }
3642 }, 3854 }
3643); 3855}
3644 3856
3645{ 3857{
3858 # configure BDB
3859
3646 BDB::min_parallel 8; 3860 BDB::min_parallel 8;
3647 BDB::max_poll_time $TICK * 0.1; 3861 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 3862 $AnyEvent::BDB::WATCHER->priority (1);
3649 reentrant => 0,
3650 fd => BDB::poll_fileno,
3651 poll => 'r',
3652 prio => 0,
3653 data => WF_AUTOCANCEL,
3654 cb => \&BDB::poll_cb,
3655 );
3656
3657 BDB::set_sync_prepare {
3658 my $status;
3659 my $current = $Coro::current;
3660 (
3661 sub {
3662 $status = $!;
3663 $current->ready; undef $current;
3664 },
3665 sub {
3666 Coro::schedule while defined $current;
3667 $! = $status;
3668 },
3669 )
3670 };
3671 3863
3672 unless ($DB_ENV) { 3864 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 3865 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3866 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675 | BDB::LOG_AUTOREMOVE, 1); 3867 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3868 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3869 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3870 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678 3871
3679 cf::sync_job { 3872 cf::sync_job {
3680 eval { 3873 eval {
3690 3883
3691 cf::cleanup "db_env_open(db): $@" if $@; 3884 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 3885 };
3693 } 3886 }
3694 3887
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 3888 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3889 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 3890 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3891 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3892 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 3893 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 3894 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3895 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 3896 };
3725} 3897}
3726 3898
3727{ 3899{
3900 # configure IO::AIO
3901
3728 IO::AIO::min_parallel 8; 3902 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 3903 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 3904 undef $AnyEvent::AIO::WATCHER;
3733 reentrant => 0,
3734 data => WF_AUTOCANCEL,
3735 fd => IO::AIO::poll_fileno,
3736 poll => 'r',
3737 prio => 0,
3738 cb => \&IO::AIO::poll_cb,
3739 );
3740} 3905}
3741 3906
3742my $_log_backtrace; 3907my $_log_backtrace;
3743 3908
3744sub _log_backtrace { 3909sub _log_backtrace {
3747 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3748 3913
3749 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3750 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3751 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3752 async { 3918 async {
3753 $Coro::current->{desc} = "abt $msg"; 3919 $Coro::current->{desc} = "abt $msg";
3754 3920
3755 my @bt = fork_call { 3921 my @bt = fork_call {
3756 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
3767 } 3933 }
3768 3934
3769 @funcs 3935 @funcs
3770 }; 3936 };
3771 3937
3772 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3773 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3774 --$_log_backtrace; 3941 --$_log_backtrace;
3775 }; 3942 };
3776 } else { 3943 } else {
3777 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3778 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3779 } 3946 }
3780} 3947}
3781 3948
3782# load additional modules 3949# load additional modules
3783use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3784 3951
3785END { cf::emergency_save } 3952END { cf::emergency_save }
3786 3953
37871 39541
3788 3955

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines