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.374 by root, Wed Sep 19 22:07:16 2007 UTC vs.
Revision 1.464 by root, Thu Jan 1 18:35:48 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "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 off
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
90our %CFG; 117our %CFG;
91 118
92our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 120our $RUNTIME;
121our $NOW;
94 122
95our (%PLAYER, %PLAYER_LOADING); # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 124our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
98 126
99# used to convert map paths into valid unix filenames by replacing / by ∕ 127# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 129
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
105 138
106binmode STDOUT; 139binmode STDOUT;
107binmode STDERR; 140binmode STDERR;
108 141
109# read virtual server time, if available 142# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
114} 147}
115 148
116mkdir $_ 149mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 195
163The raw value load value from the last tick. 196The raw value load value from the last tick.
164 197
165=item %cf::CFG 198=item %cf::CFG
166 199
167Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 201from wherever your confdir points to.
169 202
170=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
171 204
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 205These 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; 226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 227
195 LOG llevError, $msg; 228 LOG llevError, $msg;
196 }; 229 };
197} 230}
231
232$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "=="
234
235 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d#
238 }#d#
239
240 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate
243};
244
245$SIG{__DIE__} = sub { }; #d#?
198 246
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 257for my $pkg (qw(
210 cf::global cf::attachable 258 cf::global cf::attachable
211 cf::object cf::object::player 259 cf::object cf::object::player
212 cf::client cf::player 260 cf::client cf::player
213 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
214 cf::map cf::party cf::region 263 cf::party cf::region
215)) { 264)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 266}
219 267
220$Event::DIED = sub { 268$EV::DIED = sub {
221 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
222}; 270};
223 271
224############################################################################# 272#############################################################################
225 273
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 297 $d
250 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
251} 299}
252 300
253=item $ref = cf::from_json $json 301=item $ref = cf::decode_json $json
254 302
255Converts a JSON string into the corresponding perl data structure. 303Converts a JSON string into the corresponding perl data structure.
256 304
257=item $json = cf::to_json $ref 305=item $json = cf::encode_json $ref
258 306
259Converts a perl data structure into its JSON representation. 307Converts a perl data structure into its JSON representation.
260 308
261=cut 309=cut
262 310
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 312
265sub to_json ($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
267 329
268=item cf::lock_wait $string 330=item cf::lock_wait $string
269 331
270Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
271 333
272=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
273 335
274Wait until the given lock is available and then acquires it and returns 336Wait 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, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
277returned. 339returned.
278 340
279Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 342deadlocked coro.
286 348
287Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
288 350
289=cut 351=cut
290 352
291our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 354
294sub lock_wait($) { 355sub lock_wait($) {
295 my ($key) = @_; 356 $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} 357}
308 358
309sub lock_acquire($) { 359sub lock_acquire($) {
310 my ($key) = @_; 360 $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} 361}
324 362
325sub lock_active($) { 363sub lock_active($) {
326 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 365}
330 366
331sub freeze_mainloop { 367sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
333 369
334 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 371}
336 }; 372
337 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
338 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
339} 386}
340 387
341=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
342 389
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
373 } 420 }
374 } 421 }
375 } 422 }
376 423
377 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait; 427 $signal->wait;
381 } else { 428 } else {
382 Coro::schedule; 429 Coro::schedule;
383 } 430 }
384 } 431 }
385}; 432};
386 433
387sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
388 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
389 438
390 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
392 441
406 455
407BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
408 457
409=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
410 459
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 461is 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 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 463acceptable.
415 464
416If it must be done, put the blocking parts into C<sync_job>. This will run 465If 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 466the given BLOCK in another coroutine while waiting for the result. The
422 471
423sub sync_job(&) { 472sub sync_job(&) {
424 my ($job) = @_; 473 my ($job) = @_;
425 474
426 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 476 my $time = EV::time;
428 477
429 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
431 480
432 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 482
434 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
435 484
436 my $busy = 1; 485 my $busy = 1;
437 my @res; 486 my @res;
438 487
442 warn $@ if $@; 491 warn $@ if $@;
443 undef $busy; 492 undef $busy;
444 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
445 494
446 while ($busy) { 495 while ($busy) {
447 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
448 } 500 }
501 }
449 502
450 $time = Event::time - $time; 503 my $time = EV::time - $time;
451 504
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
456 506
457 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
458 } else { 508 } else {
459 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
460 510
485=item fork_call { }, $args 535=item fork_call { }, $args
486 536
487Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
491 541
492=cut 542=cut
493 543
494sub fork_call(&@) { 544sub fork_call(&@) {
495 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
502 reset_signals; 552 reset_signals;
503 &$cb 553 &$cb
504 }, @args; 554 }, @args;
505 555
506 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
507} 584}
508 585
509=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
510 587
511Returns a single value from the environment database. 588Returns a single value from the environment database.
650 727
651############################################################################# 728#############################################################################
652 729
653=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
654 731
655Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
656attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
658 735
659In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
660C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
661Crossfire TRT). 738Deliantra).
662 739
663=over 4 740=over 4
664 741
665=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
666 743
710=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
711 788
712Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
713given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
714 791
715Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
716that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
717 794
718These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
719 796
720=over 4 797=over 4
948 } 1025 }
949 1026
950 0 1027 0
951} 1028}
952 1029
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1031
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1033
957Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
958 1035
964 1041
965=cut 1042=cut
966 1043
967############################################################################# 1044#############################################################################
968# object support 1045# object support
969#
970 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
971sub _can_merge { 1080sub _can_merge {
972 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
973 1082
974 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1084
978 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
979} 1087}
980 1088
981sub reattach { 1089sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1091 my ($obj) = @_;
984 1092
1093 # no longer needed after getting rid of delete_package?
985 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
986 1095
987 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
988 1097
989 @$registry = (); 1098 @$registry = ();
990 1099
1005cf::attachable->attach ( 1114cf::attachable->attach (
1006 prio => -1000000, 1115 prio => -1000000,
1007 on_instantiate => sub { 1116 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1009 1118
1010 $data = from_json $data; 1119 $data = decode_json $data;
1011 1120
1012 for (@$data) { 1121 for (@$data) {
1013 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1014 1123
1015 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1036 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1039 1148
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1044 close $fh; 1153 aio_close $fh;
1045 1154
1046 if (@$objs) { 1155 if (@$objs) {
1047 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1048 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1051 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1052 close $fh; 1161 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1163 }
1055 } else { 1164 } else {
1056 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1057 } 1166 }
1058 1167
1059 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1060 } else { 1172 } else {
1061 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1062 } 1174 }
1063 } else { 1175 } else {
1064 aio_unlink $filename; 1176 aio_unlink $filename;
1065 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1066 } 1178 }
1085 1197
1086 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1200 or return;
1089 1201
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1091 } 1204 }
1092 1205
1093 utf8::decode (my $decname = $filename); 1206 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1156 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1157 1270
1158 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1159} 1272}
1160 1273
1274use File::Glob ();
1275
1161cf::player->attach ( 1276cf::player->attach (
1162 on_command => sub { 1277 on_command => sub {
1163 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1164 1279
1165 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1197 1312
1198 cf::override; 1313 cf::override;
1199 }, 1314 },
1200); 1315);
1201 1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1329
1202sub load_extensions { 1330sub load_extensions {
1203 cf::sync_job { 1331 cf::sync_job {
1204 my %todo; 1332 my %todo;
1205 1333
1206 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
1225 1353
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1356
1229 $ext{source} = 1357 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1231 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1232 . $source 1360 . $source
1233 . "\n};\n1"; 1361 . "\n};\n1";
1234 1362
1235 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1251 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1252 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1253 1381
1254 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1255 warn $msg; 1383 warn $msg;
1256 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1257 exit 1;
1258 } 1385 }
1259 1386
1260 warn $msg; 1387 warn $msg;
1261 } 1388 }
1262 1389
1276 1403
1277=back 1404=back
1278 1405
1279=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1280 1407
1281Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1282 1409
1283=cut 1410=cut
1284 1411
1285package cf::player; 1412package cf::player;
1286 1413
1329 1456
1330sub exists($) { 1457sub exists($) {
1331 my ($login) = @_; 1458 my ($login) = @_;
1332 1459
1333 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1334 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1335} 1462}
1336 1463
1337sub find($) { 1464sub find($) {
1338 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1339 my $login = $_[0]; 1466 my $login = $_[0];
1351 my $f = new_from_file cf::object::thawer path $login 1478 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1479 or return;
1353 1480
1354 my $pl = cf::player::load_pl $f 1481 my $pl = cf::player::load_pl $f
1355 or return; 1482 or return;
1483
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1484 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1485 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1359 } 1487 }
1360 } 1488 }
1370 1498
1371 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1372 1500
1373 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1503
1504 cf::get_slot 0.01;
1375 1505
1376 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1507 cf::cede_to_tick;
1378} 1508}
1379 1509
1411 my ($pl) = @_; 1541 my ($pl) = @_;
1412 1542
1413 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1414 1544
1415 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1416 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1417 1547
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1419 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1421 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1422 1554
1423 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1463 1595
1464 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1465 my $path = path $login; 1597 my $path = path $login;
1466 1598
1467 # a .pst is a dead give-away for a valid player 1599 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1605 }
1473 1606
1504 } 1637 }
1505 1638
1506 \@paths 1639 \@paths
1507} 1640}
1508 1641
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1510 1643
1511Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559 1645
1560=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1561 1647
1562Sends an ext reply to the player. 1648Sends an ext reply to the player.
1563 1649
1630our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1632 1718
1633sub generate_random_map { 1719sub generate_random_map {
1634 my ($self, $rmp) = @_; 1720 my ($self, $rmp) = @_;
1721
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723
1635 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1636 $self->_create_random_map ( 1725 $self->_create_random_map (
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 1850
1762# the temporary/swap location 1851# the temporary/swap location
1763sub save_path { 1852sub save_path {
1764 my ($self) = @_; 1853 my ($self) = @_;
1765 1854
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1768} 1857}
1769 1858
1770# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1771sub uniq_path { 1860sub uniq_path {
1772 my ($self) = @_; 1861 my ($self) = @_;
1773 1862
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1776}
1777
1778# and all this just because we cannot iterate over
1779# all maps in C++...
1780sub change_all_map_light {
1781 my ($change) = @_;
1782
1783 $_->change_map_light ($change)
1784 for grep $_->outdoor, values %cf::MAP;
1785} 1865}
1786 1866
1787sub decay_objects { 1867sub decay_objects {
1788 my ($self) = @_; 1868 my ($self) = @_;
1789 1869
1873sub find { 1953sub find {
1874 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1875 1955
1876 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1877 1957
1878 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1880 1960
1881 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1885 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1886 or return; 1963 or return;
1887 1964
1888 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1889 1966
1891 or return; 1968 or return;
1892 1969
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1896 undef $guard1; 1974 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 1975 $map->reset;
1899 return find $path; 1976 return find $path;
1900 } 1977 }
1901 1978
1902 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2007 $f->skip_block;
1931 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
1932 or return; 2009 or return;
1933 2010
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1935 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1936 2013
1937 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2015 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
1957 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1958 $self->decay_objects; 2035 $self->decay_objects;
1959 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1960 $self->update_buttons; 2037 $self->update_buttons;
1961 cf::cede_to_tick; 2038 cf::cede_to_tick;
1962 $self->set_darkness_map;
1963 cf::cede_to_tick;
1964 $self->activate; 2039 $self->activate;
1965 } 2040 }
1966 2041
1967 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2043 $self->last_access ($cf::RUNTIME);
1969 2044
1970 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
1971 } 2046 }
1972 2047
1973 $self->post_load; 2048 $self->post_load;
1974} 2049}
1975 2050
2033 my ($path, $origin, $load) = @_; 2108 my ($path, $origin, $load) = @_;
2034 2109
2035 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
2036 2111
2037 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2039 } 2114 }
2040 2115
2041 $MAP_PREFETCH{$path} |= $load; 2116 $MAP_PREFETCH{$path} |= $load;
2042 2117
2043 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2080 cf::async { 2155 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2156 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
2083 }; 2158 };
2084 2159
2160 cf::get_slot 0.02;
2161
2085 if ($uniq) { 2162 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2165 } else {
2089 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2097 $self->save; 2174 $self->save;
2098 2175
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2177
2101 return if $self->players; 2178 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
2103 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2104 2181
2105 $self->in_memory (cf::MAP_SWAPPED); 2182 $self->in_memory (cf::MAP_SWAPPED);
2106 2183
2107 $self->deactivate; 2184 $self->deactivate;
2225 2302
2226sub unique_maps() { 2303sub unique_maps() {
2227 [ 2304 [
2228 map { 2305 map {
2229 utf8::decode $_; 2306 utf8::decode $_;
2230 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
2231 ? normalise $_ 2310 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2312 ]
2235} 2313}
2236 2314
2237package cf;
2238
2239=back 2315=back
2240 2316
2241=head3 cf::object 2317=head3 cf::object
2242 2318
2243=cut 2319=cut
2246 2322
2247=over 4 2323=over 4
2248 2324
2249=item $ob->inv_recursive 2325=item $ob->inv_recursive
2250 2326
2251Returns the inventory of the object _and_ their inventories, recursively. 2327Returns the inventory of the object I<and> their inventories, recursively,
2328but I<not> the object itself.
2252 2329
2253=cut 2330=cut
2254 2331
2255sub inv_recursive_; 2332sub inv_recursive_;
2256sub inv_recursive_ { 2333sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2262} 2339}
2263 2340
2264=item $ref = $ob->ref 2341=item $ref = $ob->ref
2265 2342
2266creates and returns a persistent reference to an objetc that can be stored as a string. 2343Creates and returns a persistent reference to an object that can be stored as a string.
2267 2344
2268=item $ob = cf::object::deref ($refstring) 2345=item $ob = cf::object::deref ($refstring)
2269 2346
2270returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2271even if the object actually exists. May block. 2348even if the object actually exists. May block.
2273=cut 2350=cut
2274 2351
2275sub deref { 2352sub deref {
2276 my ($ref) = @_; 2353 my ($ref) = @_;
2277 2354
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2356 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2358 or return;
2285 $pl->ob->uuid eq $uuid 2359 $pl->ob->uuid eq $uuid
2286 or return; 2360 or return;
2306can be C<undef>. Does the right thing when the player is currently in a 2380can be C<undef>. Does the right thing when the player is currently in a
2307dialogue with the given NPC character. 2381dialogue with the given NPC character.
2308 2382
2309=cut 2383=cut
2310 2384
2385our $SAY_CHANNEL = {
2386 id => "say",
2387 title => "Map",
2388 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2390};
2391
2392our $CHAT_CHANNEL = {
2393 id => "chat",
2394 title => "Chat",
2395 reply => "chat ",
2396 tooltip => "Player chat and shouts, global to the server.",
2397};
2398
2311# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2400# with dialog boxes.
2313#TODO: the first argument must go, split into a $npc->reply_to ( method 2401#TODO: the first argument must go, split into a $npc->reply_to ( method
2314sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2403 my ($self, $npc, $msg, $flags) = @_;
2326 my $dialog = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2328 2416
2329 } else { 2417 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2420 }
2333 } 2421 }
2334} 2422}
2335 2423
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2361 2449
2362=item $player_object->enter_link 2450=item $player_object->enter_link
2363 2451
2364Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2365 2453
2366The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2367I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2368 2458
2369Will never block. 2459Will never block.
2370 2460
2371=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2372 2462
2430 2520
2431 $map->load; 2521 $map->load;
2432 $map->load_neighbours; 2522 $map->load_neighbours;
2433 2523
2434 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2435 $self->activate_recursive; 2526 $self->activate_recursive;
2436 2527
2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2438 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2439} 2530}
2443Moves the player to the given map-path and coordinates by first freezing 2534Moves the player to the given map-path and coordinates by first freezing
2444her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2445that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2446the new (success) or old (failed) map position. In either case, $done will 2537the new (success) or old (failed) map position. In either case, $done will
2447be called at the end of this process. 2538be called at the end of this process.
2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2448 2542
2449=cut 2543=cut
2450 2544
2451our $GOTOGEN; 2545our $GOTOGEN;
2452 2546
2531} 2625}
2532 2626
2533sub prepare_random_map { 2627sub prepare_random_map {
2534 my ($exit) = @_; 2628 my ($exit) = @_;
2535 2629
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2632 # that depends on the exit object
2541 2633
2542 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2636 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2549 } 2643 }
2550 2644
2551 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2552 2646
2553 my $data = cf::to_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2556 2650
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2653 undef $fh;
2560 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2561 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2564 } 2662 }
2565} 2663}
2566 2664
2567sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2569 2667
2570 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2571 2669
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2670 $self->enter_link;
2584 2671
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2672 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2673 $Coro::current->{desc} = "enter_exit";
2591 2674
2592 $self->deactivate_recursive; # just to be sure
2593 unless (eval { 2675 unless (eval {
2676 $self->deactivate_recursive; # just to be sure
2677
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2687 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp;
2689
2594 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2595 2691
2692 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y)
2694 if $exit->flag (cf::FLAG_DAMNED);
2695
2596 1; 2696 1
2597 }) { 2697 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2599 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2600 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2602 2702
2603 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
2631the message, with C<log> being the default. If C<$color> is negative, suppress 2731the message, with C<log> being the default. If C<$color> is negative, suppress
2632the message unless the client supports the msg packet. 2732the message unless the client supports the msg packet.
2633 2733
2634=cut 2734=cut
2635 2735
2736# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 2737our %CHANNEL = (
2637 "c/identify" => { 2738 "c/identify" => {
2638 id => "identify", 2739 id => "infobox",
2639 title => "Identify", 2740 title => "Identify",
2640 reply => undef, 2741 reply => undef,
2641 tooltip => "Items recently identified", 2742 tooltip => "Items recently identified",
2642 }, 2743 },
2643 "c/examine" => { 2744 "c/examine" => {
2644 id => "examine", 2745 id => "infobox",
2645 title => "Examine", 2746 title => "Examine",
2646 reply => undef, 2747 reply => undef,
2647 tooltip => "Signs and other items you examined", 2748 tooltip => "Signs and other items you examined",
2648 }, 2749 },
2750 "c/book" => {
2751 id => "infobox",
2752 title => "Book",
2753 reply => undef,
2754 tooltip => "The contents of a note or book",
2755 },
2756 "c/lookat" => {
2757 id => "infobox",
2758 title => "Look",
2759 reply => undef,
2760 tooltip => "What you saw there",
2761 },
2762 "c/who" => {
2763 id => "infobox",
2764 title => "Players",
2765 reply => undef,
2766 tooltip => "Shows players who are currently online",
2767 },
2768 "c/body" => {
2769 id => "infobox",
2770 title => "Body Parts",
2771 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available",
2773 },
2774 "c/skills" => {
2775 id => "infobox",
2776 title => "Skills",
2777 reply => undef,
2778 tooltip => "Shows your experience per skill and item power",
2779 },
2780 "c/uptime" => {
2781 id => "infobox",
2782 title => "Uptime",
2783 reply => undef,
2784 tooltip => "How long the server has been running since last restart",
2785 },
2786 "c/mapinfo" => {
2787 id => "infobox",
2788 title => "Map Info",
2789 reply => undef,
2790 tooltip => "Information related to the maps",
2791 },
2792 "c/party" => {
2793 id => "party",
2794 title => "Party",
2795 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party",
2797 },
2798 "c/death" => {
2799 id => "death",
2800 title => "Death",
2801 reply => undef,
2802 tooltip => "Reason for and more info about your most recent death",
2803 },
2804 "c/say" => $SAY_CHANNEL,
2805 "c/chat" => $CHAT_CHANNEL,
2649); 2806);
2650 2807
2651sub cf::client::send_msg { 2808sub cf::client::send_msg {
2652 my ($self, $channel, $msg, $color, @extra) = @_; 2809 my ($self, $channel, $msg, $color, @extra) = @_;
2653 2810
2654 $msg = $self->pl->expand_cfpod ($msg); 2811 $msg = $self->pl->expand_cfpod ($msg)
2812 unless $color & cf::NDI_VERBATIM;
2655 2813
2656 $color &= cf::NDI_CLIENT_MASK; # just in case... 2814 $color &= cf::NDI_CLIENT_MASK; # just in case...
2657 2815
2658 # check predefined channels, for the benefit of C 2816 # check predefined channels, for the benefit of C
2659 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2817 if ($CHANNEL{$channel}) {
2818 $channel = $CHANNEL{$channel};
2660 2819
2820 $self->ext_msg (channel_info => $channel);
2821 $channel = $channel->{id};
2822
2661 if (ref $channel) { 2823 } elsif (ref $channel) {
2662 # send meta info to client, if not yet sent 2824 # send meta info to client, if not yet sent
2663 unless (exists $self->{channel}{$channel->{id}}) { 2825 unless (exists $self->{channel}{$channel->{id}}) {
2664 $self->{channel}{$channel->{id}} = $channel; 2826 $self->{channel}{$channel->{id}} = $channel;
2665 $self->ext_msg (channel_info => $channel) 2827 $self->ext_msg (channel_info => $channel);
2666 if $self->can_msg;
2667 } 2828 }
2668 2829
2669 $channel = $channel->{id}; 2830 $channel = $channel->{id};
2670 } 2831 }
2671 2832
2672 return unless @extra || length $msg; 2833 return unless @extra || length $msg;
2673 2834
2674 if ($self->can_msg) {
2675 # default colour, mask it out 2835 # default colour, mask it out
2676 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2836 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2677 if $color & cf::NDI_DEF; 2837 if $color & cf::NDI_DEF;
2678 2838
2679 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2839 my $pkt = "msg "
2840 . $self->{json_coder}->encode (
2680 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2681 } else { 2842 );
2682 if ($color >= 0) {
2683 # replace some tags by gcfclient-compatible ones
2684 for ($msg) {
2685 1 while
2686 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2687 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2688 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2689 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2690 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2691 }
2692 2843
2693 $color &= cf::NDI_COLOR_MASK; 2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2694 2847
2695 utf8::encode $msg; 2848 # split very large packets
2696 2849 if (8192 < length $pkt and $self->{can_lzf}) {
2697 if (0 && $msg =~ /\[/) { 2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2698 # COMMAND/INFO 2851 $pkt = "frag";
2699 $self->send_packet ("drawextinfo $color 10 8 $msg")
2700 } else {
2701 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2702 $self->send_packet ("drawinfo $color $msg")
2703 }
2704 }
2705 } 2852 }
2853
2854 $self->send_packet ($pkt);
2706} 2855}
2707 2856
2708=item $client->ext_msg ($type, @msg) 2857=item $client->ext_msg ($type, @msg)
2709 2858
2710Sends an ext event to the client. 2859Sends an ext event to the client.
2883=pod 3032=pod
2884 3033
2885The following functions and methods are available within a safe environment: 3034The following functions and methods are available within a safe environment:
2886 3035
2887 cf::object 3036 cf::object
2888 contr pay_amount pay_player map x y force_find force_add 3037 contr pay_amount pay_player map x y force_find force_add destroy
2889 insert remove name archname title slaying race decrease_ob_nr 3038 insert remove name archname title slaying race decrease split
2890 3039
2891 cf::object::player 3040 cf::object::player
2892 player 3041 player
2893 3042
2894 cf::player 3043 cf::player
2899 3048
2900=cut 3049=cut
2901 3050
2902for ( 3051for (
2903 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2904 insert remove inv name archname title slaying race 3053 insert remove inv nrof name archname title slaying race
2905 decrease_ob_nr)], 3054 decrease split destroy change_exp)],
2906 ["cf::object::player" => qw(player)], 3055 ["cf::object::player" => qw(player)],
2907 ["cf::player" => qw(peaceful)], 3056 ["cf::player" => qw(peaceful)],
2908 ["cf::map" => qw(trigger)], 3057 ["cf::map" => qw(trigger)],
2909) { 3058) {
2910 no strict 'refs'; 3059 no strict 'refs';
3015 { 3164 {
3016 my $faces = $facedata->{faceinfo}; 3165 my $faces = $facedata->{faceinfo};
3017 3166
3018 while (my ($face, $info) = each %$faces) { 3167 while (my ($face, $info) = each %$faces) {
3019 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3168 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3169
3020 cf::face::set_visibility $idx, $info->{visibility}; 3170 cf::face::set_visibility $idx, $info->{visibility};
3021 cf::face::set_magicmap $idx, $info->{magicmap}; 3171 cf::face::set_magicmap $idx, $info->{magicmap};
3022 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3172 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3023 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3173 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3024 3174
3025 cf::cede_to_tick; 3175 cf::cede_to_tick;
3026 } 3176 }
3027 3177
3028 while (my ($face, $info) = each %$faces) { 3178 while (my ($face, $info) = each %$faces) {
3029 next unless $info->{smooth}; 3179 next unless $info->{smooth};
3180
3030 my $idx = cf::face::find $face 3181 my $idx = cf::face::find $face
3031 or next; 3182 or next;
3183
3032 if (my $smooth = cf::face::find $info->{smooth}) { 3184 if (my $smooth = cf::face::find $info->{smooth}) {
3033 cf::face::set_smooth $idx, $smooth; 3185 cf::face::set_smooth $idx, $smooth;
3034 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3186 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3035 } else { 3187 } else {
3036 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3188 warn "smooth face '$info->{smooth}' not found for face '$face'";
3054 { 3206 {
3055 # TODO: for gcfclient pleasure, we should give resources 3207 # TODO: for gcfclient pleasure, we should give resources
3056 # that gcfclient doesn't grok a >10000 face index. 3208 # that gcfclient doesn't grok a >10000 face index.
3057 my $res = $facedata->{resource}; 3209 my $res = $facedata->{resource};
3058 3210
3059 my $soundconf = delete $res->{"res/sound.conf"};
3060
3061 while (my ($name, $info) = each %$res) { 3211 while (my ($name, $info) = each %$res) {
3212 if (defined $info->{type}) {
3062 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3213 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3063 my $data; 3214 my $data;
3064 3215
3065 if ($info->{type} & 1) { 3216 if ($info->{type} & 1) {
3066 # prepend meta info 3217 # prepend meta info
3067 3218
3068 my $meta = $enc->encode ({ 3219 my $meta = $enc->encode ({
3069 name => $name, 3220 name => $name,
3070 %{ $info->{meta} || {} }, 3221 %{ $info->{meta} || {} },
3071 }); 3222 });
3072 3223
3073 $data = pack "(w/a*)*", $meta, $info->{data}; 3224 $data = pack "(w/a*)*", $meta, $info->{data};
3225 } else {
3226 $data = $info->{data};
3227 }
3228
3229 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3230 cf::face::set_type $idx, $info->{type};
3074 } else { 3231 } else {
3075 $data = $info->{data}; 3232 $RESOURCE{$name} = $info;
3076 } 3233 }
3077 3234
3078 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3079 cf::face::set_type $idx, $info->{type};
3080
3081 cf::cede_to_tick; 3235 cf::cede_to_tick;
3082 } 3236 }
3083
3084 if ($soundconf) {
3085 $soundconf = $enc->decode (delete $soundconf->{data});
3086
3087 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3088 my $sound = $soundconf->{compat}[$_]
3089 or next;
3090
3091 my $face = cf::face::find "sound/$sound->[1]";
3092 cf::sound::set $sound->[0] => $face;
3093 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3094 }
3095
3096 while (my ($k, $v) = each %{$soundconf->{event}}) {
3097 my $face = cf::face::find "sound/$v";
3098 cf::sound::set $k => $face;
3099 }
3100 }
3101 } 3237 }
3238
3239 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3102 3240
3103 1 3241 1
3104} 3242}
3243
3244cf::global->attach (on_resource_update => sub {
3245 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3246 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3247
3248 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3249 my $sound = $soundconf->{compat}[$_]
3250 or next;
3251
3252 my $face = cf::face::find "sound/$sound->[1]";
3253 cf::sound::set $sound->[0] => $face;
3254 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3255 }
3256
3257 while (my ($k, $v) = each %{$soundconf->{event}}) {
3258 my $face = cf::face::find "sound/$v";
3259 cf::sound::set $k => $face;
3260 }
3261 }
3262});
3105 3263
3106register_exticmd fx_want => sub { 3264register_exticmd fx_want => sub {
3107 my ($ns, $want) = @_; 3265 my ($ns, $want) = @_;
3108 3266
3109 while (my ($k, $v) = each %$want) { 3267 while (my ($k, $v) = each %$want) {
3110 $ns->fx_want ($k, $v); 3268 $ns->fx_want ($k, $v);
3111 } 3269 }
3112}; 3270};
3271
3272sub load_resource_file($) {
3273 my $guard = lock_acquire "load_resource_file";
3274
3275 my $status = load_resource_file_ $_[0];
3276 get_slot 0.1, 100;
3277 cf::arch::commit_load;
3278
3279 $status
3280}
3113 3281
3114sub reload_regions { 3282sub reload_regions {
3115 # HACK to clear player env face cache, we need some signal framework 3283 # HACK to clear player env face cache, we need some signal framework
3116 # for this (global event?) 3284 # for this (global event?)
3117 %ext::player_env::MUSIC_FACE_CACHE = (); 3285 %ext::player_env::MUSIC_FACE_CACHE = ();
3131} 3299}
3132 3300
3133sub reload_archetypes { 3301sub reload_archetypes {
3134 load_resource_file "$DATADIR/archetypes" 3302 load_resource_file "$DATADIR/archetypes"
3135 or die "unable to load archetypes\n"; 3303 or die "unable to load archetypes\n";
3136 #d# NEED to laod twice to resolve forward references
3137 # this really needs to be done in an extra post-pass
3138 # (which needs to be synchronous, so solve it differently)
3139 load_resource_file "$DATADIR/archetypes"
3140 or die "unable to load archetypes\n";
3141} 3304}
3142 3305
3143sub reload_treasures { 3306sub reload_treasures {
3144 load_resource_file "$DATADIR/treasures" 3307 load_resource_file "$DATADIR/treasures"
3145 or die "unable to load treasurelists\n"; 3308 or die "unable to load treasurelists\n";
3146} 3309}
3147 3310
3148sub reload_resources { 3311sub reload_resources {
3149 warn "reloading resource files...\n"; 3312 warn "reloading resource files...\n";
3150 3313
3314 reload_facedata;
3315 reload_archetypes;
3151 reload_regions; 3316 reload_regions;
3152 reload_facedata;
3153 #reload_archetypes;#d#
3154 reload_archetypes;
3155 reload_treasures; 3317 reload_treasures;
3156 3318
3157 warn "finished reloading resource files\n"; 3319 warn "finished reloading resource files\n";
3158}
3159
3160sub init {
3161 reload_resources;
3162} 3320}
3163 3321
3164sub reload_config { 3322sub reload_config {
3165 open my $fh, "<:utf8", "$CONFDIR/config" 3323 open my $fh, "<:utf8", "$CONFDIR/config"
3166 or return; 3324 or return;
3167 3325
3168 local $/; 3326 local $/;
3169 *CFG = YAML::Syck::Load <$fh>; 3327 *CFG = YAML::Load <$fh>;
3170 3328
3171 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3329 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3172 3330
3173 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3331 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3174 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3332 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3180 }; 3338 };
3181 warn $@ if $@; 3339 warn $@ if $@;
3182 } 3340 }
3183} 3341}
3184 3342
3343sub pidfile() {
3344 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3345 or die "$PIDFILE: $!";
3346 flock $fh, &Fcntl::LOCK_EX
3347 or die "$PIDFILE: flock: $!";
3348 $fh
3349}
3350
3351# make sure only one server instance is running at any one time
3352sub atomic {
3353 my $fh = pidfile;
3354
3355 my $pid = <$fh>;
3356 kill 9, $pid if $pid > 0;
3357
3358 seek $fh, 0, 0;
3359 print $fh $$;
3360}
3361
3185sub main { 3362sub main {
3363 cf::init_globals; # initialise logging
3364
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374
3375 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3376
3186 # we must not ever block the main coroutine 3377 # we must not ever block the main coroutine
3187 local $Coro::idle = sub { 3378 local $Coro::idle = sub {
3188 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3379 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3189 (async { 3380 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3381 $Coro::current->{desc} = "IDLE BUG HANDLER";
3191 Event::one_event; 3382 EV::loop EV::LOOP_ONESHOT;
3192 })->prio (Coro::PRIO_MAX); 3383 })->prio (Coro::PRIO_MAX);
3193 }; 3384 };
3194 3385
3386 evthread_start IO::AIO::poll_fileno;
3387
3388 cf::sync_job {
3389 reload_resources;
3195 reload_config; 3390 reload_config;
3196 db_init; 3391 db_init;
3392
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid;
3396 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills;
3399
3400 cf::init_beforeplay;
3401
3402 atomic;
3403
3197 load_extensions; 3404 load_extensions;
3198 3405
3199 $TICK_WATCHER->start; 3406 utime time, time, $RUNTIMEFILE;
3407
3408 # no (long-running) fork's whatsoever before this point(!)
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410
3411 (pop @POST_INIT)->(0) while @POST_INIT;
3412 };
3413
3200 Event::loop; 3414 EV::loop;
3201} 3415}
3202 3416
3203############################################################################# 3417#############################################################################
3204# initialisation and cleanup 3418# initialisation and cleanup
3205 3419
3206# install some emergency cleanup handlers 3420# install some emergency cleanup handlers
3207BEGIN { 3421BEGIN {
3422 our %SIGWATCHER = ();
3208 for my $signal (qw(INT HUP TERM)) { 3423 for my $signal (qw(INT HUP TERM)) {
3209 Event->signal ( 3424 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3210 reentrant => 0,
3211 data => WF_AUTOCANCEL,
3212 signal => $signal,
3213 prio => 0,
3214 cb => sub {
3215 cf::cleanup "SIG$signal"; 3425 cf::cleanup "SIG$signal";
3216 },
3217 ); 3426 };
3218 } 3427 }
3219} 3428}
3220 3429
3221sub write_runtime { 3430sub write_runtime_sync {
3222 my $runtime = "$LOCALDIR/runtime";
3223
3224 # first touch the runtime file to show we are still running: 3431 # first touch the runtime file to show we are still running:
3225 # the fsync below can take a very very long time. 3432 # the fsync below can take a very very long time.
3226 3433
3227 IO::AIO::aio_utime $runtime, undef, undef; 3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3228 3435
3229 my $guard = cf::lock_acquire "write_runtime"; 3436 my $guard = cf::lock_acquire "write_runtime";
3230 3437
3231 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3232 or return; 3439 or return;
3233 3440
3234 my $value = $cf::RUNTIME + 90 + 10; 3441 my $value = $cf::RUNTIME + 90 + 10;
3235 # 10 is the runtime save interval, for a monotonic clock 3442 # 10 is the runtime save interval, for a monotonic clock
3236 # 60 allows for the watchdog to kill the server. 3443 # 60 allows for the watchdog to kill the server.
3246 aio_utime $fh, undef, undef; 3453 aio_utime $fh, undef, undef;
3247 3454
3248 close $fh 3455 close $fh
3249 or return; 3456 or return;
3250 3457
3251 aio_rename "$runtime~", $runtime 3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3252 and return; 3459 and return;
3253 3460
3254 warn "runtime file written.\n"; 3461 warn "runtime file written.\n";
3255 3462
3256 1 3463 1
3464}
3465
3466our $uuid_lock;
3467our $uuid_skip;
3468
3469sub write_uuid_sync($) {
3470 $uuid_skip ||= $_[0];
3471
3472 return if $uuid_lock;
3473 local $uuid_lock = 1;
3474
3475 my $uuid = "$LOCALDIR/uuid";
3476
3477 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3478 or return;
3479
3480 my $value = uuid_seq uuid_cur;
3481
3482 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n";
3484 return;
3485 }
3486
3487 my $value = uuid_str $value + $uuid_skip;
3488 $uuid_skip = 0;
3489
3490 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3491 and return;
3492
3493 # always fsync - this file is important
3494 aio_fsync $fh
3495 and return;
3496
3497 close $fh
3498 or return;
3499
3500 aio_rename "$uuid~", $uuid
3501 and return;
3502
3503 warn "uuid file written ($value).\n";
3504
3505 1
3506
3507}
3508
3509sub write_uuid($$) {
3510 my ($skip, $sync) = @_;
3511
3512 $sync ? write_uuid_sync $skip
3513 : async { write_uuid_sync $skip };
3257} 3514}
3258 3515
3259sub emergency_save() { 3516sub emergency_save() {
3260 my $freeze_guard = cf::freeze_mainloop; 3517 my $freeze_guard = cf::freeze_mainloop;
3261 3518
3262 warn "enter emergency perl save\n"; 3519 warn "emergency_perl_save: enter\n";
3263 3520
3264 cf::sync_job { 3521 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526
3265 # use a peculiar iteration method to avoid tripping on perl 3527 # use a peculiar iteration method to avoid tripping on perl
3266 # refcount bugs in for. also avoids problems with players 3528 # refcount bugs in for. also avoids problems with players
3267 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3268 warn "begin emergency player save\n"; 3530 warn "emergency_perl_save: begin player save\n";
3269 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3270 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3271 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3272 $pl->save; 3535 $pl->save;
3273 } 3536 }
3274 warn "end emergency player save\n"; 3537 warn "emergency_perl_save: end player save\n";
3275 3538
3276 warn "begin emergency map save\n"; 3539 warn "emergency_perl_save: begin map save\n";
3277 for my $path (keys %cf::MAP) { 3540 for my $path (keys %cf::MAP) {
3278 my $map = $cf::MAP{$path} or next; 3541 my $map = $cf::MAP{$path} or next;
3279 $map->valid or next; 3542 $map->valid or next;
3280 $map->save; 3543 $map->save;
3281 } 3544 }
3282 warn "end emergency map save\n"; 3545 warn "emergency_perl_save: end map save\n";
3283 3546
3284 warn "begin emergency database checkpoint\n"; 3547 warn "emergency_perl_save: begin database checkpoint\n";
3285 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3286 warn "end emergency database checkpoint\n"; 3549 warn "emergency_perl_save: end database checkpoint\n";
3550
3551 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "emergency_perl_save: end write uuid\n";
3287 }; 3554 };
3288 3555
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
3289 warn "leave emergency perl save\n"; 3561 warn "emergency_perl_save: leave\n";
3290} 3562}
3291 3563
3292sub post_cleanup { 3564sub post_cleanup {
3293 my ($make_core) = @_; 3565 my ($make_core) = @_;
3294 3566
3295 warn Carp::longmess "post_cleanup backtrace" 3567 warn Carp::longmess "post_cleanup backtrace"
3296 if $make_core; 3568 if $make_core;
3569
3570 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$;
3572}
3573
3574# a safer delete_package, copied from Symbol
3575sub clear_package($) {
3576 my $pkg = shift;
3577
3578 # expand to full symbol table name if needed
3579 unless ($pkg =~ /^main::.*::$/) {
3580 $pkg = "main$pkg" if $pkg =~ /^::/;
3581 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3582 $pkg .= '::' unless $pkg =~ /::$/;
3583 }
3584
3585 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3586 my $stem_symtab = *{$stem}{HASH};
3587
3588 defined $stem_symtab and exists $stem_symtab->{$leaf}
3589 or return;
3590
3591 # clear all symbols
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 }
3597 warn "cleared package $pkg\n";#d#
3297} 3598}
3298 3599
3299sub do_reload_perl() { 3600sub do_reload_perl() {
3300 # can/must only be called in main 3601 # can/must only be called in main
3301 if ($Coro::current != $Coro::main) { 3602 if ($Coro::current != $Coro::main) {
3302 warn "can only reload from main coroutine"; 3603 warn "can only reload from main coroutine";
3303 return; 3604 return;
3304 } 3605 }
3305 3606
3607 return if $RELOAD++;
3608
3609 my $t1 = EV::time;
3610
3611 while ($RELOAD) {
3306 warn "reloading..."; 3612 warn "reloading...";
3307 3613
3308 warn "entering sync_job"; 3614 warn "entering sync_job";
3309 3615
3310 cf::sync_job { 3616 cf::sync_job {
3311 cf::write_runtime; # external watchdog should not bark 3617 cf::write_runtime_sync; # external watchdog should not bark
3312 cf::emergency_save; 3618 cf::emergency_save;
3313 cf::write_runtime; # external watchdog should not bark 3619 cf::write_runtime_sync; # external watchdog should not bark
3314 3620
3315 warn "syncing database to disk"; 3621 warn "syncing database to disk";
3316 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3317 3623
3318 # if anything goes wrong in here, we should simply crash as we already saved 3624 # if anything goes wrong in here, we should simply crash as we already saved
3319 3625
3320 warn "cancelling all WF_AUTOCANCEL watchers";
3321 for (Event::all_watchers) {
3322 $_->cancel if $_->data & WF_AUTOCANCEL;
3323 }
3324
3325 warn "flushing outstanding aio requests"; 3626 warn "flushing outstanding aio requests";
3326 for (;;) {
3327 BDB::flush;
3328 IO::AIO::flush;
3329 Coro::cede;
3330 last unless IO::AIO::nreqs || BDB::nreqs; 3627 while (IO::AIO::nreqs || BDB::nreqs) {
3331 warn "iterate..."; 3628 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3332 }
3333
3334 ++$RELOAD;
3335
3336 warn "cancelling all extension coros";
3337 $_->cancel for values %EXT_CORO;
3338 %EXT_CORO = ();
3339
3340 warn "removing commands";
3341 %COMMAND = ();
3342
3343 warn "removing ext/exti commands";
3344 %EXTCMD = ();
3345 %EXTICMD = ();
3346
3347 warn "unloading/nuking all extensions";
3348 for my $pkg (@EXTS) {
3349 warn "... unloading $pkg";
3350
3351 if (my $cb = $pkg->can ("unload")) {
3352 eval {
3353 $cb->($pkg);
3354 1
3355 } or warn "$pkg unloaded, but with errors: $@";
3356 } 3629 }
3357 3630
3358 warn "... nuking $pkg"; 3631 warn "cancelling all extension coros";
3359 Symbol::delete_package $pkg; 3632 $_->cancel for values %EXT_CORO;
3360 } 3633 %EXT_CORO = ();
3361 3634
3362 warn "unloading all perl modules loaded from $LIBDIR"; 3635 warn "removing commands";
3363 while (my ($k, $v) = each %INC) { 3636 %COMMAND = ();
3364 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3365 3637
3638 warn "removing ext/exti commands";
3639 %EXTCMD = ();
3640 %EXTICMD = ();
3641
3642 warn "unloading/nuking all extensions";
3643 for my $pkg (@EXTS) {
3366 warn "... unloading $k"; 3644 warn "... unloading $pkg";
3367 delete $INC{$k};
3368 3645
3369 $k =~ s/\.pm$//;
3370 $k =~ s/\//::/g;
3371
3372 if (my $cb = $k->can ("unload_module")) { 3646 if (my $cb = $pkg->can ("unload")) {
3647 eval {
3373 $cb->(); 3648 $cb->($pkg);
3649 1
3650 } or warn "$pkg unloaded, but with errors: $@";
3651 }
3652
3653 warn "... clearing $pkg";
3654 clear_package $pkg;
3374 } 3655 }
3375 3656
3376 Symbol::delete_package $k; 3657 warn "unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660
3661 warn "... unloading $k";
3662 delete $INC{$k};
3663
3664 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g;
3666
3667 if (my $cb = $k->can ("unload_module")) {
3668 $cb->();
3669 }
3670
3671 clear_package $k;
3377 } 3672 }
3378 3673
3379 warn "getting rid of safe::, as good as possible"; 3674 warn "getting rid of safe::, as good as possible";
3380 Symbol::delete_package "safe::$_" 3675 clear_package "safe::$_"
3381 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3382 3677
3383 warn "unloading cf.pm \"a bit\""; 3678 warn "unloading cf.pm \"a bit\"";
3384 delete $INC{"cf.pm"}; 3679 delete $INC{"cf.pm"};
3385 delete $INC{"cf/pod.pm"}; 3680 delete $INC{"cf/pod.pm"};
3386 3681
3387 # don't, removes xs symbols, too, 3682 # don't, removes xs symbols, too,
3388 # and global variables created in xs 3683 # and global variables created in xs
3389 #Symbol::delete_package __PACKAGE__; 3684 #clear_package __PACKAGE__;
3390 3685
3391 warn "unload completed, starting to reload now"; 3686 warn "unload completed, starting to reload now";
3392 3687
3393 warn "reloading cf.pm"; 3688 warn "reloading cf.pm";
3394 require cf; 3689 require cf;
3395 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3396 3691
3397 warn "loading config and database again"; 3692 warn "loading config and database again";
3398 cf::reload_config; 3693 cf::reload_config;
3399 3694
3400 warn "loading extensions"; 3695 warn "loading extensions";
3401 cf::load_extensions; 3696 cf::load_extensions;
3402 3697
3698 if ($REATTACH_ON_RELOAD) {
3403 warn "reattaching attachments to objects/players"; 3699 warn "reattaching attachments to objects/players";
3404 _global_reattach; # objects, sockets 3700 _global_reattach; # objects, sockets
3405 warn "reattaching attachments to maps"; 3701 warn "reattaching attachments to maps";
3406 reattach $_ for values %MAP; 3702 reattach $_ for values %MAP;
3407 warn "reattaching attachments to players"; 3703 warn "reattaching attachments to players";
3408 reattach $_ for values %PLAYER; 3704 reattach $_ for values %PLAYER;
3705 }
3409 3706
3707 warn "running post_init jobs";
3708 (pop @POST_INIT)->(1) while @POST_INIT;
3709
3410 warn "leaving sync_job"; 3710 warn "leaving sync_job";
3411 3711
3412 1 3712 1
3413 } or do { 3713 } or do {
3414 warn $@; 3714 warn $@;
3415 warn "error while reloading, exiting."; 3715 cf::cleanup "error while reloading, exiting.";
3416 exit 1;
3417 }; 3716 };
3418 3717
3419 warn "reloaded"; 3718 warn "reloaded";
3719 --$RELOAD;
3720 }
3721
3722 $t1 = EV::time - $t1;
3723 warn "reload completed in ${t1}s\n";
3420}; 3724};
3421 3725
3422our $RELOAD_WATCHER; # used only during reload 3726our $RELOAD_WATCHER; # used only during reload
3423 3727
3424sub reload_perl() { 3728sub reload_perl() {
3425 # doing reload synchronously and two reloads happen back-to-back, 3729 # doing reload synchronously and two reloads happen back-to-back,
3426 # coro crashes during coro_state_free->destroy here. 3730 # coro crashes during coro_state_free->destroy here.
3427 3731
3428 $RELOAD_WATCHER ||= Event->timer ( 3732 $RELOAD_WATCHER ||= cf::async {
3429 reentrant => 0, 3733 Coro::AIO::aio_wait cache_extensions;
3430 after => 0, 3734
3431 data => WF_AUTOCANCEL, 3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3432 cb => sub {
3433 do_reload_perl; 3736 do_reload_perl;
3434 undef $RELOAD_WATCHER; 3737 undef $RELOAD_WATCHER;
3435 }, 3738 };
3436 ); 3739 };
3437} 3740}
3438 3741
3439register_command "reload" => sub { 3742register_command "reload" => sub {
3440 my ($who, $arg) = @_; 3743 my ($who, $arg) = @_;
3441 3744
3454 3757
3455our @WAIT_FOR_TICK; 3758our @WAIT_FOR_TICK;
3456our @WAIT_FOR_TICK_BEGIN; 3759our @WAIT_FOR_TICK_BEGIN;
3457 3760
3458sub wait_for_tick { 3761sub wait_for_tick {
3459 return unless $TICK_WATCHER->is_active;
3460 return if $Coro::current == $Coro::main; 3762 return if tick_inhibit || $Coro::current == $Coro::main;
3461 3763
3462 my $signal = new Coro::Signal; 3764 my $signal = new Coro::Signal;
3463 push @WAIT_FOR_TICK, $signal; 3765 push @WAIT_FOR_TICK, $signal;
3464 $signal->wait; 3766 $signal->wait;
3465} 3767}
3466 3768
3467sub wait_for_tick_begin { 3769sub wait_for_tick_begin {
3468 return unless $TICK_WATCHER->is_active;
3469 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3470 3771
3471 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3472 push @WAIT_FOR_TICK_BEGIN, $signal; 3773 push @WAIT_FOR_TICK_BEGIN, $signal;
3473 $signal->wait; 3774 $signal->wait;
3474} 3775}
3475 3776
3476$TICK_WATCHER = Event->timer ( 3777sub tick {
3477 reentrant => 0,
3478 parked => 1,
3479 prio => 0,
3480 at => $NEXT_TICK || $TICK,
3481 data => WF_AUTOCANCEL,
3482 cb => sub {
3483 if ($Coro::current != $Coro::main) { 3778 if ($Coro::current != $Coro::main) {
3484 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3779 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3485 unless ++$bug_warning > 10; 3780 unless ++$bug_warning > 10;
3486 return; 3781 return;
3487 } 3782 }
3488 3783
3489 $NOW = $tick_start = Event::time;
3490
3491 cf::server_tick; # one server iteration 3784 cf::server_tick; # one server iteration
3492 3785
3493 $RUNTIME += $TICK;
3494 $NEXT_TICK += $TICK;
3495
3496 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3786 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3497 $NEXT_RUNTIME_WRITE = $NOW + 10; 3787 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3498 Coro::async_pool { 3788 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver"; 3789 $Coro::current->{desc} = "runtime saver";
3500 write_runtime 3790 write_runtime_sync
3501 or warn "ERROR: unable to write runtime file: $!"; 3791 or warn "ERROR: unable to write runtime file: $!";
3502 };
3503 } 3792 };
3793 }
3504 3794
3505 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3795 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3506 $sig->send; 3796 $sig->send;
3507 } 3797 }
3508 while (my $sig = shift @WAIT_FOR_TICK) { 3798 while (my $sig = shift @WAIT_FOR_TICK) {
3509 $sig->send; 3799 $sig->send;
3510 } 3800 }
3511 3801
3512 $NOW = Event::time; 3802 $LOAD = ($NOW - $TICK_START) / $TICK;
3513
3514 # if we are delayed by four ticks or more, skip them all
3515 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3516
3517 $TICK_WATCHER->at ($NEXT_TICK);
3518 $TICK_WATCHER->start;
3519
3520 $LOAD = ($NOW - $tick_start) / $TICK;
3521 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3803 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3522 3804
3523 _post_tick; 3805 if (0) {
3806 if ($NEXT_TICK) {
3807 my $jitter = $TICK_START - $NEXT_TICK;
3808 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3809 warn "jitter $JITTER\n";#d#
3810 }
3524 }, 3811 }
3525); 3812}
3526 3813
3527{ 3814{
3815 # configure BDB
3816
3528 BDB::min_parallel 8; 3817 BDB::min_parallel 8;
3529 BDB::max_poll_time $TICK * 0.1; 3818 BDB::max_poll_reqs $TICK * 0.1;
3530 $BDB_POLL_WATCHER = Event->io ( 3819 $AnyEvent::BDB::WATCHER->priority (1);
3531 reentrant => 0,
3532 fd => BDB::poll_fileno,
3533 poll => 'r',
3534 prio => 0,
3535 data => WF_AUTOCANCEL,
3536 cb => \&BDB::poll_cb,
3537 );
3538
3539 BDB::set_sync_prepare {
3540 my $status;
3541 my $current = $Coro::current;
3542 (
3543 sub {
3544 $status = $!;
3545 $current->ready; undef $current;
3546 },
3547 sub {
3548 Coro::schedule while defined $current;
3549 $! = $status;
3550 },
3551 )
3552 };
3553 3820
3554 unless ($DB_ENV) { 3821 unless ($DB_ENV) {
3555 $DB_ENV = BDB::db_env_create; 3822 $DB_ENV = BDB::db_env_create;
3556 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3823 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3557 | BDB::LOG_AUTOREMOVE, 1); 3824 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3825 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3558 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3826 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3559 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3827 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3560 3828
3561 cf::sync_job { 3829 cf::sync_job {
3562 eval { 3830 eval {
3572 3840
3573 cf::cleanup "db_env_open(db): $@" if $@; 3841 cf::cleanup "db_env_open(db): $@" if $@;
3574 }; 3842 };
3575 } 3843 }
3576 3844
3577 $BDB_DEADLOCK_WATCHER = Event->timer ( 3845 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3578 after => 3,
3579 interval => 1,
3580 hard => 1,
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3846 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3585 },
3586 ); 3847 };
3587 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3848 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3588 after => 11,
3589 interval => 60,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3849 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3595 },
3596 ); 3850 };
3597 $BDB_TRICKLE_WATCHER = Event->timer ( 3851 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3598 after => 5,
3599 interval => 10,
3600 hard => 1,
3601 prio => 0,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3852 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3605 },
3606 ); 3853 };
3607} 3854}
3608 3855
3609{ 3856{
3857 # configure IO::AIO
3858
3610 IO::AIO::min_parallel 8; 3859 IO::AIO::min_parallel 8;
3611
3612 undef $Coro::AIO::WATCHER;
3613 IO::AIO::max_poll_time $TICK * 0.1; 3860 IO::AIO::max_poll_time $TICK * 0.1;
3614 $AIO_POLL_WATCHER = Event->io ( 3861 undef $AnyEvent::AIO::WATCHER;
3615 reentrant => 0,
3616 data => WF_AUTOCANCEL,
3617 fd => IO::AIO::poll_fileno,
3618 poll => 'r',
3619 prio => 6,
3620 cb => \&IO::AIO::poll_cb,
3621 );
3622} 3862}
3623 3863
3624my $_log_backtrace; 3864my $_log_backtrace;
3625 3865
3626sub _log_backtrace { 3866sub _log_backtrace {
3629 $msg =~ s/\n//; 3869 $msg =~ s/\n//;
3630 3870
3631 # limit the # of concurrent backtraces 3871 # limit the # of concurrent backtraces
3632 if ($_log_backtrace < 2) { 3872 if ($_log_backtrace < 2) {
3633 ++$_log_backtrace; 3873 ++$_log_backtrace;
3874 my $perl_bt = Carp::longmess $msg;
3634 async { 3875 async {
3635 $Coro::current->{desc} = "abt $msg"; 3876 $Coro::current->{desc} = "abt $msg";
3636 3877
3637 my @bt = fork_call { 3878 my @bt = fork_call {
3638 @addr = map { sprintf "%x", $_ } @addr; 3879 @addr = map { sprintf "%x", $_ } @addr;
3649 } 3890 }
3650 3891
3651 @funcs 3892 @funcs
3652 }; 3893 };
3653 3894
3654 LOG llevInfo, "[ABT] $msg\n"; 3895 LOG llevInfo, "[ABT] $perl_bt\n";
3896 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3655 LOG llevInfo, "[ABT] $_\n" for @bt; 3897 LOG llevInfo, "[ABT] $_\n" for @bt;
3656 --$_log_backtrace; 3898 --$_log_backtrace;
3657 }; 3899 };
3658 } else { 3900 } else {
3659 LOG llevInfo, "[ABT] $msg\n"; 3901 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines