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.447 by root, Fri Sep 19 01:39:45 2008 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12: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 $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
99 117
100our %RESOURCE; 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;
101 125
102our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
104our $NEXT_TICK; 128our $NEXT_TICK;
105our $USE_FSYNC = 1; # use fsync to write maps - default off 129our $USE_FSYNC = 1; # use fsync to write maps - default on
106 130
107our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
109our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
110our $DB_ENV; 134our $DB_ENV;
111 135
136our @EXTRA_MODULES = qw(pod match mapscript incloader);
137
112our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
113 140
114our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
115our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
116our $NOW; 144our $NOW;
117 145
118our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
119our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
120our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
124 152
125our $LOAD; # a number between 0 (idle) and 1 (too many objects) 153our $LOAD; # a number between 0 (idle) and 1 (too many objects)
126our $LOADAVG; # same thing, but with alpha-smoothing 154our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter 155our $JITTER; # average jitter
128our $TICK_START; # for load detecting purposes 156our $TICK_START; # for load detecting purposes
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;
129 165
130binmode STDOUT; 166binmode STDOUT;
131binmode STDERR; 167binmode STDERR;
132 168
133# read virtual server time, if available 169# read virtual server time, if available
135 open my $fh, "<", $RUNTIMEFILE 171 open my $fh, "<", $RUNTIMEFILE
136 or die "unable to read $RUNTIMEFILE file: $!"; 172 or die "unable to read $RUNTIMEFILE file: $!";
137 $RUNTIME = <$fh> + 0.; 173 $RUNTIME = <$fh> + 0.;
138} 174}
139 175
176eval "sub TICK() { $TICK } 1" or die;
177
140mkdir $_ 178mkdir $_
141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 179 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
142 180
143our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
144 182
145sub cf::map::normalise; 183sub cf::map::normalise;
146 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
147############################################################################# 189#############################################################################
148 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
149=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
150 203
151=over 4 204=over 4
152 205
153=item $cf::UPTIME 206=item $cf::UPTIME
154 207
155The 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.
156 224
157=item $cf::RUNTIME 225=item $cf::RUNTIME
158 226
159The 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
160every server tick. 228every server tick.
161 229
162=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
163$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
164$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
165 233
166Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
167directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
168unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
169database environment. 237database environment.
170 238
171=item $cf::NOW
172
173The time of the last (current) server tick.
174
175=item $cf::TICK
176
177The interval between server ticks, in seconds.
178
179=item $cf::LOADAVG 239=item $cf::LOADAVG
180 240
181The 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
182(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
183objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
191Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
192from wherever your confdir points to. 252from wherever your confdir points to.
193 253
194=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
195 255
196These 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.
197returns 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
198per 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();
199 277
200=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
201 279
202This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
203C<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
204that call. 282that call.
205 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
206=back 290=back
207 291
208=cut 292=cut
209 293
210BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
211 *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 {
212 my $msg = join "", @_; 301 my $msg = join "", @_;
213 302
214 $msg .= "\n" 303 $msg .= "\n"
215 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
216 305
217 $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;
218 307
219 LOG llevError, $msg; 308 LOG llevWarn, $msg;
220 }; 309};
221}
222 310
223$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
225 313
226 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d# 318 return;#d#
229 }#d# 319 }#d#
230 320
231 # kill coroutine otherwise 321 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate 322 Coro::terminate
234}; 323};
235
236$SIG{__DIE__} = sub { }; #d#?
237 324
238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
255)) { 342)) {
256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
257} 344}
258 345
259$EV::DIED = sub { 346$EV::DIED = sub {
260 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
261}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
262 354
263############################################################################# 355#############################################################################
264 356
265=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
266 358
287 $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;
288 $d 380 $d
289 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
290} 382}
291 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
292=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
293 437
294Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
295 439
296=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
302our $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
303 447
304sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
305sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
306 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
307=item cf::lock_wait $string 513=item cf::lock_wait $string
308 514
309Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
310 516
311=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
312 518
313Wait 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
314a 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,
315for example when the coroutine gets canceled), the lock is automatically 521for example when the coroutine gets canceled), the lock is automatically
316returned. 522returned.
317 523
318Locks 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
319deadlocked coro. 525deadlocked coro.
325 531
326Return 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.
327 533
328=cut 534=cut
329 535
330our %LOCK; 536our $LOCKS = new Coro::SemaphoreSet;
331our %LOCKER;#d#
332 537
333sub lock_wait($) { 538sub lock_wait($) {
334 my ($key) = @_; 539 $LOCKS->wait ($_[0]);
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
340
341 # wait for lock, if any
342 while ($LOCK{$key}) {
343 push @{ $LOCK{$key} }, $Coro::current;
344 Coro::schedule;
345 }
346} 540}
347 541
348sub lock_acquire($) { 542sub lock_acquire($) {
349 my ($key) = @_; 543 $LOCKS->guard ($_[0])
350
351 # wait, to be sure we are not locked
352 lock_wait $key;
353
354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
356
357 Coro::guard {
358 delete $LOCKER{$key};#d#
359 # wake up all waiters, to be on the safe side
360 $_->ready for @{ delete $LOCK{$key} };
361 }
362} 544}
363 545
364sub lock_active($) { 546sub lock_active($) {
365 my ($key) = @_; 547 $LOCKS->count ($_[0]) < 1
366
367 ! ! $LOCK{$key}
368} 548}
369 549
370sub freeze_mainloop { 550sub freeze_mainloop {
371 tick_inhibit_inc; 551 tick_inhibit_inc;
372 552
373 Coro::guard \&tick_inhibit_dec; 553 &Guard::guard (\&tick_inhibit_dec);
374} 554}
375 555
376=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
377 557
378Like 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
379get spread over timer. 559get spread over time.
380 560
381=cut 561=cut
382 562
383sub periodic($$) { 563sub periodic($$) {
384 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
388 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
389} 569}
390 570
391=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
392 572
393Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
394This 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
395of 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.
396 580
397The 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
398used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
399 583
400Useful for short background jobs. 584Useful for short background jobs.
401 585
402=cut 586=cut
403 587
404our @SLOT_QUEUE; 588our @SLOT_QUEUE;
405our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
406 591
407$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
408$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
410 595
411 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
412 598
413 while () { 599 while () {
414 next_job: 600 next_job:
601
415 my $avail = cf::till_tick; 602 my $avail = cf::till_tick;
416 if ($avail > 0.01) { 603
417 for (0 .. $#SLOT_QUEUE) { 604 for (0 .. $#SLOT_QUEUE) {
418 if ($SLOT_QUEUE[$_][0] < $avail) { 605 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0;
419 my $job = splice @SLOT_QUEUE, $_, 1, (); 607 my $job = splice @SLOT_QUEUE, $_, 1, ();
420 $job->[2]->send; 608 $job->[2]->send;
421 Coro::cede; 609 Coro::cede;
422 goto next_job; 610 goto next_job;
423 } 611 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
424 } 613 }
425 } 614 }
426 615
427 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
428 # 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
429 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
430 $signal->wait;
431 } else { 619 } else {
620 $busy = 0;
432 Coro::schedule; 621 Coro::schedule;
433 } 622 }
434 } 623 }
435}; 624};
436 625
437sub get_slot($;$$) { 626sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
439 628
440 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
441 630
442 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
443 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
444 634
445 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
446 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
447 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
473=cut 663=cut
474 664
475sub sync_job(&) { 665sub sync_job(&) {
476 my ($job) = @_; 666 my ($job) = @_;
477 667
478 if ($Coro::current == $Coro::main) { 668 if (in_main) {
479 my $time = EV::time; 669 my $time = AE::time;
480 670
481 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
482 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
483 673
484 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
485 675
486 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
487 677
488 my $busy = 1; 678 my $busy = 1;
489 my @res; 679 my @res;
490 680
491 (async { 681 (async {
492 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
493 @res = eval { $job->() }; 683 @res = eval { $job->() };
494 warn $@ if $@; 684 error $@ if $@;
495 undef $busy; 685 undef $busy;
496 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
497 687
498 while ($busy) { 688 while ($busy) {
499 if (Coro::nready) { 689 if (Coro::nready) {
501 } else { 691 } else {
502 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
503 } 693 }
504 } 694 }
505 695
506 my $time = EV::time - $time; 696 my $time = AE::time - $time;
507 697
508 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
509 699
510 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
511 } else { 701 } else {
533 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
534 724
535 $coro 725 $coro
536} 726}
537 727
538=item fork_call { }, $args 728=item fork_call { }, @args
539 729
540Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
541process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
542Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
543never block itself or use any form of event handling. 733never block itself or use any form of event handling.
544 734
545=cut 735=cut
546 736
737sub post_fork {
738 reset_signals;
739}
740
547sub fork_call(&@) { 741sub fork_call(&@) {
548 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
549 743
550 # we seemingly have to make a local copy of the whole thing,
551 # otherwise perl prematurely frees the stuff :/
552 # TODO: investigate and fix (likely this will be rather laborious)
553
554 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
555 reset_signals; 745 cf::post_fork;
556 &$cb 746 &$cb
557 }, @args; 747 } @args;
558 748
559 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 )
560} 761}
561 762
562=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
563 764
564=cut 765=cut
601within each server. 802within each server.
602 803
603=cut 804=cut
604 805
605sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
606 my ($name) = @_; 810 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
608 812
609 eval { 813 eval {
610 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
620} 824}
621 825
622our $DB; 826our $DB;
623 827
624sub db_init { 828sub db_init {
625 cf::sync_job {
626 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
627 };
628} 830}
629 831
630sub db_get($$) { 832sub db_get($$) {
631 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
632 834
633 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
634 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
635 839
636 $! ? () 840 $! ? ()
637 : $data 841 : $data
638 }
639} 842}
640 843
641sub db_put($$$) { 844sub db_put($$$) {
642 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
643 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
671 874
672 my @data; 875 my @data;
673 my $md5; 876 my $md5;
674 877
675 for (0 .. $#$src) { 878 for (0 .. $#$src) {
676 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
677 or Carp::croak "$src->[$_]: $!";
678 } 880 }
679 881
680 # if processing is expensive, check 882 # if processing is expensive, check
681 # checksum first 883 # checksum first
682 if (1) { 884 if (1) {
695 897
696 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
697 } 899 }
698 } 900 }
699 901
700 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
701 my $data = $process->(\@data); 903 my $data = $process->(\@data);
702 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
703 905
704 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
705 907
706 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
707 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
708 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
709 911
719 921
720=cut 922=cut
721 923
722sub datalog($@) { 924sub datalog($@) {
723 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
724 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
725} 927}
726 928
727=back 929=back
728 930
729=cut 931=cut
924 1126
925 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
926 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
927 1129
928 } elsif (ref $type) { 1130 } elsif (ref $type) {
929 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
930 1132
931 } else { 1133 } else {
932 shift @arg; 1134 shift @arg;
933 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
934 } 1136 }
935 } 1137 }
936} 1138}
937 1139
938sub _object_attach { 1140sub _object_attach {
948 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
949 } 1151 }
950 1152
951 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
952 } else { 1154 } else {
953 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
954 } 1156 }
955 1157
956 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
957} 1159}
958 1160
1017 1219
1018 for (@$callbacks) { 1220 for (@$callbacks) {
1019 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1020 1222
1021 if ($@) { 1223 if ($@) {
1022 warn "$@";
1023 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1024 override; 1225 override;
1025 } 1226 }
1026 1227
1027 return 1 if $override; 1228 return 1 if $override;
1028 } 1229 }
1107 for (@$attach) { 1308 for (@$attach) {
1108 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1109 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1110 } 1311 }
1111 } else { 1312 } else {
1112 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1113 } 1314 }
1114 } 1315 }
1115} 1316}
1116 1317
1117cf::attachable->attach ( 1318cf::attachable->attach (
1144 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1145 1346
1146 sync_job { 1347 sync_job {
1147 if (length $$rdata) { 1348 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1149 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1150 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1151 1353
1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1153 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1155 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 }
1156 aio_close $fh; 1361 aio_close $fh;
1157 1362
1158 if (@$objs) { 1363 if (@$objs) {
1159 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) {
1160 aio_chmod $fh, SAVE_MODE; 1365 aio_chmod $fh, SAVE_MODE;
1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1162 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1163 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 }
1164 aio_close $fh; 1372 aio_close $fh;
1165 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1166 } 1374 }
1167 } else { 1375 } else {
1168 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1169 } 1377 }
1170 1378
1171 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1380
1381 $filename =~ s%/[^/]+$%%;
1382 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1383 } else {
1173 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1174 } 1385 }
1175 } else { 1386 } else {
1176 aio_unlink $filename; 1387 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1178 } 1389 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1414 $av = $st->{objs};
1204 } 1415 }
1205 1416
1206 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1209 1421
1210 ($data, $av) 1422 ($data, $av)
1211} 1423}
1212 1424
1213=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1217=cut 1429=cut
1218 1430
1219############################################################################# 1431#############################################################################
1220# command handling &c 1432# command handling &c
1221 1433
1222=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1223 1435
1224Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1225$name. 1437$name.
1226 1438
1227=cut 1439=cut
1233 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1234 1446
1235 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1236} 1448}
1237 1449
1238=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1239 1451
1240Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1241extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1242received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1243the 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
1244has logged in successfully. 1456has logged in successfully.
1245 1457
1246If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1247called.
1248 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
1249=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1250 1466
1251Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1252exticmd 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
1253are 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
1254is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1255log-in. 1471log-in.
1256 1472
1257If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1258called.
1259 1474
1260=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1261 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
1262sub register_extcmd { 1482sub register_extcmd($$) {
1263 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1264 1484
1265 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1266} 1486}
1267 1487
1268sub register_exticmd { 1488sub register_async_extcmd($$) {
1269 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1270 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1271 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1272} 1498}
1273 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1274cf::player->attach ( 1508cf::player->attach (
1275 on_command => sub { 1509 on_unknown_command => sub {
1276 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1277 1511
1278 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1279 or return; 1513 or return;
1280 1514
1288 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1289 1523
1290 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1291 1525
1292 if (ref $msg) { 1526 if (ref $msg) {
1293 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1294 "ARRAY" eq ref $msg
1295 ? @$msg
1296 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1297 1528
1298 my @reply;
1299
1300 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}) {
1301 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1302 } 1547 }
1303 1548
1304 $pl->ext_reply ($reply, @reply)
1305 if $reply;
1306
1307 } else { 1549 } else {
1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1309 } 1551 }
1310 1552
1311 cf::override; 1553 cf::override;
1312 }, 1554 },
1313); 1555);
1314 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
1315sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1316 cf::sync_job { 1586 cf::sync_job {
1317 my %todo; 1587 my %todo;
1318 1588
1319 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1320 next unless -r $path; 1590 next unless -r $path;
1338 1608
1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1341 1611
1342 $ext{source} = 1612 $ext{source} =
1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1344 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1345 . $source 1615 . $source
1346 . "\n};\n1"; 1616 . "\n};\n1";
1347 1617
1348 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1349 } 1619 }
1350 1620
1621 my $pass = 0;
1351 my %done; 1622 my %done;
1352 while (%todo) { 1623 while (%todo) {
1353 my $progress; 1624 my $progress;
1354 1625
1626 ++$pass;
1627
1628 ext:
1355 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1356 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1357 goto skip 1631 next ext
1358 unless exists $done{$_}; 1632 unless exists $done{$_};
1359 } 1633 }
1360 1634
1361 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1362 1636
1363 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 $@) {
1364 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1365 : "$v->{base}: extension inactive.\n";
1366 1650
1367 if (exists $v->{meta}{mandatory}) {
1368 warn $msg;
1369 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1370 } 1652 if exists $v->{meta}{mandatory};
1371 1653
1372 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;
1373 } 1663 }
1374
1375 $done{$k} = delete $todo{$k};
1376 push @EXTS, $v->{pkg};
1377 $progress = 1;
1378 } 1664 }
1379 1665
1380 skip: 1666 unless ($progress) {
1381 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1382 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 }
1383 } 1676 }
1384 }; 1677 };
1385} 1678}
1386 1679
1387############################################################################# 1680#############################################################################
1441 1734
1442sub exists($) { 1735sub exists($) {
1443 my ($login) = @_; 1736 my ($login) = @_;
1444 1737
1445 $cf::PLAYER{$login} 1738 $cf::PLAYER{$login}
1446 or cf::sync_job { !aio_stat path $login } 1739 or !aio_stat path $login
1447} 1740}
1448 1741
1449sub find($) { 1742sub find($) {
1450 return $cf::PLAYER{$_[0]} || do { 1743 return $cf::PLAYER{$_[0]} || do {
1451 my $login = $_[0]; 1744 my $login = $_[0];
1471 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1472 } 1765 }
1473 } 1766 }
1474} 1767}
1475 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
1476sub save($) { 1782sub save($) {
1477 my ($pl) = @_; 1783 my ($pl) = @_;
1478 1784
1479 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1480 1786
1485 1791
1486 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1487 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1488 1794
1489 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];
1490 1799
1491 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1492 cf::cede_to_tick; 1801 cf::cede_to_tick;
1493} 1802}
1494 1803
1528 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1529 1838
1530 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1532 1841
1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1534 $pl->deactivate; 1843 $pl->deactivate;
1844
1535 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;
1536 $pl->ob->check_score;
1537 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1538 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1539 1850
1540 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1541 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1542 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1596 \@logins 1907 \@logins
1597} 1908}
1598 1909
1599=item $player->maps 1910=item $player->maps
1600 1911
1912=item cf::player::maps $login
1913
1601Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1602player. May block. 1915player. May block.
1603 1916
1604=cut 1917=cut
1605 1918
1626 1939
1627=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1628 1941
1629Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1630 1943
1631=item $player->ext_reply ($msgid, @msg)
1632
1633Sends an ext reply to the player.
1634
1635=cut
1636
1637sub ext_reply($$@) {
1638 my ($self, $id, @msg) = @_;
1639
1640 $self->ns->ext_reply ($id, @msg)
1641}
1642
1643=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1644 1945
1645Sends an ext event to the client. 1946Sends an ext event to the client.
1646 1947
1647=cut 1948=cut
1666 1967
1667=cut 1968=cut
1668 1969
1669sub find_by_path($) { 1970sub find_by_path($) {
1670 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1671 1974
1672 my ($match, $specificity); 1975 my ($match, $specificity);
1673 1976
1674 for my $region (list) { 1977 for my $region (list) {
1675 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1704sub generate_random_map { 2007sub generate_random_map {
1705 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1706 2009
1707 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
1708 2011
1709 # mit "rum" bekleckern, nicht
1710 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1714 $rmp->{exit_on_final_map},
1715 $rmp->{xsize}, $rmp->{ysize},
1716 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1717 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1718 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1719 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1720 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1721 (cf::region::find $rmp->{region}), $rmp->{custom}
1722 )
1723} 2013}
1724 2014
1725=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1726 2016
1727Register 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
1732 2022
1733sub register { 2023sub register {
1734 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1735 my $pkg = caller; 2025 my $pkg = caller;
1736 2026
1737 no strict;
1738 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1739 2028
1740 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1741} 2030}
1742 2031
1743# also paths starting with '/' 2032# also paths starting with '/'
1744$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1745 2034
1746sub thawer_merge { 2035sub thawer_merge {
1747 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1748 2037
1749 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1754} 2043}
1755 2044
1756sub normalise { 2045sub normalise {
1757 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1758 2047
1759 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1760 2049
1761 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1762 2051
1763 # map plan: 2052 # map plan:
1764 # 2053 #
1779 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1780 $path = "$base/$path"; 2069 $path = "$base/$path";
1781 } 2070 }
1782 2071
1783 for ($path) { 2072 for ($path) {
1784 redo if s{//}{/};
1785 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1786 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1787 } 2075 }
1788 2076
1789 $path 2077 $path
1803 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1804 return $self; 2092 return $self;
1805 } 2093 }
1806 } 2094 }
1807 2095
1808 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1809 () 2097 ()
1810} 2098}
1811 2099
2100# may re-bless or do other evil things
1812sub init { 2101sub init {
1813 my ($self) = @_; 2102 my ($self) = @_;
1814 2103
1815 $self 2104 $self
1816} 2105}
1847 2136
1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1849 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1850} 2139}
1851 2140
1852# and all this just because we cannot iterate over
1853# all maps in C++...
1854sub change_all_map_light {
1855 my ($change) = @_;
1856
1857 $_->change_map_light ($change)
1858 for grep $_->outdoor, values %cf::MAP;
1859}
1860
1861sub decay_objects { 2141sub decay_objects {
1862 my ($self) = @_; 2142 my ($self) = @_;
1863 2143
1864 return if $self->{deny_reset}; 2144 return if $self->{deny_reset};
1865 2145
1890 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1891 2171
1892 1 2172 1
1893} 2173}
1894 2174
2175# used to laod the header of an original map
1895sub load_header_orig { 2176sub load_header_orig {
1896 my ($self) = @_; 2177 my ($self) = @_;
1897 2178
1898 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1899} 2180}
1900 2181
2182# used to laod the header of an instantiated map
1901sub load_header_temp { 2183sub load_header_temp {
1902 my ($self) = @_; 2184 my ($self) = @_;
1903 2185
1904 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1905} 2187}
1906 2188
2189# called after loading the header from an instantiated map
1907sub prepare_temp { 2190sub prepare_temp {
1908 my ($self) = @_; 2191 my ($self) = @_;
1909 2192
1910 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1911 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1912 # safety 2195 # safety
1913 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1914 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1915} 2198}
1916 2199
2200# called after loading the header from an original map
1917sub prepare_orig { 2201sub prepare_orig {
1918 my ($self) = @_; 2202 my ($self) = @_;
1919 2203
1920 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1921 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1945 2229
1946sub find; 2230sub find;
1947sub find { 2231sub find {
1948 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1949 2233
2234 cf::cede_to_tick;
2235
1950 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1951 2237
1952 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1953 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1954 2240
1955 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1959 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
1960 or return; 2243 or return;
1961 2244
1962 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
1963 2246
1975 2258
1976 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1977 } 2260 }
1978} 2261}
1979 2262
1980sub pre_load { } 2263sub pre_load { }
1981sub post_load { } 2264#sub post_load { } # XS
1982 2265
1983sub load { 2266sub load {
1984 my ($self) = @_; 2267 my ($self) = @_;
1985 2268
1986 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
1989 2272
1990 { 2273 {
1991 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
1992 2275
1993 return unless $self->valid; 2276 return unless $self->valid;
1994 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
1995
1996 $self->in_memory (cf::MAP_LOADING);
1997 2278
1998 $self->alloc; 2279 $self->alloc;
1999 2280
2000 $self->pre_load; 2281 $self->pre_load;
2001 cf::cede_to_tick; 2282 cf::cede_to_tick;
2002 2283
2284 if (exists $self->{load_path}) {
2003 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2004 $f->skip_block; 2286 $f->skip_block;
2005 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2006 or return; 2288 or return;
2007 2289
2008 $self->post_load_original 2290 $self->post_load_original
2009 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2010 2292
2011 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2012 utf8::encode $uniq; 2294 utf8::encode $uniq;
2013 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2014 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2015 $self->clear_unique_items; 2297 $self->clear_unique_items;
2016 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2017 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2018 } 2301 }
2019 } 2302 }
2020 }
2021 2303
2022 $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);
2023 2311
2024 cf::cede_to_tick; 2312 cf::cede_to_tick;
2025 # now do the right thing for maps 2313 # now do the right thing for maps
2026 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2027 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2031 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2032 $self->decay_objects; 2320 $self->decay_objects;
2033 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2034 $self->update_buttons; 2322 $self->update_buttons;
2035 cf::cede_to_tick; 2323 cf::cede_to_tick;
2036 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2037 cf::cede_to_tick;
2038 $self->activate;
2039 } 2325 }
2040 2326
2041 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2043
2044 $self->in_memory (cf::MAP_ACTIVE);
2045 } 2329 }
2046 2330
2047 $self->post_load; 2331 $self->post_load;
2048}
2049 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
2050sub customise_for { 2339sub customise_for {
2051 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2052 2341
2053 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2054 if $self->per_player; 2343 if $self->per_player;
2057# if $self->per_party; 2346# if $self->per_party;
2058 2347
2059 $self 2348 $self
2060} 2349}
2061 2350
2062# find and load all maps in the 3x3 area around a map
2063sub load_neighbours {
2064 my ($map) = @_;
2065
2066 my @neigh; # diagonal neighbours
2067
2068 for (0 .. 3) {
2069 my $neigh = $map->tile_path ($_)
2070 or next;
2071 $neigh = find $neigh, $map
2072 or next;
2073 $neigh->load;
2074
2075 push @neigh,
2076 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2077 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2078 }
2079
2080 for (grep defined $_->[0], @neigh) {
2081 my ($path, $origin) = @$_;
2082 my $neigh = find $path, $origin
2083 or next;
2084 $neigh->load;
2085 }
2086}
2087
2088sub find_sync { 2351sub find_sync {
2089 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2090 2353
2091 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
2092} 2359}
2093 2360
2094sub do_load_sync { 2361sub do_load_sync {
2095 my ($map) = @_; 2362 my ($map) = @_;
2096 2363
2364 # it's a bug to call this from the main context
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2099 2367
2100 cf::sync_job { $map->load }; 2368 $map->load;
2101} 2369}
2102 2370
2103our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2104our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2105 2373
2106sub find_async { 2374sub find_async {
2107 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2108 2376
2109 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2110 2378
2111 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2113 } 2381 }
2114 2382
2115 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2116 2384
2117 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2131 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2132 2400
2133 () 2401 ()
2134} 2402}
2135 2403
2404# common code, used by both ->save and ->swapout
2136sub save { 2405sub _save {
2137 my ($self) = @_; 2406 my ($self) = @_;
2138
2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2140 2407
2141 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2142 2409
2143 return unless $self->dirty; 2410 return unless $self->dirty;
2144 2411
2164 } else { 2431 } else {
2165 $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);
2166 } 2433 }
2167} 2434}
2168 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2169sub swap_out { 2444sub swap_out {
2170 my ($self) = @_; 2445 my ($self) = @_;
2171 2446
2172 # save first because save cedes
2173 $self->save;
2174
2175 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2176 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2177 return if $self->players; 2451 return if $self->players;
2178 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
2179 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2180 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
2181 $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};
2182 2503
2183 $self->deactivate; 2504 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2185 $self->clear; 2506 $self->clear;
2186}
2187
2188sub reset_at {
2189 my ($self) = @_;
2190
2191 # TODO: safety, remove and allow resettable per-player maps
2192 return 1e99 if $self->{deny_reset};
2193
2194 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2195 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2196
2197 $time + $to
2198}
2199
2200sub should_reset {
2201 my ($self) = @_;
2202
2203 $self->reset_at <= $cf::RUNTIME
2204}
2205
2206sub reset {
2207 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210
2211 return if $self->players;
2212
2213 warn "resetting map ", $self->path;
2214
2215 $self->in_memory (cf::MAP_SWAPPED);
2216
2217 # need to save uniques path
2218 unless ($self->{deny_save}) {
2219 my $uniq = $self->uniq_path; utf8::encode $uniq;
2220
2221 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2222 if $uniq;
2223 }
2224
2225 delete $cf::MAP{$self->path};
2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->clear;
2230 2507
2231 $self->unlink_save; 2508 $self->unlink_save;
2232 $self->destroy; 2509 $self->destroy;
2233} 2510}
2234 2511
2242 2519
2243 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2244 2521
2245 $self->unlink_save; 2522 $self->unlink_save;
2246 2523
2247 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2248 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2249 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2250 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2252 2529
2309 : normalise $_ 2586 : normalise $_
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2588 ]
2312} 2589}
2313 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
2314=back 2623=back
2315 2624
2316=head3 cf::object 2625=head3 cf::object
2317 2626
2318=cut 2627=cut
2341 2650
2342Creates 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.
2343 2652
2344=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2345 2654
2346returns 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,
2347even if the object actually exists. May block. 2656even if the object actually exists. May block.
2348 2657
2349=cut 2658=cut
2350 2659
2351sub deref { 2660sub deref {
2383 2692
2384our $SAY_CHANNEL = { 2693our $SAY_CHANNEL = {
2385 id => "say", 2694 id => "say",
2386 title => "Map", 2695 title => "Map",
2387 reply => "say ", 2696 reply => "say ",
2388 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.",
2389}; 2698};
2390 2699
2391our $CHAT_CHANNEL = { 2700our $CHAT_CHANNEL = {
2392 id => "chat", 2701 id => "chat",
2393 title => "Chat", 2702 title => "Chat",
2450 2759
2451Freezes 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}>).
2452 2761
2453The player should be reasonably safe there for short amounts of time (e.g. 2762The player should be reasonably safe there for short amounts of time (e.g.
2454for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2763for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link 2764though, as the player cannot control the character while it is on the link
2456map. 2765map.
2457 2766
2458Will never block. 2767Will never block.
2459 2768
2460=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2481sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2482 my ($self) = @_; 2791 my ($self) = @_;
2483 2792
2484 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2485 2794
2795 ++$self->{_link_recursion};
2796
2486 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2487 2798
2488 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2489 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2490 2801
2491 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2492} 2803}
2493 2804
2494sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2495 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2496 2807
2513 ($x, $y) = (-1, -1) 2824 ($x, $y) = (-1, -1)
2514 unless (defined $x) && (defined $y); 2825 unless (defined $x) && (defined $y);
2515 2826
2516 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2517 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2518 if $x <=0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2519 2830
2520 $map->load; 2831 $map->load;
2521 $map->load_neighbours;
2522 2832
2523 return unless $self->contr->active; 2833 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2525 $self->activate_recursive;
2526 2834
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2529} 2837 # entering was successful
2838 delete $self->{_link_recursion};
2839 # only activate afterwards, to support waiting in hooks
2840 $self->activate_recursive;
2841 }
2530 2842
2843}
2844
2531=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)]])
2532 2846
2533Moves 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
2534her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2535that 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
2536the 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
2543 2857
2544our $GOTOGEN; 2858our $GOTOGEN;
2545 2859
2546sub cf::object::player::goto { 2860sub cf::object::player::goto {
2547 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 }
2548 2868
2549 # 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
2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2551 2871
2552 $self->enter_link; 2872 $self->enter_link;
2572 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2573 } 2893 }
2574 } 2894 }
2575 2895
2576 my $map = eval { 2896 my $map = eval {
2577 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2578 2898
2579 if ($map) { 2899 if ($map) {
2580 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2581 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2582 } else { 2902 } else {
2583 $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);
2584 } 2904 }
2585 2905
2586 $map 2906 $map
2594 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2595 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2596 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2597 } 2917 }
2598 2918
2599 $done->() if $done; 2919 $done->($self) if $done;
2600 })->prio (1); 2920 })->prio (1);
2601} 2921}
2602 2922
2603=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2604 2924
2672 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2673 2993
2674 unless (eval { 2994 unless (eval {
2675 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2676 2996
2677 # random map handling
2678 {
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 prepare_random_map $exit
2682 if $exit->slaying eq "/!";
2683 }
2684
2685 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2686 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2687 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 }
2688 3023
2689 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2690 3025
2691 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2697 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2698 . "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. "
2699 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2700 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2701 3036
2702 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2703 $self->leave_link; 3038 $self->leave_link;
2704 } 3039 }
2705 })->prio (1); 3040 })->prio (1);
2706} 3041}
2707 3042
2719sub cf::client::send_drawinfo { 3054sub cf::client::send_drawinfo {
2720 my ($self, $text, $flags) = @_; 3055 my ($self, $text, $flags) = @_;
2721 3056
2722 utf8::encode $text; 3057 utf8::encode $text;
2723 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3058 $self->send_packet (sprintf "drawinfo %d %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);
2724} 3084}
2725 3085
2726=item $client->send_msg ($channel, $msg, $color, [extra...]) 3086=item $client->send_msg ($channel, $msg, $color, [extra...])
2727 3087
2728Send a drawinfo or msg packet to the client, formatting the msg for the 3088Send a drawinfo or msg packet to the client, formatting the msg for the
2732 3092
2733=cut 3093=cut
2734 3094
2735# non-persistent channels (usually the info channel) 3095# non-persistent channels (usually the info channel)
2736our %CHANNEL = ( 3096our %CHANNEL = (
3097 "c/motd" => {
3098 id => "infobox",
3099 title => "MOTD",
3100 reply => undef,
3101 tooltip => "The message of the day",
3102 },
2737 "c/identify" => { 3103 "c/identify" => {
2738 id => "infobox", 3104 id => "infobox",
2739 title => "Identify", 3105 title => "Identify",
2740 reply => undef, 3106 reply => undef,
2741 tooltip => "Items recently identified", 3107 tooltip => "Items recently identified",
2743 "c/examine" => { 3109 "c/examine" => {
2744 id => "infobox", 3110 id => "infobox",
2745 title => "Examine", 3111 title => "Examine",
2746 reply => undef, 3112 reply => undef,
2747 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",
2748 }, 3120 },
2749 "c/book" => { 3121 "c/book" => {
2750 id => "infobox", 3122 id => "infobox",
2751 title => "Book", 3123 title => "Book",
2752 reply => undef, 3124 reply => undef,
2768 id => "infobox", 3140 id => "infobox",
2769 title => "Body Parts", 3141 title => "Body Parts",
2770 reply => undef, 3142 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available", 3143 tooltip => "Shows which body parts you posess and are available",
2772 }, 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 },
2773 "c/uptime" => { 3181 "c/uptime" => {
2774 id => "infobox", 3182 id => "infobox",
2775 title => "Uptime", 3183 title => "Uptime",
2776 reply => undef, 3184 reply => undef,
2777 tooltip => "How long the server has been running since last restart", 3185 tooltip => "How long the server has been running since last restart",
2786 id => "party", 3194 id => "party",
2787 title => "Party", 3195 title => "Party",
2788 reply => "gsay ", 3196 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party", 3197 tooltip => "Messages and chat related to your party",
2790 }, 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/say" => $SAY_CHANNEL,
3206 "c/chat" => $CHAT_CHANNEL,
2791); 3207);
2792 3208
2793sub cf::client::send_msg { 3209sub cf::client::send_msg {
2794 my ($self, $channel, $msg, $color, @extra) = @_; 3210 my ($self, $channel, $msg, $color, @extra) = @_;
2795 3211
2800 3216
2801 # check predefined channels, for the benefit of C 3217 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) { 3218 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel}; 3219 $channel = $CHANNEL{$channel};
2804 3220
2805 $self->ext_msg (channel_info => $channel) 3221 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id}; 3222 $channel = $channel->{id};
2809 3223
2810 } elsif (ref $channel) { 3224 } elsif (ref $channel) {
2811 # send meta info to client, if not yet sent 3225 # send meta info to client, if not yet sent
2812 unless (exists $self->{channel}{$channel->{id}}) { 3226 unless (exists $self->{channel}{$channel->{id}}) {
2813 $self->{channel}{$channel->{id}} = $channel; 3227 $self->{channel}{$channel->{id}} = $channel;
2814 $self->ext_msg (channel_info => $channel) 3228 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816 } 3229 }
2817 3230
2818 $channel = $channel->{id}; 3231 $channel = $channel->{id};
2819 } 3232 }
2820 3233
2821 return unless @extra || length $msg; 3234 return unless @extra || length $msg;
2822 3235
2823 if ($self->can_msg) {
2824 # default colour, mask it out 3236 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3237 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF; 3238 if $color & cf::NDI_DEF;
2827 3239
2828 my $pkt = "msg " 3240 my $pkt = "msg "
2829 . $self->{json_coder}->encode ( 3241 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3242 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 ); 3243 );
2832 3244
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt); 3245 $self->send_big_packet ($pkt);
2844 } else {
2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2863 } else {
2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2865 $self->send_packet ("drawinfo $color $msg")
2866 }
2867 }
2868 }
2869} 3246}
2870 3247
2871=item $client->ext_msg ($type, @msg) 3248=item $client->ext_msg ($type, @msg)
2872 3249
2873Sends an ext event to the client. 3250Sends an ext event to the client.
2875=cut 3252=cut
2876 3253
2877sub cf::client::ext_msg($$@) { 3254sub cf::client::ext_msg($$@) {
2878 my ($self, $type, @msg) = @_; 3255 my ($self, $type, @msg) = @_;
2879 3256
2880 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3257 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove
2883 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 }
2886}
2887
2888=item $client->ext_reply ($msgid, @msg)
2889
2890Sends an ext reply to the client.
2891
2892=cut
2893
2894sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_;
2896
2897 if ($self->extcmd == 2) {
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id;
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 }
2904} 3258}
2905 3259
2906=item $success = $client->query ($flags, "text", \&cb) 3260=item $success = $client->query ($flags, "text", \&cb)
2907 3261
2908Queues a query to the client, calling the given callback with 3262Queues a query to the client, calling the given callback with
2963 my ($ns, $buf) = @_; 3317 my ($ns, $buf) = @_;
2964 3318
2965 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3319 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2966 3320
2967 if (ref $msg) { 3321 if (ref $msg) {
2968 my ($type, $reply, @payload) = 3322 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2969 "ARRAY" eq ref $msg
2970 ? @$msg
2971 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2972 3323
2973 my @reply;
2974
2975 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTIACMD{$type}) {
3325 $cb->(
3326 $ns,
3327 sub {
3328 $ns->ext_msg ("reply-$reply", @_)
3329 if $reply;
3330 },
3331 @payload
3332 );
3333 } else {
3334 my @reply;
3335
3336 if (my $cb = $EXTICMD{$type}) {
2976 @reply = $cb->($ns, @payload); 3337 @reply = $cb->($ns, @payload);
3338 }
3339
3340 $ns->ext_msg ("reply-$reply", @reply)
3341 if $reply;
2977 } 3342 }
2978
2979 $ns->ext_reply ($reply, @reply)
2980 if $reply;
2981
2982 } else { 3343 } else {
2983 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3344 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2984 } 3345 }
2985 3346
2986 cf::override; 3347 cf::override;
2987 }, 3348 },
2988); 3349);
3008 3369
3009 $coro 3370 $coro
3010} 3371}
3011 3372
3012cf::client->attach ( 3373cf::client->attach (
3013 on_destroy => sub { 3374 on_client_destroy => sub {
3014 my ($ns) = @_; 3375 my ($ns) = @_;
3015 3376
3016 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3377 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3017 }, 3378 },
3018); 3379);
3034our $safe_hole = new Safe::Hole; 3395our $safe_hole = new Safe::Hole;
3035 3396
3036$SIG{FPE} = 'IGNORE'; 3397$SIG{FPE} = 'IGNORE';
3037 3398
3038$safe->permit_only (Opcode::opset qw( 3399$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math 3400 :base_core :base_mem :base_orig :base_math :base_loop
3040 grepstart grepwhile mapstart mapwhile 3401 grepstart grepwhile mapstart mapwhile
3041 sort time 3402 sort time
3042)); 3403));
3043 3404
3044# here we export the classes and methods available to script code 3405# here we export the classes and methods available to script code
3048The following functions and methods are available within a safe environment: 3409The following functions and methods are available within a safe environment:
3049 3410
3050 cf::object 3411 cf::object
3051 contr pay_amount pay_player map x y force_find force_add destroy 3412 contr pay_amount pay_player map x y force_find force_add destroy
3052 insert remove name archname title slaying race decrease split 3413 insert remove name archname title slaying race decrease split
3414 value
3053 3415
3054 cf::object::player 3416 cf::object::player
3055 player 3417 player
3056 3418
3057 cf::player 3419 cf::player
3063=cut 3425=cut
3064 3426
3065for ( 3427for (
3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3428 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3067 insert remove inv nrof name archname title slaying race 3429 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)], 3430 decrease split destroy change_exp value msg lore send_msg)],
3069 ["cf::object::player" => qw(player)], 3431 ["cf::object::player" => qw(player)],
3070 ["cf::player" => qw(peaceful)], 3432 ["cf::player" => qw(peaceful send_msg)],
3071 ["cf::map" => qw(trigger)], 3433 ["cf::map" => qw(trigger)],
3072) { 3434) {
3073 no strict 'refs';
3074 my ($pkg, @funs) = @$_; 3435 my ($pkg, @funs) = @$_;
3075 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3436 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3076 for @funs; 3437 for @funs;
3077} 3438}
3078 3439
3093 3454
3094 my $qcode = $code; 3455 my $qcode = $code;
3095 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3456 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3096 $qcode =~ s/\n/\\n/g; 3457 $qcode =~ s/\n/\\n/g;
3097 3458
3459 %vars = (_dummy => 0) unless %vars;
3460
3461 my @res;
3098 local $_; 3462 local $_;
3099 local @safe::cf::_safe_eval_args = values %vars;
3100 3463
3101 my $eval = 3464 my $eval =
3102 "do {\n" 3465 "do {\n"
3103 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3466 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3104 . "#line 0 \"{$qcode}\"\n" 3467 . "#line 0 \"{$qcode}\"\n"
3105 . $code 3468 . $code
3106 . "\n}" 3469 . "\n}"
3107 ; 3470 ;
3108 3471
3472 if ($CFG{safe_eval}) {
3109 sub_generation_inc; 3473 sub_generation_inc;
3474 local @safe::cf::_safe_eval_args = values %vars;
3110 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3475 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3111 sub_generation_inc; 3476 sub_generation_inc;
3477 } else {
3478 local @cf::_safe_eval_args = values %vars;
3479 @res = wantarray ? eval eval : scalar eval $eval;
3480 }
3112 3481
3113 if ($@) { 3482 if ($@) {
3114 warn "$@"; 3483 warn "$@",
3115 warn "while executing safe code '$code'\n"; 3484 "while executing safe code '$code'\n",
3116 warn "with arguments " . (join " ", %vars) . "\n"; 3485 "with arguments " . (join " ", %vars) . "\n";
3117 } 3486 }
3118 3487
3119 wantarray ? @res : $res[0] 3488 wantarray ? @res : $res[0]
3120} 3489}
3121 3490
3135=cut 3504=cut
3136 3505
3137sub register_script_function { 3506sub register_script_function {
3138 my ($fun, $cb) = @_; 3507 my ($fun, $cb) = @_;
3139 3508
3140 no strict 'refs'; 3509 $fun = "safe::$fun" if $CFG{safe_eval};
3141 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3510 *$fun = $safe_hole->wrap ($cb);
3142} 3511}
3143 3512
3144=back 3513=back
3145 3514
3146=cut 3515=cut
3147 3516
3148############################################################################# 3517#############################################################################
3149# the server's init and main functions 3518# the server's init and main functions
3150 3519
3520{
3521 package cf::face;
3522
3523 our %HASH; # hash => idx
3524 our @DATA; # dynamically-created facedata, only faceste 0 used
3525 our @FOFS; # file offset, if > 0
3526 our @SIZE; # size of face, in octets
3527 our @META; # meta hash of face, if any
3528 our $DATAFH; # facedata filehandle
3529
3530 # internal api, not finalised
3531 sub set {
3532 my ($name, $type, $data) = @_;
3533
3534 my $idx = cf::face::find $name;
3535
3536 if ($idx) {
3537 delete $HASH{cf::face::get_chksum $idx};
3538 } else {
3539 $idx = cf::face::alloc $name;
3540 }
3541
3542 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3543
3544 cf::face::set_type $idx, $type;
3545 cf::face::set_csum $idx, 0, $hash;
3546
3547 # we need to destroy the SV itself, not just modify it, as a running ix
3548 # might hold a reference to it: "delete" achieves that.
3549 delete $FOFS[0][$idx];
3550 delete $DATA[0][$idx];
3551 $DATA[0][$idx] = $data;
3552 $SIZE[0][$idx] = length $data;
3553 delete $META[$idx];
3554 $HASH{$hash} = $idx;#d#
3555
3556 $idx
3557 }
3558
3559 sub _get_data($$$) {
3560 my ($idx, $set, $cb) = @_;
3561
3562 if (defined $DATA[$set][$idx]) {
3563 $cb->($DATA[$set][$idx]);
3564 } elsif (my $fofs = $FOFS[$set][$idx]) {
3565 my $size = $SIZE[$set][$idx];
3566 my $buf;
3567 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3568 if ($_[0] == $size) {
3569 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3570 $cb->($buf);
3571 } else {
3572 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3573 }
3574 };
3575 } else {
3576 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3577 }
3578 }
3579
3580 # rather ineffient
3581 sub cf::face::get_data($;$) {
3582 my ($idx, $set) = @_;
3583
3584 _get_data $idx, $set, Coro::rouse_cb;
3585 Coro::rouse_wait
3586 }
3587
3588 sub cf::face::ix {
3589 my ($ns, $set, $idx, $pri) = @_;
3590
3591 _get_data $idx, $set, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594 }
3595}
3596
3151sub load_facedata($) { 3597sub load_facedata($) {
3152 my ($path) = @_; 3598 my ($path) = @_;
3153 3599
3154 # HACK to clear player env face cache, we need some signal framework
3155 # for this (global event?)
3156 %ext::player_env::MUSIC_FACE_CACHE = ();
3157
3158 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3600 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3159 3601
3160 warn "loading facedata from $path\n"; 3602 trace "loading facedata from $path\n";
3161 3603
3162 my $facedata; 3604 my $facedata = decode_storable load_file "$path/faceinfo";
3163 0 < aio_load $path, $facedata
3164 or die "$path: $!";
3165
3166 $facedata = Coro::Storable::thaw $facedata;
3167 3605
3168 $facedata->{version} == 2 3606 $facedata->{version} == 2
3169 or cf::cleanup "$path: version mismatch, cannot proceed."; 3607 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3170 3608
3171 # patch in the exptable 3609 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3172 $facedata->{resource}{"res/exp_table"} = { 3610 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3173 type => FT_RSRC, 3611
3174 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3612 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3175 }; 3613
3176 cf::cede_to_tick; 3614 # BEGIN ATOMIC
3615 # from here on, everything must be atomic - no thread switch allowed
3616 my $t1 = EV::time;
3177 3617
3178 { 3618 {
3179 my $faces = $facedata->{faceinfo}; 3619 my $faces = $facedata->{faceinfo};
3180 3620
3181 while (my ($face, $info) = each %$faces) { 3621 for my $face (sort keys %$faces) {
3622 my $info = $faces->{$face};
3182 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3623 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183 3624
3184 cf::face::set_visibility $idx, $info->{visibility}; 3625 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap}; 3626 cf::face::set_magicmap $idx, $info->{magicmap};
3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3627 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3628 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3188 3629 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3189 cf::cede_to_tick; 3630 $cf::face::HASH{$info->{hash64}} = $idx;
3631 delete $cf::face::META[$idx];
3190 } 3632 }
3191 3633
3192 while (my ($face, $info) = each %$faces) { 3634 while (my ($face, $info) = each %$faces) {
3193 next unless $info->{smooth}; 3635 next unless $info->{smooth};
3194 3636
3197 3639
3198 if (my $smooth = cf::face::find $info->{smooth}) { 3640 if (my $smooth = cf::face::find $info->{smooth}) {
3199 cf::face::set_smooth $idx, $smooth; 3641 cf::face::set_smooth $idx, $smooth;
3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3642 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3201 } else { 3643 } else {
3202 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3644 error "smooth face '$info->{smooth}' not found for face '$face'";
3203 } 3645 }
3204
3205 cf::cede_to_tick;
3206 } 3646 }
3207 } 3647 }
3208 3648
3209 { 3649 {
3210 my $anims = $facedata->{animinfo}; 3650 my $anims = $facedata->{animinfo};
3211 3651
3212 while (my ($anim, $info) = each %$anims) { 3652 while (my ($anim, $info) = each %$anims) {
3213 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3653 cf::anim::set $anim, $info->{frames}, $info->{facings};
3214 cf::cede_to_tick;
3215 } 3654 }
3216 3655
3217 cf::anim::invalidate_all; # d'oh 3656 cf::anim::invalidate_all; # d'oh
3218 } 3657 }
3219 3658
3220 { 3659 {
3221 # TODO: for gcfclient pleasure, we should give resources
3222 # that gcfclient doesn't grok a >10000 face index.
3223 my $res = $facedata->{resource}; 3660 my $res = $facedata->{resource};
3224 3661
3225 while (my ($name, $info) = each %$res) { 3662 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) { 3663 if (defined (my $type = $info->{type})) {
3664 # TODO: different hash - must free and use new index, or cache ixface data queue
3227 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3665 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
3229 3666
3230 if ($info->{type} & 1) {
3231 # prepend meta info
3232
3233 my $meta = $enc->encode ({
3234 name => $name,
3235 %{ $info->{meta} || {} },
3236 });
3237
3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type}; 3667 cf::face::set_type $idx, $type;
3668 cf::face::set_csum $idx, 0, $info->{hash};
3669 $cf::face::SIZE[0][$idx] = $info->{size};
3670 $cf::face::FOFS[0][$idx] = $info->{fofs};
3671 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3672 $cf::face::HASH{$info->{hash}} = $idx;
3245 } else { 3673 } else {
3246 $RESOURCE{$name} = $info; 3674# $RESOURCE{$name} = $info; # unused
3247 } 3675 }
3248
3249 cf::cede_to_tick;
3250 } 3676 }
3251 } 3677 }
3678
3679 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3680
3681 # HACK to clear player env face cache, we need some signal framework
3682 # for this (global event?)
3683 %ext::player_env::MUSIC_FACE_CACHE = ();
3684
3685 # END ATOMIC
3686
3687 cf::debug "facedata atomic update time ", EV::time - $t1;
3252 3688
3253 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3689 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3254 3690
3691 aio_close $fh if $fh; # close old facedata
3692
3255 1 3693 1
3256} 3694}
3257
3258cf::global->attach (on_resource_update => sub {
3259 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3260 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3261
3262 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3263 my $sound = $soundconf->{compat}[$_]
3264 or next;
3265
3266 my $face = cf::face::find "sound/$sound->[1]";
3267 cf::sound::set $sound->[0] => $face;
3268 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3269 }
3270
3271 while (my ($k, $v) = each %{$soundconf->{event}}) {
3272 my $face = cf::face::find "sound/$v";
3273 cf::sound::set $k => $face;
3274 }
3275 }
3276});
3277 3695
3278register_exticmd fx_want => sub { 3696register_exticmd fx_want => sub {
3279 my ($ns, $want) = @_; 3697 my ($ns, $want) = @_;
3280 3698
3281 while (my ($k, $v) = each %$want) { 3699 while (my ($k, $v) = each %$want) {
3289 my $status = load_resource_file_ $_[0]; 3707 my $status = load_resource_file_ $_[0];
3290 get_slot 0.1, 100; 3708 get_slot 0.1, 100;
3291 cf::arch::commit_load; 3709 cf::arch::commit_load;
3292 3710
3293 $status 3711 $status
3712}
3713
3714sub reload_exp_table {
3715 _reload_exp_table;
3716
3717 cf::face::set
3718 "res/exp_table" => FT_RSRC,
3719 JSON::XS->new->utf8->canonical->encode (
3720 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3721 );
3722}
3723
3724sub reload_materials {
3725 _reload_materials;
3294} 3726}
3295 3727
3296sub reload_regions { 3728sub reload_regions {
3297 # HACK to clear player env face cache, we need some signal framework 3729 # HACK to clear player env face cache, we need some signal framework
3298 # for this (global event?) 3730 # for this (global event?)
3306 if exists $_->{match}; 3738 if exists $_->{match};
3307 } 3739 }
3308} 3740}
3309 3741
3310sub reload_facedata { 3742sub reload_facedata {
3311 load_facedata "$DATADIR/facedata" 3743 load_facedata $DATADIR
3312 or die "unable to load facedata\n"; 3744 or die "unable to load facedata\n";
3313} 3745}
3314 3746
3315sub reload_archetypes { 3747sub reload_archetypes {
3316 load_resource_file "$DATADIR/archetypes" 3748 load_resource_file "$DATADIR/archetypes"
3317 or die "unable to load archetypes\n"; 3749 or die "unable to load archetypes\n";
3750
3751 cf::face::set
3752 "res/skill_info" => FT_RSRC,
3753 JSON::XS->new->utf8->canonical->encode (
3754 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3755 );
3756
3757 cf::face::set
3758 "res/spell_paths" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3761 );
3318} 3762}
3319 3763
3320sub reload_treasures { 3764sub reload_treasures {
3321 load_resource_file "$DATADIR/treasures" 3765 load_resource_file "$DATADIR/treasures"
3322 or die "unable to load treasurelists\n"; 3766 or die "unable to load treasurelists\n";
3323} 3767}
3324 3768
3769sub reload_sound {
3770 trace "loading sound config from $DATADIR/sound\n";
3771
3772 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3773
3774 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3775 my $sound = $soundconf->{compat}[$_]
3776 or next;
3777
3778 my $face = cf::face::find "sound/$sound->[1]";
3779 cf::sound::set $sound->[0] => $face;
3780 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3781 }
3782
3783 while (my ($k, $v) = each %{$soundconf->{event}}) {
3784 my $face = cf::face::find "sound/$v";
3785 cf::sound::set $k => $face;
3786 }
3787}
3788
3325sub reload_resources { 3789sub reload_resources {
3326 warn "reloading resource files...\n"; 3790 trace "reloading resource files...\n";
3327 3791
3792 reload_materials;
3328 reload_facedata; 3793 reload_facedata;
3794 reload_exp_table;
3795 reload_sound;
3329 reload_archetypes; 3796 reload_archetypes;
3330 reload_regions; 3797 reload_regions;
3331 reload_treasures; 3798 reload_treasures;
3332 3799
3333 warn "finished reloading resource files\n"; 3800 trace "finished reloading resource files\n";
3334}
3335
3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3341 reload_resources;
3342} 3801}
3343 3802
3344sub reload_config { 3803sub reload_config {
3345 open my $fh, "<:utf8", "$CONFDIR/config" 3804 trace "reloading config file...\n";
3346 or return;
3347 3805
3348 local $/; 3806 my $config = load_file "$CONFDIR/config";
3349 *CFG = YAML::Load <$fh>; 3807 utf8::decode $config;
3808 *CFG = decode_yaml $config;
3350 3809
3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3810 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3352 3811
3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3812 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3813 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3355 3814
3356 if (exists $CFG{mlockall}) { 3815 if (exists $CFG{mlockall}) {
3379 3838
3380 seek $fh, 0, 0; 3839 seek $fh, 0, 0;
3381 print $fh $$; 3840 print $fh $$;
3382} 3841}
3383 3842
3843sub main_loop {
3844 trace "EV::loop starting\n";
3845 if (1) {
3846 EV::loop;
3847 }
3848 trace "EV::loop returned\n";
3849 goto &main_loop unless $REALLY_UNLOOP;
3850}
3851
3384sub main { 3852sub main {
3385 atomic; 3853 cf::init_globals; # initialise logging
3854
3855 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3856 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3857 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3858 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3859
3860 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3386 3861
3387 # we must not ever block the main coroutine 3862 # we must not ever block the main coroutine
3388 local $Coro::idle = sub { 3863 $Coro::idle = sub {
3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3864 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3390 (async { 3865 (async {
3391 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3866 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT; 3867 EV::loop EV::LOOP_ONESHOT;
3393 })->prio (Coro::PRIO_MAX); 3868 })->prio (Coro::PRIO_MAX);
3394 }; 3869 };
3395 3870
3396 { 3871 evthread_start IO::AIO::poll_fileno;
3397 my $guard = freeze_mainloop; 3872
3873 cf::sync_job {
3874 cf::incloader::init ();
3875
3876 db_init;
3877
3878 cf::init_anim;
3879 cf::init_attackmess;
3880 cf::init_dynamic;
3881
3882 cf::load_settings;
3883
3884 reload_resources;
3398 reload_config; 3885 reload_config;
3399 db_init; 3886
3887 cf::init_uuid;
3888 cf::init_signals;
3889 cf::init_skills;
3890
3891 cf::init_beforeplay;
3892
3893 atomic;
3894
3400 load_extensions; 3895 load_extensions;
3401 3896
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE; 3897 utime time, time, $RUNTIMEFILE;
3406 3898
3407 # no (long-running) fork's whatsoever before this point(!) 3899 # no (long-running) fork's whatsoever before this point(!)
3900 use POSIX ();
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3901 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409 3902
3410 EV::loop; 3903 cf::_post_init 0;
3904 };
3905
3906 cf::object::thawer::errors_are_fatal 0;
3907 info "parse errors in files are no longer fatal from this point on.\n";
3908
3909 AE::postpone {
3910 undef &main; # free gobs of memory :)
3911 };
3912
3913 goto &main_loop;
3411} 3914}
3412 3915
3413############################################################################# 3916#############################################################################
3414# initialisation and cleanup 3917# initialisation and cleanup
3415 3918
3416# install some emergency cleanup handlers 3919# install some emergency cleanup handlers
3417BEGIN { 3920BEGIN {
3418 our %SIGWATCHER = (); 3921 our %SIGWATCHER = ();
3419 for my $signal (qw(INT HUP TERM)) { 3922 for my $signal (qw(INT HUP TERM)) {
3420 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3923 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3421 cf::cleanup "SIG$signal"; 3924 cf::cleanup "SIG$signal";
3422 }; 3925 };
3423 } 3926 }
3424} 3927}
3425 3928
3426sub write_runtime_sync { 3929sub write_runtime_sync {
3930 my $t0 = AE::time;
3931
3427 # first touch the runtime file to show we are still running: 3932 # first touch the runtime file to show we are still running:
3428 # the fsync below can take a very very long time. 3933 # the fsync below can take a very very long time.
3429 3934
3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3935 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3431 3936
3432 my $guard = cf::lock_acquire "write_runtime"; 3937 my $guard = cf::lock_acquire "write_runtime";
3433 3938
3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3939 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3435 or return; 3940 or return;
3436 3941
3437 my $value = $cf::RUNTIME + 90 + 10; 3942 my $value = $cf::RUNTIME + 90 + 10;
3438 # 10 is the runtime save interval, for a monotonic clock 3943 # 10 is the runtime save interval, for a monotonic clock
3439 # 60 allows for the watchdog to kill the server. 3944 # 60 allows for the watchdog to kill the server.
3452 or return; 3957 or return;
3453 3958
3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3959 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3455 and return; 3960 and return;
3456 3961
3457 warn "runtime file written.\n"; 3962 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3458 3963
3459 1 3964 1
3460} 3965}
3461 3966
3462our $uuid_lock; 3967our $uuid_lock;
3471 my $uuid = "$LOCALDIR/uuid"; 3976 my $uuid = "$LOCALDIR/uuid";
3472 3977
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3978 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return; 3979 or return;
3475 3980
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3981 my $value = uuid_seq uuid_cur;
3982
3983 unless ($value) {
3984 info "cowardly refusing to write zero uuid value!\n";
3985 return;
3986 }
3987
3988 my $value = uuid_str $value + $uuid_skip;
3477 $uuid_skip = 0; 3989 $uuid_skip = 0;
3478 3990
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3991 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return; 3992 and return;
3481 3993
3487 or return; 3999 or return;
3488 4000
3489 aio_rename "$uuid~", $uuid 4001 aio_rename "$uuid~", $uuid
3490 and return; 4002 and return;
3491 4003
3492 warn "uuid file written ($value).\n"; 4004 trace "uuid file written ($value).\n";
3493 4005
3494 1 4006 1
3495 4007
3496} 4008}
3497 4009
3503} 4015}
3504 4016
3505sub emergency_save() { 4017sub emergency_save() {
3506 my $freeze_guard = cf::freeze_mainloop; 4018 my $freeze_guard = cf::freeze_mainloop;
3507 4019
3508 warn "enter emergency perl save\n"; 4020 info "emergency_perl_save: enter\n";
4021
4022 # this is a trade-off: we want to be very quick here, so
4023 # save all maps without fsync, and later call a global sync
4024 # (which in turn might be very very slow)
4025 local $USE_FSYNC = 0;
3509 4026
3510 cf::sync_job { 4027 cf::sync_job {
4028 cf::write_runtime_sync; # external watchdog should not bark
4029
3511 # use a peculiar iteration method to avoid tripping on perl 4030 # use a peculiar iteration method to avoid tripping on perl
3512 # refcount bugs in for. also avoids problems with players 4031 # refcount bugs in for. also avoids problems with players
3513 # and maps saved/destroyed asynchronously. 4032 # and maps saved/destroyed asynchronously.
3514 warn "begin emergency player save\n"; 4033 info "emergency_perl_save: begin player save\n";
3515 for my $login (keys %cf::PLAYER) { 4034 for my $login (keys %cf::PLAYER) {
3516 my $pl = $cf::PLAYER{$login} or next; 4035 my $pl = $cf::PLAYER{$login} or next;
3517 $pl->valid or next; 4036 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4037 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3519 $pl->save; 4038 $pl->save;
3520 } 4039 }
3521 warn "end emergency player save\n"; 4040 info "emergency_perl_save: end player save\n";
3522 4041
3523 warn "begin emergency map save\n"; 4042 cf::write_runtime_sync; # external watchdog should not bark
4043
4044 info "emergency_perl_save: begin map save\n";
3524 for my $path (keys %cf::MAP) { 4045 for my $path (keys %cf::MAP) {
3525 my $map = $cf::MAP{$path} or next; 4046 my $map = $cf::MAP{$path} or next;
3526 $map->valid or next; 4047 $map->valid or next;
3527 $map->save; 4048 $map->save;
3528 } 4049 }
3529 warn "end emergency map save\n"; 4050 info "emergency_perl_save: end map save\n";
3530 4051
3531 warn "begin emergency database checkpoint\n"; 4052 cf::write_runtime_sync; # external watchdog should not bark
4053
4054 info "emergency_perl_save: begin database checkpoint\n";
3532 BDB::db_env_txn_checkpoint $DB_ENV; 4055 BDB::db_env_txn_checkpoint $DB_ENV;
3533 warn "end emergency database checkpoint\n"; 4056 info "emergency_perl_save: end database checkpoint\n";
3534 4057
3535 warn "begin write uuid\n"; 4058 info "emergency_perl_save: begin write uuid\n";
3536 write_uuid_sync 1; 4059 write_uuid_sync 1;
3537 warn "end write uuid\n"; 4060 info "emergency_perl_save: end write uuid\n";
4061
4062 cf::write_runtime_sync; # external watchdog should not bark
4063
4064 trace "emergency_perl_save: syncing database to disk";
4065 BDB::db_env_txn_checkpoint $DB_ENV;
4066
4067 info "emergency_perl_save: starting sync\n";
4068 IO::AIO::aio_sync sub {
4069 info "emergency_perl_save: finished sync\n";
4070 };
4071
4072 cf::write_runtime_sync; # external watchdog should not bark
4073
4074 trace "emergency_perl_save: flushing outstanding aio requests";
4075 while (IO::AIO::nreqs || BDB::nreqs) {
4076 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4077 }
4078
4079 cf::write_runtime_sync; # external watchdog should not bark
3538 }; 4080 };
3539 4081
3540 warn "leave emergency perl save\n"; 4082 info "emergency_perl_save: leave\n";
3541} 4083}
3542 4084
3543sub post_cleanup { 4085sub post_cleanup {
3544 my ($make_core) = @_; 4086 my ($make_core) = @_;
3545 4087
4088 IO::AIO::flush;
4089
3546 warn Carp::longmess "post_cleanup backtrace" 4090 error Carp::longmess "post_cleanup backtrace"
3547 if $make_core; 4091 if $make_core;
3548 4092
3549 my $fh = pidfile; 4093 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$; 4094 unlink $PIDFILE if <$fh> == $$;
3551} 4095}
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4115 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) { 4116 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"}; 4117 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4118# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 } 4119 }
3576 warn "cleared package #$pkg\n";#d#
3577} 4120}
3578
3579our $RELOAD; # how many times to reload
3580 4121
3581sub do_reload_perl() { 4122sub do_reload_perl() {
3582 # can/must only be called in main 4123 # can/must only be called in main
3583 if ($Coro::current != $Coro::main) { 4124 unless (in_main) {
3584 warn "can only reload from main coroutine"; 4125 error "can only reload from main coroutine";
3585 return; 4126 return;
3586 } 4127 }
3587 4128
3588 return if $RELOAD++; 4129 return if $RELOAD++;
3589 4130
4131 my $t1 = AE::time;
4132
3590 while ($RELOAD) { 4133 while ($RELOAD) {
3591 warn "reloading..."; 4134 cf::get_slot 0.1, -1, "reload_perl";
4135 info "perl_reload: reloading...";
3592 4136
3593 warn "entering sync_job"; 4137 trace "perl_reload: entering sync_job";
3594 4138
3595 cf::sync_job { 4139 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 4140 #cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 4141
3600 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV;
3602
3603 # if anything goes wrong in here, we should simply crash as we already saved
3604
3605 warn "flushing outstanding aio requests";
3606 while (IO::AIO::nreqs || BDB::nreqs) {
3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3608 }
3609
3610 warn "cancelling all extension coros"; 4142 trace "perl_reload: cancelling all extension coros";
3611 $_->cancel for values %EXT_CORO; 4143 $_->cancel for values %EXT_CORO;
3612 %EXT_CORO = (); 4144 %EXT_CORO = ();
3613 4145
3614 warn "removing commands"; 4146 trace "perl_reload: removing commands";
3615 %COMMAND = (); 4147 %COMMAND = ();
3616 4148
3617 warn "removing ext/exti commands"; 4149 trace "perl_reload: removing ext/exti commands";
3618 %EXTCMD = (); 4150 %EXTCMD = ();
3619 %EXTICMD = (); 4151 %EXTICMD = ();
3620 4152
3621 warn "unloading/nuking all extensions"; 4153 trace "perl_reload: unloading/nuking all extensions";
3622 for my $pkg (@EXTS) { 4154 for my $pkg (@EXTS) {
3623 warn "... unloading $pkg"; 4155 trace "... unloading $pkg";
3624 4156
3625 if (my $cb = $pkg->can ("unload")) { 4157 if (my $cb = $pkg->can ("unload")) {
3626 eval { 4158 eval {
3627 $cb->($pkg); 4159 $cb->($pkg);
3628 1 4160 1
3629 } or warn "$pkg unloaded, but with errors: $@"; 4161 } or error "$pkg unloaded, but with errors: $@";
3630 } 4162 }
3631 4163
3632 warn "... clearing $pkg"; 4164 trace "... clearing $pkg";
3633 clear_package $pkg; 4165 clear_package $pkg;
3634 } 4166 }
3635 4167
3636 warn "unloading all perl modules loaded from $LIBDIR"; 4168 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) { 4169 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4170 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639 4171
3640 warn "... unloading $k"; 4172 trace "... unloading $k";
3641 delete $INC{$k}; 4173 delete $INC{$k};
3642 4174
3643 $k =~ s/\.pm$//; 4175 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g; 4176 $k =~ s/\//::/g;
3645 4177
3648 } 4180 }
3649 4181
3650 clear_package $k; 4182 clear_package $k;
3651 } 4183 }
3652 4184
3653 warn "getting rid of safe::, as good as possible"; 4185 trace "perl_reload: getting rid of safe::, as good as possible";
3654 clear_package "safe::$_" 4186 clear_package "safe::$_"
3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4187 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3656 4188
3657 warn "unloading cf.pm \"a bit\""; 4189 trace "perl_reload: unloading cf.pm \"a bit\"";
3658 delete $INC{"cf.pm"}; 4190 delete $INC{"cf.pm"};
3659 delete $INC{"cf/pod.pm"}; 4191 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3660 4192
3661 # don't, removes xs symbols, too, 4193 # don't, removes xs symbols, too,
3662 # and global variables created in xs 4194 # and global variables created in xs
3663 #clear_package __PACKAGE__; 4195 #clear_package __PACKAGE__;
3664 4196
3665 warn "unload completed, starting to reload now"; 4197 info "perl_reload: unload completed, starting to reload now";
3666 4198
3667 warn "reloading cf.pm"; 4199 trace "perl_reload: reloading cf.pm";
3668 require cf; 4200 require cf;
3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4201 cf::_connect_to_perl_1;
3670 4202
3671 warn "loading config and database again"; 4203 trace "perl_reload: loading config and database again";
3672 cf::reload_config; 4204 cf::reload_config;
3673 4205
3674 warn "loading extensions"; 4206 trace "perl_reload: loading extensions";
3675 cf::load_extensions; 4207 cf::load_extensions;
3676 4208
4209 if ($REATTACH_ON_RELOAD) {
3677 warn "reattaching attachments to objects/players"; 4210 trace "perl_reload: reattaching attachments to objects/players";
3678 _global_reattach; # objects, sockets 4211 _global_reattach; # objects, sockets
3679 warn "reattaching attachments to maps"; 4212 trace "perl_reload: reattaching attachments to maps";
3680 reattach $_ for values %MAP; 4213 reattach $_ for values %MAP;
3681 warn "reattaching attachments to players"; 4214 trace "perl_reload: reattaching attachments to players";
3682 reattach $_ for values %PLAYER; 4215 reattach $_ for values %PLAYER;
4216 }
3683 4217
3684 warn "leaving sync_job"; 4218 cf::_post_init 1;
4219
4220 trace "perl_reload: leaving sync_job";
3685 4221
3686 1 4222 1
3687 } or do { 4223 } or do {
3688 warn $@; 4224 error $@;
3689 cf::cleanup "error while reloading, exiting."; 4225 cf::cleanup "perl_reload: error, exiting.";
3690 }; 4226 };
3691 4227
3692 warn "reloaded";
3693 --$RELOAD; 4228 --$RELOAD;
3694 } 4229 }
4230
4231 $t1 = AE::time - $t1;
4232 info "perl_reload: completed in ${t1}s\n";
3695}; 4233};
3696 4234
3697our $RELOAD_WATCHER; # used only during reload 4235our $RELOAD_WATCHER; # used only during reload
3698 4236
3699sub reload_perl() { 4237sub reload_perl() {
3700 # doing reload synchronously and two reloads happen back-to-back, 4238 # doing reload synchronously and two reloads happen back-to-back,
3701 # coro crashes during coro_state_free->destroy here. 4239 # coro crashes during coro_state_free->destroy here.
3702 4240
4241 $RELOAD_WATCHER ||= cf::async {
4242 Coro::AIO::aio_wait cache_extensions;
4243
3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4244 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3704 do_reload_perl; 4245 do_reload_perl;
3705 undef $RELOAD_WATCHER; 4246 undef $RELOAD_WATCHER;
4247 };
3706 }; 4248 };
3707} 4249}
3708 4250
3709register_command "reload" => sub { 4251register_command "reload" => sub {
3710 my ($who, $arg) = @_; 4252 my ($who, $arg) = @_;
3716 reload_perl; 4258 reload_perl;
3717 }; 4259 };
3718 } 4260 }
3719}; 4261};
3720 4262
3721unshift @INC, $LIBDIR; 4263#############################################################################
3722 4264
3723my $bug_warning = 0; 4265my $bug_warning = 0;
3724 4266
3725our @WAIT_FOR_TICK;
3726our @WAIT_FOR_TICK_BEGIN;
3727
3728sub wait_for_tick { 4267sub wait_for_tick() {
3729 return if tick_inhibit || $Coro::current == $Coro::main; 4268 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3730 4269
3731 my $signal = new Coro::Signal; 4270 $WAIT_FOR_TICK->wait;
3732 push @WAIT_FOR_TICK, $signal;
3733 $signal->wait;
3734} 4271}
3735 4272
3736sub wait_for_tick_begin { 4273sub wait_for_tick_begin() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3738 4275
3739 my $signal = new Coro::Signal; 4276 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK_BEGIN, $signal; 4277 push @WAIT_FOR_TICK_BEGIN, $signal;
3741 $signal->wait; 4278 $signal->wait;
3742} 4279}
3746 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4283 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3747 unless ++$bug_warning > 10; 4284 unless ++$bug_warning > 10;
3748 return; 4285 return;
3749 } 4286 }
3750 4287
3751 cf::server_tick; # one server iteration 4288 cf::one_tick; # one server iteration
4289
4290 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3752 4291
3753 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4292 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4293 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3755 Coro::async_pool { 4294 Coro::async_pool {
3756 $Coro::current->{desc} = "runtime saver"; 4295 $Coro::current->{desc} = "runtime saver";
3757 write_runtime_sync 4296 write_runtime_sync
3758 or warn "ERROR: unable to write runtime file: $!"; 4297 or error "ERROR: unable to write runtime file: $!";
3759 }; 4298 };
3760 } 4299 }
3761 4300
3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4301 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3763 $sig->send; 4302 $sig->send;
3764 } 4303 }
3765 while (my $sig = shift @WAIT_FOR_TICK) { 4304 $WAIT_FOR_TICK->broadcast;
3766 $sig->send;
3767 }
3768 4305
3769 $LOAD = ($NOW - $TICK_START) / $TICK; 4306 $LOAD = ($NOW - $TICK_START) / $TICK;
3770 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4307 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3771 4308
3772 if (0) { 4309 if (0) {
3773 if ($NEXT_TICK) { 4310 if ($NEXT_TICK) {
3774 my $jitter = $TICK_START - $NEXT_TICK; 4311 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4312 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d# 4313 debug "jitter $JITTER\n";#d#
3777 } 4314 }
3778 } 4315 }
3779} 4316}
3780 4317
3781{ 4318{
3782 # configure BDB 4319 # configure BDB
4320 info "initialising database";
3783 4321
3784 BDB::min_parallel 8; 4322 BDB::min_parallel 16;
3785 BDB::max_poll_reqs $TICK * 0.1; 4323 BDB::max_poll_reqs $TICK * 0.1;
3786 $AnyEvent::BDB::WATCHER->priority (1); 4324 #$AnyEvent::BDB::WATCHER->priority (1);
3787 4325
3788 unless ($DB_ENV) { 4326 unless ($DB_ENV) {
3789 $DB_ENV = BDB::db_env_create; 4327 $DB_ENV = BDB::db_env_create;
3790 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4328 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3791 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4329 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3816 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4354 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3817 }; 4355 };
3818 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4356 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3819 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4357 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3820 }; 4358 };
4359
4360 info "database initialised";
3821} 4361}
3822 4362
3823{ 4363{
3824 # configure IO::AIO 4364 # configure IO::AIO
3825 4365
4366 info "initialising aio";
3826 IO::AIO::min_parallel 8; 4367 IO::AIO::min_parallel 8;
3827 IO::AIO::max_poll_time $TICK * 0.1; 4368 IO::AIO::max_poll_time $TICK * 0.1;
3828 undef $AnyEvent::AIO::WATCHER; 4369 undef $AnyEvent::AIO::WATCHER;
4370 info "aio initialised";
3829} 4371}
3830 4372
3831my $_log_backtrace; 4373our $_log_backtrace;
4374our $_log_backtrace_last;
3832 4375
3833sub _log_backtrace { 4376sub _log_backtrace {
3834 my ($msg, @addr) = @_; 4377 my ($msg, @addr) = @_;
3835 4378
3836 $msg =~ s/\n//; 4379 $msg =~ s/\n$//;
3837 4380
4381 if ($_log_backtrace_last eq $msg) {
4382 LOG llevInfo, "[ABT] $msg\n";
4383 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3838 # limit the # of concurrent backtraces 4384 # limit the # of concurrent backtraces
3839 if ($_log_backtrace < 2) { 4385 } elsif ($_log_backtrace < 2) {
4386 $_log_backtrace_last = $msg;
3840 ++$_log_backtrace; 4387 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg; 4388 my $perl_bt = Carp::longmess $msg;
3842 async { 4389 async {
3843 $Coro::current->{desc} = "abt $msg"; 4390 $Coro::current->{desc} = "abt $msg";
3844 4391
3864 LOG llevInfo, "[ABT] $_\n" for @bt; 4411 LOG llevInfo, "[ABT] $_\n" for @bt;
3865 --$_log_backtrace; 4412 --$_log_backtrace;
3866 }; 4413 };
3867 } else { 4414 } else {
3868 LOG llevInfo, "[ABT] $msg\n"; 4415 LOG llevInfo, "[ABT] $msg\n";
3869 LOG llevInfo, "[ABT] [suppressed]\n"; 4416 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3870 } 4417 }
3871} 4418}
3872 4419
3873# load additional modules 4420# load additional modules
3874use cf::pod; 4421require "cf/$_.pm" for @EXTRA_MODULES;
4422cf::_connect_to_perl_2;
3875 4423
3876END { cf::emergency_save } 4424END { cf::emergency_save }
3877 4425
38781 44261
3879 4427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines