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.367 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.453 by root, Tue Sep 23 04:29:11 2008 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
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::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 74
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 76
52our %COMMAND = (); 77our %COMMAND = ();
53our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
56our %EXTCMD = (); 81our %EXTCMD = ();
57our %EXTICMD = (); 82our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
60 85
61our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 87our @EVENT;
63 88
64our $CONFDIR = confdir; 89our $CONFDIR = confdir;
65our $DATADIR = datadir; 90our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
75 104
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $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 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 107our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
83 109
84our $BDB_POLL_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 113our $DB_ENV;
88 114
89our %CFG; 115our %CFG;
90 116
91our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 118our $RUNTIME;
119our $NOW;
93 120
94our (%PLAYER, %PLAYER_LOADING); # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 122our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
97 124
98# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 127
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
104 134
105binmode STDOUT; 135binmode STDOUT;
106binmode STDERR; 136binmode STDERR;
107 137
108# read virtual server time, if available 138# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
113} 143}
114 144
115mkdir $_ 145mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
161 191
162The raw value load value from the last tick. 192The raw value load value from the last tick.
163 193
164=item %cf::CFG 194=item %cf::CFG
165 195
166Configuration for the server, loaded from C</etc/crossfire/config>, or 196Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 197from wherever your confdir points to.
168 198
169=item cf::wait_for_tick, cf::wait_for_tick_begin 199=item cf::wait_for_tick, cf::wait_for_tick_begin
170 200
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 223
194 LOG llevError, $msg; 224 LOG llevError, $msg;
195 }; 225 };
196} 226}
227
228$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "=="
230
231 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d#
234 }#d#
235
236 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate
239};
240
241$SIG{__DIE__} = sub { }; #d#?
197 242
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 253for my $pkg (qw(
209 cf::global cf::attachable 254 cf::global cf::attachable
210 cf::object cf::object::player 255 cf::object cf::object::player
211 cf::client cf::player 256 cf::client cf::player
212 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
213 cf::map cf::party cf::region 259 cf::party cf::region
214)) { 260)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 262}
218 263
219$Event::DIED = sub { 264$EV::DIED = sub {
220 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
221}; 266};
222 267
223############################################################################# 268#############################################################################
224 269
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 293 $d
249 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
250} 295}
251 296
252=item $ref = cf::from_json $json 297=item $ref = cf::decode_json $json
253 298
254Converts a JSON string into the corresponding perl data structure. 299Converts a JSON string into the corresponding perl data structure.
255 300
256=item $json = cf::to_json $ref 301=item $json = cf::encode_json $ref
257 302
258Converts a perl data structure into its JSON representation. 303Converts a perl data structure into its JSON representation.
259 304
260=cut 305=cut
261 306
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 308
264sub to_json ($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
266 325
267=item cf::lock_wait $string 326=item cf::lock_wait $string
268 327
269Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
270 329
298 return;#d# 357 return;#d#
299 }#d# 358 }#d#
300 359
301 # wait for lock, if any 360 # wait for lock, if any
302 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
303 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule; 364 Coro::schedule;
305 } 365 }
306} 366}
307 367
326 386
327 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
328} 388}
329 389
330sub freeze_mainloop { 390sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
332 392
333 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
334 $TICK_WATCHER->start; 394}
335 }; 395
336 $TICK_WATCHER->stop; 396=item cf::periodic $interval, $cb
337 $guard 397
398Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer.
400
401=cut
402
403sub periodic($$) {
404 my ($interval, $cb) = @_;
405
406 my $start = rand List::Util::min 180, $interval;
407
408 EV::periodic $start, $interval, 0, $cb
338} 409}
339 410
340=item cf::get_slot $time[, $priority[, $name]] 411=item cf::get_slot $time[, $priority[, $name]]
341 412
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 413Allocate $time seconds of blocking CPU time at priority C<$priority>:
353our @SLOT_QUEUE; 424our @SLOT_QUEUE;
354our $SLOT_QUEUE; 425our $SLOT_QUEUE;
355 426
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 427$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 428$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager");
430
358 my $signal = new Coro::Signal; 431 my $signal = new Coro::Signal;
359 432
360 while () { 433 while () {
361 next_job: 434 next_job:
362 my $avail = cf::till_tick; 435 my $avail = cf::till_tick;
370 } 443 }
371 } 444 }
372 } 445 }
373 446
374 if (@SLOT_QUEUE) { 447 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 448 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 449 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 450 $signal->wait;
378 } else { 451 } else {
379 Coro::schedule; 452 Coro::schedule;
380 } 453 }
381 } 454 }
382}; 455};
383 456
384sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
385 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
386 461
387 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
389 464
403 478
404BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
405 480
406=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
407 482
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 485partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 486acceptable.
412 487
413If it must be done, put the blocking parts into C<sync_job>. This will run 488If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
419 494
420sub sync_job(&) { 495sub sync_job(&) {
421 my ($job) = @_; 496 my ($job) = @_;
422 497
423 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 499 my $time = EV::time;
425 500
426 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
428 503
429 # TODO: use suspend/resume instead 504 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 505
431 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
432 507
433 my $busy = 1; 508 my $busy = 1;
434 my @res; 509 my @res;
435 510
436 (async { 511 (async {
512 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 513 @res = eval { $job->() };
438 warn $@ if $@; 514 warn $@ if $@;
439 undef $busy; 515 undef $busy;
440 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
441 517
442 while ($busy) { 518 while ($busy) {
443 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
444 } 523 }
524 }
445 525
446 $time = Event::time - $time; 526 my $time = EV::time - $time;
447 527
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
452 529
453 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
454 } else { 531 } else {
455 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
456 533
481=item fork_call { }, $args 558=item fork_call { }, $args
482 559
483Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
487 564
488=cut 565=cut
489 566
490sub fork_call(&@) { 567sub fork_call(&@) {
491 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
498 reset_signals; 575 reset_signals;
499 &$cb 576 &$cb
500 }, @args; 577 }, @args;
501 578
502 wantarray ? @res : $res[-1] 579 wantarray ? @res : $res[-1]
580}
581
582=item $coin = coin_from_name $name
583
584=cut
585
586our %coin_alias = (
587 "silver" => "silvercoin",
588 "silvercoin" => "silvercoin",
589 "silvercoins" => "silvercoin",
590 "gold" => "goldcoin",
591 "goldcoin" => "goldcoin",
592 "goldcoins" => "goldcoin",
593 "platinum" => "platinacoin",
594 "platinumcoin" => "platinacoin",
595 "platinumcoins" => "platinacoin",
596 "platina" => "platinacoin",
597 "platinacoin" => "platinacoin",
598 "platinacoins" => "platinacoin",
599 "royalty" => "royalty",
600 "royalties" => "royalty",
601);
602
603sub coin_from_name($) {
604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
503} 607}
504 608
505=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
506 610
507Returns a single value from the environment database. 611Returns a single value from the environment database.
646 750
647############################################################################# 751#############################################################################
648 752
649=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
650 754
651Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
654 758
655In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 761Deliantra).
658 762
659=over 4 763=over 4
660 764
661=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
662 766
706=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
707 811
708Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
710 814
711Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
713 817
714These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
715 819
716=over 4 820=over 4
944 } 1048 }
945 1049
946 0 1050 0
947} 1051}
948 1052
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1054
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1056
953Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
954 1058
960 1064
961=cut 1065=cut
962 1066
963############################################################################# 1067#############################################################################
964# object support 1068# object support
965#
966 1069
1070sub _object_equal($$);
1071sub _object_equal($$) {
1072 my ($a, $b) = @_;
1073
1074 return 0 unless (ref $a) eq (ref $b);
1075
1076 if ("HASH" eq ref $a) {
1077 my @ka = keys %$a;
1078 my @kb = keys %$b;
1079
1080 return 0 if @ka != @kb;
1081
1082 for (0 .. $#ka) {
1083 return 0 unless $ka[$_] eq $kb[$_];
1084 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1085 }
1086
1087 } elsif ("ARRAY" eq ref $a) {
1088
1089 return 0 if @$a != @$b;
1090
1091 for (0 .. $#$a) {
1092 return 0 unless _object_equal $a->[$_], $b->[$_];
1093 }
1094
1095 } elsif ($a ne $b) {
1096 return 0;
1097 }
1098
1099 1
1100}
1101
1102our $SLOW_MERGES;#d#
967sub _can_merge { 1103sub _can_merge {
968 my ($ob1, $ob2) = @_; 1104 my ($ob1, $ob2) = @_;
969 1105
970 local $Storable::canonical = 1; 1106 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1107
974 $fob1 eq $fob2 1108 # we do the slow way here
1109 return _object_equal $ob1, $ob2
975} 1110}
976 1111
977sub reattach { 1112sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1114 my ($obj) = @_;
980 1115
1116 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1118
983 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
984 1120
985 @$registry = (); 1121 @$registry = ();
986 1122
1001cf::attachable->attach ( 1137cf::attachable->attach (
1002 prio => -1000000, 1138 prio => -1000000,
1003 on_instantiate => sub { 1139 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
1005 1141
1006 $data = from_json $data; 1142 $data = decode_json $data;
1007 1143
1008 for (@$data) { 1144 for (@$data) {
1009 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
1010 1146
1011 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
1024 }, 1160 },
1025); 1161);
1026 1162
1027sub object_freezer_save { 1163sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1164 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1165
1032 sync_job { 1166 sync_job {
1033 if (length $$rdata) { 1167 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1037 1171
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1042 close $fh; 1176 aio_close $fh;
1043 1177
1044 if (@$objs) { 1178 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1184 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1186 }
1053 } else { 1187 } else {
1054 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1055 } 1189 }
1061 } else { 1195 } else {
1062 aio_unlink $filename; 1196 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1064 } 1198 }
1065 }; 1199 };
1066
1067 undef $guard;
1068} 1200}
1069 1201
1070sub object_freezer_as_string { 1202sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1203 my ($rdata, $objs) = @_;
1072 1204
1077 1209
1078sub object_thawer_load { 1210sub object_thawer_load {
1079 my ($filename) = @_; 1211 my ($filename) = @_;
1080 1212
1081 my ($data, $av); 1213 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1214
1085 (aio_load $filename, $data) >= 0 1215 (aio_load $filename, $data) >= 0
1086 or return; 1216 or return;
1087 1217
1088 unless (aio_stat "$filename.pst") { 1218 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1219 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1220 or return;
1091 1221
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1222 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs};
1094 } 1224 }
1095 1225
1096 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1227 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1228 $decname, length $data, scalar @{$av || []};
1228 1358
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1361
1232 $ext{source} = 1362 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1235 . $source 1365 . $source
1236 . "\n};\n1"; 1366 . "\n};\n1";
1237 1367
1238 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1384 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1385 : "$v->{base}: extension inactive.\n";
1256 1386
1257 if (exists $v->{meta}{mandatory}) { 1387 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1388 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1389 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1390 }
1262 1391
1263 warn $msg; 1392 warn $msg;
1264 } 1393 }
1265 1394
1279 1408
1280=back 1409=back
1281 1410
1282=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1283 1412
1284Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1285 1414
1286=cut 1415=cut
1287 1416
1288package cf::player; 1417package cf::player;
1289 1418
1332 1461
1333sub exists($) { 1462sub exists($) {
1334 my ($login) = @_; 1463 my ($login) = @_;
1335 1464
1336 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1338} 1467}
1339 1468
1340sub find($) { 1469sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1471 my $login = $_[0];
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1481 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1482
1354 my $f = new_from_file cf::object::thawer path $login 1483 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1484 or return;
1356 1485
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1486 my $pl = cf::player::load_pl $f
1359 or return; 1487 or return;
1488
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1489 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1490 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1363 } 1492 }
1364 } 1493 }
1374 1503
1375 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1376 1505
1377 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1508
1509 cf::get_slot 0.01;
1379 1510
1380 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1512 cf::cede_to_tick;
1382} 1513}
1383 1514
1415 my ($pl) = @_; 1546 my ($pl) = @_;
1416 1547
1417 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1418 1549
1419 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1552
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1426 1559
1427 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1600
1468 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1469 my $path = path $login; 1602 my $path = path $login;
1470 1603
1471 # a .pst is a dead give-away for a valid player 1604 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1610 }
1477 1611
1508 } 1642 }
1509 1643
1510 \@paths 1644 \@paths
1511} 1645}
1512 1646
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1648
1515Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1650
1564=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1565 1652
1566Sends an ext reply to the player. 1653Sends an ext reply to the player.
1567 1654
1634our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1636 1723
1637sub generate_random_map { 1724sub generate_random_map {
1638 my ($self, $rmp) = @_; 1725 my ($self, $rmp) = @_;
1726
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728
1639 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1730 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1765 1855
1766# the temporary/swap location 1856# the temporary/swap location
1767sub save_path { 1857sub save_path {
1768 my ($self) = @_; 1858 my ($self) = @_;
1769 1859
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1772} 1862}
1773 1863
1774# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1775sub uniq_path { 1865sub uniq_path {
1776 my ($self) = @_; 1866 my ($self) = @_;
1777 1867
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1780} 1870}
1781 1871
1782# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1783# all maps in C++... 1873# all maps in C++...
1881 1971
1882 cf::lock_wait "map_data:$path";#d#remove 1972 cf::lock_wait "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1884 1974
1885 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1888 1978
1889 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1890 or return; 1980 or return;
1891 1981
1892 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1895 or return; 1985 or return;
1896 1986
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1900 undef $guard1; 1991 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 1992 $map->reset;
1903 return find $path; 1993 return find $path;
1904 } 1994 }
1905 1995
1906 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2024 $f->skip_block;
1935 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
1936 or return; 2026 or return;
1937 2027
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
1939 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1940 2030
1941 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2032 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
1969 } 2059 }
1970 2060
1971 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
1973 2063
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2065 }
1976 2066
1977 $self->post_load; 2067 $self->post_load;
1978} 2068}
1979 2069
2037 my ($path, $origin, $load) = @_; 2127 my ($path, $origin, $load) = @_;
2038 2128
2039 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
2040 2130
2041 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2133 }
2044 2134
2045 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2046 2136
2047 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
2048 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2142 if (my $map = find $k) {
2051 $map->load if $v; 2143 $map->load if $v;
2052 } 2144 }
2078 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2079 2171
2080 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2081 2173
2082 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2084 }; 2177 };
2178
2179 cf::get_slot 0.02;
2085 2180
2086 if ($uniq) { 2181 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2184 } else {
2098 $self->save; 2193 $self->save;
2099 2194
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2196
2102 return if $self->players; 2197 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2105 2200
2106 $self->in_memory (cf::MAP_SWAPPED); 2201 $self->in_memory (cf::MAP_SWAPPED);
2107 2202
2108 $self->deactivate; 2203 $self->deactivate;
2226 2321
2227sub unique_maps() { 2322sub unique_maps() {
2228 [ 2323 [
2229 map { 2324 map {
2230 utf8::decode $_; 2325 utf8::decode $_;
2231 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2232 ? normalise $_ 2329 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2331 ]
2236} 2332}
2237 2333
2238package cf;
2239
2240=back 2334=back
2241 2335
2242=head3 cf::object 2336=head3 cf::object
2243 2337
2244=cut 2338=cut
2247 2341
2248=over 4 2342=over 4
2249 2343
2250=item $ob->inv_recursive 2344=item $ob->inv_recursive
2251 2345
2252Returns the inventory of the object _and_ their inventories, recursively. 2346Returns the inventory of the object I<and> their inventories, recursively,
2347but I<not> the object itself.
2253 2348
2254=cut 2349=cut
2255 2350
2256sub inv_recursive_; 2351sub inv_recursive_;
2257sub inv_recursive_ { 2352sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2263} 2358}
2264 2359
2265=item $ref = $ob->ref 2360=item $ref = $ob->ref
2266 2361
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2362Creates and returns a persistent reference to an object that can be stored as a string.
2268 2363
2269=item $ob = cf::object::deref ($refstring) 2364=item $ob = cf::object::deref ($refstring)
2270 2365
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2366returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2367even if the object actually exists. May block.
2274=cut 2369=cut
2275 2370
2276sub deref { 2371sub deref {
2277 my ($ref) = @_; 2372 my ($ref) = @_;
2278 2373
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2374 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2375 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2376 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2377 or return;
2286 $pl->ob->uuid eq $uuid 2378 $pl->ob->uuid eq $uuid
2287 or return; 2379 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2399can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2400dialogue with the given NPC character.
2309 2401
2310=cut 2402=cut
2311 2403
2404our $SAY_CHANNEL = {
2405 id => "say",
2406 title => "Map",
2407 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2409};
2410
2411our $CHAT_CHANNEL = {
2412 id => "chat",
2413 title => "Chat",
2414 reply => "chat ",
2415 tooltip => "Player chat and shouts, global to the server.",
2416};
2417
2312# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2419# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2420#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2422 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2435
2330 } else { 2436 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2439 }
2334 } 2440 }
2335} 2441}
2336 2442
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2468
2363=item $player_object->enter_link 2469=item $player_object->enter_link
2364 2470
2365Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2366 2472
2367The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2369 2477
2370Will never block. 2478Will never block.
2371 2479
2372=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2373 2481
2431 2539
2432 $map->load; 2540 $map->load;
2433 $map->load_neighbours; 2541 $map->load_neighbours;
2434 2542
2435 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2436 $self->activate_recursive; 2545 $self->activate_recursive;
2437 2546
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2440} 2549}
2445her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2555that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2556the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2557be called at the end of this process.
2449 2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
2561
2450=cut 2562=cut
2451 2563
2452our $GOTOGEN; 2564our $GOTOGEN;
2453 2565
2454sub cf::object::player::goto { 2566sub cf::object::player::goto {
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2571
2460 $self->enter_link; 2572 $self->enter_link;
2461 2573
2462 (async { 2574 (async {
2575 $Coro::current->{desc} = "player::goto $path $x $y";
2576
2463 # *tag paths override both path and x|y 2577 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2578 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2579 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2580 my $ob = $obs[rand @obs];
2467 2581
2468 # see if we actually can go there 2582 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2583 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 2584 $ob = $obs[rand @obs];
2585 } else {
2586 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 }
2588 # else put us there anyways for now #d#
2471 2589
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2590 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2591 } else {
2592 ($path, $x, $y) = (undef, undef, undef);
2473 } 2593 }
2474 } 2594 }
2475 2595
2476 my $map = eval { 2596 my $map = eval {
2477 my $map = cf::map::find $path; 2597 my $map = defined $path ? cf::map::find $path : undef;
2478 2598
2479 if ($map) { 2599 if ($map) {
2480 $map = $map->customise_for ($self); 2600 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2601 $map = $check->($map) if $check && $map;
2482 } else { 2602 } else {
2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2484 } 2604 }
2485 2605
2486 $map 2606 $map
2487 }; 2607 };
2488 2608
2524} 2644}
2525 2645
2526sub prepare_random_map { 2646sub prepare_random_map {
2527 my ($exit) = @_; 2647 my ($exit) = @_;
2528 2648
2529 my $guard = cf::lock_acquire "exit_prepare:$exit";
2530
2531 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2532 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2533 # that depends on the exit object 2651 # that depends on the exit object
2534 2652
2535 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
2537 if ($exit->map) { 2655 if ($exit->map) {
2538 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2539 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2540 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2541 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2542 } 2662 }
2543 2663
2544 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2545 2665
2546 my $data = cf::to_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2547 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2548 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2549 2669
2550 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2551 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2552 undef $fh; 2672 undef $fh;
2553 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2554 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2555 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2556 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2557 } 2681 }
2558} 2682}
2559 2683
2560sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2561 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2562 2686
2563 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2564 2688
2565 if ($exit->slaying eq "/!") {
2566 #TODO: this should de-fi-ni-te-ly not be a sync-job
2567 # the problem is that $exit might not survive long enough
2568 # so it needs to be done right now, right here
2569 cf::sync_job { prepare_random_map $exit };
2570 }
2571
2572 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2573 my $hp = $exit->stats->hp;
2574 my $sp = $exit->stats->sp;
2575
2576 $self->enter_link; 2689 $self->enter_link;
2577 2690
2578 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED);
2581
2582 (async { 2691 (async {
2583 $self->deactivate_recursive; # just to be sure 2692 $Coro::current->{desc} = "enter_exit";
2693
2584 unless (eval { 2694 unless (eval {
2695 $self->deactivate_recursive; # just to be sure
2696
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2706 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp;
2708
2585 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2586 2710
2711 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y)
2713 if $exit->flag (cf::FLAG_DAMNED);
2714
2587 1; 2715 1
2588 }) { 2716 }) {
2589 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2590 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2591 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2592 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2593 2721
2594 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
2622the message, with C<log> being the default. If C<$color> is negative, suppress 2750the message, with C<log> being the default. If C<$color> is negative, suppress
2623the message unless the client supports the msg packet. 2751the message unless the client supports the msg packet.
2624 2752
2625=cut 2753=cut
2626 2754
2755# non-persistent channels (usually the info channel)
2627our %CHANNEL = ( 2756our %CHANNEL = (
2628 "c/identify" => { 2757 "c/identify" => {
2629 id => "identify", 2758 id => "infobox",
2630 title => "Identify", 2759 title => "Identify",
2631 reply => undef, 2760 reply => undef,
2632 tooltip => "Items recently identified", 2761 tooltip => "Items recently identified",
2633 }, 2762 },
2634 "c/examine" => { 2763 "c/examine" => {
2635 id => "examine", 2764 id => "infobox",
2636 title => "Examine", 2765 title => "Examine",
2637 reply => undef, 2766 reply => undef,
2638 tooltip => "Signs and other items you examined", 2767 tooltip => "Signs and other items you examined",
2639 }, 2768 },
2769 "c/book" => {
2770 id => "infobox",
2771 title => "Book",
2772 reply => undef,
2773 tooltip => "The contents of a note or book",
2774 },
2775 "c/lookat" => {
2776 id => "infobox",
2777 title => "Look",
2778 reply => undef,
2779 tooltip => "What you saw there",
2780 },
2781 "c/who" => {
2782 id => "infobox",
2783 title => "Players",
2784 reply => undef,
2785 tooltip => "Shows players who are currently online",
2786 },
2787 "c/body" => {
2788 id => "infobox",
2789 title => "Body Parts",
2790 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available",
2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2799 "c/uptime" => {
2800 id => "infobox",
2801 title => "Uptime",
2802 reply => undef,
2803 tooltip => "How long the server has been running since last restart",
2804 },
2805 "c/mapinfo" => {
2806 id => "infobox",
2807 title => "Map Info",
2808 reply => undef,
2809 tooltip => "Information related to the maps",
2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2640); 2817);
2641 2818
2642sub cf::client::send_msg { 2819sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2644 2821
2645 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2646 2824
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 2826
2649 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2828 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel};
2651 2830
2831 $self->ext_msg (channel_info => $channel)
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id};
2835
2652 if (ref $channel) { 2836 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 2837 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 2838 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 2839 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 2840 $self->ext_msg (channel_info => $channel)
2657 if $self->can_msg; 2841 if $self->can_msg;
2665 if ($self->can_msg) { 2849 if ($self->can_msg) {
2666 # default colour, mask it out 2850 # default colour, mask it out
2667 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2668 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2669 2853
2670 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2671 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2672 } else { 2870 } else {
2673 if ($color >= 0) { 2871 if ($color >= 0) {
2674 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2675 for ($msg) { 2873 for ($msg) {
2676 1 while 2874 1 while
2874=pod 3072=pod
2875 3073
2876The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2877 3075
2878 cf::object 3076 cf::object
2879 contr pay_amount pay_player map x y force_find force_add 3077 contr pay_amount pay_player map x y force_find force_add destroy
2880 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
2881 3079
2882 cf::object::player 3080 cf::object::player
2883 player 3081 player
2884 3082
2885 cf::player 3083 cf::player
2890 3088
2891=cut 3089=cut
2892 3090
2893for ( 3091for (
2894 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2895 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
2896 decrease_ob_nr)], 3094 decrease split destroy change_exp)],
2897 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
2898 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
2899 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
2900) { 3098) {
2901 no strict 'refs'; 3099 no strict 'refs';
3006 { 3204 {
3007 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
3008 3206
3009 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
3010 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
3011 cf::face::set_visibility $idx, $info->{visibility}; 3210 cf::face::set_visibility $idx, $info->{visibility};
3012 cf::face::set_magicmap $idx, $info->{magicmap}; 3211 cf::face::set_magicmap $idx, $info->{magicmap};
3013 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3014 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3015 3214
3016 cf::cede_to_tick; 3215 cf::cede_to_tick;
3017 } 3216 }
3018 3217
3019 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
3020 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
3021 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
3022 or next; 3222 or next;
3223
3023 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
3024 cf::face::set_smooth $idx, $smooth; 3225 cf::face::set_smooth $idx, $smooth;
3025 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3026 } else { 3227 } else {
3027 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
3045 { 3246 {
3046 # TODO: for gcfclient pleasure, we should give resources 3247 # TODO: for gcfclient pleasure, we should give resources
3047 # that gcfclient doesn't grok a >10000 face index. 3248 # that gcfclient doesn't grok a >10000 face index.
3048 my $res = $facedata->{resource}; 3249 my $res = $facedata->{resource};
3049 3250
3050 my $soundconf = delete $res->{"res/sound.conf"};
3051
3052 while (my ($name, $info) = each %$res) { 3251 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) {
3053 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3253 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3054 my $data; 3254 my $data;
3055 3255
3056 if ($info->{type} & 1) { 3256 if ($info->{type} & 1) {
3057 # prepend meta info 3257 # prepend meta info
3058 3258
3059 my $meta = $enc->encode ({ 3259 my $meta = $enc->encode ({
3060 name => $name, 3260 name => $name,
3061 %{ $info->{meta} || {} }, 3261 %{ $info->{meta} || {} },
3062 }); 3262 });
3063 3263
3064 $data = pack "(w/a*)*", $meta, $info->{data}; 3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type};
3065 } else { 3271 } else {
3066 $data = $info->{data}; 3272 $RESOURCE{$name} = $info;
3067 } 3273 }
3068 3274
3069 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3070 cf::face::set_type $idx, $info->{type};
3071
3072 cf::cede_to_tick; 3275 cf::cede_to_tick;
3073 } 3276 }
3074
3075 if ($soundconf) {
3076 $soundconf = $enc->decode (delete $soundconf->{data});
3077
3078 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3079 my $sound = $soundconf->{compat}[$_]
3080 or next;
3081
3082 my $face = cf::face::find "sound/$sound->[1]";
3083 cf::sound::set $sound->[0] => $face;
3084 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3085 }
3086
3087 while (my ($k, $v) = each %{$soundconf->{event}}) {
3088 my $face = cf::face::find "sound/$v";
3089 cf::sound::set $k => $face;
3090 }
3091 }
3092 } 3277 }
3278
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3093 3280
3094 1 3281 1
3095} 3282}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3096 3303
3097register_exticmd fx_want => sub { 3304register_exticmd fx_want => sub {
3098 my ($ns, $want) = @_; 3305 my ($ns, $want) = @_;
3099 3306
3100 while (my ($k, $v) = each %$want) { 3307 while (my ($k, $v) = each %$want) {
3101 $ns->fx_want ($k, $v); 3308 $ns->fx_want ($k, $v);
3102 } 3309 }
3103}; 3310};
3311
3312sub load_resource_file($) {
3313 my $guard = lock_acquire "load_resource_file";
3314
3315 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100;
3317 cf::arch::commit_load;
3318
3319 $status
3320}
3104 3321
3105sub reload_regions { 3322sub reload_regions {
3106 # HACK to clear player env face cache, we need some signal framework 3323 # HACK to clear player env face cache, we need some signal framework
3107 # for this (global event?) 3324 # for this (global event?)
3108 %ext::player_env::MUSIC_FACE_CACHE = (); 3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3122} 3339}
3123 3340
3124sub reload_archetypes { 3341sub reload_archetypes {
3125 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
3127 #d# NEED to laod twice to resolve forward references
3128 # this really needs to be done in an extra post-pass
3129 # (which needs to be synchronous, so solve it differently)
3130 load_resource_file "$DATADIR/archetypes"
3131 or die "unable to load archetypes\n";
3132} 3344}
3133 3345
3134sub reload_treasures { 3346sub reload_treasures {
3135 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
3136 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
3137} 3349}
3138 3350
3139sub reload_resources { 3351sub reload_resources {
3140 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
3141 3353
3354 reload_facedata;
3355 reload_archetypes;
3142 reload_regions; 3356 reload_regions;
3143 reload_facedata;
3144 #reload_archetypes;#d#
3145 reload_archetypes;
3146 reload_treasures; 3357 reload_treasures;
3147 3358
3148 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3149}
3150
3151sub init {
3152 reload_resources;
3153} 3360}
3154 3361
3155sub reload_config { 3362sub reload_config {
3156 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3157 or return; 3364 or return;
3158 3365
3159 local $/; 3366 local $/;
3160 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
3161 3368
3162 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3163 3370
3164 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3165 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3171 }; 3378 };
3172 warn $@ if $@; 3379 warn $@ if $@;
3173 } 3380 }
3174} 3381}
3175 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
3176sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
3177 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3179 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3180 (async { 3421 (async {
3181 Event::one_event; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3423 EV::loop EV::LOOP_ONESHOT;
3182 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3183 }; 3425 };
3184 3426
3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3185 reload_config; 3431 reload_config;
3186 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
3187 load_extensions; 3445 load_extensions;
3188 3446
3189 $TICK_WATCHER->start; 3447 utime time, time, $RUNTIMEFILE;
3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3453 };
3454
3190 Event::loop; 3455 EV::loop;
3191} 3456}
3192 3457
3193############################################################################# 3458#############################################################################
3194# initialisation and cleanup 3459# initialisation and cleanup
3195 3460
3196# install some emergency cleanup handlers 3461# install some emergency cleanup handlers
3197BEGIN { 3462BEGIN {
3463 our %SIGWATCHER = ();
3198 for my $signal (qw(INT HUP TERM)) { 3464 for my $signal (qw(INT HUP TERM)) {
3199 Event->signal ( 3465 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3200 reentrant => 0,
3201 data => WF_AUTOCANCEL,
3202 signal => $signal,
3203 prio => 0,
3204 cb => sub {
3205 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
3206 },
3207 ); 3467 };
3208 } 3468 }
3209} 3469}
3210 3470
3211sub write_runtime { 3471sub write_runtime_sync {
3212 my $runtime = "$LOCALDIR/runtime";
3213
3214 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3215 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3216 3474
3217 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3218 3476
3219 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3220 3478
3221 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3222 or return; 3480 or return;
3223 3481
3224 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3225 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3226 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
3236 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3237 3495
3238 close $fh 3496 close $fh
3239 or return; 3497 or return;
3240 3498
3241 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3242 and return; 3500 and return;
3243 3501
3244 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3245 3503
3246 1 3504 1
3505}
3506
3507our $uuid_lock;
3508our $uuid_skip;
3509
3510sub write_uuid_sync($) {
3511 $uuid_skip ||= $_[0];
3512
3513 return if $uuid_lock;
3514 local $uuid_lock = 1;
3515
3516 my $uuid = "$LOCALDIR/uuid";
3517
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return;
3520
3521 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3522 $uuid_skip = 0;
3523
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return;
3526
3527 # always fsync - this file is important
3528 aio_fsync $fh
3529 and return;
3530
3531 close $fh
3532 or return;
3533
3534 aio_rename "$uuid~", $uuid
3535 and return;
3536
3537 warn "uuid file written ($value).\n";
3538
3539 1
3540
3541}
3542
3543sub write_uuid($$) {
3544 my ($skip, $sync) = @_;
3545
3546 $sync ? write_uuid_sync $skip
3547 : async { write_uuid_sync $skip };
3247} 3548}
3248 3549
3249sub emergency_save() { 3550sub emergency_save() {
3250 my $freeze_guard = cf::freeze_mainloop; 3551 my $freeze_guard = cf::freeze_mainloop;
3251 3552
3257 # and maps saved/destroyed asynchronously. 3558 # and maps saved/destroyed asynchronously.
3258 warn "begin emergency player save\n"; 3559 warn "begin emergency player save\n";
3259 for my $login (keys %cf::PLAYER) { 3560 for my $login (keys %cf::PLAYER) {
3260 my $pl = $cf::PLAYER{$login} or next; 3561 my $pl = $cf::PLAYER{$login} or next;
3261 $pl->valid or next; 3562 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3262 $pl->save; 3564 $pl->save;
3263 } 3565 }
3264 warn "end emergency player save\n"; 3566 warn "end emergency player save\n";
3265 3567
3266 warn "begin emergency map save\n"; 3568 warn "begin emergency map save\n";
3272 warn "end emergency map save\n"; 3574 warn "end emergency map save\n";
3273 3575
3274 warn "begin emergency database checkpoint\n"; 3576 warn "begin emergency database checkpoint\n";
3275 BDB::db_env_txn_checkpoint $DB_ENV; 3577 BDB::db_env_txn_checkpoint $DB_ENV;
3276 warn "end emergency database checkpoint\n"; 3578 warn "end emergency database checkpoint\n";
3579
3580 warn "begin write uuid\n";
3581 write_uuid_sync 1;
3582 warn "end write uuid\n";
3277 }; 3583 };
3278 3584
3279 warn "leave emergency perl save\n"; 3585 warn "leave emergency perl save\n";
3280} 3586}
3281 3587
3282sub post_cleanup { 3588sub post_cleanup {
3283 my ($make_core) = @_; 3589 my ($make_core) = @_;
3284 3590
3285 warn Carp::longmess "post_cleanup backtrace" 3591 warn Carp::longmess "post_cleanup backtrace"
3286 if $make_core; 3592 if $make_core;
3593
3594 my $fh = pidfile;
3595 unlink $PIDFILE if <$fh> == $$;
3596}
3597
3598# a safer delete_package, copied from Symbol
3599sub clear_package($) {
3600 my $pkg = shift;
3601
3602 # expand to full symbol table name if needed
3603 unless ($pkg =~ /^main::.*::$/) {
3604 $pkg = "main$pkg" if $pkg =~ /^::/;
3605 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3606 $pkg .= '::' unless $pkg =~ /::$/;
3607 }
3608
3609 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3610 my $stem_symtab = *{$stem}{HASH};
3611
3612 defined $stem_symtab and exists $stem_symtab->{$leaf}
3613 or return;
3614
3615 # clear all symbols
3616 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3617 for my $name (keys %$leaf_symtab) {
3618 _gv_clear *{"$pkg$name"};
3619# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3620 }
3621 warn "cleared package $pkg\n";#d#
3287} 3622}
3288 3623
3289sub do_reload_perl() { 3624sub do_reload_perl() {
3290 # can/must only be called in main 3625 # can/must only be called in main
3291 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3292 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3293 return; 3628 return;
3294 } 3629 }
3295 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3296 warn "reloading..."; 3634 warn "reloading...";
3297 3635
3298 warn "entering sync_job"; 3636 warn "entering sync_job";
3299 3637
3300 cf::sync_job { 3638 cf::sync_job {
3301 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3302 cf::emergency_save; 3640 cf::emergency_save;
3303 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3304 3642
3305 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3306 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3307 3645
3308 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3309 3647
3310 warn "cancelling all WF_AUTOCANCEL watchers";
3311 for (Event::all_watchers) {
3312 $_->cancel if $_->data & WF_AUTOCANCEL;
3313 }
3314
3315 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3316 for (;;) {
3317 BDB::flush;
3318 IO::AIO::flush;
3319 Coro::cede;
3320 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3321 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3322 }
3323
3324 ++$RELOAD;
3325
3326 warn "cancelling all extension coros";
3327 $_->cancel for values %EXT_CORO;
3328 %EXT_CORO = ();
3329
3330 warn "removing commands";
3331 %COMMAND = ();
3332
3333 warn "removing ext/exti commands";
3334 %EXTCMD = ();
3335 %EXTICMD = ();
3336
3337 warn "unloading/nuking all extensions";
3338 for my $pkg (@EXTS) {
3339 warn "... unloading $pkg";
3340
3341 if (my $cb = $pkg->can ("unload")) {
3342 eval {
3343 $cb->($pkg);
3344 1
3345 } or warn "$pkg unloaded, but with errors: $@";
3346 } 3651 }
3347 3652
3348 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3349 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3350 } 3655 %EXT_CORO = ();
3351 3656
3352 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3353 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3354 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3355 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3356 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3357 delete $INC{$k};
3358 3667
3359 $k =~ s/\.pm$//;
3360 $k =~ s/\//::/g;
3361
3362 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3363 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3364 } 3677 }
3365 3678
3366 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3367 } 3694 }
3368 3695
3369 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3370 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3371 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3372 3699
3373 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3374 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3375 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3376 3703
3377 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3378 # and global variables created in xs 3705 # and global variables created in xs
3379 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3380 3707
3381 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3382 3709
3383 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3384 require cf; 3711 require cf;
3385 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3386 3713
3387 warn "loading config and database again"; 3714 warn "loading config and database again";
3388 cf::reload_config; 3715 cf::reload_config;
3389 3716
3390 warn "loading extensions"; 3717 warn "loading extensions";
3391 cf::load_extensions; 3718 cf::load_extensions;
3392 3719
3393 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3394 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3395 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3396 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3397 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3398 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3399 3726
3727 warn "running post_load";
3728 (pop @POST_INIT)->(1) while @POST_INIT;
3729
3400 warn "leaving sync_job"; 3730 warn "leaving sync_job";
3401 3731
3402 1 3732 1
3403 } or do { 3733 } or do {
3404 warn $@; 3734 warn $@;
3405 warn "error while reloading, exiting."; 3735 cf::cleanup "error while reloading, exiting.";
3406 exit 1;
3407 }; 3736 };
3408 3737
3409 warn "reloaded"; 3738 warn "reloaded";
3739 --$RELOAD;
3740 }
3410}; 3741};
3411 3742
3412our $RELOAD_WATCHER; # used only during reload 3743our $RELOAD_WATCHER; # used only during reload
3413 3744
3414sub reload_perl() { 3745sub reload_perl() {
3415 # doing reload synchronously and two reloads happen back-to-back, 3746 # doing reload synchronously and two reloads happen back-to-back,
3416 # coro crashes during coro_state_free->destroy here. 3747 # coro crashes during coro_state_free->destroy here.
3417 3748
3418 $RELOAD_WATCHER ||= Event->timer ( 3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3419 reentrant => 0,
3420 after => 0,
3421 data => WF_AUTOCANCEL,
3422 cb => sub {
3423 do_reload_perl; 3750 do_reload_perl;
3424 undef $RELOAD_WATCHER; 3751 undef $RELOAD_WATCHER;
3425 },
3426 ); 3752 };
3427} 3753}
3428 3754
3429register_command "reload" => sub { 3755register_command "reload" => sub {
3430 my ($who, $arg) = @_; 3756 my ($who, $arg) = @_;
3431 3757
3432 if ($who->flag (FLAG_WIZ)) { 3758 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 3759 $who->message ("reloading server.");
3760 async {
3761 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 3762 reload_perl;
3763 };
3435 } 3764 }
3436}; 3765};
3437 3766
3438unshift @INC, $LIBDIR; 3767unshift @INC, $LIBDIR;
3439 3768
3441 3770
3442our @WAIT_FOR_TICK; 3771our @WAIT_FOR_TICK;
3443our @WAIT_FOR_TICK_BEGIN; 3772our @WAIT_FOR_TICK_BEGIN;
3444 3773
3445sub wait_for_tick { 3774sub wait_for_tick {
3446 return unless $TICK_WATCHER->is_active;
3447 return if $Coro::current == $Coro::main; 3775 return if tick_inhibit || $Coro::current == $Coro::main;
3448 3776
3449 my $signal = new Coro::Signal; 3777 my $signal = new Coro::Signal;
3450 push @WAIT_FOR_TICK, $signal; 3778 push @WAIT_FOR_TICK, $signal;
3451 $signal->wait; 3779 $signal->wait;
3452} 3780}
3453 3781
3454sub wait_for_tick_begin { 3782sub wait_for_tick_begin {
3455 return unless $TICK_WATCHER->is_active;
3456 return if $Coro::current == $Coro::main; 3783 return if tick_inhibit || $Coro::current == $Coro::main;
3457 3784
3458 my $signal = new Coro::Signal; 3785 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 3786 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 3787 $signal->wait;
3461} 3788}
3462 3789
3463our $stat_fh; 3790sub tick {
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3465
3466$TICK_WATCHER = Event->timer (
3467 reentrant => 0,
3468 parked => 1,
3469 prio => 0,
3470 at => $NEXT_TICK || $TICK,
3471 data => WF_AUTOCANCEL,
3472 cb => sub {
3473 if ($Coro::current != $Coro::main) { 3791 if ($Coro::current != $Coro::main) {
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3792 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10; 3793 unless ++$bug_warning > 10;
3476 return; 3794 return;
3477 } 3795 }
3478 3796
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
3481 $NOW = $tick_start = Event::time;
3482
3483 cf::server_tick; # one server iteration 3797 cf::server_tick; # one server iteration
3484 3798
3485 $RUNTIME += $TICK;
3486 $NEXT_TICK += $TICK;
3487
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3799 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 3800 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3490 Coro::async_pool { 3801 Coro::async_pool {
3802 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 3803 write_runtime_sync
3492 or warn "ERROR: unable to write runtime file: $!"; 3804 or warn "ERROR: unable to write runtime file: $!";
3493 };
3494 } 3805 };
3806 }
3495 3807
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3808 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 3809 $sig->send;
3501 } 3810 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 3811 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 3812 $sig->send;
3504 } 3813 }
3505 3814
3506 $NOW = Event::time; 3815 $LOAD = ($NOW - $TICK_START) / $TICK;
3507
3508 # if we are delayed by four ticks or more, skip them all
3509 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3510
3511 $TICK_WATCHER->at ($NEXT_TICK);
3512 $TICK_WATCHER->start;
3513
3514 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3816 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 3817
3517 _post_tick; 3818 if (0) {
3518 3819 if ($NEXT_TICK) {
3519 # gather some statistics#d# 3820 my $jitter = $TICK_START - $NEXT_TICK;
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3821 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3822 warn "jitter $JITTER\n";#d#
3823 }
3522 }, 3824 }
3523); 3825}
3524 3826
3525{ 3827{
3828 # configure BDB
3829
3526 BDB::min_parallel 8; 3830 BDB::min_parallel 8;
3527 BDB::max_poll_time $TICK * 0.1; 3831 BDB::max_poll_reqs $TICK * 0.1;
3528 $BDB_POLL_WATCHER = Event->io ( 3832 $AnyEvent::BDB::WATCHER->priority (1);
3529 reentrant => 0,
3530 fd => BDB::poll_fileno,
3531 poll => 'r',
3532 prio => 0,
3533 data => WF_AUTOCANCEL,
3534 cb => \&BDB::poll_cb,
3535 );
3536
3537 BDB::set_sync_prepare {
3538 my $status;
3539 my $current = $Coro::current;
3540 (
3541 sub {
3542 $status = $!;
3543 $current->ready; undef $current;
3544 },
3545 sub {
3546 Coro::schedule while defined $current;
3547 $! = $status;
3548 },
3549 )
3550 };
3551 3833
3552 unless ($DB_ENV) { 3834 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create; 3835 $DB_ENV = BDB::db_env_create;
3836 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3837 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3838 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3839 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3840 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3554 3841
3555 cf::sync_job { 3842 cf::sync_job {
3556 eval { 3843 eval {
3557 BDB::db_env_open 3844 BDB::db_env_open
3558 $DB_ENV, 3845 $DB_ENV,
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3847 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3848 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 3849 0666;
3563 3850
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3851 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 }; 3852 };
3570 3853
3571 cf::cleanup "db_env_open(db): $@" if $@; 3854 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 3855 };
3573 } 3856 }
3574 3857
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3858 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3576 after => 11, 3859 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 interval => 60, 3860 };
3578 hard => 1, 3861 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => sub {
3582 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3862 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3583 },
3584 ); 3863 };
3585 $BDB_TRICKLE_WATCHER = Event->timer ( 3864 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3586 after => 5,
3587 interval => 10,
3588 hard => 1,
3589 prio => 0,
3590 data => WF_AUTOCANCEL,
3591 cb => sub {
3592 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3865 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3593 },
3594 ); 3866 };
3595} 3867}
3596 3868
3597{ 3869{
3870 # configure IO::AIO
3871
3598 IO::AIO::min_parallel 8; 3872 IO::AIO::min_parallel 8;
3599
3600 undef $Coro::AIO::WATCHER;
3601 IO::AIO::max_poll_time $TICK * 0.1; 3873 IO::AIO::max_poll_time $TICK * 0.1;
3602 $AIO_POLL_WATCHER = Event->io ( 3874 undef $AnyEvent::AIO::WATCHER;
3603 reentrant => 0,
3604 data => WF_AUTOCANCEL,
3605 fd => IO::AIO::poll_fileno,
3606 poll => 'r',
3607 prio => 6,
3608 cb => \&IO::AIO::poll_cb,
3609 );
3610} 3875}
3611 3876
3612my $_log_backtrace; 3877my $_log_backtrace;
3613 3878
3614sub _log_backtrace { 3879sub _log_backtrace {
3617 $msg =~ s/\n//; 3882 $msg =~ s/\n//;
3618 3883
3619 # limit the # of concurrent backtraces 3884 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 3885 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace; 3886 ++$_log_backtrace;
3887 my $perl_bt = Carp::longmess $msg;
3622 async { 3888 async {
3889 $Coro::current->{desc} = "abt $msg";
3890
3623 my @bt = fork_call { 3891 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 3892 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3893 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3894 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3627 or die "addr2line: $!"; 3895 or die "addr2line: $!";
3635 } 3903 }
3636 3904
3637 @funcs 3905 @funcs
3638 }; 3906 };
3639 3907
3640 LOG llevInfo, "[ABT] $msg\n"; 3908 LOG llevInfo, "[ABT] $perl_bt\n";
3909 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3641 LOG llevInfo, "[ABT] $_\n" for @bt; 3910 LOG llevInfo, "[ABT] $_\n" for @bt;
3642 --$_log_backtrace; 3911 --$_log_backtrace;
3643 }; 3912 };
3644 } else { 3913 } else {
3645 LOG llevInfo, "[ABT] $msg\n"; 3914 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines