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.427 by root, Sat Apr 26 12:25:45 2008 UTC vs.
Revision 1.586 by root, Wed Oct 31 15:02:02 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML::XS ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 75
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 78
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
71 85
72our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
82our $DATADIR = datadir; 99our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
86our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
93 120
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 123our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
99 125
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 129our $DB_ENV;
105 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
106our %CFG; 133our %CFG;
134our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
107 135
108our $UPTIME; $UPTIME ||= time; 136our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 137our $RUNTIME = 0;
138our $SERVER_TICK = 0;
110our $NOW; 139our $NOW;
111 140
112our (%PLAYER, %PLAYER_LOADING); # all users 141our (%PLAYER, %PLAYER_LOADING); # all users
113our (%MAP, %MAP_LOADING ); # all maps 142our (%MAP, %MAP_LOADING ); # all maps
114our $LINK_MAP; # the special {link} map, which is always available 143our $LINK_MAP; # the special {link} map, which is always available
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 148our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 149our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 150our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 151our $TICK_START; # for load detecting purposes
123 152
153our @POST_INIT;
154
155our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
156our $REALLY_UNLOOP; # never set to true, please :)
157
158our $WAIT_FOR_TICK = new Coro::Signal;
159our @WAIT_FOR_TICK_BEGIN;
160
124binmode STDOUT; 161binmode STDOUT;
125binmode STDERR; 162binmode STDERR;
126 163
127# read virtual server time, if available 164# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 165unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 166 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 167 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 168 $RUNTIME = <$fh> + 0.;
132} 169}
170
171eval "sub TICK() { $TICK } 1" or die;
133 172
134mkdir $_ 173mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 174 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 175
137our $EMERGENCY_POSITION; 176our $EMERGENCY_POSITION;
138 177
139sub cf::map::normalise; 178sub cf::map::normalise;
140 179
180sub in_main() {
181 $Coro::current == $Coro::main
182}
183
141############################################################################# 184#############################################################################
142 185
186%REFLECT = ();
187for (@REFLECT) {
188 my $reflect = JSON::XS::decode_json $_;
189 $REFLECT{$reflect->{class}} = $reflect;
190}
191
192# this is decidedly evil
193$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
194
195#############################################################################
196
143=head2 GLOBAL VARIABLES 197=head2 GLOBAL VARIABLES
144 198
145=over 4 199=over 4
146 200
147=item $cf::UPTIME 201=item $cf::UPTIME
148 202
149The timestamp of the server start (so not actually an uptime). 203The timestamp of the server start (so not actually an "uptime").
204
205=item $cf::SERVER_TICK
206
207An unsigned integer that starts at zero when the server is started and is
208incremented on every tick.
209
210=item $cf::NOW
211
212The (real) time of the last (current) server tick - updated before and
213after tick processing, so this is useful only as a rough "what time is it
214now" estimate.
215
216=item $cf::TICK
217
218The interval between each server tick, in seconds.
150 219
151=item $cf::RUNTIME 220=item $cf::RUNTIME
152 221
153The time this server has run, starts at 0 and is increased by $cf::TICK on 222The time this server has run, starts at 0 and is increased by $cf::TICK on
154every server tick. 223every server tick.
160Various directories - "/etc", read-only install directory, perl-library 229Various directories - "/etc", read-only install directory, perl-library
161directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 230directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
162unique-items directory, player file directory, random maps directory and 231unique-items directory, player file directory, random maps directory and
163database environment. 232database environment.
164 233
165=item $cf::NOW
166
167The time of the last (current) server tick.
168
169=item $cf::TICK
170
171The interval between server ticks, in seconds.
172
173=item $cf::LOADAVG 234=item $cf::LOADAVG
174 235
175The current CPU load on the server (alpha-smoothed), as a value between 0 236The current CPU load on the server (alpha-smoothed), as a value between 0
176(none) and 1 (overloaded), indicating how much time is spent on processing 237(none) and 1 (overloaded), indicating how much time is spent on processing
177objects per tick. Healthy values are < 0.5. 238objects per tick. Healthy values are < 0.5.
186from wherever your confdir points to. 247from wherever your confdir points to.
187 248
188=item cf::wait_for_tick, cf::wait_for_tick_begin 249=item cf::wait_for_tick, cf::wait_for_tick_begin
189 250
190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 251These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
191returns directly I<after> the tick processing (and consequently, can only wake one process 252returns directly I<after> the tick processing (and consequently, can only wake one thread
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 253per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 254
255Note that cf::Wait_for_tick will immediately return when the server is not
256ticking, making it suitable for small pauses in threads that need to run
257when the server is paused. If that is not applicable (i.e. you I<really>
258want to wait, use C<$cf::WAIT_FOR_TICK>).
259
260=item $cf::WAIT_FOR_TICK
261
262Note that C<cf::wait_for_tick> is probably the correct thing to use. This
263variable contains a L<Coro::Signal> that is broadcats after every server
264tick. Calling C<< ->wait >> on it will suspend the caller until after the
265next server tick.
266
267=cut
268
269sub wait_for_tick();
270sub wait_for_tick_begin();
271
194=item @cf::INVOKE_RESULTS 272=item @cf::INVOKE_RESULTS
195 273
196This array contains the results of the last C<invoke ()> call. When 274This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 275C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 276that call.
199 277
278=item %cf::REFLECT
279
280Contains, for each (C++) class name, a hash reference with information
281about object members (methods, scalars, arrays and flags) and other
282metadata, which is useful for introspection.
283
200=back 284=back
201 285
202=cut 286=cut
203 287
204BEGIN { 288sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 289sub warn (@) { LOG llevWarn , join "", @_ }
290sub info (@) { LOG llevInfo , join "", @_ }
291sub debug(@) { LOG llevDebug, join "", @_ }
292sub trace(@) { LOG llevTrace, join "", @_ }
293
294$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 295 my $msg = join "", @_;
207 296
208 $msg .= "\n" 297 $msg .= "\n"
209 unless $msg =~ /\n$/; 298 unless $msg =~ /\n$/;
210 299
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 300 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 301
213 LOG llevError, $msg; 302 LOG llevWarn, $msg;
214 }; 303};
215}
216 304
217$Coro::State::DIEHOOK = sub { 305$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 306 return unless $^S eq 0; # "eq", not "=="
219 307
220 if ($Coro::current == $Coro::main) {#d# 308 error Carp::longmess $_[0];
309
310 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 311 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 312 return;#d#
223 }#d# 313 }#d#
224 314
225 # kill coroutine otherwise 315 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 316 Coro::terminate
228}; 317};
229
230$SIG{__DIE__} = sub { }; #d#?
231 318
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 319@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 320@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 321@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 322@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 329for my $pkg (qw(
243 cf::global cf::attachable 330 cf::global cf::attachable
244 cf::object cf::object::player 331 cf::object cf::object::player
245 cf::client cf::player 332 cf::client cf::player
246 cf::arch cf::living 333 cf::arch cf::living
334 cf::map cf::mapspace
247 cf::map cf::party cf::region 335 cf::party cf::region
248)) { 336)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 338}
252 339
253$EV::DIED = sub { 340$EV::DIED = sub {
254 warn "error in event callback: @_"; 341 warn "error in event callback: $@";
255}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
256 348
257############################################################################# 349#############################################################################
258 350
259=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
260 352
281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 373 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
282 $d 374 $d
283 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
284} 376}
285 377
378=item $scalar = cf::load_file $path
379
380Loads the given file from path and returns its contents. Croaks on error
381and can block.
382
383=cut
384
385sub load_file($) {
386 0 <= aio_load $_[0], my $data
387 or Carp::croak "$_[0]: $!";
388
389 $data
390}
391
392=item $success = cf::replace_file $path, $data, $sync
393
394Atomically replaces the file at the given $path with new $data, and
395optionally $sync the data to disk before replacing the file.
396
397=cut
398
399sub replace_file($$;$) {
400 my ($path, $data, $sync) = @_;
401
402 my $lock = cf::lock_acquire ("replace_file:$path");
403
404 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
405 or return;
406
407 $data = $data->() if ref $data;
408
409 length $data == aio_write $fh, 0, (length $data), $data, 0
410 or return;
411
412 !$sync
413 or !aio_fsync $fh
414 or return;
415
416 aio_close $fh
417 and return;
418
419 aio_rename "$path~", $path
420 and return;
421
422 if ($sync) {
423 $path =~ s%/[^/]*$%%;
424 aio_pathsync $path;
425 }
426
427 1
428}
429
286=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
287 431
288Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
289 433
290=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 440our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 441
298sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
300 444
445=item $ref = cf::decode_storable $scalar
446
447Same as Coro::Storable::thaw, so blocks.
448
449=cut
450
451BEGIN { *decode_storable = \&Coro::Storable::thaw }
452
453=item $ref = cf::decode_yaml $scalar
454
455Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
456
457=cut
458
459sub decode_yaml($) {
460 fork_call { YAML::XS::Load $_[0] } @_
461}
462
463=item $scalar = cf::unlzf $scalar
464
465Same as Compress::LZF::compress, but takes server ticks into account, so
466blocks.
467
468=cut
469
470sub unlzf($) {
471 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
472 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
473 Compress::LZF::decompress $_[0]
474}
475
476=item cf::post_init { BLOCK }
477
478Execute the given codeblock, I<after> all extensions have been (re-)loaded,
479but I<before> the server starts ticking again.
480
481The codeblock will have a single boolean argument to indicate whether this
482is a reload or not.
483
484=cut
485
486sub post_init(&) {
487 push @POST_INIT, shift;
488}
489
490sub _post_init {
491 trace "running post_init jobs";
492
493 # run them in parallel...
494
495 my @join;
496
497 while () {
498 push @join, map &Coro::async ($_, 0), @POST_INIT;
499 @POST_INIT = ();
500
501 @join or last;
502
503 (pop @join)->join;
504 }
505}
506
301=item cf::lock_wait $string 507=item cf::lock_wait $string
302 508
303Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
304 510
305=item my $lock = cf::lock_acquire $string 511=item my $lock = cf::lock_acquire $string
306 512
307Wait until the given lock is available and then acquires it and returns 513Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 514a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 515for example when the coroutine gets canceled), the lock is automatically
310returned. 516returned.
311 517
312Locks are *not* recursive, locking from the same coro twice results in a 518Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 519deadlocked coro.
319 525
320Return true if the lock is currently active, i.e. somebody has locked it. 526Return true if the lock is currently active, i.e. somebody has locked it.
321 527
322=cut 528=cut
323 529
324our %LOCK; 530our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 531
327sub lock_wait($) { 532sub lock_wait($) {
328 my ($key) = @_; 533 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 534}
341 535
342sub lock_acquire($) { 536sub lock_acquire($) {
343 my ($key) = @_; 537 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 538}
357 539
358sub lock_active($) { 540sub lock_active($) {
359 my ($key) = @_; 541 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 542}
363 543
364sub freeze_mainloop { 544sub freeze_mainloop {
365 tick_inhibit_inc; 545 tick_inhibit_inc;
366 546
367 Coro::guard \&tick_inhibit_dec; 547 &Guard::guard (\&tick_inhibit_dec);
368} 548}
369 549
370=item cf::periodic $interval, $cb 550=item cf::periodic $interval, $cb
371 551
372Like EV::periodic, but randomly selects a starting point so that the actions 552Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 553get spread over time.
374 554
375=cut 555=cut
376 556
377sub periodic($$) { 557sub periodic($$) {
378 my ($interval, $cb) = @_; 558 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
383} 563}
384 564
385=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
386 566
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
388This call blocks and returns only when you have at least C<$time> seconds 568(default: 0): This call blocks and returns only when you have at least
389of cpu time till the next tick. The slot is only valid till the next cede. 569C<$time> seconds of cpu time till the next tick. The slot is only valid
570till the next cede.
571
572Background jobs should use a priority les than zero, interactive jobs
573should use 100 or more.
390 574
391The optional C<$name> can be used to identify the job to run. It might be 575The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
393 577
394Useful for short background jobs. 578Useful for short background jobs.
395 579
396=cut 580=cut
397 581
398our @SLOT_QUEUE; 582our @SLOT_QUEUE;
399our $SLOT_QUEUE; 583our $SLOT_QUEUE;
584our $SLOT_DECAY = 0.9;
400 585
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 586$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 587$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 588 $Coro::current->desc ("timeslot manager");
404 589
405 my $signal = new Coro::Signal; 590 my $signal = new Coro::Signal;
591 my $busy;
406 592
407 while () { 593 while () {
408 next_job: 594 next_job:
595
409 my $avail = cf::till_tick; 596 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 597
411 for (0 .. $#SLOT_QUEUE) { 598 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 599 if ($SLOT_QUEUE[$_][0] <= $avail) {
600 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 601 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 602 $job->[2]->send;
415 Coro::cede; 603 Coro::cede;
416 goto next_job; 604 goto next_job;
417 } 605 } else {
606 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 607 }
419 } 608 }
420 609
421 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 611 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
424 $signal->wait;
425 } else { 613 } else {
614 $busy = 0;
426 Coro::schedule; 615 Coro::schedule;
427 } 616 }
428 } 617 }
429}; 618};
430 619
431sub get_slot($;$$) { 620sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 621 return if tick_inhibit || $Coro::current == $Coro::main;
433 622
434 my ($time, $pri, $name) = @_; 623 my ($time, $pri, $name) = @_;
435 624
436 $time = $TICK * .6 if $time > $TICK * .6; 625 $time = clamp $time, 0.01, $TICK * .6;
626
437 my $sig = new Coro::Signal; 627 my $sig = new Coro::Signal;
438 628
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 629 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 630 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 631 $SLOT_QUEUE->ready;
467=cut 657=cut
468 658
469sub sync_job(&) { 659sub sync_job(&) {
470 my ($job) = @_; 660 my ($job) = @_;
471 661
472 if ($Coro::current == $Coro::main) { 662 if (in_main) {
473 my $time = EV::time; 663 my $time = AE::time;
474 664
475 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
477 667
478 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
479 669
480 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
481 671
482 my $busy = 1; 672 my $busy = 1;
483 my @res; 673 my @res;
484 674
485 (async { 675 (async {
486 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 677 @res = eval { $job->() };
488 warn $@ if $@; 678 error $@ if $@;
489 undef $busy; 679 undef $busy;
490 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
491 681
492 while ($busy) { 682 while ($busy) {
493 if (Coro::nready) { 683 if (Coro::nready) {
495 } else { 685 } else {
496 EV::loop EV::LOOP_ONESHOT; 686 EV::loop EV::LOOP_ONESHOT;
497 } 687 }
498 } 688 }
499 689
500 my $time = EV::time - $time; 690 my $time = AE::time - $time;
501 691
502 $TICK_START += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
503 693
504 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
505 } else { 695 } else {
527 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
528 718
529 $coro 719 $coro
530} 720}
531 721
532=item fork_call { }, $args 722=item fork_call { }, @args
533 723
534Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 727never block itself or use any form of event handling.
538 728
539=cut 729=cut
540 730
731sub post_fork {
732 reset_signals;
733}
734
541sub fork_call(&@) { 735sub fork_call(&@) {
542 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
543 737
544 # we seemingly have to make a local copy of the whole thing, 738 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
547 741
548 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
549 reset_signals; 743 cf::post_fork;
550 &$cb 744 &$cb
551 }, @args; 745 } @args;
552 746
553 wantarray ? @res : $res[-1] 747 wantarray ? @res : $res[-1]
748}
749
750sub objinfo {
751 (
752 "counter value" => cf::object::object_count,
753 "objects created" => cf::object::create_count,
754 "objects destroyed" => cf::object::destroy_count,
755 "freelist size" => cf::object::free_count,
756 "allocated objects" => cf::object::objects_size,
757 "active objects" => cf::object::actives_size,
758 )
554} 759}
555 760
556=item $coin = coin_from_name $name 761=item $coin = coin_from_name $name
557 762
558=cut 763=cut
595within each server. 800within each server.
596 801
597=cut 802=cut
598 803
599sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
600 my ($name) = @_; 808 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
602 810
603 eval { 811 eval {
604 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
614} 822}
615 823
616our $DB; 824our $DB;
617 825
618sub db_init { 826sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
621 };
622} 828}
623 829
624sub db_get($$) { 830sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
626 832
627 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
628 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
629 837
630 $! ? () 838 $! ? ()
631 : $data 839 : $data
632 }
633} 840}
634 841
635sub db_put($$$) { 842sub db_put($$$) {
636 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 872
666 my @data; 873 my @data;
667 my $md5; 874 my $md5;
668 875
669 for (0 .. $#$src) { 876 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 878 }
673 879
674 # if processing is expensive, check 880 # if processing is expensive, check
675 # checksum first 881 # checksum first
676 if (1) { 882 if (1) {
693 899
694 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 901 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
697 903
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 905
700 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
703 909
713 919
714=cut 920=cut
715 921
716sub datalog($@) { 922sub datalog($@) {
717 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 925}
720 926
721=back 927=back
722 928
723=cut 929=cut
724 930
725############################################################################# 931#############################################################################
726 932
727=head2 ATTACHABLE OBJECTS 933=head2 ATTACHABLE OBJECTS
728 934
729Many objects in crossfire are so-called attachable objects. That means you can 935Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 936attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 937to it. All such attachable objects support the following methods.
732 938
733In the following description, CLASS can be any of C<global>, C<object> 939In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 940C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 990=item cf::CLASS::attachment $name, ...
785 991
786Register an attachment by C<$name> through which attachable objects of the 992Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 993given CLASS can refer to this attachment.
788 994
789Some classes such as crossfire maps and objects can specify attachments 995Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 996that are attached at load/instantiate time, thus the need for a name.
791 997
792These calls expect any number of the following handler/hook descriptions: 998These calls expect any number of the following handler/hook descriptions:
793 999
794=over 4 1000=over 4
918 1124
919 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1127
922 } elsif (ref $type) { 1128 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
924 1130
925 } else { 1131 } else {
926 shift @arg; 1132 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
928 } 1134 }
929 } 1135 }
930} 1136}
931 1137
932sub _object_attach { 1138sub _object_attach {
942 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
943 } 1149 }
944 1150
945 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
946 } else { 1152 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1154 }
949 1155
950 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
951} 1157}
952 1158
1011 1217
1012 for (@$callbacks) { 1218 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1014 1220
1015 if ($@) { 1221 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1223 override;
1019 } 1224 }
1020 1225
1021 return 1 if $override; 1226 return 1 if $override;
1022 } 1227 }
1085 1290
1086sub reattach { 1291sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1292 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1293 my ($obj) = @_;
1089 1294
1295 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1296 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1297
1092 my $registry = $obj->registry; 1298 my $registry = $obj->registry;
1093 1299
1094 @$registry = (); 1300 @$registry = ();
1095 1301
1100 for (@$attach) { 1306 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1103 } 1309 }
1104 } else { 1310 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1312 }
1107 } 1313 }
1108} 1314}
1109 1315
1110cf::attachable->attach ( 1316cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1138 1344
1139 sync_job { 1345 sync_job {
1140 if (length $$rdata) { 1346 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1144 1351
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1353 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1355 if ($cf::USE_FSYNC) {
1356 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1357 aio_fsync $fh;
1358 }
1149 aio_close $fh; 1359 aio_close $fh;
1150 1360
1151 if (@$objs) { 1361 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1362 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1363 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1364 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1365 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1366 if ($cf::USE_FSYNC) {
1367 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1368 aio_fsync $fh;
1369 }
1157 aio_close $fh; 1370 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1371 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1372 }
1160 } else { 1373 } else {
1161 aio_unlink "$filename.pst"; 1374 aio_unlink "$filename.pst";
1162 } 1375 }
1163 1376
1164 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1378
1379 $filename =~ s%/[^/]+$%%;
1380 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1381 } else {
1166 warn "FATAL: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1167 } 1383 }
1168 } else { 1384 } else {
1169 aio_unlink $filename; 1385 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1171 } 1387 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1412 $av = $st->{objs};
1197 } 1413 }
1198 1414
1199 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1202 1419
1203 ($data, $av) 1420 ($data, $av)
1204} 1421}
1205 1422
1206=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1479 my ($name, $cb) = @_;
1263 1480
1264 $EXTICMD{$name} = $cb; 1481 $EXTICMD{$name} = $cb;
1265} 1482}
1266 1483
1484use File::Glob ();
1485
1267cf::player->attach ( 1486cf::player->attach (
1268 on_command => sub { 1487 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1270 1489
1271 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1272 or return; 1491 or return;
1273 1492
1281 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1282 1501
1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1284 1503
1285 if (ref $msg) { 1504 if (ref $msg) {
1286 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290 1506
1291 my @reply; 1507 my @reply;
1292 1508
1293 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1294 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1296 1512
1297 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1514 if $reply;
1299 1515
1300 } else { 1516 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1518 }
1303 1519
1304 cf::override; 1520 cf::override;
1305 }, 1521 },
1306); 1522);
1307 1523
1524# "readahead" all extensions
1525sub cache_extensions {
1526 my $grp = IO::AIO::aio_group;
1527
1528 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1529 for (grep /\.ext$/, @{$_[0]}) {
1530 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1531 }
1532 };
1533
1534 $grp
1535}
1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1308sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1309 cf::sync_job { 1553 cf::sync_job {
1310 my %todo; 1554 my %todo;
1311 1555
1312 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1557 next unless -r $path;
1331 1575
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1578
1335 $ext{source} = 1579 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1338 . $source 1582 . $source
1339 . "\n};\n1"; 1583 . "\n};\n1";
1340 1584
1341 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1342 } 1586 }
1343 1587
1588 my $pass = 0;
1344 my %done; 1589 my %done;
1345 while (%todo) { 1590 while (%todo) {
1346 my $progress; 1591 my $progress;
1347 1592
1593 ++$pass;
1594
1595 ext:
1348 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1598 next ext
1351 unless exists $done{$_}; 1599 unless exists $done{$_};
1352 } 1600 }
1353 1601
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1603
1356 unless (eval $v->{source}) { 1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1613 my $active = eval $source;
1614
1615 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1617
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1619 if exists $v->{meta}{mandatory};
1364 1620
1365 warn $msg; 1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1622 delete $todo{$k};
1623 } else {
1624 $done{$k} = delete $todo{$k};
1625 push @EXTS, $v->{pkg};
1626 $progress = 1;
1627
1628 info "$v->{base}: extension inactive.\n"
1629 unless $active;
1366 } 1630 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1631 }
1372 1632
1373 skip: 1633 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1635
1636 while (my ($k, $v) = each %todo) {
1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1638 if exists $v->{meta}{mandatory};
1639 }
1640
1641 last;
1642 }
1376 } 1643 }
1377 }; 1644 };
1378} 1645}
1379 1646
1380############################################################################# 1647#############################################################################
1381 1648
1382=back 1649=back
1383 1650
1384=head2 CORE EXTENSIONS 1651=head2 CORE EXTENSIONS
1385 1652
1386Functions and methods that extend core crossfire objects. 1653Functions and methods that extend core deliantra objects.
1387 1654
1388=cut 1655=cut
1389 1656
1390package cf::player; 1657package cf::player;
1391 1658
1434 1701
1435sub exists($) { 1702sub exists($) {
1436 my ($login) = @_; 1703 my ($login) = @_;
1437 1704
1438 $cf::PLAYER{$login} 1705 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1706 or !aio_stat path $login
1440} 1707}
1441 1708
1442sub find($) { 1709sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1710 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1711 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1465 } 1732 }
1466 } 1733 }
1467} 1734}
1468 1735
1736cf::player->attach (
1737 on_load => sub {
1738 my ($pl, $path) = @_;
1739
1740 # restore slots saved in save, below
1741 my $slots = delete $pl->{_slots};
1742
1743 $pl->ob->current_weapon ($slots->[0]);
1744 $pl->combat_ob ($slots->[1]);
1745 $pl->ranged_ob ($slots->[2]);
1746 },
1747);
1748
1469sub save($) { 1749sub save($) {
1470 my ($pl) = @_; 1750 my ($pl) = @_;
1471 1751
1472 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1473 1753
1478 1758
1479 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1760 $pl->{last_save} = $cf::RUNTIME;
1481 1761
1482 cf::get_slot 0.01; 1762 cf::get_slot 0.01;
1763
1764 # save slots, to be restored later
1765 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1483 1766
1484 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1768 cf::cede_to_tick;
1486} 1769}
1487 1770
1519 my ($pl) = @_; 1802 my ($pl) = @_;
1520 1803
1521 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1522 1805
1523 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1524 $pl->password ("*"); # this should lock out the player until we nuked the dir 1807 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1525 1808
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1527 $pl->deactivate; 1810 $pl->deactivate;
1811
1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1529 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1530 1817
1531 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1533 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1587 \@logins 1874 \@logins
1588} 1875}
1589 1876
1590=item $player->maps 1877=item $player->maps
1591 1878
1879=item cf::player::maps $login
1880
1592Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1593player. May block. 1882player. May block.
1594 1883
1595=cut 1884=cut
1596 1885
1613 } 1902 }
1614 1903
1615 \@paths 1904 \@paths
1616} 1905}
1617 1906
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1907=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1908
1620Expand crossfire pod fragments into protocol xml. 1909Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710 1910
1711=item $player->ext_reply ($msgid, @msg) 1911=item $player->ext_reply ($msgid, @msg)
1712 1912
1713Sends an ext reply to the player. 1913Sends an ext reply to the player.
1714 1914
1746 1946
1747=cut 1947=cut
1748 1948
1749sub find_by_path($) { 1949sub find_by_path($) {
1750 my ($path) = @_; 1950 my ($path) = @_;
1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1751 1953
1752 my ($match, $specificity); 1954 my ($match, $specificity);
1753 1955
1754 for my $region (list) { 1956 for my $region (list) {
1755 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1784sub generate_random_map { 1986sub generate_random_map {
1785 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1786 1988
1787 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1788 1990
1789 # mit "rum" bekleckern, nicht
1790 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1794 $rmp->{exit_on_final_map},
1795 $rmp->{xsize}, $rmp->{ysize},
1796 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1797 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1798 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1799 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1800 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1801 (cf::region::find $rmp->{region}), $rmp->{custom}
1802 )
1803} 1992}
1804 1993
1805=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1806 1995
1807Register a handler for the map path matching the given regex at the 1996Register a handler for the map path matching the given regex at the
1812 2001
1813sub register { 2002sub register {
1814 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1815 my $pkg = caller; 2004 my $pkg = caller;
1816 2005
1817 no strict;
1818 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1819 2007
1820 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1821} 2009}
1822 2010
1823# also paths starting with '/' 2011# also paths starting with '/'
1824$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1825 2013
1826sub thawer_merge { 2014sub thawer_merge {
1827 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1828 2016
1829 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1834} 2022}
1835 2023
1836sub normalise { 2024sub normalise {
1837 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1838 2026
1839 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1840 2028
1841 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1842 2030
1843 # map plan: 2031 # map plan:
1844 # 2032 #
1859 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1860 $path = "$base/$path"; 2048 $path = "$base/$path";
1861 } 2049 }
1862 2050
1863 for ($path) { 2051 for ($path) {
1864 redo if s{//}{/};
1865 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1866 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1867 } 2054 }
1868 2055
1869 $path 2056 $path
1883 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1884 return $self; 2071 return $self;
1885 } 2072 }
1886 } 2073 }
1887 2074
1888 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1889 () 2076 ()
1890} 2077}
1891 2078
2079# may re-bless or do other evil things
1892sub init { 2080sub init {
1893 my ($self) = @_; 2081 my ($self) = @_;
1894 2082
1895 $self 2083 $self
1896} 2084}
1927 2115
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2116 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 2117 "$UNIQUEDIR/$path"
1930} 2118}
1931 2119
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 2120sub decay_objects {
1942 my ($self) = @_; 2121 my ($self) = @_;
1943 2122
1944 return if $self->{deny_reset}; 2123 return if $self->{deny_reset};
1945 2124
1970 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1971 2150
1972 1 2151 1
1973} 2152}
1974 2153
2154# used to laod the header of an original map
1975sub load_header_orig { 2155sub load_header_orig {
1976 my ($self) = @_; 2156 my ($self) = @_;
1977 2157
1978 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1979} 2159}
1980 2160
2161# used to laod the header of an instantiated map
1981sub load_header_temp { 2162sub load_header_temp {
1982 my ($self) = @_; 2163 my ($self) = @_;
1983 2164
1984 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1985} 2166}
1986 2167
2168# called after loading the header from an instantiated map
1987sub prepare_temp { 2169sub prepare_temp {
1988 my ($self) = @_; 2170 my ($self) = @_;
1989 2171
1990 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1991 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1992 # safety 2174 # safety
1993 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1994 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1995} 2177}
1996 2178
2179# called after loading the header from an original map
1997sub prepare_orig { 2180sub prepare_orig {
1998 my ($self) = @_; 2181 my ($self) = @_;
1999 2182
2000 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2001 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
2025 2208
2026sub find; 2209sub find;
2027sub find { 2210sub find {
2028 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2029 2212
2213 cf::cede_to_tick;
2214
2030 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2031 2216
2032 cf::lock_wait "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2034 2219
2035 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_find:$path";
2037 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2038
2039 my $map = new_from_path cf::map $path 2221 my $map = new_from_path cf::map $path
2040 or return; 2222 or return;
2041 2223
2042 $map->{last_save} = $cf::RUNTIME; 2224 $map->{last_save} = $cf::RUNTIME;
2043 2225
2045 or return; 2227 or return;
2046 2228
2047 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2229 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2048 # doing this can freeze the server in a sync job, obviously 2230 # doing this can freeze the server in a sync job, obviously
2049 #$cf::WAIT_FOR_TICK->wait; 2231 #$cf::WAIT_FOR_TICK->wait;
2232 undef $guard2;
2050 undef $guard1; 2233 undef $guard1;
2051 undef $guard2;
2052 $map->reset; 2234 $map->reset;
2053 return find $path; 2235 return find $path;
2054 } 2236 }
2055 2237
2056 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
2057 } 2239 }
2058} 2240}
2059 2241
2060sub pre_load { } 2242sub pre_load { }
2061sub post_load { } 2243#sub post_load { } # XS
2062 2244
2063sub load { 2245sub load {
2064 my ($self) = @_; 2246 my ($self) = @_;
2065 2247
2066 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
2069 2251
2070 { 2252 {
2071 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2072 2254
2073 return unless $self->valid; 2255 return unless $self->valid;
2074 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2075
2076 $self->in_memory (cf::MAP_LOADING);
2077 2257
2078 $self->alloc; 2258 $self->alloc;
2079 2259
2080 $self->pre_load; 2260 $self->pre_load;
2081 cf::cede_to_tick; 2261 cf::cede_to_tick;
2082 2262
2263 if (exists $self->{load_path}) {
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2265 $f->skip_block;
2085 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2086 or return; 2267 or return;
2087 2268
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2269 $self->post_load_original
2089 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2090 2271
2091 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2273 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2095 $self->clear_unique_items; 2276 $self->clear_unique_items;
2096 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2098 } 2280 }
2099 } 2281 }
2100 }
2101 2282
2102 $f->resolve_delayed_derefs; 2283 $f->resolve_delayed_derefs;
2284 } else {
2285 $self->post_load_original
2286 if delete $self->{load_original};
2287 }
2288
2289 $self->state (cf::MAP_INACTIVE);
2103 2290
2104 cf::cede_to_tick; 2291 cf::cede_to_tick;
2105 # now do the right thing for maps 2292 # now do the right thing for maps
2106 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2107 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2111 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2299 $self->decay_objects;
2113 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2114 $self->update_buttons; 2301 $self->update_buttons;
2115 cf::cede_to_tick; 2302 cf::cede_to_tick;
2116 $self->set_darkness_map; 2303 #$self->activate; # no longer activate maps automatically
2117 cf::cede_to_tick;
2118 $self->activate;
2119 } 2304 }
2120 2305
2121 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2123
2124 $self->in_memory (cf::MAP_ACTIVE);
2125 } 2308 }
2126 2309
2127 $self->post_load; 2310 $self->post_load;
2128}
2129 2311
2312 1
2313}
2314
2315# customize the map for a given player, i.e.
2316# return the _real_ map. used by e.g. per-player
2317# maps to change the path to ~playername/mappath
2130sub customise_for { 2318sub customise_for {
2131 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2132 2320
2133 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2134 if $self->per_player; 2322 if $self->per_player;
2137# if $self->per_party; 2325# if $self->per_party;
2138 2326
2139 $self 2327 $self
2140} 2328}
2141 2329
2142# find and load all maps in the 3x3 area around a map
2143sub load_neighbours {
2144 my ($map) = @_;
2145
2146 my @neigh; # diagonal neighbours
2147
2148 for (0 .. 3) {
2149 my $neigh = $map->tile_path ($_)
2150 or next;
2151 $neigh = find $neigh, $map
2152 or next;
2153 $neigh->load;
2154
2155 push @neigh,
2156 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2157 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2158 }
2159
2160 for (grep defined $_->[0], @neigh) {
2161 my ($path, $origin) = @$_;
2162 my $neigh = find $path, $origin
2163 or next;
2164 $neigh->load;
2165 }
2166}
2167
2168sub find_sync { 2330sub find_sync {
2169 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2170 2332
2171 cf::sync_job { find $path, $origin } 2333 # it's a bug to call this from the main context
2334 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2335 if $Coro::current == $Coro::main;
2336
2337 find $path, $origin
2172} 2338}
2173 2339
2174sub do_load_sync { 2340sub do_load_sync {
2175 my ($map) = @_; 2341 my ($map) = @_;
2176 2342
2343 # it's a bug to call this from the main context
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2179 2346
2180 cf::sync_job { $map->load }; 2347 $map->load;
2181} 2348}
2182 2349
2183our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2184our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2185 2352
2186sub find_async { 2353sub find_async {
2187 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2188 2355
2189 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2190 2357
2191 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2193 } 2360 }
2194 2361
2195 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2196 2363
2197 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2211 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2212 2379
2213 () 2380 ()
2214} 2381}
2215 2382
2383# common code, used by both ->save and ->swapout
2216sub save { 2384sub _save {
2217 my ($self) = @_; 2385 my ($self) = @_;
2218
2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
2220 2386
2221 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2222 2388
2223 return unless $self->dirty; 2389 return unless $self->dirty;
2224 2390
2244 } else { 2410 } else {
2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2411 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2246 } 2412 }
2247} 2413}
2248 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2249sub swap_out { 2423sub swap_out {
2250 my ($self) = @_; 2424 my ($self) = @_;
2251 2425
2252 # save first because save cedes
2253 $self->save;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2257 return if $self->players; 2430 return if $self->players;
2258 return if $self->in_memory != cf::MAP_ACTIVE; 2431
2432 # first deactivate the map and "unlink" it from the core
2433 $self->deactivate;
2434 $_->clear_links_to ($self) for values %cf::MAP;
2435 $self->state (cf::MAP_SWAPPED);
2436
2437 # then atomically save
2438 $self->_save;
2439
2440 # then free the map
2441 $self->clear;
2442}
2443
2444sub reset_at {
2445 my ($self) = @_;
2446
2447 # TODO: safety, remove and allow resettable per-player maps
2259 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2260 2449
2450 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2451 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2452
2453 $time + $to
2454}
2455
2456sub should_reset {
2457 my ($self) = @_;
2458
2459 $self->reset_at <= $cf::RUNTIME
2460}
2461
2462sub reset {
2463 my ($self) = @_;
2464
2465 my $lock = cf::lock_acquire "map_data:$self->{path}";
2466
2467 return if $self->players;
2468
2469 cf::trace "resetting map ", $self->path, "\n";
2470
2261 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2472
2473 # need to save uniques path
2474 unless ($self->{deny_save}) {
2475 my $uniq = $self->uniq_path; utf8::encode $uniq;
2476
2477 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2478 if $uniq;
2479 }
2480
2481 delete $cf::MAP{$self->path};
2262 2482
2263 $self->deactivate; 2483 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2265 $self->clear; 2485 $self->clear;
2266}
2267
2268sub reset_at {
2269 my ($self) = @_;
2270
2271 # TODO: safety, remove and allow resettable per-player maps
2272 return 1e99 if $self->{deny_reset};
2273
2274 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2275 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2276
2277 $time + $to
2278}
2279
2280sub should_reset {
2281 my ($self) = @_;
2282
2283 $self->reset_at <= $cf::RUNTIME
2284}
2285
2286sub reset {
2287 my ($self) = @_;
2288
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
2291 return if $self->players;
2292
2293 warn "resetting map ", $self->path;
2294
2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # need to save uniques path
2298 unless ($self->{deny_save}) {
2299 my $uniq = $self->uniq_path; utf8::encode $uniq;
2300
2301 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2302 if $uniq;
2303 }
2304
2305 delete $cf::MAP{$self->path};
2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2309 $self->clear;
2310 2486
2311 $self->unlink_save; 2487 $self->unlink_save;
2312 $self->destroy; 2488 $self->destroy;
2313} 2489}
2314 2490
2322 2498
2323 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2324 2500
2325 $self->unlink_save; 2501 $self->unlink_save;
2326 2502
2327 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2328 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2329 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2330 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2332 2508
2389 : normalise $_ 2565 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2567 ]
2392} 2568}
2393 2569
2570=item cf::map::static_maps
2571
2572Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2573file in the shared directory excluding F</styles> and F</editor>). May
2574block.
2575
2576=cut
2577
2578sub static_maps() {
2579 my @dirs = "";
2580 my @maps;
2581
2582 while (@dirs) {
2583 my $dir = shift @dirs;
2584
2585 next if $dir eq "/styles" || $dir eq "/editor";
2586
2587 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2588 or return;
2589
2590 for (@$files) {
2591 s/\.map$// or next;
2592 utf8::decode $_;
2593 push @maps, "$dir/$_";
2594 }
2595
2596 push @dirs, map "$dir/$_", @$dirs;
2597 }
2598
2599 \@maps
2600}
2601
2394=back 2602=back
2395 2603
2396=head3 cf::object 2604=head3 cf::object
2397 2605
2398=cut 2606=cut
2459can be C<undef>. Does the right thing when the player is currently in a 2667can be C<undef>. Does the right thing when the player is currently in a
2460dialogue with the given NPC character. 2668dialogue with the given NPC character.
2461 2669
2462=cut 2670=cut
2463 2671
2672our $SAY_CHANNEL = {
2673 id => "say",
2674 title => "Map",
2675 reply => "say ",
2676 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2677};
2678
2679our $CHAT_CHANNEL = {
2680 id => "chat",
2681 title => "Chat",
2682 reply => "chat ",
2683 tooltip => "Player chat and shouts, global to the server.",
2684};
2685
2464# rough implementation of a future "reply" method that works 2686# rough implementation of a future "reply" method that works
2465# with dialog boxes. 2687# with dialog boxes.
2466#TODO: the first argument must go, split into a $npc->reply_to ( method 2688#TODO: the first argument must go, split into a $npc->reply_to ( method
2467sub cf::object::player::reply($$$;$) { 2689sub cf::object::player::reply($$$;$) {
2468 my ($self, $npc, $msg, $flags) = @_; 2690 my ($self, $npc, $msg, $flags) = @_;
2479 my $dialog = $pl->{npc_dialog}; 2701 my $dialog = $pl->{npc_dialog};
2480 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2702 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2481 2703
2482 } else { 2704 } else {
2483 $msg = $npc->name . " says: $msg" if $npc; 2705 $msg = $npc->name . " says: $msg" if $npc;
2484 $self->message ($msg, $flags); 2706 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2485 } 2707 }
2486 } 2708 }
2487} 2709}
2488 2710
2489=item $object->send_msg ($channel, $msg, $color, [extra...]) 2711=item $object->send_msg ($channel, $msg, $color, [extra...])
2514 2736
2515=item $player_object->enter_link 2737=item $player_object->enter_link
2516 2738
2517Freezes the player and moves him/her to a special map (C<{link}>). 2739Freezes the player and moves him/her to a special map (C<{link}>).
2518 2740
2519The player should be reasonably safe there for short amounts of time. You 2741The player should be reasonably safe there for short amounts of time (e.g.
2520I<MUST> call C<leave_link> as soon as possible, though. 2742for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2743though, as the player cannot control the character while it is on the link
2744map.
2521 2745
2522Will never block. 2746Will never block.
2523 2747
2524=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2525 2749
2545sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2546 my ($self) = @_; 2770 my ($self) = @_;
2547 2771
2548 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2549 2773
2774 ++$self->{_link_recursion};
2775
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2777
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2554 2780
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2782}
2557 2783
2558sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2560 2786
2577 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2578 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2579 2805
2580 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2581 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2582 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2583 2809
2584 $map->load; 2810 $map->load;
2585 $map->load_neighbours;
2586 2811
2587 return unless $self->contr->active; 2812 return unless $self->contr->active;
2588 $self->activate_recursive;
2589 2813
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2592} 2816 # entering was successful
2817 delete $self->{_link_recursion};
2818 # only activate afterwards, to support waiting in hooks
2819 $self->activate_recursive;
2820 }
2593 2821
2822}
2823
2594=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2824=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2595 2825
2596Moves the player to the given map-path and coordinates by first freezing 2826Moves the player to the given map-path and coordinates by first freezing
2597her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2598that has to return the map if sucecssful, and then unfreezes the player on 2828that has to return the map if sucecssful, and then unfreezes the player on
2599the new (success) or old (failed) map position. In either case, $done will 2829the new (success) or old (failed) map position. In either case, $done will
2600be called at the end of this process. 2830be called at the end of this process.
2601 2831
2832Note that $check will be called with a potentially non-loaded map, so if
2833it needs a loaded map it has to call C<< ->load >>.
2834
2602=cut 2835=cut
2603 2836
2604our $GOTOGEN; 2837our $GOTOGEN;
2605 2838
2606sub cf::object::player::goto { 2839sub cf::object::player::goto {
2607 my ($self, $path, $x, $y, $check, $done) = @_; 2840 my ($self, $path, $x, $y, $check, $done) = @_;
2841
2842 if ($self->{_link_recursion} >= $MAX_LINKS) {
2843 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2844 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2845 ($path, $x, $y) = @$EMERGENCY_POSITION;
2846 }
2608 2847
2609 # do generation counting so two concurrent goto's will be executed in-order 2848 # do generation counting so two concurrent goto's will be executed in-order
2610 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2611 2850
2612 $self->enter_link; 2851 $self->enter_link;
2632 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2633 } 2872 }
2634 } 2873 }
2635 2874
2636 my $map = eval { 2875 my $map = eval {
2637 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2638 2877
2639 if ($map) { 2878 if ($map) {
2640 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2641 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2642 } else { 2881 } else {
2643 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2882 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2644 } 2883 }
2645 2884
2646 $map 2885 $map
2654 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2655 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2656 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2657 } 2896 }
2658 2897
2659 $done->() if $done; 2898 $done->($self) if $done;
2660 })->prio (1); 2899 })->prio (1);
2661} 2900}
2662 2901
2663=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2664 2903
2684} 2923}
2685 2924
2686sub prepare_random_map { 2925sub prepare_random_map {
2687 my ($exit) = @_; 2926 my ($exit) = @_;
2688 2927
2689 my $guard = cf::lock_acquire "exit_prepare:$exit";
2690
2691 # all this does is basically replace the /! path by 2928 # all this does is basically replace the /! path by
2692 # a new random map path (?random/...) with a seed 2929 # a new random map path (?random/...) with a seed
2693 # that depends on the exit object 2930 # that depends on the exit object
2694 2931
2695 my $rmp = parse_random_map_params $exit->msg; 2932 my $rmp = parse_random_map_params $exit->msg;
2697 if ($exit->map) { 2934 if ($exit->map) {
2698 $rmp->{region} = $exit->region->name; 2935 $rmp->{region} = $exit->region->name;
2699 $rmp->{origin_map} = $exit->map->path; 2936 $rmp->{origin_map} = $exit->map->path;
2700 $rmp->{origin_x} = $exit->x; 2937 $rmp->{origin_x} = $exit->x;
2701 $rmp->{origin_y} = $exit->y; 2938 $rmp->{origin_y} = $exit->y;
2939
2940 $exit->map->touch;
2702 } 2941 }
2703 2942
2704 $rmp->{random_seed} ||= $exit->random_seed; 2943 $rmp->{random_seed} ||= $exit->random_seed;
2705 2944
2706 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2945 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2710 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2949 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2711 aio_write $fh, 0, (length $data), $data, 0; 2950 aio_write $fh, 0, (length $data), $data, 0;
2712 undef $fh; 2951 undef $fh;
2713 aio_rename "$meta~", $meta; 2952 aio_rename "$meta~", $meta;
2714 2953
2954 my $slaying = "?random/$md5";
2955
2956 if ($exit->valid) {
2715 $exit->slaying ("?random/$md5"); 2957 $exit->slaying ("?random/$md5");
2716 $exit->msg (undef); 2958 $exit->msg (undef);
2959 }
2717 } 2960 }
2718} 2961}
2719 2962
2720sub cf::object::player::enter_exit { 2963sub cf::object::player::enter_exit {
2721 my ($self, $exit) = @_; 2964 my ($self, $exit) = @_;
2722 2965
2723 return unless $self->type == cf::PLAYER; 2966 return unless $self->type == cf::PLAYER;
2724 2967
2725 if ($exit->slaying eq "/!") {
2726 #TODO: this should de-fi-ni-te-ly not be a sync-job
2727 # the problem is that $exit might not survive long enough
2728 # so it needs to be done right now, right here
2729 cf::sync_job { prepare_random_map $exit };
2730 }
2731
2732 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2733 my $hp = $exit->stats->hp;
2734 my $sp = $exit->stats->sp;
2735
2736 $self->enter_link; 2968 $self->enter_link;
2737 2969
2738 # if exit is damned, update players death & WoR home-position
2739 $self->contr->savebed ($slaying, $hp, $sp)
2740 if $exit->flag (FLAG_DAMNED);
2741
2742 (async { 2970 (async {
2743 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2971 $Coro::current->{desc} = "enter_exit";
2744 2972
2745 $self->deactivate_recursive; # just to be sure
2746 unless (eval { 2973 unless (eval {
2974 $self->deactivate_recursive; # just to be sure
2975
2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2977 my $x = $exit->stats->hp;
2978 my $y = $exit->stats->sp;
2979
2980 # special map handling
2981 my $slaying = $exit->slaying;
2982
2983 # special map handling
2984 if ($slaying eq "/!") {
2985 my $guard = cf::lock_acquire "exit_prepare:$exit";
2986
2987 prepare_random_map $exit
2988 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2989
2990 $map = $exit->slaying;
2991
2992 } elsif ($slaying eq '!up') {
2993 $map = $exit->map->tile_path (cf::TILE_UP);
2994 $x = $exit->x;
2995 $y = $exit->y;
2996
2997 } elsif ($slaying eq '!down') {
2998 $map = $exit->map->tile_path (cf::TILE_DOWN);
2999 $x = $exit->x;
3000 $y = $exit->y;
3001 }
3002
2747 $self->goto ($slaying, $hp, $sp); 3003 $self->goto ($map, $x, $y);
2748 3004
3005 # if exit is damned, update players death & WoR home-position
3006 $self->contr->savebed ($map, $x, $y)
3007 if $exit->flag (cf::FLAG_DAMNED);
3008
2749 1; 3009 1
2750 }) { 3010 }) {
2751 $self->message ("Something went wrong deep within the crossfire server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2752 . "I'll try to bring you back to the map you were before. " 3012 . "I'll try to bring you back to the map you were before. "
2753 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2754 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2755 3015
2756 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2757 $self->leave_link; 3017 $self->leave_link;
2758 } 3018 }
2759 })->prio (1); 3019 })->prio (1);
2760} 3020}
2761 3021
2773sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2774 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2775 3035
2776 utf8::encode $text; 3036 utf8::encode $text;
2777 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3037 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3038}
3039
3040=item $client->send_big_packet ($pkt)
3041
3042Like C<send_packet>, but tries to compress large packets, and fragments
3043them as required.
3044
3045=cut
3046
3047our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3048
3049sub cf::client::send_big_packet {
3050 my ($self, $pkt) = @_;
3051
3052 # try lzf for large packets
3053 $pkt = "lzf " . Compress::LZF::compress $pkt
3054 if 1024 <= length $pkt and $self->{can_lzf};
3055
3056 # split very large packets
3057 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3058 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3059 $pkt = "frag";
3060 }
3061
3062 $self->send_packet ($pkt);
2778} 3063}
2779 3064
2780=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2781 3066
2782Send a drawinfo or msg packet to the client, formatting the msg for the 3067Send a drawinfo or msg packet to the client, formatting the msg for the
2786 3071
2787=cut 3072=cut
2788 3073
2789# non-persistent channels (usually the info channel) 3074# non-persistent channels (usually the info channel)
2790our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2791 "c/identify" => { 3082 "c/identify" => {
2792 id => "infobox", 3083 id => "infobox",
2793 title => "Identify", 3084 title => "Identify",
2794 reply => undef, 3085 reply => undef,
2795 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2797 "c/examine" => { 3088 "c/examine" => {
2798 id => "infobox", 3089 id => "infobox",
2799 title => "Examine", 3090 title => "Examine",
2800 reply => undef, 3091 reply => undef,
2801 tooltip => "Signs and other items you examined", 3092 tooltip => "Signs and other items you examined",
3093 },
3094 "c/shopinfo" => {
3095 id => "infobox",
3096 title => "Shop Info",
3097 reply => undef,
3098 tooltip => "What your bargaining skill tells you about the shop",
2802 }, 3099 },
2803 "c/book" => { 3100 "c/book" => {
2804 id => "infobox", 3101 id => "infobox",
2805 title => "Book", 3102 title => "Book",
2806 reply => undef, 3103 reply => undef,
2822 id => "infobox", 3119 id => "infobox",
2823 title => "Body Parts", 3120 title => "Body Parts",
2824 reply => undef, 3121 reply => undef,
2825 tooltip => "Shows which body parts you posess and are available", 3122 tooltip => "Shows which body parts you posess and are available",
2826 }, 3123 },
3124 "c/statistics" => {
3125 id => "infobox",
3126 title => "Statistics",
3127 reply => undef,
3128 tooltip => "Shows your primary statistics",
3129 },
3130 "c/skills" => {
3131 id => "infobox",
3132 title => "Skills",
3133 reply => undef,
3134 tooltip => "Shows your experience per skill and item power",
3135 },
3136 "c/shopitems" => {
3137 id => "infobox",
3138 title => "Shop Items",
3139 reply => undef,
3140 tooltip => "Shows the items currently for sale in this shop",
3141 },
3142 "c/resistances" => {
3143 id => "infobox",
3144 title => "Resistances",
3145 reply => undef,
3146 tooltip => "Shows your resistances",
3147 },
3148 "c/pets" => {
3149 id => "infobox",
3150 title => "Pets",
3151 reply => undef,
3152 tooltip => "Shows information abotu your pets/a specific pet",
3153 },
3154 "c/perceiveself" => {
3155 id => "infobox",
3156 title => "Perceive Self",
3157 reply => undef,
3158 tooltip => "You gained detailed knowledge about yourself",
3159 },
2827 "c/uptime" => { 3160 "c/uptime" => {
2828 id => "infobox", 3161 id => "infobox",
2829 title => "Uptime", 3162 title => "Uptime",
2830 reply => undef, 3163 reply => undef,
2831 tooltip => "How long the server has been running since last restart", 3164 tooltip => "How long the server has been running since last restart",
2840 id => "party", 3173 id => "party",
2841 title => "Party", 3174 title => "Party",
2842 reply => "gsay ", 3175 reply => "gsay ",
2843 tooltip => "Messages and chat related to your party", 3176 tooltip => "Messages and chat related to your party",
2844 }, 3177 },
3178 "c/death" => {
3179 id => "death",
3180 title => "Death",
3181 reply => undef,
3182 tooltip => "Reason for and more info about your most recent death",
3183 },
3184 "c/say" => $SAY_CHANNEL,
3185 "c/chat" => $CHAT_CHANNEL,
2845); 3186);
2846 3187
2847sub cf::client::send_msg { 3188sub cf::client::send_msg {
2848 my ($self, $channel, $msg, $color, @extra) = @_; 3189 my ($self, $channel, $msg, $color, @extra) = @_;
2849 3190
2850 $msg = $self->pl->expand_cfpod ($msg); 3191 $msg = $self->pl->expand_cfpod ($msg)
3192 unless $color & cf::NDI_VERBATIM;
2851 3193
2852 $color &= cf::NDI_CLIENT_MASK; # just in case... 3194 $color &= cf::NDI_CLIENT_MASK; # just in case...
2853 3195
2854 # check predefined channels, for the benefit of C 3196 # check predefined channels, for the benefit of C
2855 if ($CHANNEL{$channel}) { 3197 if ($CHANNEL{$channel}) {
2856 $channel = $CHANNEL{$channel}; 3198 $channel = $CHANNEL{$channel};
2857 3199
2858 $self->ext_msg (channel_info => $channel) 3200 $self->ext_msg (channel_info => $channel);
2859 if $self->can_msg;
2860
2861 $channel = $channel->{id}; 3201 $channel = $channel->{id};
2862 3202
2863 } elsif (ref $channel) { 3203 } elsif (ref $channel) {
2864 # send meta info to client, if not yet sent 3204 # send meta info to client, if not yet sent
2865 unless (exists $self->{channel}{$channel->{id}}) { 3205 unless (exists $self->{channel}{$channel->{id}}) {
2866 $self->{channel}{$channel->{id}} = $channel; 3206 $self->{channel}{$channel->{id}} = $channel;
2867 $self->ext_msg (channel_info => $channel) 3207 $self->ext_msg (channel_info => $channel);
2868 if $self->can_msg;
2869 } 3208 }
2870 3209
2871 $channel = $channel->{id}; 3210 $channel = $channel->{id};
2872 } 3211 }
2873 3212
2874 return unless @extra || length $msg; 3213 return unless @extra || length $msg;
2875 3214
2876 if ($self->can_msg) {
2877 # default colour, mask it out 3215 # default colour, mask it out
2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3216 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2879 if $color & cf::NDI_DEF; 3217 if $color & cf::NDI_DEF;
2880 3218
2881 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3219 my $pkt = "msg "
3220 . $self->{json_coder}->encode (
2882 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2883 } else { 3222 );
2884 if ($color >= 0) {
2885 # replace some tags by gcfclient-compatible ones
2886 for ($msg) {
2887 1 while
2888 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2889 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2890 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2891 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2892 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2893 }
2894 3223
2895 $color &= cf::NDI_COLOR_MASK; 3224 $self->send_big_packet ($pkt);
2896
2897 utf8::encode $msg;
2898
2899 if (0 && $msg =~ /\[/) {
2900 # COMMAND/INFO
2901 $self->send_packet ("drawextinfo $color 10 8 $msg")
2902 } else {
2903 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2904 $self->send_packet ("drawinfo $color $msg")
2905 }
2906 }
2907 }
2908} 3225}
2909 3226
2910=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2911 3228
2912Sends an ext event to the client. 3229Sends an ext event to the client.
2915 3232
2916sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2917 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2918 3235
2919 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2921 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2922 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2923 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2924 } 3241 }
2925} 3242}
2926 3243
2927=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2928 3245
2931=cut 3248=cut
2932 3249
2933sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2934 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2935 3252
2936 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2937 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2938 } elsif ($self->extcmd == 1) {
2939 #TODO: version 1, remove
2940 unshift @msg, msgtype => "reply", msgid => $id;
2941 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2942 }
2943} 3256}
2944 3257
2945=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2946 3259
2947Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
3002 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3003 3316
3004 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3005 3318
3006 if (ref $msg) { 3319 if (ref $msg) {
3007 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3008 "ARRAY" eq ref $msg
3009 ? @$msg
3010 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3011 3321
3012 my @reply; 3322 my @reply;
3013 3323
3014 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3015 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
3017 3327
3018 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3019 if $reply; 3329 if $reply;
3020 3330
3021 } else { 3331 } else {
3022 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3332 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3023 } 3333 }
3024 3334
3025 cf::override; 3335 cf::override;
3026 }, 3336 },
3027); 3337);
3047 3357
3048 $coro 3358 $coro
3049} 3359}
3050 3360
3051cf::client->attach ( 3361cf::client->attach (
3052 on_destroy => sub { 3362 on_client_destroy => sub {
3053 my ($ns) = @_; 3363 my ($ns) = @_;
3054 3364
3055 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3056 }, 3366 },
3057); 3367);
3073our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
3074 3384
3075$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
3076 3386
3077$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
3078 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
3079 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
3080 sort time 3390 sort time
3081)); 3391));
3082 3392
3083# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
3087The following functions and methods are available within a safe environment: 3397The following functions and methods are available within a safe environment:
3088 3398
3089 cf::object 3399 cf::object
3090 contr pay_amount pay_player map x y force_find force_add destroy 3400 contr pay_amount pay_player map x y force_find force_add destroy
3091 insert remove name archname title slaying race decrease split 3401 insert remove name archname title slaying race decrease split
3402 value
3092 3403
3093 cf::object::player 3404 cf::object::player
3094 player 3405 player
3095 3406
3096 cf::player 3407 cf::player
3101 3412
3102=cut 3413=cut
3103 3414
3104for ( 3415for (
3105 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3416 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3106 insert remove inv name archname title slaying race 3417 insert remove inv nrof name archname title slaying race
3107 decrease split destroy)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3108 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3109 ["cf::player" => qw(peaceful)], 3420 ["cf::player" => qw(peaceful send_msg)],
3110 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3111) { 3422) {
3112 no strict 'refs';
3113 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3114 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3115 for @funs; 3425 for @funs;
3116} 3426}
3117 3427
3132 3442
3133 my $qcode = $code; 3443 my $qcode = $code;
3134 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3135 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
3136 3446
3447 %vars = (_dummy => 0) unless %vars;
3448
3449 my @res;
3137 local $_; 3450 local $_;
3138 local @safe::cf::_safe_eval_args = values %vars;
3139 3451
3140 my $eval = 3452 my $eval =
3141 "do {\n" 3453 "do {\n"
3142 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3143 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
3144 . $code 3456 . $code
3145 . "\n}" 3457 . "\n}"
3146 ; 3458 ;
3147 3459
3460 if ($CFG{safe_eval}) {
3148 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
3149 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3150 sub_generation_inc; 3464 sub_generation_inc;
3465 } else {
3466 local @cf::_safe_eval_args = values %vars;
3467 @res = wantarray ? eval eval : scalar eval $eval;
3468 }
3151 3469
3152 if ($@) { 3470 if ($@) {
3153 warn "$@"; 3471 warn "$@",
3154 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3155 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3156 } 3474 }
3157 3475
3158 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3159} 3477}
3160 3478
3174=cut 3492=cut
3175 3493
3176sub register_script_function { 3494sub register_script_function {
3177 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
3178 3496
3179 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
3180 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
3181} 3499}
3182 3500
3183=back 3501=back
3184 3502
3185=cut 3503=cut
3186 3504
3187############################################################################# 3505#############################################################################
3188# the server's init and main functions 3506# the server's init and main functions
3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3189 3509
3190sub load_facedata($) { 3510sub load_facedata($) {
3191 my ($path) = @_; 3511 my ($path) = @_;
3192 3512
3193 # HACK to clear player env face cache, we need some signal framework 3513 # HACK to clear player env face cache, we need some signal framework
3194 # for this (global event?) 3514 # for this (global event?)
3195 %ext::player_env::MUSIC_FACE_CACHE = (); 3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3196 3516
3197 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3198 3518
3199 warn "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3200 3520
3201 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3202 0 < aio_load $path, $facedata
3203 or die "$path: $!";
3204
3205 $facedata = Coro::Storable::thaw $facedata;
3206 3522
3207 $facedata->{version} == 2 3523 $facedata->{version} == 2
3208 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3209 3525
3210 # patch in the exptable 3526 # patch in the exptable
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3211 $facedata->{resource}{"res/exp_table"} = { 3528 $facedata->{resource}{"res/exp_table"} = {
3212 type => FT_RSRC, 3529 type => FT_RSRC,
3213 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3530 data => $exp_table,
3531 hash => (Digest::MD5::md5 $exp_table),
3214 }; 3532 };
3215 cf::cede_to_tick; 3533 cf::cede_to_tick;
3216 3534
3217 { 3535 {
3218 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3219 3537
3220 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3221 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3222 3541
3223 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3224 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3225 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3226 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3545 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3546 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3547 $FACEHASH{$info->{hash64}} = $idx;#d#
3227 3548
3228 cf::cede_to_tick; 3549 cf::cede_to_tick;
3229 } 3550 }
3230 3551
3231 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
3236 3557
3237 if (my $smooth = cf::face::find $info->{smooth}) { 3558 if (my $smooth = cf::face::find $info->{smooth}) {
3238 cf::face::set_smooth $idx, $smooth; 3559 cf::face::set_smooth $idx, $smooth;
3239 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3560 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3240 } else { 3561 } else {
3241 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3562 error "smooth face '$info->{smooth}' not found for face '$face'";
3242 } 3563 }
3243 3564
3244 cf::cede_to_tick; 3565 cf::cede_to_tick;
3245 } 3566 }
3246 } 3567 }
3255 3576
3256 cf::anim::invalidate_all; # d'oh 3577 cf::anim::invalidate_all; # d'oh
3257 } 3578 }
3258 3579
3259 { 3580 {
3260 # TODO: for gcfclient pleasure, we should give resources
3261 # that gcfclient doesn't grok a >10000 face index.
3262 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3263 3582
3264 while (my ($name, $info) = each %$res) { 3583 while (my ($name, $info) = each %$res) {
3265 if (defined $info->{type}) { 3584 if (defined (my $type = $info->{type})) {
3585 # TODO: different hash - must free and use new index, or cache ixface data queue
3266 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3267 my $data;
3268 3587
3269 if ($info->{type} & 1) { 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3270 # prepend meta info
3271
3272 my $meta = $enc->encode ({
3273 name => $name,
3274 %{ $info->{meta} || {} },
3275 });
3276
3277 $data = pack "(w/a*)*", $meta, $info->{data};
3278 } else {
3279 $data = $info->{data};
3280 }
3281
3282 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3283 cf::face::set_type $idx, $info->{type}; 3589 cf::face::set_type $idx, $type;
3590 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3591 $FACEHASH{$info->{hash}} = $idx;#d#
3284 } else { 3592 } else {
3285 $RESOURCE{$name} = $info; 3593# $RESOURCE{$name} = $info; # unused
3286 } 3594 }
3287 3595
3288 cf::cede_to_tick; 3596 cf::cede_to_tick;
3289 } 3597 }
3290 } 3598 }
3291 3599
3292 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3600 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3293 3601
3294 1 3602 1
3295} 3603}
3296
3297cf::global->attach (on_resource_update => sub {
3298 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3299 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3300
3301 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3302 my $sound = $soundconf->{compat}[$_]
3303 or next;
3304
3305 my $face = cf::face::find "sound/$sound->[1]";
3306 cf::sound::set $sound->[0] => $face;
3307 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3308 }
3309
3310 while (my ($k, $v) = each %{$soundconf->{event}}) {
3311 my $face = cf::face::find "sound/$v";
3312 cf::sound::set $k => $face;
3313 }
3314 }
3315});
3316 3604
3317register_exticmd fx_want => sub { 3605register_exticmd fx_want => sub {
3318 my ($ns, $want) = @_; 3606 my ($ns, $want) = @_;
3319 3607
3320 while (my ($k, $v) = each %$want) { 3608 while (my ($k, $v) = each %$want) {
3359sub reload_treasures { 3647sub reload_treasures {
3360 load_resource_file "$DATADIR/treasures" 3648 load_resource_file "$DATADIR/treasures"
3361 or die "unable to load treasurelists\n"; 3649 or die "unable to load treasurelists\n";
3362} 3650}
3363 3651
3652sub reload_sound {
3653 trace "loading sound config from $DATADIR/sound\n";
3654
3655 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3656
3657 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3658 my $sound = $soundconf->{compat}[$_]
3659 or next;
3660
3661 my $face = cf::face::find "sound/$sound->[1]";
3662 cf::sound::set $sound->[0] => $face;
3663 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3664 }
3665
3666 while (my ($k, $v) = each %{$soundconf->{event}}) {
3667 my $face = cf::face::find "sound/$v";
3668 cf::sound::set $k => $face;
3669 }
3670}
3671
3364sub reload_resources { 3672sub reload_resources {
3365 warn "reloading resource files...\n"; 3673 trace "reloading resource files...\n";
3366 3674
3675 reload_exp_table;
3676 reload_materials;
3367 reload_facedata; 3677 reload_facedata;
3678 reload_sound;
3368 reload_archetypes; 3679 reload_archetypes;
3369 reload_regions; 3680 reload_regions;
3370 reload_treasures; 3681 reload_treasures;
3371 3682
3372 warn "finished reloading resource files\n"; 3683 trace "finished reloading resource files\n";
3373}
3374
3375sub init {
3376 my $guard = freeze_mainloop;
3377
3378 reload_resources;
3379} 3684}
3380 3685
3381sub reload_config { 3686sub reload_config {
3382 open my $fh, "<:utf8", "$CONFDIR/config" 3687 trace "reloading config file...\n";
3383 or return;
3384 3688
3385 local $/; 3689 my $config = load_file "$CONFDIR/config";
3386 *CFG = YAML::Load <$fh>; 3690 utf8::decode $config;
3691 *CFG = decode_yaml $config;
3387 3692
3388 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3693 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3389 3694
3390 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3695 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3391 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3696 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3392 3697
3393 if (exists $CFG{mlockall}) { 3698 if (exists $CFG{mlockall}) {
3397 }; 3702 };
3398 warn $@ if $@; 3703 warn $@ if $@;
3399 } 3704 }
3400} 3705}
3401 3706
3707sub pidfile() {
3708 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3709 or die "$PIDFILE: $!";
3710 flock $fh, &Fcntl::LOCK_EX
3711 or die "$PIDFILE: flock: $!";
3712 $fh
3713}
3714
3715# make sure only one server instance is running at any one time
3716sub atomic {
3717 my $fh = pidfile;
3718
3719 my $pid = <$fh>;
3720 kill 9, $pid if $pid > 0;
3721
3722 seek $fh, 0, 0;
3723 print $fh $$;
3724}
3725
3726sub main_loop {
3727 trace "EV::loop starting\n";
3728 if (1) {
3729 EV::loop;
3730 }
3731 trace "EV::loop returned\n";
3732 goto &main_loop unless $REALLY_UNLOOP;
3733}
3734
3402sub main { 3735sub main {
3736 cf::init_globals; # initialise logging
3737
3738 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3739 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3740 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3741 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3742
3743 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3744
3403 # we must not ever block the main coroutine 3745 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3746 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3747 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3748 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3749 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3750 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3751 })->prio (Coro::PRIO_MAX);
3410 }; 3752 };
3411 3753
3412 { 3754 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3755
3756 cf::sync_job {
3757 cf::incloader::init ();
3758
3759 cf::init_anim;
3760 cf::init_attackmess;
3761 cf::init_dynamic;
3762
3763 cf::load_settings;
3764
3765 reload_resources;
3414 reload_config; 3766 reload_config;
3415 db_init; 3767 db_init;
3768
3769 cf::init_uuid;
3770 cf::init_signals;
3771 cf::init_skills;
3772
3773 cf::init_beforeplay;
3774
3775 atomic;
3776
3416 load_extensions; 3777 load_extensions;
3417 3778
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3779 utime time, time, $RUNTIMEFILE;
3419 evthread_start IO::AIO::poll_fileno; 3780
3781 # no (long-running) fork's whatsoever before this point(!)
3782 use POSIX ();
3783 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3784
3785 cf::_post_init 0;
3420 } 3786 };
3421 3787
3422 EV::loop; 3788 cf::object::thawer::errors_are_fatal 0;
3789 info "parse errors in files are no longer fatal from this point on.\n";
3790
3791 AE::postpone {
3792 undef &main; # free gobs of memory :)
3793 };
3794
3795 goto &main_loop;
3423} 3796}
3424 3797
3425############################################################################# 3798#############################################################################
3426# initialisation and cleanup 3799# initialisation and cleanup
3427 3800
3428# install some emergency cleanup handlers 3801# install some emergency cleanup handlers
3429BEGIN { 3802BEGIN {
3430 our %SIGWATCHER = (); 3803 our %SIGWATCHER = ();
3431 for my $signal (qw(INT HUP TERM)) { 3804 for my $signal (qw(INT HUP TERM)) {
3432 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3805 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3433 cf::cleanup "SIG$signal"; 3806 cf::cleanup "SIG$signal";
3434 }; 3807 };
3435 } 3808 }
3436} 3809}
3437 3810
3438sub write_runtime_sync { 3811sub write_runtime_sync {
3439 my $runtime = "$LOCALDIR/runtime"; 3812 my $t0 = AE::time;
3440 3813
3441 # first touch the runtime file to show we are still running: 3814 # first touch the runtime file to show we are still running:
3442 # the fsync below can take a very very long time. 3815 # the fsync below can take a very very long time.
3443 3816
3444 IO::AIO::aio_utime $runtime, undef, undef; 3817 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3445 3818
3446 my $guard = cf::lock_acquire "write_runtime"; 3819 my $guard = cf::lock_acquire "write_runtime";
3447 3820
3448 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3821 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3449 or return; 3822 or return;
3450 3823
3451 my $value = $cf::RUNTIME + 90 + 10; 3824 my $value = $cf::RUNTIME + 90 + 10;
3452 # 10 is the runtime save interval, for a monotonic clock 3825 # 10 is the runtime save interval, for a monotonic clock
3453 # 60 allows for the watchdog to kill the server. 3826 # 60 allows for the watchdog to kill the server.
3463 aio_utime $fh, undef, undef; 3836 aio_utime $fh, undef, undef;
3464 3837
3465 close $fh 3838 close $fh
3466 or return; 3839 or return;
3467 3840
3468 aio_rename "$runtime~", $runtime 3841 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3469 and return; 3842 and return;
3470 3843
3471 warn "runtime file written.\n"; 3844 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3472 3845
3473 1 3846 1
3474} 3847}
3475 3848
3476our $uuid_lock; 3849our $uuid_lock;
3485 my $uuid = "$LOCALDIR/uuid"; 3858 my $uuid = "$LOCALDIR/uuid";
3486 3859
3487 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3860 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3488 or return; 3861 or return;
3489 3862
3490 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3863 my $value = uuid_seq uuid_cur;
3864
3865 unless ($value) {
3866 info "cowardly refusing to write zero uuid value!\n";
3867 return;
3868 }
3869
3870 my $value = uuid_str $value + $uuid_skip;
3491 $uuid_skip = 0; 3871 $uuid_skip = 0;
3492 3872
3493 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3873 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3494 and return; 3874 and return;
3495 3875
3501 or return; 3881 or return;
3502 3882
3503 aio_rename "$uuid~", $uuid 3883 aio_rename "$uuid~", $uuid
3504 and return; 3884 and return;
3505 3885
3506 warn "uuid file written ($value).\n"; 3886 trace "uuid file written ($value).\n";
3507 3887
3508 1 3888 1
3509 3889
3510} 3890}
3511 3891
3517} 3897}
3518 3898
3519sub emergency_save() { 3899sub emergency_save() {
3520 my $freeze_guard = cf::freeze_mainloop; 3900 my $freeze_guard = cf::freeze_mainloop;
3521 3901
3522 warn "enter emergency perl save\n"; 3902 info "emergency_perl_save: enter\n";
3903
3904 # this is a trade-off: we want to be very quick here, so
3905 # save all maps without fsync, and later call a global sync
3906 # (which in turn might be very very slow)
3907 local $USE_FSYNC = 0;
3523 3908
3524 cf::sync_job { 3909 cf::sync_job {
3910 cf::write_runtime_sync; # external watchdog should not bark
3911
3525 # use a peculiar iteration method to avoid tripping on perl 3912 # use a peculiar iteration method to avoid tripping on perl
3526 # refcount bugs in for. also avoids problems with players 3913 # refcount bugs in for. also avoids problems with players
3527 # and maps saved/destroyed asynchronously. 3914 # and maps saved/destroyed asynchronously.
3528 warn "begin emergency player save\n"; 3915 info "emergency_perl_save: begin player save\n";
3529 for my $login (keys %cf::PLAYER) { 3916 for my $login (keys %cf::PLAYER) {
3530 my $pl = $cf::PLAYER{$login} or next; 3917 my $pl = $cf::PLAYER{$login} or next;
3531 $pl->valid or next; 3918 $pl->valid or next;
3532 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3919 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3533 $pl->save; 3920 $pl->save;
3534 } 3921 }
3535 warn "end emergency player save\n"; 3922 info "emergency_perl_save: end player save\n";
3536 3923
3537 warn "begin emergency map save\n"; 3924 cf::write_runtime_sync; # external watchdog should not bark
3925
3926 info "emergency_perl_save: begin map save\n";
3538 for my $path (keys %cf::MAP) { 3927 for my $path (keys %cf::MAP) {
3539 my $map = $cf::MAP{$path} or next; 3928 my $map = $cf::MAP{$path} or next;
3540 $map->valid or next; 3929 $map->valid or next;
3541 $map->save; 3930 $map->save;
3542 } 3931 }
3543 warn "end emergency map save\n"; 3932 info "emergency_perl_save: end map save\n";
3544 3933
3545 warn "begin emergency database checkpoint\n"; 3934 cf::write_runtime_sync; # external watchdog should not bark
3935
3936 info "emergency_perl_save: begin database checkpoint\n";
3546 BDB::db_env_txn_checkpoint $DB_ENV; 3937 BDB::db_env_txn_checkpoint $DB_ENV;
3547 warn "end emergency database checkpoint\n"; 3938 info "emergency_perl_save: end database checkpoint\n";
3548 3939
3549 warn "begin write uuid\n"; 3940 info "emergency_perl_save: begin write uuid\n";
3550 write_uuid_sync 1; 3941 write_uuid_sync 1;
3551 warn "end write uuid\n"; 3942 info "emergency_perl_save: end write uuid\n";
3943
3944 cf::write_runtime_sync; # external watchdog should not bark
3945
3946 trace "emergency_perl_save: syncing database to disk";
3947 BDB::db_env_txn_checkpoint $DB_ENV;
3948
3949 info "emergency_perl_save: starting sync\n";
3950 IO::AIO::aio_sync sub {
3951 info "emergency_perl_save: finished sync\n";
3952 };
3953
3954 cf::write_runtime_sync; # external watchdog should not bark
3955
3956 trace "emergency_perl_save: flushing outstanding aio requests";
3957 while (IO::AIO::nreqs || BDB::nreqs) {
3958 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3959 }
3960
3961 cf::write_runtime_sync; # external watchdog should not bark
3552 }; 3962 };
3553 3963
3554 warn "leave emergency perl save\n"; 3964 info "emergency_perl_save: leave\n";
3555} 3965}
3556 3966
3557sub post_cleanup { 3967sub post_cleanup {
3558 my ($make_core) = @_; 3968 my ($make_core) = @_;
3559 3969
3970 IO::AIO::flush;
3971
3560 warn Carp::longmess "post_cleanup backtrace" 3972 error Carp::longmess "post_cleanup backtrace"
3561 if $make_core; 3973 if $make_core;
3974
3975 my $fh = pidfile;
3976 unlink $PIDFILE if <$fh> == $$;
3977}
3978
3979# a safer delete_package, copied from Symbol
3980sub clear_package($) {
3981 my $pkg = shift;
3982
3983 # expand to full symbol table name if needed
3984 unless ($pkg =~ /^main::.*::$/) {
3985 $pkg = "main$pkg" if $pkg =~ /^::/;
3986 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3987 $pkg .= '::' unless $pkg =~ /::$/;
3988 }
3989
3990 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3991 my $stem_symtab = *{$stem}{HASH};
3992
3993 defined $stem_symtab and exists $stem_symtab->{$leaf}
3994 or return;
3995
3996 # clear all symbols
3997 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3998 for my $name (keys %$leaf_symtab) {
3999 _gv_clear *{"$pkg$name"};
4000# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4001 }
3562} 4002}
3563 4003
3564sub do_reload_perl() { 4004sub do_reload_perl() {
3565 # can/must only be called in main 4005 # can/must only be called in main
3566 if ($Coro::current != $Coro::main) { 4006 unless (in_main) {
3567 warn "can only reload from main coroutine"; 4007 error "can only reload from main coroutine";
3568 return; 4008 return;
3569 } 4009 }
3570 4010
3571 warn "reloading..."; 4011 return if $RELOAD++;
3572 4012
3573 warn "entering sync_job"; 4013 my $t1 = AE::time;
3574 4014
4015 while ($RELOAD) {
4016 cf::get_slot 0.1, -1, "reload_perl";
4017 info "perl_reload: reloading...";
4018
4019 trace "perl_reload: entering sync_job";
4020
3575 cf::sync_job { 4021 cf::sync_job {
3576 cf::write_runtime_sync; # external watchdog should not bark
3577 cf::emergency_save; 4022 #cf::emergency_save;
3578 cf::write_runtime_sync; # external watchdog should not bark
3579 4023
3580 warn "syncing database to disk";
3581 BDB::db_env_txn_checkpoint $DB_ENV;
3582
3583 # if anything goes wrong in here, we should simply crash as we already saved
3584
3585 warn "flushing outstanding aio requests";
3586 for (;;) {
3587 BDB::flush;
3588 IO::AIO::flush;
3589 Coro::cede_notself;
3590 last unless IO::AIO::nreqs || BDB::nreqs;
3591 warn "iterate...";
3592 }
3593
3594 ++$RELOAD;
3595
3596 warn "cancelling all extension coros"; 4024 trace "perl_reload: cancelling all extension coros";
3597 $_->cancel for values %EXT_CORO; 4025 $_->cancel for values %EXT_CORO;
3598 %EXT_CORO = (); 4026 %EXT_CORO = ();
3599 4027
3600 warn "removing commands"; 4028 trace "perl_reload: removing commands";
3601 %COMMAND = (); 4029 %COMMAND = ();
3602 4030
3603 warn "removing ext/exti commands"; 4031 trace "perl_reload: removing ext/exti commands";
3604 %EXTCMD = (); 4032 %EXTCMD = ();
3605 %EXTICMD = (); 4033 %EXTICMD = ();
3606 4034
3607 warn "unloading/nuking all extensions"; 4035 trace "perl_reload: unloading/nuking all extensions";
3608 for my $pkg (@EXTS) { 4036 for my $pkg (@EXTS) {
3609 warn "... unloading $pkg"; 4037 trace "... unloading $pkg";
3610 4038
3611 if (my $cb = $pkg->can ("unload")) { 4039 if (my $cb = $pkg->can ("unload")) {
3612 eval { 4040 eval {
3613 $cb->($pkg); 4041 $cb->($pkg);
3614 1 4042 1
3615 } or warn "$pkg unloaded, but with errors: $@"; 4043 } or error "$pkg unloaded, but with errors: $@";
4044 }
4045
4046 trace "... clearing $pkg";
4047 clear_package $pkg;
3616 } 4048 }
3617 4049
3618 warn "... nuking $pkg";
3619 Symbol::delete_package $pkg;
3620 }
3621
3622 warn "unloading all perl modules loaded from $LIBDIR"; 4050 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3623 while (my ($k, $v) = each %INC) { 4051 while (my ($k, $v) = each %INC) {
3624 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4052 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3625 4053
3626 warn "... unloading $k"; 4054 trace "... unloading $k";
3627 delete $INC{$k}; 4055 delete $INC{$k};
3628 4056
3629 $k =~ s/\.pm$//; 4057 $k =~ s/\.pm$//;
3630 $k =~ s/\//::/g; 4058 $k =~ s/\//::/g;
3631 4059
3632 if (my $cb = $k->can ("unload_module")) { 4060 if (my $cb = $k->can ("unload_module")) {
3633 $cb->(); 4061 $cb->();
4062 }
4063
4064 clear_package $k;
3634 } 4065 }
3635 4066
3636 Symbol::delete_package $k;
3637 }
3638
3639 warn "getting rid of safe::, as good as possible"; 4067 trace "perl_reload: getting rid of safe::, as good as possible";
3640 Symbol::delete_package "safe::$_" 4068 clear_package "safe::$_"
3641 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4069 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3642 4070
3643 warn "unloading cf.pm \"a bit\""; 4071 trace "perl_reload: unloading cf.pm \"a bit\"";
3644 delete $INC{"cf.pm"}; 4072 delete $INC{"cf.pm"};
3645 delete $INC{"cf/pod.pm"}; 4073 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3646 4074
3647 # don't, removes xs symbols, too, 4075 # don't, removes xs symbols, too,
3648 # and global variables created in xs 4076 # and global variables created in xs
3649 #Symbol::delete_package __PACKAGE__; 4077 #clear_package __PACKAGE__;
3650 4078
3651 warn "unload completed, starting to reload now"; 4079 info "perl_reload: unload completed, starting to reload now";
3652 4080
3653 warn "reloading cf.pm"; 4081 trace "perl_reload: reloading cf.pm";
3654 require cf; 4082 require cf;
3655 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4083 cf::_connect_to_perl_1;
3656 4084
3657 warn "loading config and database again"; 4085 trace "perl_reload: loading config and database again";
3658 cf::reload_config; 4086 cf::reload_config;
3659 4087
3660 warn "loading extensions"; 4088 trace "perl_reload: loading extensions";
3661 cf::load_extensions; 4089 cf::load_extensions;
3662 4090
4091 if ($REATTACH_ON_RELOAD) {
3663 warn "reattaching attachments to objects/players"; 4092 trace "perl_reload: reattaching attachments to objects/players";
3664 _global_reattach; # objects, sockets 4093 _global_reattach; # objects, sockets
3665 warn "reattaching attachments to maps"; 4094 trace "perl_reload: reattaching attachments to maps";
3666 reattach $_ for values %MAP; 4095 reattach $_ for values %MAP;
3667 warn "reattaching attachments to players"; 4096 trace "perl_reload: reattaching attachments to players";
3668 reattach $_ for values %PLAYER; 4097 reattach $_ for values %PLAYER;
4098 }
3669 4099
3670 warn "leaving sync_job"; 4100 cf::_post_init 1;
3671 4101
4102 trace "perl_reload: leaving sync_job";
4103
3672 1 4104 1
3673 } or do { 4105 } or do {
3674 warn $@; 4106 error $@;
3675 cf::cleanup "error while reloading, exiting."; 4107 cf::cleanup "perl_reload: error, exiting.";
4108 };
4109
4110 --$RELOAD;
3676 }; 4111 }
3677 4112
3678 warn "reloaded"; 4113 $t1 = AE::time - $t1;
4114 info "perl_reload: completed in ${t1}s\n";
3679}; 4115};
3680 4116
3681our $RELOAD_WATCHER; # used only during reload 4117our $RELOAD_WATCHER; # used only during reload
3682 4118
3683sub reload_perl() { 4119sub reload_perl() {
3684 # doing reload synchronously and two reloads happen back-to-back, 4120 # doing reload synchronously and two reloads happen back-to-back,
3685 # coro crashes during coro_state_free->destroy here. 4121 # coro crashes during coro_state_free->destroy here.
3686 4122
4123 $RELOAD_WATCHER ||= cf::async {
4124 Coro::AIO::aio_wait cache_extensions;
4125
3687 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4126 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3688 do_reload_perl; 4127 do_reload_perl;
3689 undef $RELOAD_WATCHER; 4128 undef $RELOAD_WATCHER;
4129 };
3690 }; 4130 };
3691} 4131}
3692 4132
3693register_command "reload" => sub { 4133register_command "reload" => sub {
3694 my ($who, $arg) = @_; 4134 my ($who, $arg) = @_;
3700 reload_perl; 4140 reload_perl;
3701 }; 4141 };
3702 } 4142 }
3703}; 4143};
3704 4144
3705unshift @INC, $LIBDIR; 4145#############################################################################
3706 4146
3707my $bug_warning = 0; 4147my $bug_warning = 0;
3708 4148
3709our @WAIT_FOR_TICK;
3710our @WAIT_FOR_TICK_BEGIN;
3711
3712sub wait_for_tick { 4149sub wait_for_tick() {
3713 return if tick_inhibit || $Coro::current == $Coro::main; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3714 4151
3715 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
3716 push @WAIT_FOR_TICK, $signal;
3717 $signal->wait;
3718} 4153}
3719 4154
3720sub wait_for_tick_begin { 4155sub wait_for_tick_begin() {
3721 return if tick_inhibit || $Coro::current == $Coro::main; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3722 4157
3723 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
3724 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
3725 $signal->wait; 4160 $signal->wait;
3726} 4161}
3730 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4165 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3731 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
3732 return; 4167 return;
3733 } 4168 }
3734 4169
3735 cf::server_tick; # one server iteration 4170 cf::one_tick; # one server iteration
4171
4172 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3736 4173
3737 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3738 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4175 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3739 Coro::async_pool { 4176 Coro::async_pool {
3740 $Coro::current->{desc} = "runtime saver"; 4177 $Coro::current->{desc} = "runtime saver";
3741 write_runtime_sync 4178 write_runtime_sync
3742 or warn "ERROR: unable to write runtime file: $!"; 4179 or error "ERROR: unable to write runtime file: $!";
3743 }; 4180 };
3744 } 4181 }
3745 4182
3746 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3747 $sig->send; 4184 $sig->send;
3748 } 4185 }
3749 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
3750 $sig->send;
3751 }
3752 4187
3753 $LOAD = ($NOW - $TICK_START) / $TICK; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
3754 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3755 4190
3756 if (0) { 4191 if (0) {
3757 if ($NEXT_TICK) { 4192 if ($NEXT_TICK) {
3758 my $jitter = $TICK_START - $NEXT_TICK; 4193 my $jitter = $TICK_START - $NEXT_TICK;
3759 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4194 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3760 warn "jitter $JITTER\n";#d# 4195 debug "jitter $JITTER\n";#d#
3761 } 4196 }
3762 } 4197 }
3763} 4198}
3764 4199
3765{ 4200{
3766 # configure BDB 4201 # configure BDB
3767 4202
3768 BDB::min_parallel 8; 4203 BDB::min_parallel 16;
3769 BDB::max_poll_reqs $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
3770 $Coro::BDB::WATCHER->priority (1); 4205 #$AnyEvent::BDB::WATCHER->priority (1);
3771 4206
3772 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
3773 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
3774 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3775 | BDB::LOG_AUTOREMOVE, 1); 4210 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4211 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3776 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4212 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3777 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4213 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3778 4214
3779 cf::sync_job { 4215 cf::sync_job {
3780 eval { 4216 eval {
3806{ 4242{
3807 # configure IO::AIO 4243 # configure IO::AIO
3808 4244
3809 IO::AIO::min_parallel 8; 4245 IO::AIO::min_parallel 8;
3810 IO::AIO::max_poll_time $TICK * 0.1; 4246 IO::AIO::max_poll_time $TICK * 0.1;
3811 $Coro::AIO::WATCHER->priority (1); 4247 undef $AnyEvent::AIO::WATCHER;
3812} 4248}
3813 4249
3814my $_log_backtrace; 4250our $_log_backtrace;
4251our $_log_backtrace_last;
3815 4252
3816sub _log_backtrace { 4253sub _log_backtrace {
3817 my ($msg, @addr) = @_; 4254 my ($msg, @addr) = @_;
3818 4255
3819 $msg =~ s/\n//; 4256 $msg =~ s/\n$//;
3820 4257
4258 if ($_log_backtrace_last eq $msg) {
4259 LOG llevInfo, "[ABT] $msg\n";
4260 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3821 # limit the # of concurrent backtraces 4261 # limit the # of concurrent backtraces
3822 if ($_log_backtrace < 2) { 4262 } elsif ($_log_backtrace < 2) {
4263 $_log_backtrace_last = $msg;
3823 ++$_log_backtrace; 4264 ++$_log_backtrace;
4265 my $perl_bt = Carp::longmess $msg;
3824 async { 4266 async {
3825 $Coro::current->{desc} = "abt $msg"; 4267 $Coro::current->{desc} = "abt $msg";
3826 4268
3827 my @bt = fork_call { 4269 my @bt = fork_call {
3828 @addr = map { sprintf "%x", $_ } @addr; 4270 @addr = map { sprintf "%x", $_ } @addr;
3839 } 4281 }
3840 4282
3841 @funcs 4283 @funcs
3842 }; 4284 };
3843 4285
3844 LOG llevInfo, "[ABT] $msg\n"; 4286 LOG llevInfo, "[ABT] $perl_bt\n";
4287 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3845 LOG llevInfo, "[ABT] $_\n" for @bt; 4288 LOG llevInfo, "[ABT] $_\n" for @bt;
3846 --$_log_backtrace; 4289 --$_log_backtrace;
3847 }; 4290 };
3848 } else { 4291 } else {
3849 LOG llevInfo, "[ABT] $msg\n"; 4292 LOG llevInfo, "[ABT] $msg\n";
3850 LOG llevInfo, "[ABT] [suppressed]\n"; 4293 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3851 } 4294 }
3852} 4295}
3853 4296
3854# load additional modules 4297# load additional modules
3855use cf::pod; 4298require "cf/$_.pm" for @EXTRA_MODULES;
4299cf::_connect_to_perl_2;
3856 4300
3857END { cf::emergency_save } 4301END { cf::emergency_save }
3858 4302
38591 43031
3860 4304

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines