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.444 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.608 by root, Sun Nov 18 09:53:57 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines