ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.379 by root, Thu Oct 4 23:59:07 2007 UTC vs.
Revision 1.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 Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5; 56use Digest::MD5;
30use Fcntl; 57use Fcntl;
31use YAML::Syck (); 58use YAML ();
32use IO::AIO 2.32 (); 59use IO::AIO ();
33use Time::HiRes; 60use Time::HiRes;
34use Compress::LZF; 61use Compress::LZF;
35use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
36 65
37# configure various modules to our taste 66# configure various modules to our taste
38# 67#
39$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 76
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 78
52our %COMMAND = (); 79our %COMMAND = ();
53our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
56our %EXTCMD = (); 83our %EXTCMD = ();
57our %EXTICMD = (); 84our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
60 87
61our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 89our @EVENT;
63 90
64our $CONFDIR = confdir; 91our $CONFDIR = confdir;
65our $DATADIR = datadir; 92our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
75 106
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 109our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default 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>:
373 } 424 }
374 } 425 }
375 } 426 }
376 427
377 if (@SLOT_QUEUE) { 428 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 429 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 430 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 431 $signal->wait;
381 } else { 432 } else {
382 Coro::schedule; 433 Coro::schedule;
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 | logBacktrace, 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
444 warn $@ if $@; 495 warn $@ if $@;
445 undef $busy; 496 undef $busy;
446 })->prio (Coro::PRIO_MAX); 497 })->prio (Coro::PRIO_MAX);
447 498
448 while ($busy) { 499 while ($busy) {
449 Coro::cede or Event::one_event; 500 if (Coro::nready) {
501 Coro::cede_notself;
502 } else {
503 EV::loop EV::LOOP_ONESHOT;
450 } 504 }
505 }
451 506
452 $time = Event::time - $time; 507 my $time = EV::time - $time;
453 508
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
458 510
459 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
460 } else { 512 } else {
461 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
462 514
487=item fork_call { }, $args 539=item fork_call { }, $args
488 540
489Executes the given code block with the given arguments in a seperate 541Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 542process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 543Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 544never block itself or use any form of event handling.
493 545
494=cut 546=cut
495 547
496sub fork_call(&@) { 548sub fork_call(&@) {
497 my ($cb, @args) = @_; 549 my ($cb, @args) = @_;
504 reset_signals; 556 reset_signals;
505 &$cb 557 &$cb
506 }, @args; 558 }, @args;
507 559
508 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
509} 588}
510 589
511=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
512 591
513Returns a single value from the environment database. 592Returns a single value from the environment database.
652 731
653############################################################################# 732#############################################################################
654 733
655=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
656 735
657Many 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
658attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
660 739
661In 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>
662C<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
663Crossfire TRT). 742Deliantra).
664 743
665=over 4 744=over 4
666 745
667=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
668 747
712=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
713 792
714Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
716 795
717Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
718that 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.
719 798
720These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
721 800
722=over 4 801=over 4
950 } 1029 }
951 1030
952 0 1031 0
953} 1032}
954 1033
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1035
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1037
959Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
960 1039
966 1045
967=cut 1046=cut
968 1047
969############################################################################# 1048#############################################################################
970# object support 1049# object support
971#
972 1050
1051sub _object_equal($$);
1052sub _object_equal($$) {
1053 my ($a, $b) = @_;
1054
1055 return 0 unless (ref $a) eq (ref $b);
1056
1057 if ("HASH" eq ref $a) {
1058 my @ka = keys %$a;
1059 my @kb = keys %$b;
1060
1061 return 0 if @ka != @kb;
1062
1063 for (0 .. $#ka) {
1064 return 0 unless $ka[$_] eq $kb[$_];
1065 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1066 }
1067
1068 } elsif ("ARRAY" eq ref $a) {
1069
1070 return 0 if @$a != @$b;
1071
1072 for (0 .. $#$a) {
1073 return 0 unless _object_equal $a->[$_], $b->[$_];
1074 }
1075
1076 } elsif ($a ne $b) {
1077 return 0;
1078 }
1079
1080 1
1081}
1082
1083our $SLOW_MERGES;#d#
973sub _can_merge { 1084sub _can_merge {
974 my ($ob1, $ob2) = @_; 1085 my ($ob1, $ob2) = @_;
975 1086
976 local $Storable::canonical = 1; 1087 ++$SLOW_MERGES;#d#
977 my $fob1 = Storable::freeze $ob1;
978 my $fob2 = Storable::freeze $ob2;
979 1088
980 $fob1 eq $fob2 1089 # we do the slow way here
1090 return _object_equal $ob1, $ob2
981} 1091}
982 1092
983sub reattach { 1093sub reattach {
984 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
985 my ($obj) = @_; 1095 my ($obj) = @_;
986 1096
1097 # no longer needed after getting rid of delete_package?
987 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
988 1099
989 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
990 1101
991 @$registry = (); 1102 @$registry = ();
992 1103
1007cf::attachable->attach ( 1118cf::attachable->attach (
1008 prio => -1000000, 1119 prio => -1000000,
1009 on_instantiate => sub { 1120 on_instantiate => sub {
1010 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
1011 1122
1012 $data = from_json $data; 1123 $data = decode_json $data;
1013 1124
1014 for (@$data) { 1125 for (@$data) {
1015 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
1016 1127
1017 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
1038 utf8::decode (my $decname = $filename); 1149 utf8::decode (my $decname = $filename);
1039 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1040 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1041 1152
1042 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1043 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1044 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1045 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1046 close $fh; 1157 aio_close $fh;
1047 1158
1048 if (@$objs) { 1159 if (@$objs) {
1049 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) {
1050 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
1051 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1052 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
1053 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
1054 close $fh; 1165 aio_close $fh;
1055 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
1056 } 1167 }
1057 } else { 1168 } else {
1058 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1059 } 1170 }
1060 1171
1061 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1062 } else { 1176 } else {
1063 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1064 } 1178 }
1065 } else { 1179 } else {
1066 aio_unlink $filename; 1180 aio_unlink $filename;
1067 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1068 } 1182 }
1087 1201
1088 unless (aio_stat "$filename.pst") { 1202 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1203 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1204 or return;
1091 1205
1092 $av = eval { (Storable::thaw $av)->{objs} }; 1206 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs};
1093 } 1208 }
1094 1209
1095 utf8::decode (my $decname = $filename); 1210 utf8::decode (my $decname = $filename);
1096 warn sprintf "loading %s (%d,%d)\n", 1211 warn sprintf "loading %s (%d,%d)\n",
1097 $decname, length $data, scalar @{$av || []}; 1212 $decname, length $data, scalar @{$av || []};
1158 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1159 1274
1160 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1161} 1276}
1162 1277
1278use File::Glob ();
1279
1163cf::player->attach ( 1280cf::player->attach (
1164 on_command => sub { 1281 on_command => sub {
1165 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1166 1283
1167 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
1199 1316
1200 cf::override; 1317 cf::override;
1201 }, 1318 },
1202); 1319);
1203 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
1204sub load_extensions { 1334sub load_extensions {
1205 cf::sync_job { 1335 cf::sync_job {
1206 my %todo; 1336 my %todo;
1207 1337
1208 for my $path (<$LIBDIR/*.ext>) { 1338 for my $path (<$LIBDIR/*.ext>) {
1227 1357
1228 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1229 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1230 1360
1231 $ext{source} = 1361 $ext{source} =
1232 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1233 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1234 . $source 1364 . $source
1235 . "\n};\n1"; 1365 . "\n};\n1";
1236 1366
1237 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
1253 my $msg = $@ ? "$v->{path}: $@\n" 1383 my $msg = $@ ? "$v->{path}: $@\n"
1254 : "$v->{base}: extension inactive.\n"; 1384 : "$v->{base}: extension inactive.\n";
1255 1385
1256 if (exists $v->{meta}{mandatory}) { 1386 if (exists $v->{meta}{mandatory}) {
1257 warn $msg; 1387 warn $msg;
1258 warn "mandatory extension failed to load, exiting.\n"; 1388 cf::cleanup "mandatory extension failed to load, exiting.";
1259 exit 1;
1260 } 1389 }
1261 1390
1262 warn $msg; 1391 warn $msg;
1263 } 1392 }
1264 1393
1278 1407
1279=back 1408=back
1280 1409
1281=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1282 1411
1283Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1284 1413
1285=cut 1414=cut
1286 1415
1287package cf::player; 1416package cf::player;
1288 1417
1331 1460
1332sub exists($) { 1461sub exists($) {
1333 my ($login) = @_; 1462 my ($login) = @_;
1334 1463
1335 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1336 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1337} 1466}
1338 1467
1339sub find($) { 1468sub find($) {
1340 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1341 my $login = $_[0]; 1470 my $login = $_[0];
1353 my $f = new_from_file cf::object::thawer path $login 1482 my $f = new_from_file cf::object::thawer path $login
1354 or return; 1483 or return;
1355 1484
1356 my $pl = cf::player::load_pl $f 1485 my $pl = cf::player::load_pl $f
1357 or return; 1486 or return;
1487
1358 local $cf::PLAYER_LOADING{$login} = $pl; 1488 local $cf::PLAYER_LOADING{$login} = $pl;
1359 $f->resolve_delayed_derefs; 1489 $f->resolve_delayed_derefs;
1360 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1361 } 1491 }
1362 } 1492 }
1372 1502
1373 return if $pl->{deny_save}; 1503 return if $pl->{deny_save};
1374 1504
1375 aio_mkdir playerdir $pl, 0770; 1505 aio_mkdir playerdir $pl, 0770;
1376 $pl->{last_save} = $cf::RUNTIME; 1506 $pl->{last_save} = $cf::RUNTIME;
1507
1508 cf::get_slot 0.01;
1377 1509
1378 $pl->save_pl ($path); 1510 $pl->save_pl ($path);
1379 cf::cede_to_tick; 1511 cf::cede_to_tick;
1380} 1512}
1381 1513
1413 my ($pl) = @_; 1545 my ($pl) = @_;
1414 1546
1415 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1416 1548
1417 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1418 $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
1419 1551
1420 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1421 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1422 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1423 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1424 1558
1425 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1426 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
1465 1599
1466 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1467 my $path = path $login; 1601 my $path = path $login;
1468 1602
1469 # a .pst is a dead give-away for a valid player 1603 # a .pst is a dead give-away for a valid player
1470 unless (-e "$path.pst") { 1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1471 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1472 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1473 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1474 } 1609 }
1475 1610
1506 } 1641 }
1507 1642
1508 \@paths 1643 \@paths
1509} 1644}
1510 1645
1511=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1512 1647
1513Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1514
1515=cut
1516
1517sub expand_cfpod {
1518 ((my $self), (local $_)) = @_;
1519
1520 # escape & and <
1521 s/&/&amp;/g;
1522 s/(?<![BIUGHT])</&lt;/g;
1523
1524 # this is buggy, it needs to properly take care of nested <'s
1525
1526 1 while
1527 # replace B<>, I<>, U<> etc.
1528 s/B<([^\>]*)>/<b>$1<\/b>/
1529 || s/I<([^\>]*)>/<i>$1<\/i>/
1530 || s/U<([^\>]*)>/<u>$1<\/u>/
1531 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1532 # replace G<male|female> tags
1533 || s{G<([^>|]*)\|([^>]*)>}{
1534 $self->gender ? $2 : $1
1535 }ge
1536 # replace H<hint text>
1537 || s{H<([^\>]*)>}
1538 {
1539 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1540 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1541 "")
1542 [$self->{hintmode}]
1543 }ge;
1544
1545 # create single paragraphs (very hackish)
1546 s/(?<=\S)\n(?=\w)/ /g;
1547
1548 # compress some whitespace
1549 s/\s+\n/\n/g; # ws line-ends
1550 s/\n\n+/\n/g; # double lines
1551 s/^\n+//; # beginning lines
1552 s/\n+$//; # ending lines
1553
1554 $_
1555}
1556
1557sub hintmode {
1558 $_[0]{hintmode} = $_[1] if @_ > 1;
1559 $_[0]{hintmode}
1560}
1561 1649
1562=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1563 1651
1564Sends an ext reply to the player. 1652Sends an ext reply to the player.
1565 1653
1632our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1633our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1634 1722
1635sub generate_random_map { 1723sub generate_random_map {
1636 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
1637 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1638 $self->_create_random_map ( 1729 $self->_create_random_map (
1639 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1640 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1641 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1763 1854
1764# the temporary/swap location 1855# the temporary/swap location
1765sub save_path { 1856sub save_path {
1766 my ($self) = @_; 1857 my ($self) = @_;
1767 1858
1768 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1769 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1770} 1861}
1771 1862
1772# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1773sub uniq_path { 1864sub uniq_path {
1774 my ($self) = @_; 1865 my ($self) = @_;
1775 1866
1776 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1777 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1778}
1779
1780# and all this just because we cannot iterate over
1781# all maps in C++...
1782sub change_all_map_light {
1783 my ($change) = @_;
1784
1785 $_->change_map_light ($change)
1786 for grep $_->outdoor, values %cf::MAP;
1787} 1869}
1788 1870
1789sub decay_objects { 1871sub decay_objects {
1790 my ($self) = @_; 1872 my ($self) = @_;
1791 1873
1875sub find { 1957sub find {
1876 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1877 1959
1878 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1879 1961
1880 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1881 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1882 1964
1883 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1884 my $guard1 = cf::lock_acquire "map_find:$path";
1885 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1886
1887 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1888 or return; 1967 or return;
1889 1968
1890 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1891 1970
1893 or return; 1972 or return;
1894 1973
1895 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1896 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
1897 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
1898 undef $guard1; 1978 undef $guard1;
1899 undef $guard2;
1900 $map->reset; 1979 $map->reset;
1901 return find $path; 1980 return find $path;
1902 } 1981 }
1903 1982
1904 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
1931 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
1932 $f->skip_block; 2011 $f->skip_block;
1933 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
1934 or return; 2013 or return;
1935 2014
1936 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
1937 if delete $self->{load_original}; 2016 if delete $self->{load_original};
1938 2017
1939 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
1940 utf8::encode $uniq; 2019 utf8::encode $uniq;
1941 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
1959 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
1960 $self->decay_objects; 2039 $self->decay_objects;
1961 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
1962 $self->update_buttons; 2041 $self->update_buttons;
1963 cf::cede_to_tick; 2042 cf::cede_to_tick;
1964 $self->set_darkness_map;
1965 cf::cede_to_tick;
1966 $self->activate; 2043 $self->activate;
1967 } 2044 }
1968 2045
1969 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
1970 $self->last_access ($cf::RUNTIME); 2047 $self->last_access ($cf::RUNTIME);
1971 2048
1972 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
1973 } 2050 }
1974 2051
1975 $self->post_load; 2052 $self->post_load;
1976} 2053}
1977 2054
2035 my ($path, $origin, $load) = @_; 2112 my ($path, $origin, $load) = @_;
2036 2113
2037 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
2038 2115
2039 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
2040 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2041 } 2118 }
2042 2119
2043 $MAP_PREFETCH{$path} |= $load; 2120 $MAP_PREFETCH{$path} |= $load;
2044 2121
2045 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2082 cf::async { 2159 cf::async {
2083 $Coro::current->{desc} = "map player save"; 2160 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
2085 }; 2162 };
2086 2163
2164 cf::get_slot 0.02;
2165
2087 if ($uniq) { 2166 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2169 } else {
2091 $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);
2099 $self->save; 2178 $self->save;
2100 2179
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2181
2103 return if $self->players; 2182 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2184 return if $self->{deny_save};
2106 2185
2107 $self->in_memory (cf::MAP_SWAPPED); 2186 $self->in_memory (cf::MAP_SWAPPED);
2108 2187
2109 $self->deactivate; 2188 $self->deactivate;
2227 2306
2228sub unique_maps() { 2307sub unique_maps() {
2229 [ 2308 [
2230 map { 2309 map {
2231 utf8::decode $_; 2310 utf8::decode $_;
2232 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2233 ? normalise $_ 2314 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2316 ]
2237} 2317}
2238 2318
2239package cf;
2240
2241=back 2319=back
2242 2320
2243=head3 cf::object 2321=head3 cf::object
2244 2322
2245=cut 2323=cut
2248 2326
2249=over 4 2327=over 4
2250 2328
2251=item $ob->inv_recursive 2329=item $ob->inv_recursive
2252 2330
2253Returns 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.
2254 2333
2255=cut 2334=cut
2256 2335
2257sub inv_recursive_; 2336sub inv_recursive_;
2258sub inv_recursive_ { 2337sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2264} 2343}
2265 2344
2266=item $ref = $ob->ref 2345=item $ref = $ob->ref
2267 2346
2268creates 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.
2269 2348
2270=item $ob = cf::object::deref ($refstring) 2349=item $ob = cf::object::deref ($refstring)
2271 2350
2272returns 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,
2273even if the object actually exists. May block. 2352even if the object actually exists. May block.
2305can 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
2306dialogue with the given NPC character. 2385dialogue with the given NPC character.
2307 2386
2308=cut 2387=cut
2309 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
2310# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2311# with dialog boxes. 2404# with dialog boxes.
2312#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
2313sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2314 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
2325 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2326 $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));
2327 2420
2328 } else { 2421 } else {
2329 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2330 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2331 } 2424 }
2332 } 2425 }
2333} 2426}
2334 2427
2335=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2360 2453
2361=item $player_object->enter_link 2454=item $player_object->enter_link
2362 2455
2363Freezes 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}>).
2364 2457
2365The 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.
2366I<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.
2367 2462
2368Will never block. 2463Will never block.
2369 2464
2370=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2371 2466
2429 2524
2430 $map->load; 2525 $map->load;
2431 $map->load_neighbours; 2526 $map->load_neighbours;
2432 2527
2433 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2434 $self->activate_recursive; 2530 $self->activate_recursive;
2435 2531
2436 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2437 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2438} 2534}
2442Moves 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
2443her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2444that 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
2445the 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
2446be 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 >>.
2447 2546
2448=cut 2547=cut
2449 2548
2450our $GOTOGEN; 2549our $GOTOGEN;
2451 2550
2530} 2629}
2531 2630
2532sub prepare_random_map { 2631sub prepare_random_map {
2533 my ($exit) = @_; 2632 my ($exit) = @_;
2534 2633
2535 my $guard = cf::lock_acquire "exit_prepare:$exit";
2536
2537 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2538 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2539 # that depends on the exit object 2636 # that depends on the exit object
2540 2637
2541 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
2543 if ($exit->map) { 2640 if ($exit->map) {
2544 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2545 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2546 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2547 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2548 } 2647 }
2549 2648
2550 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2551 2650
2552 my $data = cf::to_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2553 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2554 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2555 2654
2556 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2557 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2558 undef $fh; 2657 undef $fh;
2559 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2560 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2561 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2562 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2563 } 2666 }
2564} 2667}
2565 2668
2566sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2567 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2568 2671
2569 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2570 2673
2571 if ($exit->slaying eq "/!") {
2572 #TODO: this should de-fi-ni-te-ly not be a sync-job
2573 # the problem is that $exit might not survive long enough
2574 # so it needs to be done right now, right here
2575 cf::sync_job { prepare_random_map $exit };
2576 }
2577
2578 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2579 my $hp = $exit->stats->hp;
2580 my $sp = $exit->stats->sp;
2581
2582 $self->enter_link; 2674 $self->enter_link;
2583 2675
2584 # if exit is damned, update players death & WoR home-position
2585 $self->contr->savebed ($slaying, $hp, $sp)
2586 if $exit->flag (FLAG_DAMNED);
2587
2588 (async { 2676 (async {
2589 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2677 $Coro::current->{desc} = "enter_exit";
2590 2678
2591 $self->deactivate_recursive; # just to be sure
2592 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
2593 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2594 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
2595 1; 2700 1
2596 }) { 2701 }) {
2597 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2598 . "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. "
2599 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2600 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2601 2706
2602 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
2630the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2631the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2632 2737
2633=cut 2738=cut
2634 2739
2740# non-persistent channels (usually the info channel)
2635our %CHANNEL = ( 2741our %CHANNEL = (
2636 "c/identify" => { 2742 "c/identify" => {
2637 id => "infobox", 2743 id => "infobox",
2638 title => "Identify", 2744 title => "Identify",
2639 reply => undef, 2745 reply => undef,
2643 id => "infobox", 2749 id => "infobox",
2644 title => "Examine", 2750 title => "Examine",
2645 reply => undef, 2751 reply => undef,
2646 tooltip => "Signs and other items you examined", 2752 tooltip => "Signs and other items you examined",
2647 }, 2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2648 "c/lookat" => { 2760 "c/lookat" => {
2649 id => "infobox", 2761 id => "infobox",
2650 title => "Look", 2762 title => "Look",
2651 reply => undef, 2763 reply => undef,
2652 tooltip => "What you saw there", 2764 tooltip => "What you saw there",
2653 }, 2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/uptime" => {
2809 id => "infobox",
2810 title => "Uptime",
2811 reply => undef,
2812 tooltip => "How long the server has been running since last restart",
2813 },
2814 "c/mapinfo" => {
2815 id => "infobox",
2816 title => "Map Info",
2817 reply => undef,
2818 tooltip => "Information related to the maps",
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,
2654); 2834);
2655 2835
2656sub cf::client::send_msg { 2836sub cf::client::send_msg {
2657 my ($self, $channel, $msg, $color, @extra) = @_; 2837 my ($self, $channel, $msg, $color, @extra) = @_;
2658 2838
2659 $msg = $self->pl->expand_cfpod ($msg); 2839 $msg = $self->pl->expand_cfpod ($msg)
2840 unless $color & cf::NDI_VERBATIM;
2660 2841
2661 $color &= cf::NDI_CLIENT_MASK; # just in case... 2842 $color &= cf::NDI_CLIENT_MASK; # just in case...
2662 2843
2663 # check predefined channels, for the benefit of C 2844 # check predefined channels, for the benefit of C
2664 if ($CHANNEL{$channel}) { 2845 if ($CHANNEL{$channel}) {
2665 $channel = $CHANNEL{$channel}; 2846 $channel = $CHANNEL{$channel};
2666 2847
2667 $self->ext_msg (channel_info => $channel) 2848 $self->ext_msg (channel_info => $channel);
2668 if $self->can_msg;
2669
2670 $channel = $channel->{id}; 2849 $channel = $channel->{id};
2671 2850
2672 } elsif (ref $channel) { 2851 } elsif (ref $channel) {
2673 # send meta info to client, if not yet sent 2852 # send meta info to client, if not yet sent
2674 unless (exists $self->{channel}{$channel->{id}}) { 2853 unless (exists $self->{channel}{$channel->{id}}) {
2675 $self->{channel}{$channel->{id}} = $channel; 2854 $self->{channel}{$channel->{id}} = $channel;
2676 $self->ext_msg (channel_info => $channel) 2855 $self->ext_msg (channel_info => $channel);
2677 if $self->can_msg;
2678 } 2856 }
2679 2857
2680 $channel = $channel->{id}; 2858 $channel = $channel->{id};
2681 } 2859 }
2682 2860
2683 return unless @extra || length $msg; 2861 return unless @extra || length $msg;
2684 2862
2685 if ($self->can_msg) {
2686 # default colour, mask it out 2863 # default colour, mask it out
2687 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2688 if $color & cf::NDI_DEF; 2865 if $color & cf::NDI_DEF;
2689 2866
2690 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2867 my $pkt = "msg "
2868 . $self->{json_coder}->encode (
2691 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2869 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2692 } else { 2870 );
2693 if ($color >= 0) {
2694 # replace some tags by gcfclient-compatible ones
2695 for ($msg) {
2696 1 while
2697 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2698 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2699 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2700 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2701 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2702 }
2703 2871
2704 $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};
2705 2875
2706 utf8::encode $msg; 2876 # split very large packets
2707 2877 if (8192 < length $pkt and $self->{can_lzf}) {
2708 if (0 && $msg =~ /\[/) { 2878 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2709 # COMMAND/INFO 2879 $pkt = "frag";
2710 $self->send_packet ("drawextinfo $color 10 8 $msg")
2711 } else {
2712 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2713 $self->send_packet ("drawinfo $color $msg")
2714 }
2715 }
2716 } 2880 }
2881
2882 $self->send_packet ($pkt);
2717} 2883}
2718 2884
2719=item $client->ext_msg ($type, @msg) 2885=item $client->ext_msg ($type, @msg)
2720 2886
2721Sends an ext event to the client. 2887Sends an ext event to the client.
2894=pod 3060=pod
2895 3061
2896The following functions and methods are available within a safe environment: 3062The following functions and methods are available within a safe environment:
2897 3063
2898 cf::object 3064 cf::object
2899 contr pay_amount pay_player map x y force_find force_add 3065 contr pay_amount pay_player map x y force_find force_add destroy
2900 insert remove name archname title slaying race decrease_ob_nr 3066 insert remove name archname title slaying race decrease split
3067 value
2901 3068
2902 cf::object::player 3069 cf::object::player
2903 player 3070 player
2904 3071
2905 cf::player 3072 cf::player
2910 3077
2911=cut 3078=cut
2912 3079
2913for ( 3080for (
2914 ["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
2915 insert remove inv name archname title slaying race 3082 insert remove inv nrof name archname title slaying race
2916 decrease_ob_nr)], 3083 decrease split destroy change_exp value msg lore send_msg)],
2917 ["cf::object::player" => qw(player)], 3084 ["cf::object::player" => qw(player)],
2918 ["cf::player" => qw(peaceful)], 3085 ["cf::player" => qw(peaceful send_msg)],
2919 ["cf::map" => qw(trigger)], 3086 ["cf::map" => qw(trigger)],
2920) { 3087) {
2921 no strict 'refs'; 3088 no strict 'refs';
2922 my ($pkg, @funs) = @$_; 3089 my ($pkg, @funs) = @$_;
2923 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3090 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2940 my ($code, %vars) = @_; 3107 my ($code, %vars) = @_;
2941 3108
2942 my $qcode = $code; 3109 my $qcode = $code;
2943 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3110 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2944 $qcode =~ s/\n/\\n/g; 3111 $qcode =~ s/\n/\\n/g;
3112
3113 %vars = (_dummy => 0) unless %vars;
2945 3114
2946 local $_; 3115 local $_;
2947 local @safe::cf::_safe_eval_args = values %vars; 3116 local @safe::cf::_safe_eval_args = values %vars;
2948 3117
2949 my $eval = 3118 my $eval =
3026 { 3195 {
3027 my $faces = $facedata->{faceinfo}; 3196 my $faces = $facedata->{faceinfo};
3028 3197
3029 while (my ($face, $info) = each %$faces) { 3198 while (my ($face, $info) = each %$faces) {
3030 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3199 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3200
3031 cf::face::set_visibility $idx, $info->{visibility}; 3201 cf::face::set_visibility $idx, $info->{visibility};
3032 cf::face::set_magicmap $idx, $info->{magicmap}; 3202 cf::face::set_magicmap $idx, $info->{magicmap};
3033 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};
3034 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};
3035 3205
3036 cf::cede_to_tick; 3206 cf::cede_to_tick;
3037 } 3207 }
3038 3208
3039 while (my ($face, $info) = each %$faces) { 3209 while (my ($face, $info) = each %$faces) {
3040 next unless $info->{smooth}; 3210 next unless $info->{smooth};
3211
3041 my $idx = cf::face::find $face 3212 my $idx = cf::face::find $face
3042 or next; 3213 or next;
3214
3043 if (my $smooth = cf::face::find $info->{smooth}) { 3215 if (my $smooth = cf::face::find $info->{smooth}) {
3044 cf::face::set_smooth $idx, $smooth; 3216 cf::face::set_smooth $idx, $smooth;
3045 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3217 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3046 } else { 3218 } else {
3047 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3219 warn "smooth face '$info->{smooth}' not found for face '$face'";
3065 { 3237 {
3066 # TODO: for gcfclient pleasure, we should give resources 3238 # TODO: for gcfclient pleasure, we should give resources
3067 # that gcfclient doesn't grok a >10000 face index. 3239 # that gcfclient doesn't grok a >10000 face index.
3068 my $res = $facedata->{resource}; 3240 my $res = $facedata->{resource};
3069 3241
3070 my $soundconf = delete $res->{"res/sound.conf"};
3071
3072 while (my ($name, $info) = each %$res) { 3242 while (my ($name, $info) = each %$res) {
3243 if (defined $info->{type}) {
3073 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3244 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3074 my $data; 3245 my $data;
3075 3246
3076 if ($info->{type} & 1) { 3247 if ($info->{type} & 1) {
3077 # prepend meta info 3248 # prepend meta info
3078 3249
3079 my $meta = $enc->encode ({ 3250 my $meta = $enc->encode ({
3080 name => $name, 3251 name => $name,
3081 %{ $info->{meta} || {} }, 3252 %{ $info->{meta} || {} },
3082 }); 3253 });
3083 3254
3084 $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};
3085 } else { 3262 } else {
3086 $data = $info->{data}; 3263 $RESOURCE{$name} = $info;
3087 } 3264 }
3088 3265
3089 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3090 cf::face::set_type $idx, $info->{type};
3091
3092 cf::cede_to_tick; 3266 cf::cede_to_tick;
3093 } 3267 }
3094
3095 if ($soundconf) {
3096 $soundconf = $enc->decode (delete $soundconf->{data});
3097
3098 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3099 my $sound = $soundconf->{compat}[$_]
3100 or next;
3101
3102 my $face = cf::face::find "sound/$sound->[1]";
3103 cf::sound::set $sound->[0] => $face;
3104 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3105 }
3106
3107 while (my ($k, $v) = each %{$soundconf->{event}}) {
3108 my $face = cf::face::find "sound/$v";
3109 cf::sound::set $k => $face;
3110 }
3111 }
3112 } 3268 }
3269
3270 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3113 3271
3114 1 3272 1
3115} 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});
3116 3294
3117register_exticmd fx_want => sub { 3295register_exticmd fx_want => sub {
3118 my ($ns, $want) = @_; 3296 my ($ns, $want) = @_;
3119 3297
3120 while (my ($k, $v) = each %$want) { 3298 while (my ($k, $v) = each %$want) {
3121 $ns->fx_want ($k, $v); 3299 $ns->fx_want ($k, $v);
3122 } 3300 }
3123}; 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}
3124 3312
3125sub reload_regions { 3313sub reload_regions {
3126 # 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
3127 # for this (global event?) 3315 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = (); 3316 %ext::player_env::MUSIC_FACE_CACHE = ();
3142} 3330}
3143 3331
3144sub reload_archetypes { 3332sub reload_archetypes {
3145 load_resource_file "$DATADIR/archetypes" 3333 load_resource_file "$DATADIR/archetypes"
3146 or die "unable to load archetypes\n"; 3334 or die "unable to load archetypes\n";
3147 #d# NEED to laod twice to resolve forward references
3148 # this really needs to be done in an extra post-pass
3149 # (which needs to be synchronous, so solve it differently)
3150 load_resource_file "$DATADIR/archetypes"
3151 or die "unable to load archetypes\n";
3152} 3335}
3153 3336
3154sub reload_treasures { 3337sub reload_treasures {
3155 load_resource_file "$DATADIR/treasures" 3338 load_resource_file "$DATADIR/treasures"
3156 or die "unable to load treasurelists\n"; 3339 or die "unable to load treasurelists\n";
3157} 3340}
3158 3341
3159sub reload_resources { 3342sub reload_resources {
3160 warn "reloading resource files...\n"; 3343 warn "reloading resource files...\n";
3161 3344
3345 reload_facedata;
3346 reload_archetypes;
3162 reload_regions; 3347 reload_regions;
3163 reload_facedata;
3164 #reload_archetypes;#d#
3165 reload_archetypes;
3166 reload_treasures; 3348 reload_treasures;
3167 3349
3168 warn "finished reloading resource files\n"; 3350 warn "finished reloading resource files\n";
3169}
3170
3171sub init {
3172 reload_resources;
3173} 3351}
3174 3352
3175sub reload_config { 3353sub reload_config {
3176 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
3177 or return; 3355 or return;
3178 3356
3179 local $/; 3357 local $/;
3180 *CFG = YAML::Syck::Load <$fh>; 3358 *CFG = YAML::Load <$fh>;
3181 3359
3182 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3183 3361
3184 $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};
3185 $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};
3191 }; 3369 };
3192 warn $@ if $@; 3370 warn $@ if $@;
3193 } 3371 }
3194} 3372}
3195 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
3196sub 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
3197 # we must not ever block the main coroutine 3408 # we must not ever block the main coroutine
3198 local $Coro::idle = sub { 3409 local $Coro::idle = sub {
3199 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#
3200 (async { 3411 (async {
3201 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3412 $Coro::current->{desc} = "IDLE BUG HANDLER";
3202 Event::one_event; 3413 EV::loop EV::LOOP_ONESHOT;
3203 })->prio (Coro::PRIO_MAX); 3414 })->prio (Coro::PRIO_MAX);
3204 }; 3415 };
3205 3416
3417 evthread_start IO::AIO::poll_fileno;
3418
3419 cf::sync_job {
3420 reload_resources;
3206 reload_config; 3421 reload_config;
3207 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
3208 load_extensions; 3435 load_extensions;
3209 3436
3210 $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
3211 Event::loop; 3445 EV::loop;
3212} 3446}
3213 3447
3214############################################################################# 3448#############################################################################
3215# initialisation and cleanup 3449# initialisation and cleanup
3216 3450
3217# install some emergency cleanup handlers 3451# install some emergency cleanup handlers
3218BEGIN { 3452BEGIN {
3453 our %SIGWATCHER = ();
3219 for my $signal (qw(INT HUP TERM)) { 3454 for my $signal (qw(INT HUP TERM)) {
3220 Event->signal ( 3455 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3221 reentrant => 0,
3222 data => WF_AUTOCANCEL,
3223 signal => $signal,
3224 prio => 0,
3225 cb => sub {
3226 cf::cleanup "SIG$signal"; 3456 cf::cleanup "SIG$signal";
3227 },
3228 ); 3457 };
3229 } 3458 }
3230} 3459}
3231 3460
3232sub write_runtime { 3461sub write_runtime_sync {
3233 my $runtime = "$LOCALDIR/runtime";
3234
3235 # first touch the runtime file to show we are still running: 3462 # first touch the runtime file to show we are still running:
3236 # the fsync below can take a very very long time. 3463 # the fsync below can take a very very long time.
3237 3464
3238 IO::AIO::aio_utime $runtime, undef, undef; 3465 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3239 3466
3240 my $guard = cf::lock_acquire "write_runtime"; 3467 my $guard = cf::lock_acquire "write_runtime";
3241 3468
3242 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3469 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3243 or return; 3470 or return;
3244 3471
3245 my $value = $cf::RUNTIME + 90 + 10; 3472 my $value = $cf::RUNTIME + 90 + 10;
3246 # 10 is the runtime save interval, for a monotonic clock 3473 # 10 is the runtime save interval, for a monotonic clock
3247 # 60 allows for the watchdog to kill the server. 3474 # 60 allows for the watchdog to kill the server.
3257 aio_utime $fh, undef, undef; 3484 aio_utime $fh, undef, undef;
3258 3485
3259 close $fh 3486 close $fh
3260 or return; 3487 or return;
3261 3488
3262 aio_rename "$runtime~", $runtime 3489 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3263 and return; 3490 and return;
3264 3491
3265 warn "runtime file written.\n"; 3492 warn "runtime file written.\n";
3266 3493
3267 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 };
3268} 3545}
3269 3546
3270sub emergency_save() { 3547sub emergency_save() {
3271 my $freeze_guard = cf::freeze_mainloop; 3548 my $freeze_guard = cf::freeze_mainloop;
3272 3549
3273 warn "enter emergency perl save\n"; 3550 warn "emergency_perl_save: enter\n";
3274 3551
3275 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
3276 # use a peculiar iteration method to avoid tripping on perl 3558 # use a peculiar iteration method to avoid tripping on perl
3277 # refcount bugs in for. also avoids problems with players 3559 # refcount bugs in for. also avoids problems with players
3278 # and maps saved/destroyed asynchronously. 3560 # and maps saved/destroyed asynchronously.
3279 warn "begin emergency player save\n"; 3561 warn "emergency_perl_save: begin player save\n";
3280 for my $login (keys %cf::PLAYER) { 3562 for my $login (keys %cf::PLAYER) {
3281 my $pl = $cf::PLAYER{$login} or next; 3563 my $pl = $cf::PLAYER{$login} or next;
3282 $pl->valid or next; 3564 $pl->valid or next;
3565 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3283 $pl->save; 3566 $pl->save;
3284 } 3567 }
3285 warn "end emergency player save\n"; 3568 warn "emergency_perl_save: end player save\n";
3286 3569
3287 warn "begin emergency map save\n"; 3570 warn "emergency_perl_save: begin map save\n";
3288 for my $path (keys %cf::MAP) { 3571 for my $path (keys %cf::MAP) {
3289 my $map = $cf::MAP{$path} or next; 3572 my $map = $cf::MAP{$path} or next;
3290 $map->valid or next; 3573 $map->valid or next;
3291 $map->save; 3574 $map->save;
3292 } 3575 }
3293 warn "end emergency map save\n"; 3576 warn "emergency_perl_save: end map save\n";
3294 3577
3295 warn "begin emergency database checkpoint\n"; 3578 warn "emergency_perl_save: begin database checkpoint\n";
3296 BDB::db_env_txn_checkpoint $DB_ENV; 3579 BDB::db_env_txn_checkpoint $DB_ENV;
3297 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";
3298 }; 3585 };
3299 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
3300 warn "leave emergency perl save\n"; 3592 warn "emergency_perl_save: leave\n";
3301} 3593}
3302 3594
3303sub post_cleanup { 3595sub post_cleanup {
3304 my ($make_core) = @_; 3596 my ($make_core) = @_;
3305 3597
3306 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3307 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#
3308} 3629}
3309 3630
3310sub do_reload_perl() { 3631sub do_reload_perl() {
3311 # can/must only be called in main 3632 # can/must only be called in main
3312 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3313 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3314 return; 3635 return;
3315 } 3636 }
3316 3637
3638 return if $RELOAD++;
3639
3640 my $t1 = EV::time;
3641
3642 while ($RELOAD) {
3317 warn "reloading..."; 3643 warn "reloading...";
3318 3644
3319 warn "entering sync_job"; 3645 warn "entering sync_job";
3320 3646
3321 cf::sync_job { 3647 cf::sync_job {
3322 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3323 cf::emergency_save; 3649 cf::emergency_save;
3324 cf::write_runtime; # external watchdog should not bark 3650 cf::write_runtime_sync; # external watchdog should not bark
3325 3651
3326 warn "syncing database to disk"; 3652 warn "syncing database to disk";
3327 BDB::db_env_txn_checkpoint $DB_ENV; 3653 BDB::db_env_txn_checkpoint $DB_ENV;
3328 3654
3329 # 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
3330 3656
3331 warn "cancelling all WF_AUTOCANCEL watchers";
3332 for (Event::all_watchers) {
3333 $_->cancel if $_->data & WF_AUTOCANCEL;
3334 }
3335
3336 warn "flushing outstanding aio requests"; 3657 warn "flushing outstanding aio requests";
3337 for (;;) {
3338 BDB::flush;
3339 IO::AIO::flush;
3340 Coro::cede;
3341 last unless IO::AIO::nreqs || BDB::nreqs; 3658 while (IO::AIO::nreqs || BDB::nreqs) {
3342 warn "iterate..."; 3659 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3343 }
3344
3345 ++$RELOAD;
3346
3347 warn "cancelling all extension coros";
3348 $_->cancel for values %EXT_CORO;
3349 %EXT_CORO = ();
3350
3351 warn "removing commands";
3352 %COMMAND = ();
3353
3354 warn "removing ext/exti commands";
3355 %EXTCMD = ();
3356 %EXTICMD = ();
3357
3358 warn "unloading/nuking all extensions";
3359 for my $pkg (@EXTS) {
3360 warn "... unloading $pkg";
3361
3362 if (my $cb = $pkg->can ("unload")) {
3363 eval {
3364 $cb->($pkg);
3365 1
3366 } or warn "$pkg unloaded, but with errors: $@";
3367 } 3660 }
3368 3661
3369 warn "... nuking $pkg"; 3662 warn "cancelling all extension coros";
3370 Symbol::delete_package $pkg; 3663 $_->cancel for values %EXT_CORO;
3371 } 3664 %EXT_CORO = ();
3372 3665
3373 warn "unloading all perl modules loaded from $LIBDIR"; 3666 warn "removing commands";
3374 while (my ($k, $v) = each %INC) { 3667 %COMMAND = ();
3375 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3376 3668
3669 warn "removing ext/exti commands";
3670 %EXTCMD = ();
3671 %EXTICMD = ();
3672
3673 warn "unloading/nuking all extensions";
3674 for my $pkg (@EXTS) {
3377 warn "... unloading $k"; 3675 warn "... unloading $pkg";
3378 delete $INC{$k};
3379 3676
3380 $k =~ s/\.pm$//;
3381 $k =~ s/\//::/g;
3382
3383 if (my $cb = $k->can ("unload_module")) { 3677 if (my $cb = $pkg->can ("unload")) {
3678 eval {
3384 $cb->(); 3679 $cb->($pkg);
3680 1
3681 } or warn "$pkg unloaded, but with errors: $@";
3682 }
3683
3684 warn "... clearing $pkg";
3685 clear_package $pkg;
3385 } 3686 }
3386 3687
3387 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;
3388 } 3703 }
3389 3704
3390 warn "getting rid of safe::, as good as possible"; 3705 warn "getting rid of safe::, as good as possible";
3391 Symbol::delete_package "safe::$_" 3706 clear_package "safe::$_"
3392 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);
3393 3708
3394 warn "unloading cf.pm \"a bit\""; 3709 warn "unloading cf.pm \"a bit\"";
3395 delete $INC{"cf.pm"}; 3710 delete $INC{"cf.pm"};
3396 delete $INC{"cf/pod.pm"}; 3711 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3397 3712
3398 # don't, removes xs symbols, too, 3713 # don't, removes xs symbols, too,
3399 # and global variables created in xs 3714 # and global variables created in xs
3400 #Symbol::delete_package __PACKAGE__; 3715 #clear_package __PACKAGE__;
3401 3716
3402 warn "unload completed, starting to reload now"; 3717 warn "unload completed, starting to reload now";
3403 3718
3404 warn "reloading cf.pm"; 3719 warn "reloading cf.pm";
3405 require cf; 3720 require cf;
3406 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3721 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3407 3722
3408 warn "loading config and database again"; 3723 warn "loading config and database again";
3409 cf::reload_config; 3724 cf::reload_config;
3410 3725
3411 warn "loading extensions"; 3726 warn "loading extensions";
3412 cf::load_extensions; 3727 cf::load_extensions;
3413 3728
3729 if ($REATTACH_ON_RELOAD) {
3414 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3415 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3416 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3417 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3418 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3419 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3736 }
3420 3737
3738 warn "running post_init jobs";
3739 (pop @POST_INIT)->(1) while @POST_INIT;
3740
3421 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3422 3742
3423 1 3743 1
3424 } or do { 3744 } or do {
3425 warn $@; 3745 warn $@;
3426 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3427 exit 1;
3428 }; 3747 };
3429 3748
3430 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3752
3753 $t1 = EV::time - $t1;
3754 warn "reload completed in ${t1}s\n";
3431}; 3755};
3432 3756
3433our $RELOAD_WATCHER; # used only during reload 3757our $RELOAD_WATCHER; # used only during reload
3434 3758
3435sub reload_perl() { 3759sub reload_perl() {
3436 # doing reload synchronously and two reloads happen back-to-back, 3760 # doing reload synchronously and two reloads happen back-to-back,
3437 # coro crashes during coro_state_free->destroy here. 3761 # coro crashes during coro_state_free->destroy here.
3438 3762
3439 $RELOAD_WATCHER ||= Event->timer ( 3763 $RELOAD_WATCHER ||= cf::async {
3440 reentrant => 0, 3764 Coro::AIO::aio_wait cache_extensions;
3441 after => 0, 3765
3442 data => WF_AUTOCANCEL, 3766 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3443 cb => sub {
3444 do_reload_perl; 3767 do_reload_perl;
3445 undef $RELOAD_WATCHER; 3768 undef $RELOAD_WATCHER;
3446 }, 3769 };
3447 ); 3770 };
3448} 3771}
3449 3772
3450register_command "reload" => sub { 3773register_command "reload" => sub {
3451 my ($who, $arg) = @_; 3774 my ($who, $arg) = @_;
3452 3775
3465 3788
3466our @WAIT_FOR_TICK; 3789our @WAIT_FOR_TICK;
3467our @WAIT_FOR_TICK_BEGIN; 3790our @WAIT_FOR_TICK_BEGIN;
3468 3791
3469sub wait_for_tick { 3792sub wait_for_tick {
3470 return unless $TICK_WATCHER->is_active;
3471 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3472 3794
3473 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3474 push @WAIT_FOR_TICK, $signal; 3796 push @WAIT_FOR_TICK, $signal;
3475 $signal->wait; 3797 $signal->wait;
3476} 3798}
3477 3799
3478sub wait_for_tick_begin { 3800sub wait_for_tick_begin {
3479 return unless $TICK_WATCHER->is_active;
3480 return if $Coro::current == $Coro::main; 3801 return if tick_inhibit || $Coro::current == $Coro::main;
3481 3802
3482 my $signal = new Coro::Signal; 3803 my $signal = new Coro::Signal;
3483 push @WAIT_FOR_TICK_BEGIN, $signal; 3804 push @WAIT_FOR_TICK_BEGIN, $signal;
3484 $signal->wait; 3805 $signal->wait;
3485} 3806}
3486 3807
3487$TICK_WATCHER = Event->timer ( 3808sub tick {
3488 reentrant => 0,
3489 parked => 1,
3490 prio => 0,
3491 at => $NEXT_TICK || $TICK,
3492 data => WF_AUTOCANCEL,
3493 cb => sub {
3494 if ($Coro::current != $Coro::main) { 3809 if ($Coro::current != $Coro::main) {
3495 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"
3496 unless ++$bug_warning > 10; 3811 unless ++$bug_warning > 10;
3497 return; 3812 return;
3498 } 3813 }
3499 3814
3500 $NOW = $tick_start = Event::time;
3501
3502 cf::server_tick; # one server iteration 3815 cf::server_tick; # one server iteration
3503 3816
3504 $RUNTIME += $TICK;
3505 $NEXT_TICK += $TICK;
3506
3507 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3817 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3508 $NEXT_RUNTIME_WRITE = $NOW + 10; 3818 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3509 Coro::async_pool { 3819 Coro::async_pool {
3510 $Coro::current->{desc} = "runtime saver"; 3820 $Coro::current->{desc} = "runtime saver";
3511 write_runtime 3821 write_runtime_sync
3512 or warn "ERROR: unable to write runtime file: $!"; 3822 or warn "ERROR: unable to write runtime file: $!";
3513 };
3514 } 3823 };
3824 }
3515 3825
3516 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3826 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3517 $sig->send; 3827 $sig->send;
3518 } 3828 }
3519 while (my $sig = shift @WAIT_FOR_TICK) { 3829 while (my $sig = shift @WAIT_FOR_TICK) {
3520 $sig->send; 3830 $sig->send;
3521 } 3831 }
3522 3832
3523 $NOW = Event::time; 3833 $LOAD = ($NOW - $TICK_START) / $TICK;
3524
3525 # if we are delayed by four ticks or more, skip them all
3526 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3527
3528 $TICK_WATCHER->at ($NEXT_TICK);
3529 $TICK_WATCHER->start;
3530
3531 $LOAD = ($NOW - $tick_start) / $TICK;
3532 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3834 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3533 3835
3534 _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 }
3535 }, 3842 }
3536); 3843}
3537 3844
3538{ 3845{
3846 # configure BDB
3847
3539 BDB::min_parallel 8; 3848 BDB::min_parallel 8;
3540 BDB::max_poll_time $TICK * 0.1; 3849 BDB::max_poll_reqs $TICK * 0.1;
3541 $BDB_POLL_WATCHER = Event->io ( 3850 $AnyEvent::BDB::WATCHER->priority (1);
3542 reentrant => 0,
3543 fd => BDB::poll_fileno,
3544 poll => 'r',
3545 prio => 0,
3546 data => WF_AUTOCANCEL,
3547 cb => \&BDB::poll_cb,
3548 );
3549
3550 BDB::set_sync_prepare {
3551 my $status;
3552 my $current = $Coro::current;
3553 (
3554 sub {
3555 $status = $!;
3556 $current->ready; undef $current;
3557 },
3558 sub {
3559 Coro::schedule while defined $current;
3560 $! = $status;
3561 },
3562 )
3563 };
3564 3851
3565 unless ($DB_ENV) { 3852 unless ($DB_ENV) {
3566 $DB_ENV = BDB::db_env_create; 3853 $DB_ENV = BDB::db_env_create;
3567 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3854 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3568 | 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;
3569 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3857 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3570 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3858 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3571 3859
3572 cf::sync_job { 3860 cf::sync_job {
3573 eval { 3861 eval {
3583 3871
3584 cf::cleanup "db_env_open(db): $@" if $@; 3872 cf::cleanup "db_env_open(db): $@" if $@;
3585 }; 3873 };
3586 } 3874 }
3587 3875
3588 $BDB_DEADLOCK_WATCHER = Event->timer ( 3876 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3589 after => 3,
3590 interval => 1,
3591 hard => 1,
3592 prio => 0,
3593 data => WF_AUTOCANCEL,
3594 cb => sub {
3595 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3877 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3596 },
3597 ); 3878 };
3598 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3879 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3599 after => 11,
3600 interval => 60,
3601 hard => 1,
3602 prio => 0,
3603 data => WF_AUTOCANCEL,
3604 cb => sub {
3605 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3880 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3606 },
3607 ); 3881 };
3608 $BDB_TRICKLE_WATCHER = Event->timer ( 3882 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3609 after => 5,
3610 interval => 10,
3611 hard => 1,
3612 prio => 0,
3613 data => WF_AUTOCANCEL,
3614 cb => sub {
3615 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3883 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3616 },
3617 ); 3884 };
3618} 3885}
3619 3886
3620{ 3887{
3888 # configure IO::AIO
3889
3621 IO::AIO::min_parallel 8; 3890 IO::AIO::min_parallel 8;
3622
3623 undef $Coro::AIO::WATCHER;
3624 IO::AIO::max_poll_time $TICK * 0.1; 3891 IO::AIO::max_poll_time $TICK * 0.1;
3625 $AIO_POLL_WATCHER = Event->io ( 3892 undef $AnyEvent::AIO::WATCHER;
3626 reentrant => 0,
3627 data => WF_AUTOCANCEL,
3628 fd => IO::AIO::poll_fileno,
3629 poll => 'r',
3630 prio => 0,
3631 cb => \&IO::AIO::poll_cb,
3632 );
3633} 3893}
3634 3894
3635my $_log_backtrace; 3895my $_log_backtrace;
3636 3896
3637sub _log_backtrace { 3897sub _log_backtrace {
3640 $msg =~ s/\n//; 3900 $msg =~ s/\n//;
3641 3901
3642 # limit the # of concurrent backtraces 3902 # limit the # of concurrent backtraces
3643 if ($_log_backtrace < 2) { 3903 if ($_log_backtrace < 2) {
3644 ++$_log_backtrace; 3904 ++$_log_backtrace;
3905 my $perl_bt = Carp::longmess $msg;
3645 async { 3906 async {
3646 $Coro::current->{desc} = "abt $msg"; 3907 $Coro::current->{desc} = "abt $msg";
3647 3908
3648 my @bt = fork_call { 3909 my @bt = fork_call {
3649 @addr = map { sprintf "%x", $_ } @addr; 3910 @addr = map { sprintf "%x", $_ } @addr;
3660 } 3921 }
3661 3922
3662 @funcs 3923 @funcs
3663 }; 3924 };
3664 3925
3665 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $perl_bt\n";
3927 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3666 LOG llevInfo, "[ABT] $_\n" for @bt; 3928 LOG llevInfo, "[ABT] $_\n" for @bt;
3667 --$_log_backtrace; 3929 --$_log_backtrace;
3668 }; 3930 };
3669 } else { 3931 } else {
3670 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $msg\n";
3671 LOG llevInfo, "[ABT] [suppressed]\n"; 3933 LOG llevInfo, "[ABT] [suppressed]\n";
3672 } 3934 }
3673} 3935}
3674 3936
3675# load additional modules 3937# load additional modules
3676use cf::pod; 3938require "cf/$_.pm" for @EXTRA_MODULES;
3677 3939
3678END { cf::emergency_save } 3940END { cf::emergency_save }
3679 3941
36801 39421
3681 3943

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines