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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines