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.393 by root, Fri Oct 26 04:47:00 2007 UTC vs.
Revision 1.472 by root, Sat Jun 6 21:43:13 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_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, 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
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639 1649
1640=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1641 1651
1642Sends an ext reply to the player. 1652Sends an ext reply to the player.
1643 1653
… …
1710our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1712 1722
1713sub generate_random_map { 1723sub generate_random_map {
1714 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
1715 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1716 $self->_create_random_map ( 1729 $self->_create_random_map (
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1841 1854
1842# the temporary/swap location 1855# the temporary/swap location
1843sub save_path { 1856sub save_path {
1844 my ($self) = @_; 1857 my ($self) = @_;
1845 1858
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1848} 1861}
1849 1862
1850# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1851sub uniq_path { 1864sub uniq_path {
1852 my ($self) = @_; 1865 my ($self) = @_;
1853 1866
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1856}
1857
1858# and all this just because we cannot iterate over
1859# all maps in C++...
1860sub change_all_map_light {
1861 my ($change) = @_;
1862
1863 $_->change_map_light ($change)
1864 for grep $_->outdoor, values %cf::MAP;
1865} 1869}
1866 1870
1867sub decay_objects { 1871sub decay_objects {
1868 my ($self) = @_; 1872 my ($self) = @_;
1869 1873
… …
1953sub find { 1957sub find {
1954 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1955 1959
1956 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1957 1961
1958 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1960 1964
1961 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1965 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1966 or return; 1967 or return;
1967 1968
1968 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1969 1970
… …
1971 or return; 1972 or return;
1972 1973
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
1976 undef $guard1; 1978 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 1979 $map->reset;
1979 return find $path; 1980 return find $path;
1980 } 1981 }
1981 1982
1982 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
… …
2009 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block; 2011 $f->skip_block;
2011 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
2012 or return; 2013 or return;
2013 2014
2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
2015 if delete $self->{load_original}; 2016 if delete $self->{load_original};
2016 2017
2017 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
2018 utf8::encode $uniq; 2019 utf8::encode $uniq;
2019 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
… …
2037 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2038 $self->decay_objects; 2039 $self->decay_objects;
2039 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2040 $self->update_buttons; 2041 $self->update_buttons;
2041 cf::cede_to_tick; 2042 cf::cede_to_tick;
2042 $self->set_darkness_map;
2043 cf::cede_to_tick;
2044 $self->activate; 2043 $self->activate;
2045 } 2044 }
2046 2045
2047 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2047 $self->last_access ($cf::RUNTIME);
2049 2048
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2050 }
2052 2051
2053 $self->post_load; 2052 $self->post_load;
2054} 2053}
2055 2054
… …
2113 my ($path, $origin, $load) = @_; 2112 my ($path, $origin, $load) = @_;
2114 2113
2115 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
2116 2115
2117 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2118 }
2120 2119
2121 $MAP_PREFETCH{$path} |= $load; 2120 $MAP_PREFETCH{$path} |= $load;
2122 2121
2123 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
… …
2160 cf::async { 2159 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2160 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
2163 }; 2162 };
2164 2163
2164 cf::get_slot 0.02;
2165
2165 if ($uniq) { 2166 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2169 } else {
2169 $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);
… …
2177 $self->save; 2178 $self->save;
2178 2179
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2181
2181 return if $self->players; 2182 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2184 return if $self->{deny_save};
2184 2185
2185 $self->in_memory (cf::MAP_SWAPPED); 2186 $self->in_memory (cf::MAP_SWAPPED);
2186 2187
2187 $self->deactivate; 2188 $self->deactivate;
… …
2305 2306
2306sub unique_maps() { 2307sub unique_maps() {
2307 [ 2308 [
2308 map { 2309 map {
2309 utf8::decode $_; 2310 utf8::decode $_;
2310 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2311 ? normalise $_ 2314 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2316 ]
2315} 2317}
2316 2318
2317package cf;
2318
2319=back 2319=back
2320 2320
2321=head3 cf::object 2321=head3 cf::object
2322 2322
2323=cut 2323=cut
… …
2326 2326
2327=over 4 2327=over 4
2328 2328
2329=item $ob->inv_recursive 2329=item $ob->inv_recursive
2330 2330
2331Returns 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.
2332 2333
2333=cut 2334=cut
2334 2335
2335sub inv_recursive_; 2336sub inv_recursive_;
2336sub inv_recursive_ { 2337sub inv_recursive_ {
… …
2341 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2342} 2343}
2343 2344
2344=item $ref = $ob->ref 2345=item $ref = $ob->ref
2345 2346
2346creates 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.
2347 2348
2348=item $ob = cf::object::deref ($refstring) 2349=item $ob = cf::object::deref ($refstring)
2349 2350
2350returns 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,
2351even if the object actually exists. May block. 2352even if the object actually exists. May block.
… …
2383can 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
2384dialogue with the given NPC character. 2385dialogue with the given NPC character.
2385 2386
2386=cut 2387=cut
2387 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
2388# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2404# with dialog boxes.
2390#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
2391sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
… …
2403 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2404 $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));
2405 2420
2406 } else { 2421 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2424 }
2410 } 2425 }
2411} 2426}
2412 2427
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2438 2453
2439=item $player_object->enter_link 2454=item $player_object->enter_link
2440 2455
2441Freezes 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}>).
2442 2457
2443The 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.
2444I<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.
2445 2462
2446Will never block. 2463Will never block.
2447 2464
2448=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2449 2466
… …
2507 2524
2508 $map->load; 2525 $map->load;
2509 $map->load_neighbours; 2526 $map->load_neighbours;
2510 2527
2511 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2512 $self->activate_recursive; 2530 $self->activate_recursive;
2513 2531
2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2515 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2516} 2534}
… …
2520Moves 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
2521her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2522that 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
2523the 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
2524be 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 >>.
2525 2546
2526=cut 2547=cut
2527 2548
2528our $GOTOGEN; 2549our $GOTOGEN;
2529 2550
… …
2608} 2629}
2609 2630
2610sub prepare_random_map { 2631sub prepare_random_map {
2611 my ($exit) = @_; 2632 my ($exit) = @_;
2612 2633
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2636 # that depends on the exit object
2618 2637
2619 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
… …
2621 if ($exit->map) { 2640 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2626 } 2647 }
2627 2648
2628 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2629 2650
2630 my $data = cf::to_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2633 2654
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2657 undef $fh;
2637 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2638 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2641 } 2666 }
2642} 2667}
2643 2668
2644sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2646 2671
2647 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2648 2673
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2674 $self->enter_link;
2661 2675
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2676 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2677 $Coro::current->{desc} = "enter_exit";
2668 2678
2669 $self->deactivate_recursive; # just to be sure
2670 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
2671 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2672 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
2673 1; 2700 1
2674 }) { 2701 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2676 . "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. "
2677 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2679 2706
2680 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
… …
2746 id => "infobox", 2773 id => "infobox",
2747 title => "Body Parts", 2774 title => "Body Parts",
2748 reply => undef, 2775 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2750 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/perceiveself" => {
2809 id => "infobox",
2810 title => "Perceive Self",
2811 reply => undef,
2812 tooltip => "You gained detailed knowledge about yourself",
2813 },
2751 "c/uptime" => { 2814 "c/uptime" => {
2752 id => "infobox", 2815 id => "infobox",
2753 title => "Uptime", 2816 title => "Uptime",
2754 reply => undef, 2817 reply => undef,
2755 tooltip => "How long the server has been running since last restart", 2818 tooltip => "How long the server has been running since last restart",
… …
2758 id => "infobox", 2821 id => "infobox",
2759 title => "Map Info", 2822 title => "Map Info",
2760 reply => undef, 2823 reply => undef,
2761 tooltip => "Information related to the maps", 2824 tooltip => "Information related to the maps",
2762 }, 2825 },
2826 "c/party" => {
2827 id => "party",
2828 title => "Party",
2829 reply => "gsay ",
2830 tooltip => "Messages and chat related to your party",
2831 },
2832 "c/death" => {
2833 id => "death",
2834 title => "Death",
2835 reply => undef,
2836 tooltip => "Reason for and more info about your most recent death",
2837 },
2838 "c/say" => $SAY_CHANNEL,
2839 "c/chat" => $CHAT_CHANNEL,
2763); 2840);
2764 2841
2765sub cf::client::send_msg { 2842sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 2843 my ($self, $channel, $msg, $color, @extra) = @_;
2767 2844
2768 $msg = $self->pl->expand_cfpod ($msg); 2845 $msg = $self->pl->expand_cfpod ($msg)
2846 unless $color & cf::NDI_VERBATIM;
2769 2847
2770 $color &= cf::NDI_CLIENT_MASK; # just in case... 2848 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771 2849
2772 # check predefined channels, for the benefit of C 2850 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) { 2851 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel}; 2852 $channel = $CHANNEL{$channel};
2775 2853
2776 $self->ext_msg (channel_info => $channel) 2854 $self->ext_msg (channel_info => $channel);
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id}; 2855 $channel = $channel->{id};
2780 2856
2781 } elsif (ref $channel) { 2857 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent 2858 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) { 2859 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel; 2860 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel) 2861 $self->ext_msg (channel_info => $channel);
2786 if $self->can_msg;
2787 } 2862 }
2788 2863
2789 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2790 } 2865 }
2791 2866
2792 return unless @extra || length $msg; 2867 return unless @extra || length $msg;
2793 2868
2794 if ($self->can_msg) {
2795 # default colour, mask it out 2869 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF; 2871 if $color & cf::NDI_DEF;
2798 2872
2799 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2873 my $pkt = "msg "
2874 . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2801 } else { 2876 );
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812 2877
2813 $color &= cf::NDI_COLOR_MASK; 2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2814 2881
2815 utf8::encode $msg; 2882 # split very large packets
2816 2883 if (8192 < length $pkt and $self->{can_lzf}) {
2817 if (0 && $msg =~ /\[/) { 2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2818 # COMMAND/INFO 2885 $pkt = "frag";
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 } 2886 }
2887
2888 $self->send_packet ($pkt);
2826} 2889}
2827 2890
2828=item $client->ext_msg ($type, @msg) 2891=item $client->ext_msg ($type, @msg)
2829 2892
2830Sends an ext event to the client. 2893Sends an ext event to the client.
… …
3004 3067
3005The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
3006 3069
3007 cf::object 3070 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3071 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3072 insert remove name archname title slaying race decrease split
3073 value
3010 3074
3011 cf::object::player 3075 cf::object::player
3012 player 3076 player
3013 3077
3014 cf::player 3078 cf::player
… …
3019 3083
3020=cut 3084=cut
3021 3085
3022for ( 3086for (
3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3087 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race 3088 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3089 decrease split destroy change_exp value msg lore send_msg)],
3026 ["cf::object::player" => qw(player)], 3090 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3091 ["cf::player" => qw(peaceful send_msg)],
3028 ["cf::map" => qw(trigger)], 3092 ["cf::map" => qw(trigger)],
3029) { 3093) {
3030 no strict 'refs'; 3094 no strict 'refs';
3031 my ($pkg, @funs) = @$_; 3095 my ($pkg, @funs) = @$_;
3032 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3049 my ($code, %vars) = @_; 3113 my ($code, %vars) = @_;
3050 3114
3051 my $qcode = $code; 3115 my $qcode = $code;
3052 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3053 $qcode =~ s/\n/\\n/g; 3117 $qcode =~ s/\n/\\n/g;
3118
3119 %vars = (_dummy => 0) unless %vars;
3054 3120
3055 local $_; 3121 local $_;
3056 local @safe::cf::_safe_eval_args = values %vars; 3122 local @safe::cf::_safe_eval_args = values %vars;
3057 3123
3058 my $eval = 3124 my $eval =
… …
3135 { 3201 {
3136 my $faces = $facedata->{faceinfo}; 3202 my $faces = $facedata->{faceinfo};
3137 3203
3138 while (my ($face, $info) = each %$faces) { 3204 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3205 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206
3140 cf::face::set_visibility $idx, $info->{visibility}; 3207 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3208 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3144 3211
3145 cf::cede_to_tick; 3212 cf::cede_to_tick;
3146 } 3213 }
3147 3214
3148 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3216 next unless $info->{smooth};
3217
3150 my $idx = cf::face::find $face 3218 my $idx = cf::face::find $face
3151 or next; 3219 or next;
3220
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3221 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3222 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3224 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3225 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
3174 { 3243 {
3175 # TODO: for gcfclient pleasure, we should give resources 3244 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index. 3245 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3246 my $res = $facedata->{resource};
3178 3247
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3248 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3250 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data; 3251 my $data;
3184 3252
3185 if ($info->{type} & 1) { 3253 if ($info->{type} & 1) {
3186 # prepend meta info 3254 # prepend meta info
3187 3255
3188 my $meta = $enc->encode ({ 3256 my $meta = $enc->encode ({
3189 name => $name, 3257 name => $name,
3190 %{ $info->{meta} || {} }, 3258 %{ $info->{meta} || {} },
3191 }); 3259 });
3192 3260
3193 $data = pack "(w/a*)*", $meta, $info->{data}; 3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type};
3194 } else { 3268 } else {
3195 $data = $info->{data}; 3269 $RESOURCE{$name} = $info;
3196 } 3270 }
3197 3271
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3272 cf::cede_to_tick;
3202 } 3273 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3274 }
3275
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3277
3223 1 3278 1
3224} 3279}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3225 3300
3226register_exticmd fx_want => sub { 3301register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_; 3302 my ($ns, $want) = @_;
3228 3303
3229 while (my ($k, $v) = each %$want) { 3304 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3305 $ns->fx_want ($k, $v);
3231 } 3306 }
3232}; 3307};
3308
3309sub load_resource_file($) {
3310 my $guard = lock_acquire "load_resource_file";
3311
3312 my $status = load_resource_file_ $_[0];
3313 get_slot 0.1, 100;
3314 cf::arch::commit_load;
3315
3316 $status
3317}
3233 3318
3234sub reload_regions { 3319sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework 3320 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?) 3321 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3322 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3251} 3336}
3252 3337
3253sub reload_archetypes { 3338sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3339 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3340 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3341}
3262 3342
3263sub reload_treasures { 3343sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3344 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3345 or die "unable to load treasurelists\n";
3266} 3346}
3267 3347
3268sub reload_resources { 3348sub reload_resources {
3269 warn "reloading resource files...\n"; 3349 warn "reloading resource files...\n";
3270 3350
3351 reload_facedata;
3352 reload_archetypes;
3271 reload_regions; 3353 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3354 reload_treasures;
3276 3355
3277 warn "finished reloading resource files\n"; 3356 warn "finished reloading resource files\n";
3278}
3279
3280sub init {
3281 reload_resources;
3282} 3357}
3283 3358
3284sub reload_config { 3359sub reload_config {
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
3286 or return; 3361 or return;
3287 3362
3288 local $/; 3363 local $/;
3289 *CFG = YAML::Syck::Load <$fh>; 3364 *CFG = YAML::Load <$fh>;
3290 3365
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3292 3367
3293 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3294 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3300 }; 3375 };
3301 warn $@ if $@; 3376 warn $@ if $@;
3302 } 3377 }
3303} 3378}
3304 3379
3380sub pidfile() {
3381 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3382 or die "$PIDFILE: $!";
3383 flock $fh, &Fcntl::LOCK_EX
3384 or die "$PIDFILE: flock: $!";
3385 $fh
3386}
3387
3388# make sure only one server instance is running at any one time
3389sub atomic {
3390 my $fh = pidfile;
3391
3392 my $pid = <$fh>;
3393 kill 9, $pid if $pid > 0;
3394
3395 seek $fh, 0, 0;
3396 print $fh $$;
3397}
3398
3305sub main { 3399sub main {
3400 cf::init_globals; # initialise logging
3401
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413
3306 # we must not ever block the main coroutine 3414 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3415 local $Coro::idle = sub {
3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3416 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3309 (async { 3417 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3418 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3419 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3420 })->prio (Coro::PRIO_MAX);
3313 }; 3421 };
3314 3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3425 cf::sync_job {
3426 reload_resources;
3315 reload_config; 3427 reload_config;
3316 db_init; 3428 db_init;
3429
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid;
3433 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills;
3436
3437 cf::init_beforeplay;
3438
3439 atomic;
3440
3317 load_extensions; 3441 load_extensions;
3318 3442
3319 $TICK_WATCHER->start; 3443 utime time, time, $RUNTIMEFILE;
3444
3445 # no (long-running) fork's whatsoever before this point(!)
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447
3448 (pop @POST_INIT)->(0) while @POST_INIT;
3449 };
3450
3320 Event::loop; 3451 EV::loop;
3321} 3452}
3322 3453
3323############################################################################# 3454#############################################################################
3324# initialisation and cleanup 3455# initialisation and cleanup
3325 3456
3326# install some emergency cleanup handlers 3457# install some emergency cleanup handlers
3327BEGIN { 3458BEGIN {
3459 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3460 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3461 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3462 cf::cleanup "SIG$signal";
3336 },
3337 ); 3463 };
3338 } 3464 }
3339} 3465}
3340 3466
3341sub write_runtime { 3467sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime";
3343
3344 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3346 3470
3347 IO::AIO::aio_utime $runtime, undef, undef; 3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348 3472
3349 my $guard = cf::lock_acquire "write_runtime"; 3473 my $guard = cf::lock_acquire "write_runtime";
3350 3474
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3352 or return; 3476 or return;
3353 3477
3354 my $value = $cf::RUNTIME + 90 + 10; 3478 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock 3479 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server. 3480 # 60 allows for the watchdog to kill the server.
… …
3366 aio_utime $fh, undef, undef; 3490 aio_utime $fh, undef, undef;
3367 3491
3368 close $fh 3492 close $fh
3369 or return; 3493 or return;
3370 3494
3371 aio_rename "$runtime~", $runtime 3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372 and return; 3496 and return;
3373 3497
3374 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3375 3499
3376 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_seq uuid_cur;
3518
3519 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n";
3521 return;
3522 }
3523
3524 my $value = uuid_str $value + $uuid_skip;
3525 $uuid_skip = 0;
3526
3527 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3528 and return;
3529
3530 # always fsync - this file is important
3531 aio_fsync $fh
3532 and return;
3533
3534 close $fh
3535 or return;
3536
3537 aio_rename "$uuid~", $uuid
3538 and return;
3539
3540 warn "uuid file written ($value).\n";
3541
3542 1
3543
3544}
3545
3546sub write_uuid($$) {
3547 my ($skip, $sync) = @_;
3548
3549 $sync ? write_uuid_sync $skip
3550 : async { write_uuid_sync $skip };
3377} 3551}
3378 3552
3379sub emergency_save() { 3553sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3554 my $freeze_guard = cf::freeze_mainloop;
3381 3555
3382 warn "enter emergency perl save\n"; 3556 warn "emergency_perl_save: enter\n";
3383 3557
3384 cf::sync_job { 3558 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563
3385 # use a peculiar iteration method to avoid tripping on perl 3564 # use a peculiar iteration method to avoid tripping on perl
3386 # refcount bugs in for. also avoids problems with players 3565 # refcount bugs in for. also avoids problems with players
3387 # and maps saved/destroyed asynchronously. 3566 # and maps saved/destroyed asynchronously.
3388 warn "begin emergency player save\n"; 3567 warn "emergency_perl_save: begin player save\n";
3389 for my $login (keys %cf::PLAYER) { 3568 for my $login (keys %cf::PLAYER) {
3390 my $pl = $cf::PLAYER{$login} or next; 3569 my $pl = $cf::PLAYER{$login} or next;
3391 $pl->valid or next; 3570 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3393 $pl->save; 3572 $pl->save;
3394 } 3573 }
3395 warn "end emergency player save\n"; 3574 warn "emergency_perl_save: end player save\n";
3396 3575
3397 warn "begin emergency map save\n"; 3576 warn "emergency_perl_save: begin map save\n";
3398 for my $path (keys %cf::MAP) { 3577 for my $path (keys %cf::MAP) {
3399 my $map = $cf::MAP{$path} or next; 3578 my $map = $cf::MAP{$path} or next;
3400 $map->valid or next; 3579 $map->valid or next;
3401 $map->save; 3580 $map->save;
3402 } 3581 }
3403 warn "end emergency map save\n"; 3582 warn "emergency_perl_save: end map save\n";
3404 3583
3405 warn "begin emergency database checkpoint\n"; 3584 warn "emergency_perl_save: begin database checkpoint\n";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3585 BDB::db_env_txn_checkpoint $DB_ENV;
3407 warn "end emergency database checkpoint\n"; 3586 warn "emergency_perl_save: end database checkpoint\n";
3587
3588 warn "emergency_perl_save: begin write uuid\n";
3589 write_uuid_sync 1;
3590 warn "emergency_perl_save: end write uuid\n";
3408 }; 3591 };
3409 3592
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3410 warn "leave emergency perl save\n"; 3598 warn "emergency_perl_save: leave\n";
3411} 3599}
3412 3600
3413sub post_cleanup { 3601sub post_cleanup {
3414 my ($make_core) = @_; 3602 my ($make_core) = @_;
3415 3603
3416 warn Carp::longmess "post_cleanup backtrace" 3604 warn Carp::longmess "post_cleanup backtrace"
3417 if $make_core; 3605 if $make_core;
3606
3607 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$;
3609}
3610
3611# a safer delete_package, copied from Symbol
3612sub clear_package($) {
3613 my $pkg = shift;
3614
3615 # expand to full symbol table name if needed
3616 unless ($pkg =~ /^main::.*::$/) {
3617 $pkg = "main$pkg" if $pkg =~ /^::/;
3618 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3619 $pkg .= '::' unless $pkg =~ /::$/;
3620 }
3621
3622 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3623 my $stem_symtab = *{$stem}{HASH};
3624
3625 defined $stem_symtab and exists $stem_symtab->{$leaf}
3626 or return;
3627
3628 # clear all symbols
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 }
3634 warn "cleared package $pkg\n";#d#
3418} 3635}
3419 3636
3420sub do_reload_perl() { 3637sub do_reload_perl() {
3421 # can/must only be called in main 3638 # can/must only be called in main
3422 if ($Coro::current != $Coro::main) { 3639 if ($Coro::current != $Coro::main) {
3423 warn "can only reload from main coroutine"; 3640 warn "can only reload from main coroutine";
3424 return; 3641 return;
3425 } 3642 }
3426 3643
3644 return if $RELOAD++;
3645
3646 my $t1 = EV::time;
3647
3648 while ($RELOAD) {
3427 warn "reloading..."; 3649 warn "reloading...";
3428 3650
3429 warn "entering sync_job"; 3651 warn "entering sync_job";
3430 3652
3431 cf::sync_job { 3653 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark 3654 cf::write_runtime_sync; # external watchdog should not bark
3433 cf::emergency_save; 3655 cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark 3656 cf::write_runtime_sync; # external watchdog should not bark
3435 3657
3436 warn "syncing database to disk"; 3658 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3659 BDB::db_env_txn_checkpoint $DB_ENV;
3438 3660
3439 # if anything goes wrong in here, we should simply crash as we already saved 3661 # if anything goes wrong in here, we should simply crash as we already saved
3440 3662
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests"; 3663 warn "flushing outstanding aio requests";
3447 for (;;) {
3448 BDB::flush;
3449 IO::AIO::flush;
3450 Coro::cede_notself;
3451 last unless IO::AIO::nreqs || BDB::nreqs; 3664 while (IO::AIO::nreqs || BDB::nreqs) {
3452 warn "iterate..."; 3665 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3453 }
3454
3455 ++$RELOAD;
3456
3457 warn "cancelling all extension coros";
3458 $_->cancel for values %EXT_CORO;
3459 %EXT_CORO = ();
3460
3461 warn "removing commands";
3462 %COMMAND = ();
3463
3464 warn "removing ext/exti commands";
3465 %EXTCMD = ();
3466 %EXTICMD = ();
3467
3468 warn "unloading/nuking all extensions";
3469 for my $pkg (@EXTS) {
3470 warn "... unloading $pkg";
3471
3472 if (my $cb = $pkg->can ("unload")) {
3473 eval {
3474 $cb->($pkg);
3475 1
3476 } or warn "$pkg unloaded, but with errors: $@";
3477 } 3666 }
3478 3667
3479 warn "... nuking $pkg"; 3668 warn "cancelling all extension coros";
3480 Symbol::delete_package $pkg; 3669 $_->cancel for values %EXT_CORO;
3481 } 3670 %EXT_CORO = ();
3482 3671
3483 warn "unloading all perl modules loaded from $LIBDIR"; 3672 warn "removing commands";
3484 while (my ($k, $v) = each %INC) { 3673 %COMMAND = ();
3485 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486 3674
3675 warn "removing ext/exti commands";
3676 %EXTCMD = ();
3677 %EXTICMD = ();
3678
3679 warn "unloading/nuking all extensions";
3680 for my $pkg (@EXTS) {
3487 warn "... unloading $k"; 3681 warn "... unloading $pkg";
3488 delete $INC{$k};
3489 3682
3490 $k =~ s/\.pm$//;
3491 $k =~ s/\//::/g;
3492
3493 if (my $cb = $k->can ("unload_module")) { 3683 if (my $cb = $pkg->can ("unload")) {
3684 eval {
3494 $cb->(); 3685 $cb->($pkg);
3686 1
3687 } or warn "$pkg unloaded, but with errors: $@";
3688 }
3689
3690 warn "... clearing $pkg";
3691 clear_package $pkg;
3495 } 3692 }
3496 3693
3497 Symbol::delete_package $k; 3694 warn "unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697
3698 warn "... unloading $k";
3699 delete $INC{$k};
3700
3701 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g;
3703
3704 if (my $cb = $k->can ("unload_module")) {
3705 $cb->();
3706 }
3707
3708 clear_package $k;
3498 } 3709 }
3499 3710
3500 warn "getting rid of safe::, as good as possible"; 3711 warn "getting rid of safe::, as good as possible";
3501 Symbol::delete_package "safe::$_" 3712 clear_package "safe::$_"
3502 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3503 3714
3504 warn "unloading cf.pm \"a bit\""; 3715 warn "unloading cf.pm \"a bit\"";
3505 delete $INC{"cf.pm"}; 3716 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"}; 3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3507 3718
3508 # don't, removes xs symbols, too, 3719 # don't, removes xs symbols, too,
3509 # and global variables created in xs 3720 # and global variables created in xs
3510 #Symbol::delete_package __PACKAGE__; 3721 #clear_package __PACKAGE__;
3511 3722
3512 warn "unload completed, starting to reload now"; 3723 warn "unload completed, starting to reload now";
3513 3724
3514 warn "reloading cf.pm"; 3725 warn "reloading cf.pm";
3515 require cf; 3726 require cf;
3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3517 3728
3518 warn "loading config and database again"; 3729 warn "loading config and database again";
3519 cf::reload_config; 3730 cf::reload_config;
3520 3731
3521 warn "loading extensions"; 3732 warn "loading extensions";
3522 cf::load_extensions; 3733 cf::load_extensions;
3523 3734
3735 if ($REATTACH_ON_RELOAD) {
3524 warn "reattaching attachments to objects/players"; 3736 warn "reattaching attachments to objects/players";
3525 _global_reattach; # objects, sockets 3737 _global_reattach; # objects, sockets
3526 warn "reattaching attachments to maps"; 3738 warn "reattaching attachments to maps";
3527 reattach $_ for values %MAP; 3739 reattach $_ for values %MAP;
3528 warn "reattaching attachments to players"; 3740 warn "reattaching attachments to players";
3529 reattach $_ for values %PLAYER; 3741 reattach $_ for values %PLAYER;
3742 }
3530 3743
3744 warn "running post_init jobs";
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3746
3531 warn "leaving sync_job"; 3747 warn "leaving sync_job";
3532 3748
3533 1 3749 1
3534 } or do { 3750 } or do {
3535 warn $@; 3751 warn $@;
3536 warn "error while reloading, exiting."; 3752 cf::cleanup "error while reloading, exiting.";
3537 exit 1;
3538 }; 3753 };
3539 3754
3540 warn "reloaded"; 3755 warn "reloaded";
3756 --$RELOAD;
3757 }
3758
3759 $t1 = EV::time - $t1;
3760 warn "reload completed in ${t1}s\n";
3541}; 3761};
3542 3762
3543our $RELOAD_WATCHER; # used only during reload 3763our $RELOAD_WATCHER; # used only during reload
3544 3764
3545sub reload_perl() { 3765sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 3766 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 3767 # coro crashes during coro_state_free->destroy here.
3548 3768
3549 $RELOAD_WATCHER ||= Event->timer ( 3769 $RELOAD_WATCHER ||= cf::async {
3550 reentrant => 0, 3770 Coro::AIO::aio_wait cache_extensions;
3551 after => 0, 3771
3552 data => WF_AUTOCANCEL, 3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3553 cb => sub {
3554 do_reload_perl; 3773 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3774 undef $RELOAD_WATCHER;
3556 }, 3775 };
3557 ); 3776 };
3558} 3777}
3559 3778
3560register_command "reload" => sub { 3779register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3780 my ($who, $arg) = @_;
3562 3781
… …
3575 3794
3576our @WAIT_FOR_TICK; 3795our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3796our @WAIT_FOR_TICK_BEGIN;
3578 3797
3579sub wait_for_tick { 3798sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3799 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3800
3583 my $signal = new Coro::Signal; 3801 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3802 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3803 $signal->wait;
3586} 3804}
3587 3805
3588sub wait_for_tick_begin { 3806sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3807 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3808
3592 my $signal = new Coro::Signal; 3809 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3810 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3811 $signal->wait;
3595} 3812}
3596 3813
3597$TICK_WATCHER = Event->timer ( 3814sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 3815 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3816 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3817 unless ++$bug_warning > 10;
3607 return; 3818 return;
3608 } 3819 }
3609 3820
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 3821 cf::server_tick; # one server iteration
3613 3822
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK += $TICK;
3616
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3823 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 3824 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3825 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3826 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3827 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3828 or warn "ERROR: unable to write runtime file: $!";
3623 };
3624 } 3829 };
3830 }
3625 3831
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 3833 $sig->send;
3628 } 3834 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3835 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3836 $sig->send;
3631 } 3837 }
3632 3838
3633 $NOW = Event::time; 3839 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3840 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 3841
3644 _post_tick; 3842 if (0) {
3843 if ($NEXT_TICK) {
3844 my $jitter = $TICK_START - $NEXT_TICK;
3845 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3846 warn "jitter $JITTER\n";#d#
3847 }
3645 }, 3848 }
3646); 3849}
3647 3850
3648{ 3851{
3852 # configure BDB
3853
3649 BDB::min_parallel 8; 3854 BDB::min_parallel 8;
3650 BDB::max_poll_time $TICK * 0.1; 3855 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 3856 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 3857
3675 unless ($DB_ENV) { 3858 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 3859 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3860 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678 | BDB::LOG_AUTOREMOVE, 1); 3861 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3862 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3863 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3864 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681 3865
3682 cf::sync_job { 3866 cf::sync_job {
3683 eval { 3867 eval {
… …
3693 3877
3694 cf::cleanup "db_env_open(db): $@" if $@; 3878 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 3879 };
3696 } 3880 }
3697 3881
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 3882 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3883 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 ); 3884 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3885 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3886 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 3887 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 3888 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3889 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 3890 };
3728} 3891}
3729 3892
3730{ 3893{
3894 # configure IO::AIO
3895
3731 IO::AIO::min_parallel 8; 3896 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 3897 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 3898 undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 3899}
3744 3900
3745my $_log_backtrace; 3901my $_log_backtrace;
3746 3902
3747sub _log_backtrace { 3903sub _log_backtrace {
… …
3750 $msg =~ s/\n//; 3906 $msg =~ s/\n//;
3751 3907
3752 # limit the # of concurrent backtraces 3908 # limit the # of concurrent backtraces
3753 if ($_log_backtrace < 2) { 3909 if ($_log_backtrace < 2) {
3754 ++$_log_backtrace; 3910 ++$_log_backtrace;
3911 my $perl_bt = Carp::longmess $msg;
3755 async { 3912 async {
3756 $Coro::current->{desc} = "abt $msg"; 3913 $Coro::current->{desc} = "abt $msg";
3757 3914
3758 my @bt = fork_call { 3915 my @bt = fork_call {
3759 @addr = map { sprintf "%x", $_ } @addr; 3916 @addr = map { sprintf "%x", $_ } @addr;
… …
3770 } 3927 }
3771 3928
3772 @funcs 3929 @funcs
3773 }; 3930 };
3774 3931
3775 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $perl_bt\n";
3933 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3776 LOG llevInfo, "[ABT] $_\n" for @bt; 3934 LOG llevInfo, "[ABT] $_\n" for @bt;
3777 --$_log_backtrace; 3935 --$_log_backtrace;
3778 }; 3936 };
3779 } else { 3937 } else {
3780 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $msg\n";
3781 LOG llevInfo, "[ABT] [suppressed]\n"; 3939 LOG llevInfo, "[ABT] [suppressed]\n";
3782 } 3940 }
3783} 3941}
3784 3942
3785# load additional modules 3943# load additional modules
3786use cf::pod; 3944require "cf/$_.pm" for @EXTRA_MODULES;
3787 3945
3788END { cf::emergency_save } 3946END { cf::emergency_save }
3789 3947
37901 39481
3791 3949

Diff Legend

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