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.392 by root, Fri Oct 26 04:44:54 2007 UTC vs.
Revision 1.470 by root, Sun Apr 26 19:42:45 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::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 }
1194 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1195 1274
1196 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1197} 1276}
1198 1277
1278use File::Glob ();
1279
1199cf::player->attach ( 1280cf::player->attach (
1200 on_command => sub { 1281 on_command => sub {
1201 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1202 1283
1203 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
1235 1316
1236 cf::override; 1317 cf::override;
1237 }, 1318 },
1238); 1319);
1239 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
1240sub load_extensions { 1334sub load_extensions {
1241 cf::sync_job { 1335 cf::sync_job {
1242 my %todo; 1336 my %todo;
1243 1337
1244 for my $path (<$LIBDIR/*.ext>) { 1338 for my $path (<$LIBDIR/*.ext>) {
1263 1357
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1360
1267 $ext{source} = 1361 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1270 . $source 1364 . $source
1271 . "\n};\n1"; 1365 . "\n};\n1";
1272 1366
1273 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1383 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1384 : "$v->{base}: extension inactive.\n";
1291 1385
1292 if (exists $v->{meta}{mandatory}) { 1386 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1387 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1388 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1389 }
1297 1390
1298 warn $msg; 1391 warn $msg;
1299 } 1392 }
1300 1393
1314 1407
1315=back 1408=back
1316 1409
1317=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1318 1411
1319Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1320 1413
1321=cut 1414=cut
1322 1415
1323package cf::player; 1416package cf::player;
1324 1417
1367 1460
1368sub exists($) { 1461sub exists($) {
1369 my ($login) = @_; 1462 my ($login) = @_;
1370 1463
1371 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1373} 1466}
1374 1467
1375sub find($) { 1468sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1470 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1482 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1483 or return;
1391 1484
1392 my $pl = cf::player::load_pl $f 1485 my $pl = cf::player::load_pl $f
1393 or return; 1486 or return;
1487
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1488 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1489 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1397 } 1491 }
1398 } 1492 }
1408 1502
1409 return if $pl->{deny_save}; 1503 return if $pl->{deny_save};
1410 1504
1411 aio_mkdir playerdir $pl, 0770; 1505 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1506 $pl->{last_save} = $cf::RUNTIME;
1507
1508 cf::get_slot 0.01;
1413 1509
1414 $pl->save_pl ($path); 1510 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1511 cf::cede_to_tick;
1416} 1512}
1417 1513
1449 my ($pl) = @_; 1545 my ($pl) = @_;
1450 1546
1451 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1452 1548
1453 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1454 $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
1455 1551
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1460 1558
1461 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1599
1502 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1503 my $path = path $login; 1601 my $path = path $login;
1504 1602
1505 # a .pst is a dead give-away for a valid player 1603 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1609 }
1511 1610
1542 } 1641 }
1543 1642
1544 \@paths 1643 \@paths
1545} 1644}
1546 1645
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1647
1549Expand crossfire pod fragments into protocol xml. 1648Expand 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 1649
1637=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1638 1651
1639Sends an ext reply to the player. 1652Sends an ext reply to the player.
1640 1653
1707our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1709 1722
1710sub generate_random_map { 1723sub generate_random_map {
1711 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
1712 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1729 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1838 1854
1839# the temporary/swap location 1855# the temporary/swap location
1840sub save_path { 1856sub save_path {
1841 my ($self) = @_; 1857 my ($self) = @_;
1842 1858
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1845} 1861}
1846 1862
1847# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1848sub uniq_path { 1864sub uniq_path {
1849 my ($self) = @_; 1865 my ($self) = @_;
1850 1866
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1868 "$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} 1869}
1863 1870
1864sub decay_objects { 1871sub decay_objects {
1865 my ($self) = @_; 1872 my ($self) = @_;
1866 1873
1950sub find { 1957sub find {
1951 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1952 1959
1953 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1954 1961
1955 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1964
1958 $cf::MAP{$path} || do { 1965 $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 1966 my $map = new_from_path cf::map $path
1963 or return; 1967 or return;
1964 1968
1965 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1966 1970
1968 or return; 1972 or return;
1969 1973
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
1973 undef $guard1; 1978 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 1979 $map->reset;
1976 return find $path; 1980 return find $path;
1977 } 1981 }
1978 1982
1979 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2011 $f->skip_block;
2008 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
2009 or return; 2013 or return;
2010 2014
2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
2012 if delete $self->{load_original}; 2016 if delete $self->{load_original};
2013 2017
2014 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2019 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
2034 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2039 $self->decay_objects;
2036 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2037 $self->update_buttons; 2041 $self->update_buttons;
2038 cf::cede_to_tick; 2042 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2043 $self->activate;
2042 } 2044 }
2043 2045
2044 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2047 $self->last_access ($cf::RUNTIME);
2046 2048
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2050 }
2049 2051
2050 $self->post_load; 2052 $self->post_load;
2051} 2053}
2052 2054
2110 my ($path, $origin, $load) = @_; 2112 my ($path, $origin, $load) = @_;
2111 2113
2112 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
2113 2115
2114 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2118 }
2117 2119
2118 $MAP_PREFETCH{$path} |= $load; 2120 $MAP_PREFETCH{$path} |= $load;
2119 2121
2120 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2157 cf::async { 2159 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2160 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
2160 }; 2162 };
2161 2163
2164 cf::get_slot 0.02;
2165
2162 if ($uniq) { 2166 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2169 } else {
2166 $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);
2174 $self->save; 2178 $self->save;
2175 2179
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2181
2178 return if $self->players; 2182 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2184 return if $self->{deny_save};
2181 2185
2182 $self->in_memory (cf::MAP_SWAPPED); 2186 $self->in_memory (cf::MAP_SWAPPED);
2183 2187
2184 $self->deactivate; 2188 $self->deactivate;
2302 2306
2303sub unique_maps() { 2307sub unique_maps() {
2304 [ 2308 [
2305 map { 2309 map {
2306 utf8::decode $_; 2310 utf8::decode $_;
2307 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2308 ? normalise $_ 2314 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2316 ]
2312} 2317}
2313 2318
2314package cf;
2315
2316=back 2319=back
2317 2320
2318=head3 cf::object 2321=head3 cf::object
2319 2322
2320=cut 2323=cut
2323 2326
2324=over 4 2327=over 4
2325 2328
2326=item $ob->inv_recursive 2329=item $ob->inv_recursive
2327 2330
2328Returns 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.
2329 2333
2330=cut 2334=cut
2331 2335
2332sub inv_recursive_; 2336sub inv_recursive_;
2333sub inv_recursive_ { 2337sub inv_recursive_ {
2338 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2339} 2343}
2340 2344
2341=item $ref = $ob->ref 2345=item $ref = $ob->ref
2342 2346
2343creates 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.
2344 2348
2345=item $ob = cf::object::deref ($refstring) 2349=item $ob = cf::object::deref ($refstring)
2346 2350
2347returns 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,
2348even if the object actually exists. May block. 2352even if the object actually exists. May block.
2380can 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
2381dialogue with the given NPC character. 2385dialogue with the given NPC character.
2382 2386
2383=cut 2387=cut
2384 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
2385# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2404# with dialog boxes.
2387#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
2388sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
2400 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2401 $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));
2402 2420
2403 } else { 2421 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2424 }
2407 } 2425 }
2408} 2426}
2409 2427
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2435 2453
2436=item $player_object->enter_link 2454=item $player_object->enter_link
2437 2455
2438Freezes 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}>).
2439 2457
2440The 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.
2441I<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.
2442 2462
2443Will never block. 2463Will never block.
2444 2464
2445=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2446 2466
2504 2524
2505 $map->load; 2525 $map->load;
2506 $map->load_neighbours; 2526 $map->load_neighbours;
2507 2527
2508 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2509 $self->activate_recursive; 2530 $self->activate_recursive;
2510 2531
2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2512 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2513} 2534}
2517Moves 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
2518her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2519that 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
2520the 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
2521be 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 >>.
2522 2546
2523=cut 2547=cut
2524 2548
2525our $GOTOGEN; 2549our $GOTOGEN;
2526 2550
2605} 2629}
2606 2630
2607sub prepare_random_map { 2631sub prepare_random_map {
2608 my ($exit) = @_; 2632 my ($exit) = @_;
2609 2633
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2636 # that depends on the exit object
2615 2637
2616 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
2618 if ($exit->map) { 2640 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2623 } 2647 }
2624 2648
2625 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2626 2650
2627 my $data = cf::to_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2630 2654
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2657 undef $fh;
2634 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2635 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2638 } 2666 }
2639} 2667}
2640 2668
2641sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2643 2671
2644 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2645 2673
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; 2674 $self->enter_link;
2658 2675
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 { 2676 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2677 $Coro::current->{desc} = "enter_exit";
2665 2678
2666 $self->deactivate_recursive; # just to be sure
2667 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
2668 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2669 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
2670 1; 2700 1
2671 }) { 2701 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2673 . "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. "
2674 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2676 2706
2677 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
2743 id => "infobox", 2773 id => "infobox",
2744 title => "Body Parts", 2774 title => "Body Parts",
2745 reply => undef, 2775 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2747 }, 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 },
2748 "c/uptime" => { 2808 "c/uptime" => {
2749 id => "infobox", 2809 id => "infobox",
2750 title => "Uptime", 2810 title => "Uptime",
2751 reply => undef, 2811 reply => undef,
2752 tooltip => "How long the server has been running since last restart", 2812 tooltip => "How long the server has been running since last restart",
2755 id => "infobox", 2815 id => "infobox",
2756 title => "Map Info", 2816 title => "Map Info",
2757 reply => undef, 2817 reply => undef,
2758 tooltip => "Information related to the maps", 2818 tooltip => "Information related to the maps",
2759 }, 2819 },
2820 "c/party" => {
2821 id => "party",
2822 title => "Party",
2823 reply => "gsay ",
2824 tooltip => "Messages and chat related to your party",
2825 },
2826 "c/death" => {
2827 id => "death",
2828 title => "Death",
2829 reply => undef,
2830 tooltip => "Reason for and more info about your most recent death",
2831 },
2832 "c/say" => $SAY_CHANNEL,
2833 "c/chat" => $CHAT_CHANNEL,
2760); 2834);
2761 2835
2762sub cf::client::send_msg { 2836sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 2837 my ($self, $channel, $msg, $color, @extra) = @_;
2764 2838
2765 $msg = $self->pl->expand_cfpod ($msg); 2839 $msg = $self->pl->expand_cfpod ($msg)
2840 unless $color & cf::NDI_VERBATIM;
2766 2841
2767 $color &= cf::NDI_CLIENT_MASK; # just in case... 2842 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768 2843
2769 # check predefined channels, for the benefit of C 2844 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) { 2845 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel}; 2846 $channel = $CHANNEL{$channel};
2772 2847
2773 $self->ext_msg (channel_info => $channel) 2848 $self->ext_msg (channel_info => $channel);
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id}; 2849 $channel = $channel->{id};
2777 2850
2778 } elsif (ref $channel) { 2851 } elsif (ref $channel) {
2779 # send meta info to client, if not yet sent 2852 # send meta info to client, if not yet sent
2780 unless (exists $self->{channel}{$channel->{id}}) { 2853 unless (exists $self->{channel}{$channel->{id}}) {
2781 $self->{channel}{$channel->{id}} = $channel; 2854 $self->{channel}{$channel->{id}} = $channel;
2782 $self->ext_msg (channel_info => $channel) 2855 $self->ext_msg (channel_info => $channel);
2783 if $self->can_msg;
2784 } 2856 }
2785 2857
2786 $channel = $channel->{id}; 2858 $channel = $channel->{id};
2787 } 2859 }
2788 2860
2789 return unless @extra || length $msg; 2861 return unless @extra || length $msg;
2790 2862
2791 if ($self->can_msg) {
2792 # default colour, mask it out 2863 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF; 2865 if $color & cf::NDI_DEF;
2795 2866
2796 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2867 my $pkt = "msg "
2868 . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2798 } else { 2870 );
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 2871
2810 $color &= cf::NDI_COLOR_MASK; 2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2811 2875
2812 utf8::encode $msg; 2876 # split very large packets
2813 2877 if (8192 < length $pkt and $self->{can_lzf}) {
2814 if (0 && $msg =~ /\[/) { 2878 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2815 # COMMAND/INFO 2879 $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 } 2880 }
2881
2882 $self->send_packet ($pkt);
2823} 2883}
2824 2884
2825=item $client->ext_msg ($type, @msg) 2885=item $client->ext_msg ($type, @msg)
2826 2886
2827Sends an ext event to the client. 2887Sends an ext event to the client.
3001 3061
3002The following functions and methods are available within a safe environment: 3062The following functions and methods are available within a safe environment:
3003 3063
3004 cf::object 3064 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3065 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3066 insert remove name archname title slaying race decrease split
3067 value
3007 3068
3008 cf::object::player 3069 cf::object::player
3009 player 3070 player
3010 3071
3011 cf::player 3072 cf::player
3016 3077
3017=cut 3078=cut
3018 3079
3019for ( 3080for (
3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3081 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race 3082 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3083 decrease split destroy change_exp value msg lore send_msg)],
3023 ["cf::object::player" => qw(player)], 3084 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3085 ["cf::player" => qw(peaceful send_msg)],
3025 ["cf::map" => qw(trigger)], 3086 ["cf::map" => qw(trigger)],
3026) { 3087) {
3027 no strict 'refs'; 3088 no strict 'refs';
3028 my ($pkg, @funs) = @$_; 3089 my ($pkg, @funs) = @$_;
3029 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3090 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 my ($code, %vars) = @_; 3107 my ($code, %vars) = @_;
3047 3108
3048 my $qcode = $code; 3109 my $qcode = $code;
3049 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3110 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3050 $qcode =~ s/\n/\\n/g; 3111 $qcode =~ s/\n/\\n/g;
3112
3113 %vars = (_dummy => 0) unless %vars;
3051 3114
3052 local $_; 3115 local $_;
3053 local @safe::cf::_safe_eval_args = values %vars; 3116 local @safe::cf::_safe_eval_args = values %vars;
3054 3117
3055 my $eval = 3118 my $eval =
3132 { 3195 {
3133 my $faces = $facedata->{faceinfo}; 3196 my $faces = $facedata->{faceinfo};
3134 3197
3135 while (my ($face, $info) = each %$faces) { 3198 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3199 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200
3137 cf::face::set_visibility $idx, $info->{visibility}; 3201 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3202 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3203 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}; 3204 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3141 3205
3142 cf::cede_to_tick; 3206 cf::cede_to_tick;
3143 } 3207 }
3144 3208
3145 while (my ($face, $info) = each %$faces) { 3209 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3210 next unless $info->{smooth};
3211
3147 my $idx = cf::face::find $face 3212 my $idx = cf::face::find $face
3148 or next; 3213 or next;
3214
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3215 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3216 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3217 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3218 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3219 warn "smooth face '$info->{smooth}' not found for face '$face'";
3171 { 3237 {
3172 # TODO: for gcfclient pleasure, we should give resources 3238 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index. 3239 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3240 my $res = $facedata->{resource};
3175 3241
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3242 while (my ($name, $info) = each %$res) {
3243 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3244 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data; 3245 my $data;
3181 3246
3182 if ($info->{type} & 1) { 3247 if ($info->{type} & 1) {
3183 # prepend meta info 3248 # prepend meta info
3184 3249
3185 my $meta = $enc->encode ({ 3250 my $meta = $enc->encode ({
3186 name => $name, 3251 name => $name,
3187 %{ $info->{meta} || {} }, 3252 %{ $info->{meta} || {} },
3188 }); 3253 });
3189 3254
3190 $data = pack "(w/a*)*", $meta, $info->{data}; 3255 $data = pack "(w/a*)*", $meta, $info->{data};
3256 } else {
3257 $data = $info->{data};
3258 }
3259
3260 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3261 cf::face::set_type $idx, $info->{type};
3191 } else { 3262 } else {
3192 $data = $info->{data}; 3263 $RESOURCE{$name} = $info;
3193 } 3264 }
3194 3265
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; 3266 cf::cede_to_tick;
3199 } 3267 }
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 } 3268 }
3269
3270 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3271
3220 1 3272 1
3221} 3273}
3274
3275cf::global->attach (on_resource_update => sub {
3276 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3277 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3278
3279 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3280 my $sound = $soundconf->{compat}[$_]
3281 or next;
3282
3283 my $face = cf::face::find "sound/$sound->[1]";
3284 cf::sound::set $sound->[0] => $face;
3285 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3286 }
3287
3288 while (my ($k, $v) = each %{$soundconf->{event}}) {
3289 my $face = cf::face::find "sound/$v";
3290 cf::sound::set $k => $face;
3291 }
3292 }
3293});
3222 3294
3223register_exticmd fx_want => sub { 3295register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3296 my ($ns, $want) = @_;
3225 3297
3226 while (my ($k, $v) = each %$want) { 3298 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3299 $ns->fx_want ($k, $v);
3228 } 3300 }
3229}; 3301};
3302
3303sub load_resource_file($) {
3304 my $guard = lock_acquire "load_resource_file";
3305
3306 my $status = load_resource_file_ $_[0];
3307 get_slot 0.1, 100;
3308 cf::arch::commit_load;
3309
3310 $status
3311}
3230 3312
3231sub reload_regions { 3313sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3314 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3315 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3316 %ext::player_env::MUSIC_FACE_CACHE = ();
3248} 3330}
3249 3331
3250sub reload_archetypes { 3332sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3333 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3334 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} 3335}
3259 3336
3260sub reload_treasures { 3337sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3338 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3339 or die "unable to load treasurelists\n";
3263} 3340}
3264 3341
3265sub reload_resources { 3342sub reload_resources {
3266 warn "reloading resource files...\n"; 3343 warn "reloading resource files...\n";
3267 3344
3345 reload_facedata;
3346 reload_archetypes;
3268 reload_regions; 3347 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3348 reload_treasures;
3273 3349
3274 warn "finished reloading resource files\n"; 3350 warn "finished reloading resource files\n";
3275}
3276
3277sub init {
3278 reload_resources;
3279} 3351}
3280 3352
3281sub reload_config { 3353sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3355 or return;
3284 3356
3285 local $/; 3357 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3358 *CFG = YAML::Load <$fh>;
3287 3359
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3361
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3362 $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}; 3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3297 }; 3369 };
3298 warn $@ if $@; 3370 warn $@ if $@;
3299 } 3371 }
3300} 3372}
3301 3373
3374sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!";
3377 flock $fh, &Fcntl::LOCK_EX
3378 or die "$PIDFILE: flock: $!";
3379 $fh
3380}
3381
3382# make sure only one server instance is running at any one time
3383sub atomic {
3384 my $fh = pidfile;
3385
3386 my $pid = <$fh>;
3387 kill 9, $pid if $pid > 0;
3388
3389 seek $fh, 0, 0;
3390 print $fh $$;
3391}
3392
3302sub main { 3393sub main {
3394 cf::init_globals; # initialise logging
3395
3396 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3397 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3398 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3399 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3400
3401 cf::init_experience;
3402 cf::init_anim;
3403 cf::init_attackmess;
3404 cf::init_dynamic;
3405
3406 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3407
3303 # we must not ever block the main coroutine 3408 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3409 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3410 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3411 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3412 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3413 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3414 })->prio (Coro::PRIO_MAX);
3310 }; 3415 };
3311 3416
3417 evthread_start IO::AIO::poll_fileno;
3418
3419 cf::sync_job {
3420 reload_resources;
3312 reload_config; 3421 reload_config;
3313 db_init; 3422 db_init;
3423
3424 cf::load_settings;
3425 cf::load_materials;
3426 cf::init_uuid;
3427 cf::init_signals;
3428 cf::init_commands;
3429 cf::init_skills;
3430
3431 cf::init_beforeplay;
3432
3433 atomic;
3434
3314 load_extensions; 3435 load_extensions;
3315 3436
3316 $TICK_WATCHER->start; 3437 utime time, time, $RUNTIMEFILE;
3438
3439 # no (long-running) fork's whatsoever before this point(!)
3440 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3441
3442 (pop @POST_INIT)->(0) while @POST_INIT;
3443 };
3444
3317 Event::loop; 3445 EV::loop;
3318} 3446}
3319 3447
3320############################################################################# 3448#############################################################################
3321# initialisation and cleanup 3449# initialisation and cleanup
3322 3450
3323# install some emergency cleanup handlers 3451# install some emergency cleanup handlers
3324BEGIN { 3452BEGIN {
3453 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3454 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3455 $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"; 3456 cf::cleanup "SIG$signal";
3333 },
3334 ); 3457 };
3335 } 3458 }
3336} 3459}
3337 3460
3338sub write_runtime { 3461sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime";
3340
3341 # first touch the runtime file to show we are still running: 3462 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3463 # the fsync below can take a very very long time.
3343 3464
3344 IO::AIO::aio_utime $runtime, undef, undef; 3465 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3345 3466
3346 my $guard = cf::lock_acquire "write_runtime"; 3467 my $guard = cf::lock_acquire "write_runtime";
3347 3468
3348 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3469 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3349 or return; 3470 or return;
3350 3471
3351 my $value = $cf::RUNTIME + 90 + 10; 3472 my $value = $cf::RUNTIME + 90 + 10;
3352 # 10 is the runtime save interval, for a monotonic clock 3473 # 10 is the runtime save interval, for a monotonic clock
3353 # 60 allows for the watchdog to kill the server. 3474 # 60 allows for the watchdog to kill the server.
3363 aio_utime $fh, undef, undef; 3484 aio_utime $fh, undef, undef;
3364 3485
3365 close $fh 3486 close $fh
3366 or return; 3487 or return;
3367 3488
3368 aio_rename "$runtime~", $runtime 3489 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3369 and return; 3490 and return;
3370 3491
3371 warn "runtime file written.\n"; 3492 warn "runtime file written.\n";
3372 3493
3373 1 3494 1
3495}
3496
3497our $uuid_lock;
3498our $uuid_skip;
3499
3500sub write_uuid_sync($) {
3501 $uuid_skip ||= $_[0];
3502
3503 return if $uuid_lock;
3504 local $uuid_lock = 1;
3505
3506 my $uuid = "$LOCALDIR/uuid";
3507
3508 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3509 or return;
3510
3511 my $value = uuid_seq uuid_cur;
3512
3513 unless ($value) {
3514 warn "cowardly refusing to write zero uuid value!\n";
3515 return;
3516 }
3517
3518 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0;
3520
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return;
3523
3524 # always fsync - this file is important
3525 aio_fsync $fh
3526 and return;
3527
3528 close $fh
3529 or return;
3530
3531 aio_rename "$uuid~", $uuid
3532 and return;
3533
3534 warn "uuid file written ($value).\n";
3535
3536 1
3537
3538}
3539
3540sub write_uuid($$) {
3541 my ($skip, $sync) = @_;
3542
3543 $sync ? write_uuid_sync $skip
3544 : async { write_uuid_sync $skip };
3374} 3545}
3375 3546
3376sub emergency_save() { 3547sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
3378 3549
3379 warn "enter emergency perl save\n"; 3550 warn "emergency_perl_save: enter\n";
3380 3551
3381 cf::sync_job { 3552 cf::sync_job {
3553 # this is a trade-off: we want to be very quick here, so
3554 # save all maps without fsync, and later call a global sync
3555 # (which in turn might be very very slow)
3556 local $USE_FSYNC = 0;
3557
3382 # use a peculiar iteration method to avoid tripping on perl 3558 # use a peculiar iteration method to avoid tripping on perl
3383 # refcount bugs in for. also avoids problems with players 3559 # refcount bugs in for. also avoids problems with players
3384 # and maps saved/destroyed asynchronously. 3560 # and maps saved/destroyed asynchronously.
3385 warn "begin emergency player save\n"; 3561 warn "emergency_perl_save: begin player save\n";
3386 for my $login (keys %cf::PLAYER) { 3562 for my $login (keys %cf::PLAYER) {
3387 my $pl = $cf::PLAYER{$login} or next; 3563 my $pl = $cf::PLAYER{$login} or next;
3388 $pl->valid or next; 3564 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3565 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3390 $pl->save; 3566 $pl->save;
3391 } 3567 }
3392 warn "end emergency player save\n"; 3568 warn "emergency_perl_save: end player save\n";
3393 3569
3394 warn "begin emergency map save\n"; 3570 warn "emergency_perl_save: begin map save\n";
3395 for my $path (keys %cf::MAP) { 3571 for my $path (keys %cf::MAP) {
3396 my $map = $cf::MAP{$path} or next; 3572 my $map = $cf::MAP{$path} or next;
3397 $map->valid or next; 3573 $map->valid or next;
3398 $map->save; 3574 $map->save;
3399 } 3575 }
3400 warn "end emergency map save\n"; 3576 warn "emergency_perl_save: end map save\n";
3401 3577
3402 warn "begin emergency database checkpoint\n"; 3578 warn "emergency_perl_save: begin database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
3404 warn "end emergency database checkpoint\n"; 3580 warn "emergency_perl_save: end database checkpoint\n";
3581
3582 warn "emergency_perl_save: begin write uuid\n";
3583 write_uuid_sync 1;
3584 warn "emergency_perl_save: end write uuid\n";
3405 }; 3585 };
3406 3586
3587 warn "emergency_perl_save: starting sync()\n";
3588 IO::AIO::aio_sync sub {
3589 warn "emergency_perl_save: finished sync()\n";
3590 };
3591
3407 warn "leave emergency perl save\n"; 3592 warn "emergency_perl_save: leave\n";
3408} 3593}
3409 3594
3410sub post_cleanup { 3595sub post_cleanup {
3411 my ($make_core) = @_; 3596 my ($make_core) = @_;
3412 3597
3413 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3414 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
3415} 3629}
3416 3630
3417sub do_reload_perl() { 3631sub do_reload_perl() {
3418 # can/must only be called in main 3632 # can/must only be called in main
3419 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3420 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3421 return; 3635 return;
3422 } 3636 }
3423 3637
3638 return if $RELOAD++;
3639
3640 my $t1 = EV::time;
3641
3642 while ($RELOAD) {
3424 warn "reloading..."; 3643 warn "reloading...";
3425 3644
3426 warn "entering sync_job"; 3645 warn "entering sync_job";
3427 3646
3428 cf::sync_job { 3647 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3649 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3650 cf::write_runtime_sync; # external watchdog should not bark
3432 3651
3433 warn "syncing database to disk"; 3652 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3653 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3654
3436 # if anything goes wrong in here, we should simply crash as we already saved 3655 # if anything goes wrong in here, we should simply crash as we already saved
3437 3656
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"; 3657 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; 3658 while (IO::AIO::nreqs || BDB::nreqs) {
3449 warn "iterate..."; 3659 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 } 3660 }
3475 3661
3476 warn "... nuking $pkg"; 3662 warn "cancelling all extension coros";
3477 Symbol::delete_package $pkg; 3663 $_->cancel for values %EXT_CORO;
3478 } 3664 %EXT_CORO = ();
3479 3665
3480 warn "unloading all perl modules loaded from $LIBDIR"; 3666 warn "removing commands";
3481 while (my ($k, $v) = each %INC) { 3667 %COMMAND = ();
3482 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483 3668
3669 warn "removing ext/exti commands";
3670 %EXTCMD = ();
3671 %EXTICMD = ();
3672
3673 warn "unloading/nuking all extensions";
3674 for my $pkg (@EXTS) {
3484 warn "... unloading $k"; 3675 warn "... unloading $pkg";
3485 delete $INC{$k};
3486 3676
3487 $k =~ s/\.pm$//;
3488 $k =~ s/\//::/g;
3489
3490 if (my $cb = $k->can ("unload_module")) { 3677 if (my $cb = $pkg->can ("unload")) {
3678 eval {
3491 $cb->(); 3679 $cb->($pkg);
3680 1
3681 } or warn "$pkg unloaded, but with errors: $@";
3682 }
3683
3684 warn "... clearing $pkg";
3685 clear_package $pkg;
3492 } 3686 }
3493 3687
3494 Symbol::delete_package $k; 3688 warn "unloading all perl modules loaded from $LIBDIR";
3689 while (my ($k, $v) = each %INC) {
3690 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3691
3692 warn "... unloading $k";
3693 delete $INC{$k};
3694
3695 $k =~ s/\.pm$//;
3696 $k =~ s/\//::/g;
3697
3698 if (my $cb = $k->can ("unload_module")) {
3699 $cb->();
3700 }
3701
3702 clear_package $k;
3495 } 3703 }
3496 3704
3497 warn "getting rid of safe::, as good as possible"; 3705 warn "getting rid of safe::, as good as possible";
3498 Symbol::delete_package "safe::$_" 3706 clear_package "safe::$_"
3499 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3707 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3500 3708
3501 warn "unloading cf.pm \"a bit\""; 3709 warn "unloading cf.pm \"a bit\"";
3502 delete $INC{"cf.pm"}; 3710 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"}; 3711 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3504 3712
3505 # don't, removes xs symbols, too, 3713 # don't, removes xs symbols, too,
3506 # and global variables created in xs 3714 # and global variables created in xs
3507 #Symbol::delete_package __PACKAGE__; 3715 #clear_package __PACKAGE__;
3508 3716
3509 warn "unload completed, starting to reload now"; 3717 warn "unload completed, starting to reload now";
3510 3718
3511 warn "reloading cf.pm"; 3719 warn "reloading cf.pm";
3512 require cf; 3720 require cf;
3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3721 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3514 3722
3515 warn "loading config and database again"; 3723 warn "loading config and database again";
3516 cf::reload_config; 3724 cf::reload_config;
3517 3725
3518 warn "loading extensions"; 3726 warn "loading extensions";
3519 cf::load_extensions; 3727 cf::load_extensions;
3520 3728
3729 if ($REATTACH_ON_RELOAD) {
3521 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3522 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3523 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3524 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3525 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3526 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3736 }
3527 3737
3738 warn "running post_init jobs";
3739 (pop @POST_INIT)->(1) while @POST_INIT;
3740
3528 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3529 3742
3530 1 3743 1
3531 } or do { 3744 } or do {
3532 warn $@; 3745 warn $@;
3533 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3534 exit 1;
3535 }; 3747 };
3536 3748
3537 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3752
3753 $t1 = EV::time - $t1;
3754 warn "reload completed in ${t1}s\n";
3538}; 3755};
3539 3756
3540our $RELOAD_WATCHER; # used only during reload 3757our $RELOAD_WATCHER; # used only during reload
3541 3758
3542sub reload_perl() { 3759sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3760 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3761 # coro crashes during coro_state_free->destroy here.
3545 3762
3546 $RELOAD_WATCHER ||= Event->timer ( 3763 $RELOAD_WATCHER ||= cf::async {
3547 reentrant => 0, 3764 Coro::AIO::aio_wait cache_extensions;
3548 after => 0, 3765
3549 data => WF_AUTOCANCEL, 3766 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3550 cb => sub {
3551 do_reload_perl; 3767 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3768 undef $RELOAD_WATCHER;
3553 }, 3769 };
3554 ); 3770 };
3555} 3771}
3556 3772
3557register_command "reload" => sub { 3773register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3774 my ($who, $arg) = @_;
3559 3775
3572 3788
3573our @WAIT_FOR_TICK; 3789our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3790our @WAIT_FOR_TICK_BEGIN;
3575 3791
3576sub wait_for_tick { 3792sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3579 3794
3580 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3796 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3797 $signal->wait;
3583} 3798}
3584 3799
3585sub wait_for_tick_begin { 3800sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3801 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3802
3589 my $signal = new Coro::Signal; 3803 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3804 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3805 $signal->wait;
3592} 3806}
3593 3807
3594$TICK_WATCHER = Event->timer ( 3808sub 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) { 3809 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3810 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 3811 unless ++$bug_warning > 10;
3604 return; 3812 return;
3605 } 3813 }
3606 3814
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 3815 cf::server_tick; # one server iteration
3610 3816
3611 $RUNTIME += $TICK;
3612 $NEXT_TICK += $TICK;
3613
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3817 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3818 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3819 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3820 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3821 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 3822 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3823 };
3824 }
3622 3825
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3826 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 3827 $sig->send;
3625 } 3828 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 3829 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 3830 $sig->send;
3628 } 3831 }
3629 3832
3630 $NOW = Event::time; 3833 $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; 3834 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 3835
3641 _post_tick; 3836 if (0) {
3837 if ($NEXT_TICK) {
3838 my $jitter = $TICK_START - $NEXT_TICK;
3839 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3840 warn "jitter $JITTER\n";#d#
3841 }
3642 }, 3842 }
3643); 3843}
3644 3844
3645{ 3845{
3846 # configure BDB
3847
3646 BDB::min_parallel 8; 3848 BDB::min_parallel 8;
3647 BDB::max_poll_time $TICK * 0.1; 3849 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 3850 $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 3851
3672 unless ($DB_ENV) { 3852 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 3853 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3854 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675 | BDB::LOG_AUTOREMOVE, 1); 3855 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3856 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3857 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3858 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678 3859
3679 cf::sync_job { 3860 cf::sync_job {
3680 eval { 3861 eval {
3690 3871
3691 cf::cleanup "db_env_open(db): $@" if $@; 3872 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 3873 };
3693 } 3874 }
3694 3875
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 3876 $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 { }; 3877 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 3878 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3879 $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 { }; 3880 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 3881 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 3882 $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 { }; 3883 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 3884 };
3725} 3885}
3726 3886
3727{ 3887{
3888 # configure IO::AIO
3889
3728 IO::AIO::min_parallel 8; 3890 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 3891 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 3892 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} 3893}
3741 3894
3742my $_log_backtrace; 3895my $_log_backtrace;
3743 3896
3744sub _log_backtrace { 3897sub _log_backtrace {
3747 $msg =~ s/\n//; 3900 $msg =~ s/\n//;
3748 3901
3749 # limit the # of concurrent backtraces 3902 # limit the # of concurrent backtraces
3750 if ($_log_backtrace < 2) { 3903 if ($_log_backtrace < 2) {
3751 ++$_log_backtrace; 3904 ++$_log_backtrace;
3905 my $perl_bt = Carp::longmess $msg;
3752 async { 3906 async {
3753 $Coro::current->{desc} = "abt $msg"; 3907 $Coro::current->{desc} = "abt $msg";
3754 3908
3755 my @bt = fork_call { 3909 my @bt = fork_call {
3756 @addr = map { sprintf "%x", $_ } @addr; 3910 @addr = map { sprintf "%x", $_ } @addr;
3767 } 3921 }
3768 3922
3769 @funcs 3923 @funcs
3770 }; 3924 };
3771 3925
3772 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $perl_bt\n";
3927 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3773 LOG llevInfo, "[ABT] $_\n" for @bt; 3928 LOG llevInfo, "[ABT] $_\n" for @bt;
3774 --$_log_backtrace; 3929 --$_log_backtrace;
3775 }; 3930 };
3776 } else { 3931 } else {
3777 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $msg\n";
3778 LOG llevInfo, "[ABT] [suppressed]\n"; 3933 LOG llevInfo, "[ABT] [suppressed]\n";
3779 } 3934 }
3780} 3935}
3781 3936
3782# load additional modules 3937# load additional modules
3783use cf::pod; 3938require "cf/$_.pm" for @EXTRA_MODULES;
3784 3939
3785END { cf::emergency_save } 3940END { cf::emergency_save }
3786 3941
37871 39421
3788 3943

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines