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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines