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.386 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.450 by root, Mon Sep 22 01:33:09 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 Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.1 (); 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.51 (); 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 = ();
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
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;
85our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 113our $DB_ENV;
89 114
90our %CFG; 115our %CFG;
91 116
92our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 118our $RUNTIME;
119our $NOW;
94 120
95our (%PLAYER, %PLAYER_LOADING); # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 122our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
98 124
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 127
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
105 132
106binmode STDOUT; 133binmode STDOUT;
107binmode STDERR; 134binmode STDERR;
108 135
109# read virtual server time, if available 136# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
114} 141}
115 142
116mkdir $_ 143mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 189
163The raw value load value from the last tick. 190The raw value load value from the last tick.
164 191
165=item %cf::CFG 192=item %cf::CFG
166 193
167Configuration for the server, loaded from C</etc/crossfire/config>, or 194Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 195from wherever your confdir points to.
169 196
170=item cf::wait_for_tick, cf::wait_for_tick_begin 197=item cf::wait_for_tick, cf::wait_for_tick_begin
171 198
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 199These 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; 220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 221
195 LOG llevError, $msg; 222 LOG llevError, $msg;
196 }; 223 };
197} 224}
225
226$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "=="
228
229 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d#
232 }#d#
233
234 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate
237};
238
239$SIG{__DIE__} = sub { }; #d#?
198 240
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 251for my $pkg (qw(
210 cf::global cf::attachable 252 cf::global cf::attachable
211 cf::object cf::object::player 253 cf::object cf::object::player
212 cf::client cf::player 254 cf::client cf::player
213 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
214 cf::map cf::party cf::region 257 cf::party cf::region
215)) { 258)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 260}
219 261
220$Event::DIED = sub { 262$EV::DIED = sub {
221 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
222}; 264};
223 265
224############################################################################# 266#############################################################################
225 267
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 290 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 291 $d
250 } || "[unable to dump $_[0]: '$@']"; 292 } || "[unable to dump $_[0]: '$@']";
251} 293}
252 294
253=item $ref = cf::from_json $json 295=item $ref = cf::decode_json $json
254 296
255Converts a JSON string into the corresponding perl data structure. 297Converts a JSON string into the corresponding perl data structure.
256 298
257=item $json = cf::to_json $ref 299=item $json = cf::encode_json $ref
258 300
259Converts a perl data structure into its JSON representation. 301Converts a perl data structure into its JSON representation.
260 302
261=cut 303=cut
262 304
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 306
265sub to_json ($) { $json_coder->encode ($_[0]) } 307sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 308sub decode_json($) { $json_coder->decode ($_[0]) }
267 309
268=item cf::lock_wait $string 310=item cf::lock_wait $string
269 311
270Wait until the given lock is available. See cf::lock_acquire. 312Wait until the given lock is available. See cf::lock_acquire.
271 313
327 369
328 ! ! $LOCK{$key} 370 ! ! $LOCK{$key}
329} 371}
330 372
331sub freeze_mainloop { 373sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 374 tick_inhibit_inc;
333 375
334 my $guard = Coro::guard { 376 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 377}
336 }; 378
337 $TICK_WATCHER->stop; 379=item cf::periodic $interval, $cb
338 $guard 380
381Like EV::periodic, but randomly selects a starting point so that the actions
382get spread over timer.
383
384=cut
385
386sub periodic($$) {
387 my ($interval, $cb) = @_;
388
389 my $start = rand List::Util::min 180, $interval;
390
391 EV::periodic $start, $interval, 0, $cb
339} 392}
340 393
341=item cf::get_slot $time[, $priority[, $name]] 394=item cf::get_slot $time[, $priority[, $name]]
342 395
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 396Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 436 }
384 } 437 }
385}; 438};
386 439
387sub get_slot($;$$) { 440sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main;
442
388 my ($time, $pri, $name) = @_; 443 my ($time, $pri, $name) = @_;
389 444
390 $time = $TICK * .6 if $time > $TICK * .6; 445 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 446 my $sig = new Coro::Signal;
392 447
406 461
407BEGIN { *async = \&Coro::async_pool } 462BEGIN { *async = \&Coro::async_pool }
408 463
409=item cf::sync_job { BLOCK } 464=item cf::sync_job { BLOCK }
410 465
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 466The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 467is 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 468partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 469acceptable.
415 470
416If it must be done, put the blocking parts into C<sync_job>. This will run 471If 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 472the given BLOCK in another coroutine while waiting for the result. The
422 477
423sub sync_job(&) { 478sub sync_job(&) {
424 my ($job) = @_; 479 my ($job) = @_;
425 480
426 if ($Coro::current == $Coro::main) { 481 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 482 my $time = EV::time;
428 483
429 # this is the main coro, too bad, we have to block 484 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 485 # till the operation succeeds, freezing the server :/
431 486
432 LOG llevError, Carp::longmess "sync job";#d# 487 LOG llevError, Carp::longmess "sync job";#d#
433 488
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 489 my $freeze_guard = freeze_mainloop;
437 490
438 my $busy = 1; 491 my $busy = 1;
439 my @res; 492 my @res;
440 493
444 warn $@ if $@; 497 warn $@ if $@;
445 undef $busy; 498 undef $busy;
446 })->prio (Coro::PRIO_MAX); 499 })->prio (Coro::PRIO_MAX);
447 500
448 while ($busy) { 501 while ($busy) {
449 Coro::cede or Event::one_event; 502 if (Coro::nready) {
503 Coro::cede_notself;
504 } else {
505 EV::loop EV::LOOP_ONESHOT;
450 } 506 }
507 }
451 508
452 $time = Event::time - $time; 509 my $time = EV::time - $time;
453 510
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 511 $TICK_START += $time; # do not account sync jobs to server load
458 512
459 wantarray ? @res : $res[0] 513 wantarray ? @res : $res[0]
460 } else { 514 } else {
461 # we are in another coroutine, how wonderful, everything just works 515 # we are in another coroutine, how wonderful, everything just works
462 516
487=item fork_call { }, $args 541=item fork_call { }, $args
488 542
489Executes the given code block with the given arguments in a seperate 543Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 544process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 545Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 546never block itself or use any form of event handling.
493 547
494=cut 548=cut
495 549
496sub fork_call(&@) { 550sub fork_call(&@) {
497 my ($cb, @args) = @_; 551 my ($cb, @args) = @_;
504 reset_signals; 558 reset_signals;
505 &$cb 559 &$cb
506 }, @args; 560 }, @args;
507 561
508 wantarray ? @res : $res[-1] 562 wantarray ? @res : $res[-1]
563}
564
565=item $coin = coin_from_name $name
566
567=cut
568
569our %coin_alias = (
570 "silver" => "silvercoin",
571 "silvercoin" => "silvercoin",
572 "silvercoins" => "silvercoin",
573 "gold" => "goldcoin",
574 "goldcoin" => "goldcoin",
575 "goldcoins" => "goldcoin",
576 "platinum" => "platinacoin",
577 "platinumcoin" => "platinacoin",
578 "platinumcoins" => "platinacoin",
579 "platina" => "platinacoin",
580 "platinacoin" => "platinacoin",
581 "platinacoins" => "platinacoin",
582 "royalty" => "royalty",
583 "royalties" => "royalty",
584);
585
586sub coin_from_name($) {
587 $coin_alias{$_[0]}
588 ? cf::arch::find $coin_alias{$_[0]}
589 : undef
509} 590}
510 591
511=item $value = cf::db_get $family => $key 592=item $value = cf::db_get $family => $key
512 593
513Returns a single value from the environment database. 594Returns a single value from the environment database.
652 733
653############################################################################# 734#############################################################################
654 735
655=head2 ATTACHABLE OBJECTS 736=head2 ATTACHABLE OBJECTS
656 737
657Many objects in crossfire are so-called attachable objects. That means you can 738Many objects in deliantra are so-called attachable objects. That means you can
658attach callbacks/event handlers (a collection of which is called an "attachment") 739attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 740to it. All such attachable objects support the following methods.
660 741
661In the following description, CLASS can be any of C<global>, C<object> 742In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 743C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 744Deliantra).
664 745
665=over 4 746=over 4
666 747
667=item $attachable->attach ($attachment, key => $value...) 748=item $attachable->attach ($attachment, key => $value...)
668 749
712=item cf::CLASS::attachment $name, ... 793=item cf::CLASS::attachment $name, ...
713 794
714Register an attachment by C<$name> through which attachable objects of the 795Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 796given CLASS can refer to this attachment.
716 797
717Some classes such as crossfire maps and objects can specify attachments 798Some classes such as deliantra maps and objects can specify attachments
718that are attached at load/instantiate time, thus the need for a name. 799that are attached at load/instantiate time, thus the need for a name.
719 800
720These calls expect any number of the following handler/hook descriptions: 801These calls expect any number of the following handler/hook descriptions:
721 802
722=over 4 803=over 4
950 } 1031 }
951 1032
952 0 1033 0
953} 1034}
954 1035
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1037
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1038=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1039
959Generate an object-specific event with the given arguments. 1040Generate an object-specific event with the given arguments.
960 1041
1013 1094
1014sub reattach { 1095sub reattach {
1015 # basically do the same as instantiate, without calling instantiate 1096 # basically do the same as instantiate, without calling instantiate
1016 my ($obj) = @_; 1097 my ($obj) = @_;
1017 1098
1099 # no longer needed after getting rid of delete_package?
1018 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1100 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1019 1101
1020 my $registry = $obj->registry; 1102 my $registry = $obj->registry;
1021 1103
1022 @$registry = (); 1104 @$registry = ();
1023 1105
1038cf::attachable->attach ( 1120cf::attachable->attach (
1039 prio => -1000000, 1121 prio => -1000000,
1040 on_instantiate => sub { 1122 on_instantiate => sub {
1041 my ($obj, $data) = @_; 1123 my ($obj, $data) = @_;
1042 1124
1043 $data = from_json $data; 1125 $data = decode_json $data;
1044 1126
1045 for (@$data) { 1127 for (@$data) {
1046 my ($name, $args) = @$_; 1128 my ($name, $args) = @$_;
1047 1129
1048 $obj->attach ($name, %{$args || {} }); 1130 $obj->attach ($name, %{$args || {} });
1069 utf8::decode (my $decname = $filename); 1151 utf8::decode (my $decname = $filename);
1070 warn sprintf "saving %s (%d,%d)\n", 1152 warn sprintf "saving %s (%d,%d)\n",
1071 $decname, length $$rdata, scalar @$objs; 1153 $decname, length $$rdata, scalar @$objs;
1072 1154
1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1074 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1076 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
1077 close $fh; 1159 aio_close $fh;
1078 1160
1079 if (@$objs) { 1161 if (@$objs) {
1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1162 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1081 chmod SAVE_MODE, $fh; 1163 aio_chmod $fh, SAVE_MODE;
1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1083 aio_write $fh, 0, (length $data), $data, 0; 1165 aio_write $fh, 0, (length $data), $data, 0;
1084 aio_fsync $fh if $cf::USE_FSYNC; 1166 aio_fsync $fh if $cf::USE_FSYNC;
1085 close $fh; 1167 aio_close $fh;
1086 aio_rename "$filename.pst~", "$filename.pst"; 1168 aio_rename "$filename.pst~", "$filename.pst";
1087 } 1169 }
1088 } else { 1170 } else {
1089 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
1090 } 1172 }
1118 1200
1119 unless (aio_stat "$filename.pst") { 1201 unless (aio_stat "$filename.pst") {
1120 (aio_load "$filename.pst", $av) >= 0 1202 (aio_load "$filename.pst", $av) >= 0
1121 or return; 1203 or return;
1122 1204
1123 my $st = eval { Coro::Storable::thaw $av } 1205 my $st = eval { Coro::Storable::thaw $av };
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs}; 1206 $av = $st->{objs};
1126 } 1207 }
1127 1208
1128 utf8::decode (my $decname = $filename); 1209 utf8::decode (my $decname = $filename);
1129 warn sprintf "loading %s (%d,%d)\n", 1210 warn sprintf "loading %s (%d,%d)\n",
1260 1341
1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1263 1344
1264 $ext{source} = 1345 $ext{source} =
1265 "package $pkg; use strict; use utf8;\n" 1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1266 . "#line 1 \"$path\"\n{\n" 1347 . "#line 1 \"$path\"\n{\n"
1267 . $source 1348 . $source
1268 . "\n};\n1"; 1349 . "\n};\n1";
1269 1350
1270 $todo{$base} = \%ext; 1351 $todo{$base} = \%ext;
1286 my $msg = $@ ? "$v->{path}: $@\n" 1367 my $msg = $@ ? "$v->{path}: $@\n"
1287 : "$v->{base}: extension inactive.\n"; 1368 : "$v->{base}: extension inactive.\n";
1288 1369
1289 if (exists $v->{meta}{mandatory}) { 1370 if (exists $v->{meta}{mandatory}) {
1290 warn $msg; 1371 warn $msg;
1291 warn "mandatory extension failed to load, exiting.\n"; 1372 cf::cleanup "mandatory extension failed to load, exiting.";
1292 exit 1;
1293 } 1373 }
1294 1374
1295 warn $msg; 1375 warn $msg;
1296 } 1376 }
1297 1377
1311 1391
1312=back 1392=back
1313 1393
1314=head2 CORE EXTENSIONS 1394=head2 CORE EXTENSIONS
1315 1395
1316Functions and methods that extend core crossfire objects. 1396Functions and methods that extend core deliantra objects.
1317 1397
1318=cut 1398=cut
1319 1399
1320package cf::player; 1400package cf::player;
1321 1401
1386 my $f = new_from_file cf::object::thawer path $login 1466 my $f = new_from_file cf::object::thawer path $login
1387 or return; 1467 or return;
1388 1468
1389 my $pl = cf::player::load_pl $f 1469 my $pl = cf::player::load_pl $f
1390 or return; 1470 or return;
1471
1391 local $cf::PLAYER_LOADING{$login} = $pl; 1472 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs; 1473 $f->resolve_delayed_derefs;
1393 $cf::PLAYER{$login} = $pl 1474 $cf::PLAYER{$login} = $pl
1394 } 1475 }
1395 } 1476 }
1405 1486
1406 return if $pl->{deny_save}; 1487 return if $pl->{deny_save};
1407 1488
1408 aio_mkdir playerdir $pl, 0770; 1489 aio_mkdir playerdir $pl, 0770;
1409 $pl->{last_save} = $cf::RUNTIME; 1490 $pl->{last_save} = $cf::RUNTIME;
1491
1492 cf::get_slot 0.01;
1410 1493
1411 $pl->save_pl ($path); 1494 $pl->save_pl ($path);
1412 cf::cede_to_tick; 1495 cf::cede_to_tick;
1413} 1496}
1414 1497
1446 my ($pl) = @_; 1529 my ($pl) = @_;
1447 1530
1448 my $name = $pl->ob->name; 1531 my $name = $pl->ob->name;
1449 1532
1450 $pl->{deny_save} = 1; 1533 $pl->{deny_save} = 1;
1451 $pl->password ("*"); # this should lock out the player until we nuked the dir 1534 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1452 1535
1453 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1454 $pl->deactivate; 1537 $pl->deactivate;
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1455 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1540 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1456 $pl->ns->destroy if $pl->ns; 1541 $pl->ns->destroy if $pl->ns;
1457 1542
1458 my $path = playerdir $pl; 1543 my $path = playerdir $pl;
1459 my $temp = "$path~$cf::RUNTIME~deleting~"; 1544 my $temp = "$path~$cf::RUNTIME~deleting~";
1498 1583
1499 for my $login (@$dirs) { 1584 for my $login (@$dirs) {
1500 my $path = path $login; 1585 my $path = path $login;
1501 1586
1502 # a .pst is a dead give-away for a valid player 1587 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") { 1588 # if no pst file found, open and chekc for blocked users
1589 if (aio_stat "$path.pst") {
1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1590 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1505 aio_read $fh, 0, 512, my $buf, 0 or next; 1591 aio_read $fh, 0, 512, my $buf, 0 or next;
1506 $buf !~ /^password -------------$/m or next; # official not-valid tag 1592 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 } 1593 }
1508 1594
1539 } 1625 }
1540 1626
1541 \@paths 1627 \@paths
1542} 1628}
1543 1629
1544=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1545 1631
1546Expand crossfire pod fragments into protocol xml. 1632Expand deliantra pod fragments into protocol xml.
1547
1548=cut
1549
1550sub expand_cfpod {
1551 ((my $self), (local $_)) = @_;
1552
1553 # escape & and <
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556
1557 # this is buggy, it needs to properly take care of nested <'s
1558
1559 1 while
1560 # replace B<>, I<>, U<> etc.
1561 s/B<([^\>]*)>/<b>$1<\/b>/
1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1565 # replace G<male|female> tags
1566 || s{G<([^>|]*)\|([^>]*)>}{
1567 $self->gender ? $2 : $1
1568 }ge
1569 # replace H<hint text>
1570 || s{H<([^\>]*)>}
1571 {
1572 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "")
1575 [$self->{hintmode}]
1576 }ge;
1577
1578 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g;
1580
1581 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines
1586
1587 $_
1588}
1589
1590sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode}
1593}
1594 1633
1595=item $player->ext_reply ($msgid, @msg) 1634=item $player->ext_reply ($msgid, @msg)
1596 1635
1597Sends an ext reply to the player. 1636Sends an ext reply to the player.
1598 1637
1665our $MAX_RESET = 3600; 1704our $MAX_RESET = 3600;
1666our $DEFAULT_RESET = 3000; 1705our $DEFAULT_RESET = 3000;
1667 1706
1668sub generate_random_map { 1707sub generate_random_map {
1669 my ($self, $rmp) = @_; 1708 my ($self, $rmp) = @_;
1709
1710 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1711
1670 # mit "rum" bekleckern, nicht 1712 # mit "rum" bekleckern, nicht
1671 $self->_create_random_map ( 1713 $self->_create_random_map (
1672 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1673 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1674 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1796 1838
1797# the temporary/swap location 1839# the temporary/swap location
1798sub save_path { 1840sub save_path {
1799 my ($self) = @_; 1841 my ($self) = @_;
1800 1842
1801 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1802 "$TMPDIR/$path.map" 1844 "$TMPDIR/$path.map"
1803} 1845}
1804 1846
1805# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1806sub uniq_path { 1848sub uniq_path {
1807 my ($self) = @_; 1849 my ($self) = @_;
1808 1850
1809 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1810 "$UNIQUEDIR/$path" 1852 "$UNIQUEDIR/$path"
1811} 1853}
1812 1854
1813# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1814# all maps in C++... 1856# all maps in C++...
1912 1954
1913 cf::lock_wait "map_data:$path";#d#remove 1955 cf::lock_wait "map_data:$path";#d#remove
1914 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1915 1957
1916 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1960 my $guard2 = cf::lock_acquire "map_find:$path";
1919 1961
1920 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1921 or return; 1963 or return;
1922 1964
1923 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1926 or return; 1968 or return;
1927 1969
1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1929 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1930 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1931 undef $guard1; 1974 undef $guard1;
1932 undef $guard2;
1933 $map->reset; 1975 $map->reset;
1934 return find $path; 1976 return find $path;
1935 } 1977 }
1936 1978
1937 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1964 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block; 2007 $f->skip_block;
1966 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
1967 or return; 2009 or return;
1968 2010
1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1970 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1971 2013
1972 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1973 utf8::encode $uniq; 2015 utf8::encode $uniq;
1974 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
2000 } 2042 }
2001 2043
2002 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
2004 2046
2005 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
2006 } 2048 }
2007 2049
2008 $self->post_load; 2050 $self->post_load;
2009} 2051}
2010 2052
2068 my ($path, $origin, $load) = @_; 2110 my ($path, $origin, $load) = @_;
2069 2111
2070 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
2071 2113
2072 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2074 } 2116 }
2075 2117
2076 $MAP_PREFETCH{$path} |= $load; 2118 $MAP_PREFETCH{$path} |= $load;
2077 2119
2078 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2115 cf::async { 2157 cf::async {
2116 $Coro::current->{desc} = "map player save"; 2158 $Coro::current->{desc} = "map player save";
2117 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2118 }; 2160 };
2119 2161
2162 cf::get_slot 0.02;
2163
2120 if ($uniq) { 2164 if ($uniq) {
2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2122 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2123 } else { 2167 } else {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2132 $self->save; 2176 $self->save;
2133 2177
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2179
2136 return if $self->players; 2180 return if $self->players;
2137 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
2138 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2139 2183
2140 $self->in_memory (cf::MAP_SWAPPED); 2184 $self->in_memory (cf::MAP_SWAPPED);
2141 2185
2142 $self->deactivate; 2186 $self->deactivate;
2260 2304
2261sub unique_maps() { 2305sub unique_maps() {
2262 [ 2306 [
2263 map { 2307 map {
2264 utf8::decode $_; 2308 utf8::decode $_;
2265 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2266 ? normalise $_ 2312 : normalise $_
2267 : ()
2268 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2269 ] 2314 ]
2270} 2315}
2271 2316
2272package cf;
2273
2274=back 2317=back
2275 2318
2276=head3 cf::object 2319=head3 cf::object
2277 2320
2278=cut 2321=cut
2281 2324
2282=over 4 2325=over 4
2283 2326
2284=item $ob->inv_recursive 2327=item $ob->inv_recursive
2285 2328
2286Returns the inventory of the object _and_ their inventories, recursively. 2329Returns the inventory of the object I<and> their inventories, recursively,
2330but I<not> the object itself.
2287 2331
2288=cut 2332=cut
2289 2333
2290sub inv_recursive_; 2334sub inv_recursive_;
2291sub inv_recursive_ { 2335sub inv_recursive_ {
2296 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2297} 2341}
2298 2342
2299=item $ref = $ob->ref 2343=item $ref = $ob->ref
2300 2344
2301creates and returns a persistent reference to an objetc that can be stored as a string. 2345Creates and returns a persistent reference to an object that can be stored as a string.
2302 2346
2303=item $ob = cf::object::deref ($refstring) 2347=item $ob = cf::object::deref ($refstring)
2304 2348
2305returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2349returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2306even if the object actually exists. May block. 2350even if the object actually exists. May block.
2338can be C<undef>. Does the right thing when the player is currently in a 2382can be C<undef>. Does the right thing when the player is currently in a
2339dialogue with the given NPC character. 2383dialogue with the given NPC character.
2340 2384
2341=cut 2385=cut
2342 2386
2387our $SAY_CHANNEL = {
2388 id => "say",
2389 title => "Map",
2390 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2392};
2393
2394our $CHAT_CHANNEL = {
2395 id => "chat",
2396 title => "Chat",
2397 reply => "chat ",
2398 tooltip => "Player chat and shouts, global to the server.",
2399};
2400
2343# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2344# with dialog boxes. 2402# with dialog boxes.
2345#TODO: the first argument must go, split into a $npc->reply_to ( method 2403#TODO: the first argument must go, split into a $npc->reply_to ( method
2346sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2347 my ($self, $npc, $msg, $flags) = @_; 2405 my ($self, $npc, $msg, $flags) = @_;
2358 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2359 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2360 2418
2361 } else { 2419 } else {
2362 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2363 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2364 } 2422 }
2365 } 2423 }
2366} 2424}
2367 2425
2368=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2393 2451
2394=item $player_object->enter_link 2452=item $player_object->enter_link
2395 2453
2396Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
2397 2455
2398The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
2399I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
2400 2460
2401Will never block. 2461Will never block.
2402 2462
2403=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2404 2464
2462 2522
2463 $map->load; 2523 $map->load;
2464 $map->load_neighbours; 2524 $map->load_neighbours;
2465 2525
2466 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2467 $self->activate_recursive; 2528 $self->activate_recursive;
2468 2529
2469 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2470 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2471} 2532}
2475Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
2476her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2477that has to return the map if sucecssful, and then unfreezes the player on 2538that has to return the map if sucecssful, and then unfreezes the player on
2478the new (success) or old (failed) map position. In either case, $done will 2539the new (success) or old (failed) map position. In either case, $done will
2479be called at the end of this process. 2540be called at the end of this process.
2541
2542Note that $check will be called with a potentially non-loaded map, so if
2543it needs a loaded map it has to call C<< ->load >>.
2480 2544
2481=cut 2545=cut
2482 2546
2483our $GOTOGEN; 2547our $GOTOGEN;
2484 2548
2563} 2627}
2564 2628
2565sub prepare_random_map { 2629sub prepare_random_map {
2566 my ($exit) = @_; 2630 my ($exit) = @_;
2567 2631
2568 my $guard = cf::lock_acquire "exit_prepare:$exit";
2569
2570 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2571 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2572 # that depends on the exit object 2634 # that depends on the exit object
2573 2635
2574 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
2576 if ($exit->map) { 2638 if ($exit->map) {
2577 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2578 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2579 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2580 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2581 } 2645 }
2582 2646
2583 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2584 2648
2585 my $data = cf::to_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2586 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2587 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2588 2652
2589 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2590 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2591 undef $fh; 2655 undef $fh;
2592 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2593 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2594 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2595 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2596 } 2664 }
2597} 2665}
2598 2666
2599sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2600 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2601 2669
2602 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2603 2671
2604 if ($exit->slaying eq "/!") {
2605 #TODO: this should de-fi-ni-te-ly not be a sync-job
2606 # the problem is that $exit might not survive long enough
2607 # so it needs to be done right now, right here
2608 cf::sync_job { prepare_random_map $exit };
2609 }
2610
2611 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2612 my $hp = $exit->stats->hp;
2613 my $sp = $exit->stats->sp;
2614
2615 $self->enter_link; 2672 $self->enter_link;
2616 2673
2617 # if exit is damned, update players death & WoR home-position
2618 $self->contr->savebed ($slaying, $hp, $sp)
2619 if $exit->flag (FLAG_DAMNED);
2620
2621 (async { 2674 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2675 $Coro::current->{desc} = "enter_exit";
2623 2676
2624 $self->deactivate_recursive; # just to be sure
2625 unless (eval { 2677 unless (eval {
2678 $self->deactivate_recursive; # just to be sure
2679
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2689 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp;
2691
2626 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2627 2693
2694 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y)
2696 if $exit->flag (cf::FLAG_DAMNED);
2697
2628 1; 2698 1
2629 }) { 2699 }) {
2630 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2631 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2632 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2633 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2634 2704
2635 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
2663the message, with C<log> being the default. If C<$color> is negative, suppress 2733the message, with C<log> being the default. If C<$color> is negative, suppress
2664the message unless the client supports the msg packet. 2734the message unless the client supports the msg packet.
2665 2735
2666=cut 2736=cut
2667 2737
2738# non-persistent channels (usually the info channel)
2668our %CHANNEL = ( 2739our %CHANNEL = (
2669 "c/identify" => { 2740 "c/identify" => {
2670 id => "infobox", 2741 id => "infobox",
2671 title => "Identify", 2742 title => "Identify",
2672 reply => undef, 2743 reply => undef,
2676 id => "infobox", 2747 id => "infobox",
2677 title => "Examine", 2748 title => "Examine",
2678 reply => undef, 2749 reply => undef,
2679 tooltip => "Signs and other items you examined", 2750 tooltip => "Signs and other items you examined",
2680 }, 2751 },
2752 "c/book" => {
2753 id => "infobox",
2754 title => "Book",
2755 reply => undef,
2756 tooltip => "The contents of a note or book",
2757 },
2681 "c/lookat" => { 2758 "c/lookat" => {
2682 id => "infobox", 2759 id => "infobox",
2683 title => "Look", 2760 title => "Look",
2684 reply => undef, 2761 reply => undef,
2685 tooltip => "What you saw there", 2762 tooltip => "What you saw there",
2686 }, 2763 },
2764 "c/who" => {
2765 id => "infobox",
2766 title => "Players",
2767 reply => undef,
2768 tooltip => "Shows players who are currently online",
2769 },
2770 "c/body" => {
2771 id => "infobox",
2772 title => "Body Parts",
2773 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available",
2775 },
2776 "c/skills" => {
2777 id => "infobox",
2778 title => "Skills",
2779 reply => undef,
2780 tooltip => "Shows your experience per skill and item power",
2781 },
2782 "c/uptime" => {
2783 id => "infobox",
2784 title => "Uptime",
2785 reply => undef,
2786 tooltip => "How long the server has been running since last restart",
2787 },
2788 "c/mapinfo" => {
2789 id => "infobox",
2790 title => "Map Info",
2791 reply => undef,
2792 tooltip => "Information related to the maps",
2793 },
2794 "c/party" => {
2795 id => "party",
2796 title => "Party",
2797 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party",
2799 },
2687); 2800);
2688 2801
2689sub cf::client::send_msg { 2802sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2691 2804
2692 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2693 2807
2694 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2695 2809
2696 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2697 if ($CHANNEL{$channel}) { 2811 if ($CHANNEL{$channel}) {
2718 if ($self->can_msg) { 2832 if ($self->can_msg) {
2719 # default colour, mask it out 2833 # default colour, mask it out
2720 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2721 if $color & cf::NDI_DEF; 2835 if $color & cf::NDI_DEF;
2722 2836
2723 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2837 my $pkt = "msg "
2838 . $self->{json_coder}->encode (
2724 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 );
2841
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt);
2725 } else { 2853 } else {
2726 if ($color >= 0) { 2854 if ($color >= 0) {
2727 # replace some tags by gcfclient-compatible ones 2855 # replace some tags by gcfclient-compatible ones
2728 for ($msg) { 2856 for ($msg) {
2729 1 while 2857 1 while
2928 3056
2929The following functions and methods are available within a safe environment: 3057The following functions and methods are available within a safe environment:
2930 3058
2931 cf::object 3059 cf::object
2932 contr pay_amount pay_player map x y force_find force_add destroy 3060 contr pay_amount pay_player map x y force_find force_add destroy
2933 insert remove name archname title slaying race decrease_ob_nr 3061 insert remove name archname title slaying race decrease split
2934 3062
2935 cf::object::player 3063 cf::object::player
2936 player 3064 player
2937 3065
2938 cf::player 3066 cf::player
2943 3071
2944=cut 3072=cut
2945 3073
2946for ( 3074for (
2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2948 insert remove inv name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
2949 decrease_ob_nr destroy)], 3077 decrease split destroy change_exp)],
2950 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
2951 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful)],
2952 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
2953) { 3081) {
2954 no strict 'refs'; 3082 no strict 'refs';
3059 { 3187 {
3060 my $faces = $facedata->{faceinfo}; 3188 my $faces = $facedata->{faceinfo};
3061 3189
3062 while (my ($face, $info) = each %$faces) { 3190 while (my ($face, $info) = each %$faces) {
3063 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3191 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192
3064 cf::face::set_visibility $idx, $info->{visibility}; 3193 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap}; 3194 cf::face::set_magicmap $idx, $info->{magicmap};
3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3068 3197
3069 cf::cede_to_tick; 3198 cf::cede_to_tick;
3070 } 3199 }
3071 3200
3072 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
3073 next unless $info->{smooth}; 3202 next unless $info->{smooth};
3203
3074 my $idx = cf::face::find $face 3204 my $idx = cf::face::find $face
3075 or next; 3205 or next;
3206
3076 if (my $smooth = cf::face::find $info->{smooth}) { 3207 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth; 3208 cf::face::set_smooth $idx, $smooth;
3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3079 } else { 3210 } else {
3080 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3211 warn "smooth face '$info->{smooth}' not found for face '$face'";
3098 { 3229 {
3099 # TODO: for gcfclient pleasure, we should give resources 3230 # TODO: for gcfclient pleasure, we should give resources
3100 # that gcfclient doesn't grok a >10000 face index. 3231 # that gcfclient doesn't grok a >10000 face index.
3101 my $res = $facedata->{resource}; 3232 my $res = $facedata->{resource};
3102 3233
3103 my $soundconf = delete $res->{"res/sound.conf"};
3104
3105 while (my ($name, $info) = each %$res) { 3234 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) {
3106 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3236 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data; 3237 my $data;
3108 3238
3109 if ($info->{type} & 1) { 3239 if ($info->{type} & 1) {
3110 # prepend meta info 3240 # prepend meta info
3111 3241
3112 my $meta = $enc->encode ({ 3242 my $meta = $enc->encode ({
3113 name => $name, 3243 name => $name,
3114 %{ $info->{meta} || {} }, 3244 %{ $info->{meta} || {} },
3115 }); 3245 });
3116 3246
3117 $data = pack "(w/a*)*", $meta, $info->{data}; 3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type};
3118 } else { 3254 } else {
3119 $data = $info->{data}; 3255 $RESOURCE{$name} = $info;
3120 } 3256 }
3121 3257
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
3125 cf::cede_to_tick; 3258 cf::cede_to_tick;
3126 } 3259 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
3145 } 3260 }
3261
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3146 3263
3147 1 3264 1
3148} 3265}
3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3149 3286
3150register_exticmd fx_want => sub { 3287register_exticmd fx_want => sub {
3151 my ($ns, $want) = @_; 3288 my ($ns, $want) = @_;
3152 3289
3153 while (my ($k, $v) = each %$want) { 3290 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v); 3291 $ns->fx_want ($k, $v);
3155 } 3292 }
3156}; 3293};
3294
3295sub load_resource_file($) {
3296 my $guard = lock_acquire "load_resource_file";
3297
3298 my $status = load_resource_file_ $_[0];
3299 get_slot 0.1, 100;
3300 cf::arch::commit_load;
3301
3302 $status
3303}
3157 3304
3158sub reload_regions { 3305sub reload_regions {
3159 # HACK to clear player env face cache, we need some signal framework 3306 # HACK to clear player env face cache, we need some signal framework
3160 # for this (global event?) 3307 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = (); 3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3175} 3322}
3176 3323
3177sub reload_archetypes { 3324sub reload_archetypes {
3178 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
3179 or die "unable to load archetypes\n"; 3326 or die "unable to load archetypes\n";
3180 #d# NEED to laod twice to resolve forward references
3181 # this really needs to be done in an extra post-pass
3182 # (which needs to be synchronous, so solve it differently)
3183 load_resource_file "$DATADIR/archetypes"
3184 or die "unable to load archetypes\n";
3185} 3327}
3186 3328
3187sub reload_treasures { 3329sub reload_treasures {
3188 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
3189 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
3190} 3332}
3191 3333
3192sub reload_resources { 3334sub reload_resources {
3193 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
3194 3336
3337 reload_facedata;
3338 reload_archetypes;
3195 reload_regions; 3339 reload_regions;
3196 reload_facedata;
3197 #reload_archetypes;#d#
3198 reload_archetypes;
3199 reload_treasures; 3340 reload_treasures;
3200 3341
3201 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3202} 3343}
3203 3344
3204sub init { 3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
3205 reload_resources; 3350 reload_resources;
3206} 3351}
3207 3352
3208sub reload_config { 3353sub reload_config {
3209 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
3210 or return; 3355 or return;
3211 3356
3212 local $/; 3357 local $/;
3213 *CFG = YAML::Syck::Load <$fh>; 3358 *CFG = YAML::Load <$fh>;
3214 3359
3215 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3216 3361
3217 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3218 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3224 }; 3369 };
3225 warn $@ if $@; 3370 warn $@ if $@;
3226 } 3371 }
3227} 3372}
3228 3373
3374sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!";
3377 flock $fh, &Fcntl::LOCK_EX
3378 or die "$PIDFILE: flock: $!";
3379 $fh
3380}
3381
3382# make sure only one server instance is running at any one time
3383sub atomic {
3384 my $fh = pidfile;
3385
3386 my $pid = <$fh>;
3387 kill 9, $pid if $pid > 0;
3388
3389 seek $fh, 0, 0;
3390 print $fh $$;
3391}
3392
3229sub main { 3393sub main {
3394 atomic;
3395
3230 # we must not ever block the main coroutine 3396 # we must not ever block the main coroutine
3231 local $Coro::idle = sub { 3397 local $Coro::idle = sub {
3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3233 (async { 3399 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3400 $Coro::current->{desc} = "IDLE BUG HANDLER";
3235 Event::one_event; 3401 EV::loop EV::LOOP_ONESHOT;
3236 })->prio (Coro::PRIO_MAX); 3402 })->prio (Coro::PRIO_MAX);
3237 }; 3403 };
3238 3404
3405 {
3406 my $guard = freeze_mainloop;
3239 reload_config; 3407 reload_config;
3240 db_init; 3408 db_init;
3241 load_extensions; 3409 load_extensions;
3242 3410
3243 $TICK_WATCHER->start; 3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE;
3415
3416 # no (long-running) fork's whatsoever before this point(!)
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418
3244 Event::loop; 3419 EV::loop;
3245} 3420}
3246 3421
3247############################################################################# 3422#############################################################################
3248# initialisation and cleanup 3423# initialisation and cleanup
3249 3424
3250# install some emergency cleanup handlers 3425# install some emergency cleanup handlers
3251BEGIN { 3426BEGIN {
3427 our %SIGWATCHER = ();
3252 for my $signal (qw(INT HUP TERM)) { 3428 for my $signal (qw(INT HUP TERM)) {
3253 Event->signal ( 3429 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3254 reentrant => 0,
3255 data => WF_AUTOCANCEL,
3256 signal => $signal,
3257 prio => 0,
3258 cb => sub {
3259 cf::cleanup "SIG$signal"; 3430 cf::cleanup "SIG$signal";
3260 },
3261 ); 3431 };
3262 } 3432 }
3263} 3433}
3264 3434
3265sub write_runtime { 3435sub write_runtime_sync {
3266 my $runtime = "$LOCALDIR/runtime";
3267
3268 # first touch the runtime file to show we are still running: 3436 # first touch the runtime file to show we are still running:
3269 # the fsync below can take a very very long time. 3437 # the fsync below can take a very very long time.
3270 3438
3271 IO::AIO::aio_utime $runtime, undef, undef; 3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3272 3440
3273 my $guard = cf::lock_acquire "write_runtime"; 3441 my $guard = cf::lock_acquire "write_runtime";
3274 3442
3275 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3276 or return; 3444 or return;
3277 3445
3278 my $value = $cf::RUNTIME + 90 + 10; 3446 my $value = $cf::RUNTIME + 90 + 10;
3279 # 10 is the runtime save interval, for a monotonic clock 3447 # 10 is the runtime save interval, for a monotonic clock
3280 # 60 allows for the watchdog to kill the server. 3448 # 60 allows for the watchdog to kill the server.
3290 aio_utime $fh, undef, undef; 3458 aio_utime $fh, undef, undef;
3291 3459
3292 close $fh 3460 close $fh
3293 or return; 3461 or return;
3294 3462
3295 aio_rename "$runtime~", $runtime 3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3296 and return; 3464 and return;
3297 3465
3298 warn "runtime file written.\n"; 3466 warn "runtime file written.\n";
3299 3467
3300 1 3468 1
3469}
3470
3471our $uuid_lock;
3472our $uuid_skip;
3473
3474sub write_uuid_sync($) {
3475 $uuid_skip ||= $_[0];
3476
3477 return if $uuid_lock;
3478 local $uuid_lock = 1;
3479
3480 my $uuid = "$LOCALDIR/uuid";
3481
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return;
3484
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3486 $uuid_skip = 0;
3487
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return;
3490
3491 # always fsync - this file is important
3492 aio_fsync $fh
3493 and return;
3494
3495 close $fh
3496 or return;
3497
3498 aio_rename "$uuid~", $uuid
3499 and return;
3500
3501 warn "uuid file written ($value).\n";
3502
3503 1
3504
3505}
3506
3507sub write_uuid($$) {
3508 my ($skip, $sync) = @_;
3509
3510 $sync ? write_uuid_sync $skip
3511 : async { write_uuid_sync $skip };
3301} 3512}
3302 3513
3303sub emergency_save() { 3514sub emergency_save() {
3304 my $freeze_guard = cf::freeze_mainloop; 3515 my $freeze_guard = cf::freeze_mainloop;
3305 3516
3327 warn "end emergency map save\n"; 3538 warn "end emergency map save\n";
3328 3539
3329 warn "begin emergency database checkpoint\n"; 3540 warn "begin emergency database checkpoint\n";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3541 BDB::db_env_txn_checkpoint $DB_ENV;
3331 warn "end emergency database checkpoint\n"; 3542 warn "end emergency database checkpoint\n";
3543
3544 warn "begin write uuid\n";
3545 write_uuid_sync 1;
3546 warn "end write uuid\n";
3332 }; 3547 };
3333 3548
3334 warn "leave emergency perl save\n"; 3549 warn "leave emergency perl save\n";
3335} 3550}
3336 3551
3337sub post_cleanup { 3552sub post_cleanup {
3338 my ($make_core) = @_; 3553 my ($make_core) = @_;
3339 3554
3340 warn Carp::longmess "post_cleanup backtrace" 3555 warn Carp::longmess "post_cleanup backtrace"
3341 if $make_core; 3556 if $make_core;
3557
3558 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$;
3342} 3560}
3561
3562# a safer delete_package, copied from Symbol
3563sub clear_package($) {
3564 my $pkg = shift;
3565
3566 # expand to full symbol table name if needed
3567 unless ($pkg =~ /^main::.*::$/) {
3568 $pkg = "main$pkg" if $pkg =~ /^::/;
3569 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3570 $pkg .= '::' unless $pkg =~ /::$/;
3571 }
3572
3573 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3574 my $stem_symtab = *{$stem}{HASH};
3575
3576 defined $stem_symtab and exists $stem_symtab->{$leaf}
3577 or return;
3578
3579 # clear all symbols
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 }
3585 warn "cleared package #$pkg\n";#d#
3586}
3587
3588our $RELOAD; # how many times to reload
3343 3589
3344sub do_reload_perl() { 3590sub do_reload_perl() {
3345 # can/must only be called in main 3591 # can/must only be called in main
3346 if ($Coro::current != $Coro::main) { 3592 if ($Coro::current != $Coro::main) {
3347 warn "can only reload from main coroutine"; 3593 warn "can only reload from main coroutine";
3348 return; 3594 return;
3349 } 3595 }
3350 3596
3597 return if $RELOAD++;
3598
3599 while ($RELOAD) {
3351 warn "reloading..."; 3600 warn "reloading...";
3352 3601
3353 warn "entering sync_job"; 3602 warn "entering sync_job";
3354 3603
3355 cf::sync_job { 3604 cf::sync_job {
3356 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
3357 cf::emergency_save; 3606 cf::emergency_save;
3358 cf::write_runtime; # external watchdog should not bark 3607 cf::write_runtime_sync; # external watchdog should not bark
3359 3608
3360 warn "syncing database to disk"; 3609 warn "syncing database to disk";
3361 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
3362 3611
3363 # if anything goes wrong in here, we should simply crash as we already saved 3612 # if anything goes wrong in here, we should simply crash as we already saved
3364 3613
3365 warn "cancelling all WF_AUTOCANCEL watchers";
3366 for (Event::all_watchers) {
3367 $_->cancel if $_->data & WF_AUTOCANCEL;
3368 }
3369
3370 warn "flushing outstanding aio requests"; 3614 warn "flushing outstanding aio requests";
3371 for (;;) {
3372 BDB::flush;
3373 IO::AIO::flush;
3374 Coro::cede;
3375 last unless IO::AIO::nreqs || BDB::nreqs; 3615 while (IO::AIO::nreqs || BDB::nreqs) {
3376 warn "iterate..."; 3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3377 }
3378
3379 ++$RELOAD;
3380
3381 warn "cancelling all extension coros";
3382 $_->cancel for values %EXT_CORO;
3383 %EXT_CORO = ();
3384
3385 warn "removing commands";
3386 %COMMAND = ();
3387
3388 warn "removing ext/exti commands";
3389 %EXTCMD = ();
3390 %EXTICMD = ();
3391
3392 warn "unloading/nuking all extensions";
3393 for my $pkg (@EXTS) {
3394 warn "... unloading $pkg";
3395
3396 if (my $cb = $pkg->can ("unload")) {
3397 eval {
3398 $cb->($pkg);
3399 1
3400 } or warn "$pkg unloaded, but with errors: $@";
3401 } 3617 }
3402 3618
3403 warn "... nuking $pkg"; 3619 warn "cancelling all extension coros";
3404 Symbol::delete_package $pkg; 3620 $_->cancel for values %EXT_CORO;
3405 } 3621 %EXT_CORO = ();
3406 3622
3407 warn "unloading all perl modules loaded from $LIBDIR"; 3623 warn "removing commands";
3408 while (my ($k, $v) = each %INC) { 3624 %COMMAND = ();
3409 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3410 3625
3626 warn "removing ext/exti commands";
3627 %EXTCMD = ();
3628 %EXTICMD = ();
3629
3630 warn "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) {
3411 warn "... unloading $k"; 3632 warn "... unloading $pkg";
3412 delete $INC{$k};
3413 3633
3414 $k =~ s/\.pm$//;
3415 $k =~ s/\//::/g;
3416
3417 if (my $cb = $k->can ("unload_module")) { 3634 if (my $cb = $pkg->can ("unload")) {
3635 eval {
3418 $cb->(); 3636 $cb->($pkg);
3637 1
3638 } or warn "$pkg unloaded, but with errors: $@";
3639 }
3640
3641 warn "... clearing $pkg";
3642 clear_package $pkg;
3419 } 3643 }
3420 3644
3421 Symbol::delete_package $k; 3645 warn "unloading all perl modules loaded from $LIBDIR";
3646 while (my ($k, $v) = each %INC) {
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648
3649 warn "... unloading $k";
3650 delete $INC{$k};
3651
3652 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g;
3654
3655 if (my $cb = $k->can ("unload_module")) {
3656 $cb->();
3657 }
3658
3659 clear_package $k;
3422 } 3660 }
3423 3661
3424 warn "getting rid of safe::, as good as possible"; 3662 warn "getting rid of safe::, as good as possible";
3425 Symbol::delete_package "safe::$_" 3663 clear_package "safe::$_"
3426 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3427 3665
3428 warn "unloading cf.pm \"a bit\""; 3666 warn "unloading cf.pm \"a bit\"";
3429 delete $INC{"cf.pm"}; 3667 delete $INC{"cf.pm"};
3430 delete $INC{"cf/pod.pm"}; 3668 delete $INC{"cf/pod.pm"};
3431 3669
3432 # don't, removes xs symbols, too, 3670 # don't, removes xs symbols, too,
3433 # and global variables created in xs 3671 # and global variables created in xs
3434 #Symbol::delete_package __PACKAGE__; 3672 #clear_package __PACKAGE__;
3435 3673
3436 warn "unload completed, starting to reload now"; 3674 warn "unload completed, starting to reload now";
3437 3675
3438 warn "reloading cf.pm"; 3676 warn "reloading cf.pm";
3439 require cf; 3677 require cf;
3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3441 3679
3442 warn "loading config and database again"; 3680 warn "loading config and database again";
3443 cf::reload_config; 3681 cf::reload_config;
3444 3682
3445 warn "loading extensions"; 3683 warn "loading extensions";
3446 cf::load_extensions; 3684 cf::load_extensions;
3447 3685
3448 warn "reattaching attachments to objects/players"; 3686 warn "reattaching attachments to objects/players";
3449 _global_reattach; # objects, sockets 3687 _global_reattach; # objects, sockets
3450 warn "reattaching attachments to maps"; 3688 warn "reattaching attachments to maps";
3451 reattach $_ for values %MAP; 3689 reattach $_ for values %MAP;
3452 warn "reattaching attachments to players"; 3690 warn "reattaching attachments to players";
3453 reattach $_ for values %PLAYER; 3691 reattach $_ for values %PLAYER;
3454 3692
3455 warn "leaving sync_job"; 3693 warn "leaving sync_job";
3456 3694
3457 1 3695 1
3458 } or do { 3696 } or do {
3459 warn $@; 3697 warn $@;
3460 warn "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
3461 exit 1;
3462 }; 3699 };
3463 3700
3464 warn "reloaded"; 3701 warn "reloaded";
3702 --$RELOAD;
3703 }
3465}; 3704};
3466 3705
3467our $RELOAD_WATCHER; # used only during reload 3706our $RELOAD_WATCHER; # used only during reload
3468 3707
3469sub reload_perl() { 3708sub reload_perl() {
3470 # doing reload synchronously and two reloads happen back-to-back, 3709 # doing reload synchronously and two reloads happen back-to-back,
3471 # coro crashes during coro_state_free->destroy here. 3710 # coro crashes during coro_state_free->destroy here.
3472 3711
3473 $RELOAD_WATCHER ||= Event->timer ( 3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3474 reentrant => 0,
3475 after => 0,
3476 data => WF_AUTOCANCEL,
3477 cb => sub {
3478 do_reload_perl; 3713 do_reload_perl;
3479 undef $RELOAD_WATCHER; 3714 undef $RELOAD_WATCHER;
3480 },
3481 ); 3715 };
3482} 3716}
3483 3717
3484register_command "reload" => sub { 3718register_command "reload" => sub {
3485 my ($who, $arg) = @_; 3719 my ($who, $arg) = @_;
3486 3720
3499 3733
3500our @WAIT_FOR_TICK; 3734our @WAIT_FOR_TICK;
3501our @WAIT_FOR_TICK_BEGIN; 3735our @WAIT_FOR_TICK_BEGIN;
3502 3736
3503sub wait_for_tick { 3737sub wait_for_tick {
3504 return unless $TICK_WATCHER->is_active;
3505 return if $Coro::current == $Coro::main; 3738 return if tick_inhibit || $Coro::current == $Coro::main;
3506 3739
3507 my $signal = new Coro::Signal; 3740 my $signal = new Coro::Signal;
3508 push @WAIT_FOR_TICK, $signal; 3741 push @WAIT_FOR_TICK, $signal;
3509 $signal->wait; 3742 $signal->wait;
3510} 3743}
3511 3744
3512sub wait_for_tick_begin { 3745sub wait_for_tick_begin {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 3746 return if tick_inhibit || $Coro::current == $Coro::main;
3515 3747
3516 my $signal = new Coro::Signal; 3748 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK_BEGIN, $signal; 3749 push @WAIT_FOR_TICK_BEGIN, $signal;
3518 $signal->wait; 3750 $signal->wait;
3519} 3751}
3520 3752
3521$TICK_WATCHER = Event->timer ( 3753sub tick {
3522 reentrant => 0,
3523 parked => 1,
3524 prio => 0,
3525 at => $NEXT_TICK || $TICK,
3526 data => WF_AUTOCANCEL,
3527 cb => sub {
3528 if ($Coro::current != $Coro::main) { 3754 if ($Coro::current != $Coro::main) {
3529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3755 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3530 unless ++$bug_warning > 10; 3756 unless ++$bug_warning > 10;
3531 return; 3757 return;
3532 } 3758 }
3533 3759
3534 $NOW = $tick_start = Event::time;
3535
3536 cf::server_tick; # one server iteration 3760 cf::server_tick; # one server iteration
3537 3761
3538 $RUNTIME += $TICK;
3539 $NEXT_TICK += $TICK;
3540
3541 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3762 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3542 $NEXT_RUNTIME_WRITE = $NOW + 10; 3763 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3543 Coro::async_pool { 3764 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver"; 3765 $Coro::current->{desc} = "runtime saver";
3545 write_runtime 3766 write_runtime_sync
3546 or warn "ERROR: unable to write runtime file: $!"; 3767 or warn "ERROR: unable to write runtime file: $!";
3547 };
3548 } 3768 };
3769 }
3549 3770
3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3771 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3551 $sig->send; 3772 $sig->send;
3552 } 3773 }
3553 while (my $sig = shift @WAIT_FOR_TICK) { 3774 while (my $sig = shift @WAIT_FOR_TICK) {
3554 $sig->send; 3775 $sig->send;
3555 } 3776 }
3556 3777
3557 $NOW = Event::time; 3778 $LOAD = ($NOW - $TICK_START) / $TICK;
3558
3559 # if we are delayed by four ticks or more, skip them all
3560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3561
3562 $TICK_WATCHER->at ($NEXT_TICK);
3563 $TICK_WATCHER->start;
3564
3565 $LOAD = ($NOW - $tick_start) / $TICK;
3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3779 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3567 3780
3568 _post_tick; 3781 if (0) {
3782 if ($NEXT_TICK) {
3783 my $jitter = $TICK_START - $NEXT_TICK;
3784 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3785 warn "jitter $JITTER\n";#d#
3786 }
3569 }, 3787 }
3570); 3788}
3571 3789
3572{ 3790{
3791 # configure BDB
3792
3573 BDB::min_parallel 8; 3793 BDB::min_parallel 8;
3574 BDB::max_poll_time $TICK * 0.1; 3794 BDB::max_poll_reqs $TICK * 0.1;
3575 $BDB_POLL_WATCHER = Event->io ( 3795 $AnyEvent::BDB::WATCHER->priority (1);
3576 reentrant => 0,
3577 fd => BDB::poll_fileno,
3578 poll => 'r',
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => \&BDB::poll_cb,
3582 );
3583
3584 BDB::set_sync_prepare {
3585 my $status;
3586 my $current = $Coro::current;
3587 (
3588 sub {
3589 $status = $!;
3590 $current->ready; undef $current;
3591 },
3592 sub {
3593 Coro::schedule while defined $current;
3594 $! = $status;
3595 },
3596 )
3597 };
3598 3796
3599 unless ($DB_ENV) { 3797 unless ($DB_ENV) {
3600 $DB_ENV = BDB::db_env_create; 3798 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3799 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3602 | BDB::LOG_AUTOREMOVE, 1); 3800 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3801 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3802 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3803 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3605 3804
3606 cf::sync_job { 3805 cf::sync_job {
3607 eval { 3806 eval {
3617 3816
3618 cf::cleanup "db_env_open(db): $@" if $@; 3817 cf::cleanup "db_env_open(db): $@" if $@;
3619 }; 3818 };
3620 } 3819 }
3621 3820
3622 $BDB_DEADLOCK_WATCHER = Event->timer ( 3821 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3822 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 ); 3823 };
3632 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3824 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3825 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 ); 3826 };
3642 $BDB_TRICKLE_WATCHER = Event->timer ( 3827 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3828 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 ); 3829 };
3652} 3830}
3653 3831
3654{ 3832{
3833 # configure IO::AIO
3834
3655 IO::AIO::min_parallel 8; 3835 IO::AIO::min_parallel 8;
3656
3657 undef $Coro::AIO::WATCHER;
3658 IO::AIO::max_poll_time $TICK * 0.1; 3836 IO::AIO::max_poll_time $TICK * 0.1;
3659 $AIO_POLL_WATCHER = Event->io ( 3837 undef $AnyEvent::AIO::WATCHER;
3660 reentrant => 0,
3661 data => WF_AUTOCANCEL,
3662 fd => IO::AIO::poll_fileno,
3663 poll => 'r',
3664 prio => 0,
3665 cb => \&IO::AIO::poll_cb,
3666 );
3667} 3838}
3668 3839
3669my $_log_backtrace; 3840my $_log_backtrace;
3670 3841
3671sub _log_backtrace { 3842sub _log_backtrace {
3674 $msg =~ s/\n//; 3845 $msg =~ s/\n//;
3675 3846
3676 # limit the # of concurrent backtraces 3847 # limit the # of concurrent backtraces
3677 if ($_log_backtrace < 2) { 3848 if ($_log_backtrace < 2) {
3678 ++$_log_backtrace; 3849 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg;
3679 async { 3851 async {
3680 $Coro::current->{desc} = "abt $msg"; 3852 $Coro::current->{desc} = "abt $msg";
3681 3853
3682 my @bt = fork_call { 3854 my @bt = fork_call {
3683 @addr = map { sprintf "%x", $_ } @addr; 3855 @addr = map { sprintf "%x", $_ } @addr;
3694 } 3866 }
3695 3867
3696 @funcs 3868 @funcs
3697 }; 3869 };
3698 3870
3699 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $perl_bt\n";
3872 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3700 LOG llevInfo, "[ABT] $_\n" for @bt; 3873 LOG llevInfo, "[ABT] $_\n" for @bt;
3701 --$_log_backtrace; 3874 --$_log_backtrace;
3702 }; 3875 };
3703 } else { 3876 } else {
3704 LOG llevInfo, "[ABT] $msg\n"; 3877 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines