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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.604 by root, Thu Nov 15 07:08:08 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
70 74
71# make sure c-lzf reinitialises itself 75# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 76Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
74 78
79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83
84our @ORIG_INC;
76 85
77our %COMMAND = (); 86our %COMMAND = ();
78our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
79 88
80our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
81our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
82our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
83our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
85 96
86our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
88 101
89our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
90our $DATADIR = datadir; 104our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
94our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 117
103our %RESOURCE; 118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
104 125
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 128our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 129our $USE_FSYNC = 1; # use fsync to write maps - default on
109 130
110our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 134our $DB_ENV;
114 135
136our @EXTRA_MODULES = qw(pod match mapscript incloader);
137
115our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
116 140
117our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
119our $NOW; 144our $NOW;
120 145
121our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
122our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
123our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
130our $JITTER; # average jitter 155our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 156our $TICK_START; # for load detecting purposes
132 157
133our @POST_INIT; 158our @POST_INIT;
134 159
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 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;
136 165
137binmode STDOUT; 166binmode STDOUT;
138binmode STDERR; 167binmode STDERR;
139 168
140# read virtual server time, if available 169# read virtual server time, if available
142 open my $fh, "<", $RUNTIMEFILE 171 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 172 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 173 $RUNTIME = <$fh> + 0.;
145} 174}
146 175
176eval "sub TICK() { $TICK } 1" or die;
177
147mkdir $_ 178mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 179 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 180
150our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
151 182
152sub cf::map::normalise; 183sub cf::map::normalise;
153 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
154############################################################################# 189#############################################################################
155 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
156=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
157 203
158=over 4 204=over 4
159 205
160=item $cf::UPTIME 206=item $cf::UPTIME
161 207
162The 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.
163 224
164=item $cf::RUNTIME 225=item $cf::RUNTIME
165 226
166The 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
167every server tick. 228every server tick.
168 229
169=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
170$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
171$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
172 233
173Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
174directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
175unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
176database environment. 237database environment.
177 238
178=item $cf::NOW
179
180The time of the last (current) server tick.
181
182=item $cf::TICK
183
184The interval between server ticks, in seconds.
185
186=item $cf::LOADAVG 239=item $cf::LOADAVG
187 240
188The 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
189(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
190objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
198Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
199from wherever your confdir points to. 252from wherever your confdir points to.
200 253
201=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
202 255
203These 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.
204returns 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
205per 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();
206 277
207=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
208 279
209This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
210C<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
211that call. 282that call.
212 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
213=back 290=back
214 291
215=cut 292=cut
216 293
217BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
218 *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 {
219 my $msg = join "", @_; 301 my $msg = join "", @_;
220 302
221 $msg .= "\n" 303 $msg .= "\n"
222 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
223 305
224 $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;
225 307
226 LOG llevError, $msg; 308 LOG llevWarn, $msg;
227 }; 309};
228}
229 310
230$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
232 313
233 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 318 return;#d#
236 }#d# 319 }#d#
237 320
238 # kill coroutine otherwise 321 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 322 Coro::terminate
241}; 323};
242
243$SIG{__DIE__} = sub { }; #d#?
244 324
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
262)) { 342)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 344}
265 345
266$EV::DIED = sub { 346$EV::DIED = sub {
267 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
268}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
269 354
270############################################################################# 355#############################################################################
271 356
272=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
273 358
294 $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;
295 $d 380 $d
296 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
297} 382}
298 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
299=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
300 437
301Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
302 439
303=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
309our $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
310 447
311sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
312sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
313 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
314=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
315 483
316Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
318 486
319The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
320is a reload or not. 488is a reload or not.
321 489
322=cut 490=cut
323 491
324sub post_init(&) { 492sub post_init(&) {
325 push @POST_INIT, shift; 493 push @POST_INIT, shift;
326} 494}
327 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
328=item cf::lock_wait $string 513=item cf::lock_wait $string
329 514
330Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
331 516
332=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
333 518
334Wait 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
335a 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,
336for example when the coroutine gets canceled), the lock is automatically 521for example when the coroutine gets canceled), the lock is automatically
337returned. 522returned.
338 523
339Locks 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
340deadlocked coro. 525deadlocked coro.
346 531
347Return 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.
348 533
349=cut 534=cut
350 535
351our %LOCK; 536our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 537
354sub lock_wait($) { 538sub lock_wait($) {
355 my ($key) = @_; 539 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 540}
369 541
370sub lock_acquire($) { 542sub lock_acquire($) {
371 my ($key) = @_; 543 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 544}
385 545
386sub lock_active($) { 546sub lock_active($) {
387 my ($key) = @_; 547 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 548}
391 549
392sub freeze_mainloop { 550sub freeze_mainloop {
393 tick_inhibit_inc; 551 tick_inhibit_inc;
394 552
395 Coro::guard \&tick_inhibit_dec; 553 &Guard::guard (\&tick_inhibit_dec);
396} 554}
397 555
398=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
399 557
400Like 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
401get spread over timer. 559get spread over time.
402 560
403=cut 561=cut
404 562
405sub periodic($$) { 563sub periodic($$) {
406 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
411} 569}
412 570
413=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
414 572
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
416This 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
417of 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.
418 580
419The 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
420used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
421 583
422Useful for short background jobs. 584Useful for short background jobs.
423 585
424=cut 586=cut
425 587
426our @SLOT_QUEUE; 588our @SLOT_QUEUE;
427our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
428 591
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
432 595
433 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
434 598
435 while () { 599 while () {
436 next_job: 600 next_job:
601
437 my $avail = cf::till_tick; 602 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 603
439 for (0 .. $#SLOT_QUEUE) { 604 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 605 if ($SLOT_QUEUE[$_][0] <= $avail) {
606 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 607 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 608 $job->[2]->send;
443 Coro::cede; 609 Coro::cede;
444 goto next_job; 610 goto next_job;
445 } 611 } else {
612 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 613 }
447 } 614 }
448 615
449 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
450 # 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
451 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
452 $signal->wait;
453 } else { 619 } else {
620 $busy = 0;
454 Coro::schedule; 621 Coro::schedule;
455 } 622 }
456 } 623 }
457}; 624};
458 625
459sub get_slot($;$$) { 626sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
461 628
462 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
463 630
464 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
465 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
466 634
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
495=cut 663=cut
496 664
497sub sync_job(&) { 665sub sync_job(&) {
498 my ($job) = @_; 666 my ($job) = @_;
499 667
500 if ($Coro::current == $Coro::main) { 668 if (in_main) {
501 my $time = EV::time; 669 my $time = AE::time;
502 670
503 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
505 673
506 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
507 675
508 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
509 677
510 my $busy = 1; 678 my $busy = 1;
511 my @res; 679 my @res;
512 680
513 (async { 681 (async {
514 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 683 @res = eval { $job->() };
516 warn $@ if $@; 684 error $@ if $@;
517 undef $busy; 685 undef $busy;
518 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
519 687
520 while ($busy) { 688 while ($busy) {
521 if (Coro::nready) { 689 if (Coro::nready) {
523 } else { 691 } else {
524 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
525 } 693 }
526 } 694 }
527 695
528 my $time = EV::time - $time; 696 my $time = AE::time - $time;
529 697
530 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
531 699
532 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
533 } else { 701 } else {
555 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
556 724
557 $coro 725 $coro
558} 726}
559 727
560=item fork_call { }, $args 728=item fork_call { }, @args
561 729
562Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 733never block itself or use any form of event handling.
566 734
567=cut 735=cut
568 736
737sub post_fork {
738 reset_signals;
739}
740
569sub fork_call(&@) { 741sub fork_call(&@) {
570 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
571 743
572 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious)
575
576 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
577 reset_signals; 745 cf::post_fork;
578 &$cb 746 &$cb
579 }, @args; 747 } @args;
580 748
581 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 )
582} 761}
583 762
584=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
585 764
586=cut 765=cut
623within each server. 802within each server.
624 803
625=cut 804=cut
626 805
627sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
628 my ($name) = @_; 810 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
630 812
631 eval { 813 eval {
632 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
642} 824}
643 825
644our $DB; 826our $DB;
645 827
646sub db_init { 828sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
649 };
650} 830}
651 831
652sub db_get($$) { 832sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
654 834
655 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
656 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
657 839
658 $! ? () 840 $! ? ()
659 : $data 841 : $data
660 }
661} 842}
662 843
663sub db_put($$$) { 844sub db_put($$$) {
664 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 874
694 my @data; 875 my @data;
695 my $md5; 876 my $md5;
696 877
697 for (0 .. $#$src) { 878 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 880 }
701 881
702 # if processing is expensive, check 882 # if processing is expensive, check
703 # checksum first 883 # checksum first
704 if (1) { 884 if (1) {
717 897
718 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
719 } 899 }
720 } 900 }
721 901
722 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
723 my $data = $process->(\@data); 903 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
725 905
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 907
728 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
731 911
741 921
742=cut 922=cut
743 923
744sub datalog($@) { 924sub datalog($@) {
745 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 927}
748 928
749=back 929=back
750 930
751=cut 931=cut
946 1126
947 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1129
950 } elsif (ref $type) { 1130 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
952 1132
953 } else { 1133 } else {
954 shift @arg; 1134 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
956 } 1136 }
957 } 1137 }
958} 1138}
959 1139
960sub _object_attach { 1140sub _object_attach {
970 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
971 } 1151 }
972 1152
973 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
974 } else { 1154 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1156 }
977 1157
978 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
979} 1159}
980 1160
1039 1219
1040 for (@$callbacks) { 1220 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1042 1222
1043 if ($@) { 1223 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1225 override;
1047 } 1226 }
1048 1227
1049 return 1 if $override; 1228 return 1 if $override;
1050 } 1229 }
1129 for (@$attach) { 1308 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1132 } 1311 }
1133 } else { 1312 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1314 }
1136 } 1315 }
1137} 1316}
1138 1317
1139cf::attachable->attach ( 1318cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1167 1346
1168 sync_job { 1347 sync_job {
1169 if (length $$rdata) { 1348 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1173 1353
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 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 }
1178 aio_close $fh; 1361 aio_close $fh;
1179 1362
1180 if (@$objs) { 1363 if (@$objs) {
1181 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) {
1182 aio_chmod $fh, SAVE_MODE; 1365 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1185 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 }
1186 aio_close $fh; 1372 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1374 }
1189 } else { 1375 } else {
1190 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1193 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1194 1380
1195 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1383 } else {
1198 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1199 } 1385 }
1200 } else { 1386 } else {
1201 aio_unlink $filename; 1387 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1203 } 1389 }
1227 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs}; 1414 $av = $st->{objs};
1229 } 1415 }
1230 1416
1231 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1232 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1233 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1234 1421
1235 ($data, $av) 1422 ($data, $av)
1236} 1423}
1237 1424
1238=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1242=cut 1429=cut
1243 1430
1244############################################################################# 1431#############################################################################
1245# command handling &c 1432# command handling &c
1246 1433
1247=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1248 1435
1249Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1250$name. 1437$name.
1251 1438
1252=cut 1439=cut
1258 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1259 1446
1260 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1261} 1448}
1262 1449
1263=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1264 1451
1265Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1266extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1267received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1268the 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
1269has logged in successfully. 1456has logged in successfully.
1270 1457
1271If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1272called.
1273 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
1274=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1275 1466
1276Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1277exticmd 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
1278are 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
1279is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1280log-in. 1471log-in.
1281 1472
1282If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1283called.
1284 1474
1285=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1286 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
1287sub register_extcmd { 1482sub register_extcmd($$) {
1288 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1289 1484
1290 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1291} 1486}
1292 1487
1293sub register_exticmd { 1488sub register_async_extcmd($$) {
1294 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1295 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1296 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1297} 1498}
1298 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1299use File::Glob (); 1506use File::Glob ();
1300 1507
1301cf::player->attach ( 1508cf::player->attach (
1302 on_command => sub { 1509 on_unknown_command => sub {
1303 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1304 1511
1305 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1306 or return; 1513 or return;
1307 1514
1315 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1316 1523
1317 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1318 1525
1319 if (ref $msg) { 1526 if (ref $msg) {
1320 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1321 "ARRAY" eq ref $msg
1322 ? @$msg
1323 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1324 1528
1325 my @reply;
1326
1327 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}) {
1328 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1329 } 1547 }
1330 1548
1331 $pl->ext_reply ($reply, @reply)
1332 if $reply;
1333
1334 } else { 1549 } else {
1335 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1336 } 1551 }
1337 1552
1338 cf::override; 1553 cf::override;
1339 }, 1554 },
1340); 1555);
1341 1556
1342# "readahead" all extensions 1557# "readahead" all extensions
1343sub cache_extensions { 1558sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1559 my $grp = IO::AIO::aio_group;
1345 1560
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1561 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1562 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1563 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1564 }
1350 }; 1565 };
1351 1566
1352 $grp 1567 $grp
1353} 1568}
1354 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
1355sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1356 cf::sync_job { 1586 cf::sync_job {
1357 my %todo; 1587 my %todo;
1358 1588
1359 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1360 next unless -r $path; 1590 next unless -r $path;
1378 1608
1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1381 1611
1382 $ext{source} = 1612 $ext{source} =
1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1384 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1385 . $source 1615 . $source
1386 . "\n};\n1"; 1616 . "\n};\n1";
1387 1617
1388 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1389 } 1619 }
1390 1620
1621 my $pass = 0;
1391 my %done; 1622 my %done;
1392 while (%todo) { 1623 while (%todo) {
1393 my $progress; 1624 my $progress;
1394 1625
1626 ++$pass;
1627
1628 ext:
1395 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1396 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1397 goto skip 1631 next ext
1398 unless exists $done{$_}; 1632 unless exists $done{$_};
1399 } 1633 }
1400 1634
1401 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402 1636
1403 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 $@) {
1404 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1405 : "$v->{base}: extension inactive.\n";
1406 1650
1407 if (exists $v->{meta}{mandatory}) {
1408 warn $msg;
1409 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410 } 1652 if exists $v->{meta}{mandatory};
1411 1653
1412 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;
1413 } 1663 }
1414
1415 $done{$k} = delete $todo{$k};
1416 push @EXTS, $v->{pkg};
1417 $progress = 1;
1418 } 1664 }
1419 1665
1420 skip: 1666 unless ($progress) {
1421 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422 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 }
1423 } 1676 }
1424 }; 1677 };
1425} 1678}
1426 1679
1427############################################################################# 1680#############################################################################
1511 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1512 } 1765 }
1513 } 1766 }
1514} 1767}
1515 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
1516sub save($) { 1782sub save($) {
1517 my ($pl) = @_; 1783 my ($pl) = @_;
1518 1784
1519 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1520 1786
1525 1791
1526 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1527 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1528 1794
1529 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];
1530 1799
1531 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1532 cf::cede_to_tick; 1801 cf::cede_to_tick;
1533} 1802}
1534 1803
1568 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1569 1838
1570 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1571 $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
1572 1841
1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1574 $pl->deactivate; 1843 $pl->deactivate;
1844
1575 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;
1576 $pl->ob->check_score;
1577 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1578 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1579 1850
1580 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1581 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1582 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1636 \@logins 1907 \@logins
1637} 1908}
1638 1909
1639=item $player->maps 1910=item $player->maps
1640 1911
1912=item cf::player::maps $login
1913
1641Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1642player. May block. 1915player. May block.
1643 1916
1644=cut 1917=cut
1645 1918
1666 1939
1667=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1668 1941
1669Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1670 1943
1671=item $player->ext_reply ($msgid, @msg)
1672
1673Sends an ext reply to the player.
1674
1675=cut
1676
1677sub ext_reply($$@) {
1678 my ($self, $id, @msg) = @_;
1679
1680 $self->ns->ext_reply ($id, @msg)
1681}
1682
1683=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1684 1945
1685Sends an ext event to the client. 1946Sends an ext event to the client.
1686 1947
1687=cut 1948=cut
1706 1967
1707=cut 1968=cut
1708 1969
1709sub find_by_path($) { 1970sub find_by_path($) {
1710 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1711 1974
1712 my ($match, $specificity); 1975 my ($match, $specificity);
1713 1976
1714 for my $region (list) { 1977 for my $region (list) {
1715 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1744sub generate_random_map { 2007sub generate_random_map {
1745 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1746 2009
1747 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
1748 2011
1749 # mit "rum" bekleckern, nicht
1750 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1754 $rmp->{exit_on_final_map},
1755 $rmp->{xsize}, $rmp->{ysize},
1756 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1757 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1759 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1760 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1761 (cf::region::find $rmp->{region}), $rmp->{custom}
1762 )
1763} 2013}
1764 2014
1765=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1766 2016
1767Register 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
1772 2022
1773sub register { 2023sub register {
1774 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1775 my $pkg = caller; 2025 my $pkg = caller;
1776 2026
1777 no strict;
1778 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1779 2028
1780 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1781} 2030}
1782 2031
1783# also paths starting with '/' 2032# also paths starting with '/'
1784$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1785 2034
1786sub thawer_merge { 2035sub thawer_merge {
1787 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1788 2037
1789 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1794} 2043}
1795 2044
1796sub normalise { 2045sub normalise {
1797 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1798 2047
1799 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1800 2049
1801 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1802 2051
1803 # map plan: 2052 # map plan:
1804 # 2053 #
1819 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1820 $path = "$base/$path"; 2069 $path = "$base/$path";
1821 } 2070 }
1822 2071
1823 for ($path) { 2072 for ($path) {
1824 redo if s{//}{/};
1825 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1826 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1827 } 2075 }
1828 2076
1829 $path 2077 $path
1843 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1844 return $self; 2092 return $self;
1845 } 2093 }
1846 } 2094 }
1847 2095
1848 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1849 () 2097 ()
1850} 2098}
1851 2099
2100# may re-bless or do other evil things
1852sub init { 2101sub init {
1853 my ($self) = @_; 2102 my ($self) = @_;
1854 2103
1855 $self 2104 $self
1856} 2105}
1887 2136
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1890} 2139}
1891 2140
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899}
1900
1901sub decay_objects { 2141sub decay_objects {
1902 my ($self) = @_; 2142 my ($self) = @_;
1903 2143
1904 return if $self->{deny_reset}; 2144 return if $self->{deny_reset};
1905 2145
1930 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1931 2171
1932 1 2172 1
1933} 2173}
1934 2174
2175# used to laod the header of an original map
1935sub load_header_orig { 2176sub load_header_orig {
1936 my ($self) = @_; 2177 my ($self) = @_;
1937 2178
1938 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1939} 2180}
1940 2181
2182# used to laod the header of an instantiated map
1941sub load_header_temp { 2183sub load_header_temp {
1942 my ($self) = @_; 2184 my ($self) = @_;
1943 2185
1944 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1945} 2187}
1946 2188
2189# called after loading the header from an instantiated map
1947sub prepare_temp { 2190sub prepare_temp {
1948 my ($self) = @_; 2191 my ($self) = @_;
1949 2192
1950 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1951 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1952 # safety 2195 # safety
1953 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1954 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1955} 2198}
1956 2199
2200# called after loading the header from an original map
1957sub prepare_orig { 2201sub prepare_orig {
1958 my ($self) = @_; 2202 my ($self) = @_;
1959 2203
1960 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1961 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1985 2229
1986sub find; 2230sub find;
1987sub find { 2231sub find {
1988 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1989 2233
2234 cf::cede_to_tick;
2235
1990 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1991 2237
1992 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1994 2240
1995 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
2000 or return; 2243 or return;
2001 2244
2002 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
2003 2246
2015 2258
2016 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
2017 } 2260 }
2018} 2261}
2019 2262
2020sub pre_load { } 2263sub pre_load { }
2021sub post_load { } 2264#sub post_load { } # XS
2022 2265
2023sub load { 2266sub load {
2024 my ($self) = @_; 2267 my ($self) = @_;
2025 2268
2026 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2029 2272
2030 { 2273 {
2031 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2032 2275
2033 return unless $self->valid; 2276 return unless $self->valid;
2034 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2035
2036 $self->in_memory (cf::MAP_LOADING);
2037 2278
2038 $self->alloc; 2279 $self->alloc;
2039 2280
2040 $self->pre_load; 2281 $self->pre_load;
2041 cf::cede_to_tick; 2282 cf::cede_to_tick;
2042 2283
2284 if (exists $self->{load_path}) {
2043 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2044 $f->skip_block; 2286 $f->skip_block;
2045 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2046 or return; 2288 or return;
2047 2289
2048 $self->post_load_original 2290 $self->post_load_original
2049 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2050 2292
2051 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2052 utf8::encode $uniq; 2294 utf8::encode $uniq;
2053 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2054 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2055 $self->clear_unique_items; 2297 $self->clear_unique_items;
2056 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2057 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2058 } 2301 }
2059 } 2302 }
2060 }
2061 2303
2062 $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);
2063 2311
2064 cf::cede_to_tick; 2312 cf::cede_to_tick;
2065 # now do the right thing for maps 2313 # now do the right thing for maps
2066 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2067 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2071 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2320 $self->decay_objects;
2073 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2074 $self->update_buttons; 2322 $self->update_buttons;
2075 cf::cede_to_tick; 2323 cf::cede_to_tick;
2076 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2077 cf::cede_to_tick;
2078 $self->activate;
2079 } 2325 }
2080 2326
2081 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2083
2084 $self->in_memory (cf::MAP_ACTIVE);
2085 } 2329 }
2086 2330
2087 $self->post_load; 2331 $self->post_load;
2088}
2089 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
2090sub customise_for { 2339sub customise_for {
2091 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2092 2341
2093 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2094 if $self->per_player; 2343 if $self->per_player;
2097# if $self->per_party; 2346# if $self->per_party;
2098 2347
2099 $self 2348 $self
2100} 2349}
2101 2350
2102# find and load all maps in the 3x3 area around a map
2103sub load_neighbours {
2104 my ($map) = @_;
2105
2106 my @neigh; # diagonal neighbours
2107
2108 for (0 .. 3) {
2109 my $neigh = $map->tile_path ($_)
2110 or next;
2111 $neigh = find $neigh, $map
2112 or next;
2113 $neigh->load;
2114
2115 push @neigh,
2116 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2117 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2118 }
2119
2120 for (grep defined $_->[0], @neigh) {
2121 my ($path, $origin) = @$_;
2122 my $neigh = find $path, $origin
2123 or next;
2124 $neigh->load;
2125 }
2126}
2127
2128sub find_sync { 2351sub find_sync {
2129 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2130 2353
2131 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
2132} 2359}
2133 2360
2134sub do_load_sync { 2361sub do_load_sync {
2135 my ($map) = @_; 2362 my ($map) = @_;
2136 2363
2364 # it's a bug to call this from the main context
2137 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2138 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2139 2367
2140 cf::sync_job { $map->load }; 2368 $map->load;
2141} 2369}
2142 2370
2143our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2144our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2145 2373
2146sub find_async { 2374sub find_async {
2147 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2148 2376
2149 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2150 2378
2151 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2153 } 2381 }
2154 2382
2155 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2156 2384
2157 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2171 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2172 2400
2173 () 2401 ()
2174} 2402}
2175 2403
2404# common code, used by both ->save and ->swapout
2176sub save { 2405sub _save {
2177 my ($self) = @_; 2406 my ($self) = @_;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2407
2181 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2182 2409
2183 return unless $self->dirty; 2410 return unless $self->dirty;
2184 2411
2204 } else { 2431 } else {
2205 $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);
2206 } 2433 }
2207} 2434}
2208 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2209sub swap_out { 2444sub swap_out {
2210 my ($self) = @_; 2445 my ($self) = @_;
2211 2446
2212 # save first because save cedes
2213 $self->save;
2214
2215 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2216 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2217 return if $self->players; 2451 return if $self->players;
2218 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
2219 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2220 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
2221 $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};
2222 2503
2223 $self->deactivate; 2504 $self->deactivate;
2224 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2225 $self->clear; 2506 $self->clear;
2226}
2227
2228sub reset_at {
2229 my ($self) = @_;
2230
2231 # TODO: safety, remove and allow resettable per-player maps
2232 return 1e99 if $self->{deny_reset};
2233
2234 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2235 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2236
2237 $time + $to
2238}
2239
2240sub should_reset {
2241 my ($self) = @_;
2242
2243 $self->reset_at <= $cf::RUNTIME
2244}
2245
2246sub reset {
2247 my ($self) = @_;
2248
2249 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250
2251 return if $self->players;
2252
2253 warn "resetting map ", $self->path;
2254
2255 $self->in_memory (cf::MAP_SWAPPED);
2256
2257 # need to save uniques path
2258 unless ($self->{deny_save}) {
2259 my $uniq = $self->uniq_path; utf8::encode $uniq;
2260
2261 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2262 if $uniq;
2263 }
2264
2265 delete $cf::MAP{$self->path};
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear;
2270 2507
2271 $self->unlink_save; 2508 $self->unlink_save;
2272 $self->destroy; 2509 $self->destroy;
2273} 2510}
2274 2511
2282 2519
2283 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2284 2521
2285 $self->unlink_save; 2522 $self->unlink_save;
2286 2523
2287 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2288 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2289 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2290 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2291 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2292 2529
2349 : normalise $_ 2586 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2588 ]
2352} 2589}
2353 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
2354=back 2623=back
2355 2624
2356=head3 cf::object 2625=head3 cf::object
2357 2626
2358=cut 2627=cut
2381 2650
2382Creates 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.
2383 2652
2384=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2385 2654
2386returns 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,
2387even if the object actually exists. May block. 2656even if the object actually exists. May block.
2388 2657
2389=cut 2658=cut
2390 2659
2391sub deref { 2660sub deref {
2423 2692
2424our $SAY_CHANNEL = { 2693our $SAY_CHANNEL = {
2425 id => "say", 2694 id => "say",
2426 title => "Map", 2695 title => "Map",
2427 reply => "say ", 2696 reply => "say ",
2428 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.",
2429}; 2698};
2430 2699
2431our $CHAT_CHANNEL = { 2700our $CHAT_CHANNEL = {
2432 id => "chat", 2701 id => "chat",
2433 title => "Chat", 2702 title => "Chat",
2490 2759
2491Freezes 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}>).
2492 2761
2493The player should be reasonably safe there for short amounts of time (e.g. 2762The player should be reasonably safe there for short amounts of time (e.g.
2494for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2763for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link 2764though, as the player cannot control the character while it is on the link
2496map. 2765map.
2497 2766
2498Will never block. 2767Will never block.
2499 2768
2500=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2521sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2522 my ($self) = @_; 2791 my ($self) = @_;
2523 2792
2524 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2525 2794
2795 ++$self->{_link_recursion};
2796
2526 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2527 2798
2528 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2529 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2530 2801
2531 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2532} 2803}
2533 2804
2534sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2535 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2536 2807
2553 ($x, $y) = (-1, -1) 2824 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2825 unless (defined $x) && (defined $y);
2555 2826
2556 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2559 2830
2560 $map->load; 2831 $map->load;
2561 $map->load_neighbours;
2562 2832
2563 return unless $self->contr->active; 2833 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2834
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2569} 2837 # entering was successful
2838 delete $self->{_link_recursion};
2839 # only activate afterwards, to support waiting in hooks
2840 $self->activate_recursive;
2841 }
2570 2842
2843}
2844
2571=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)]])
2572 2846
2573Moves 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
2574her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2575that 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
2576the 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
2583 2857
2584our $GOTOGEN; 2858our $GOTOGEN;
2585 2859
2586sub cf::object::player::goto { 2860sub cf::object::player::goto {
2587 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 }
2588 2868
2589 # 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
2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2591 2871
2592 $self->enter_link; 2872 $self->enter_link;
2612 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2613 } 2893 }
2614 } 2894 }
2615 2895
2616 my $map = eval { 2896 my $map = eval {
2617 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2618 2898
2619 if ($map) { 2899 if ($map) {
2620 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2621 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2622 } else { 2902 } else {
2623 $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);
2624 } 2904 }
2625 2905
2626 $map 2906 $map
2634 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2635 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2636 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2637 } 2917 }
2638 2918
2639 $done->() if $done; 2919 $done->($self) if $done;
2640 })->prio (1); 2920 })->prio (1);
2641} 2921}
2642 2922
2643=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2644 2924
2712 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2713 2993
2714 unless (eval { 2994 unless (eval {
2715 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2716 2996
2717 # random map handling
2718 {
2719 my $guard = cf::lock_acquire "exit_prepare:$exit";
2720
2721 prepare_random_map $exit
2722 if $exit->slaying eq "/!";
2723 }
2724
2725 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2726 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2727 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 }
2728 3023
2729 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2730 3025
2731 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2732 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2737 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2738 . "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. "
2739 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2740 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2741 3036
2742 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2743 $self->leave_link; 3038 $self->leave_link;
2744 } 3039 }
2745 })->prio (1); 3040 })->prio (1);
2746} 3041}
2747 3042
2759sub cf::client::send_drawinfo { 3054sub cf::client::send_drawinfo {
2760 my ($self, $text, $flags) = @_; 3055 my ($self, $text, $flags) = @_;
2761 3056
2762 utf8::encode $text; 3057 utf8::encode $text;
2763 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3058 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3059}
3060
3061=item $client->send_big_packet ($pkt)
3062
3063Like C<send_packet>, but tries to compress large packets, and fragments
3064them as required.
3065
3066=cut
3067
3068our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3069
3070sub cf::client::send_big_packet {
3071 my ($self, $pkt) = @_;
3072
3073 # try lzf for large packets
3074 $pkt = "lzf " . Compress::LZF::compress $pkt
3075 if 1024 <= length $pkt and $self->{can_lzf};
3076
3077 # split very large packets
3078 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3079 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3080 $pkt = "frag";
3081 }
3082
3083 $self->send_packet ($pkt);
2764} 3084}
2765 3085
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 3086=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 3087
2768Send a drawinfo or msg packet to the client, formatting the msg for the 3088Send a drawinfo or msg packet to the client, formatting the msg for the
2772 3092
2773=cut 3093=cut
2774 3094
2775# non-persistent channels (usually the info channel) 3095# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 3096our %CHANNEL = (
3097 "c/motd" => {
3098 id => "infobox",
3099 title => "MOTD",
3100 reply => undef,
3101 tooltip => "The message of the day",
3102 },
2777 "c/identify" => { 3103 "c/identify" => {
2778 id => "infobox", 3104 id => "infobox",
2779 title => "Identify", 3105 title => "Identify",
2780 reply => undef, 3106 reply => undef,
2781 tooltip => "Items recently identified", 3107 tooltip => "Items recently identified",
2783 "c/examine" => { 3109 "c/examine" => {
2784 id => "infobox", 3110 id => "infobox",
2785 title => "Examine", 3111 title => "Examine",
2786 reply => undef, 3112 reply => undef,
2787 tooltip => "Signs and other items you examined", 3113 tooltip => "Signs and other items you examined",
3114 },
3115 "c/shopinfo" => {
3116 id => "infobox",
3117 title => "Shop Info",
3118 reply => undef,
3119 tooltip => "What your bargaining skill tells you about the shop",
2788 }, 3120 },
2789 "c/book" => { 3121 "c/book" => {
2790 id => "infobox", 3122 id => "infobox",
2791 title => "Book", 3123 title => "Book",
2792 reply => undef, 3124 reply => undef,
2808 id => "infobox", 3140 id => "infobox",
2809 title => "Body Parts", 3141 title => "Body Parts",
2810 reply => undef, 3142 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 3143 tooltip => "Shows which body parts you posess and are available",
2812 }, 3144 },
3145 "c/statistics" => {
3146 id => "infobox",
3147 title => "Statistics",
3148 reply => undef,
3149 tooltip => "Shows your primary statistics",
3150 },
2813 "c/skills" => { 3151 "c/skills" => {
2814 id => "infobox", 3152 id => "infobox",
2815 title => "Skills", 3153 title => "Skills",
2816 reply => undef, 3154 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 3155 tooltip => "Shows your experience per skill and item power",
3156 },
3157 "c/shopitems" => {
3158 id => "infobox",
3159 title => "Shop Items",
3160 reply => undef,
3161 tooltip => "Shows the items currently for sale in this shop",
3162 },
3163 "c/resistances" => {
3164 id => "infobox",
3165 title => "Resistances",
3166 reply => undef,
3167 tooltip => "Shows your resistances",
3168 },
3169 "c/pets" => {
3170 id => "infobox",
3171 title => "Pets",
3172 reply => undef,
3173 tooltip => "Shows information abotu your pets/a specific pet",
3174 },
3175 "c/perceiveself" => {
3176 id => "infobox",
3177 title => "Perceive Self",
3178 reply => undef,
3179 tooltip => "You gained detailed knowledge about yourself",
2818 }, 3180 },
2819 "c/uptime" => { 3181 "c/uptime" => {
2820 id => "infobox", 3182 id => "infobox",
2821 title => "Uptime", 3183 title => "Uptime",
2822 reply => undef, 3184 reply => undef,
2832 id => "party", 3194 id => "party",
2833 title => "Party", 3195 title => "Party",
2834 reply => "gsay ", 3196 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 3197 tooltip => "Messages and chat related to your party",
2836 }, 3198 },
3199 "c/death" => {
3200 id => "death",
3201 title => "Death",
3202 reply => undef,
3203 tooltip => "Reason for and more info about your most recent death",
3204 },
3205 "c/fatal" => {
3206 id => "fatal",
3207 title => "Fatal Error",
3208 reply => undef,
3209 tooltip => "Reason for the server disconnect",
3210 },
3211 "c/say" => $SAY_CHANNEL,
3212 "c/chat" => $CHAT_CHANNEL,
2837); 3213);
2838 3214
2839sub cf::client::send_msg { 3215sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3216 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3217
2846 3222
2847 # check predefined channels, for the benefit of C 3223 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 3224 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 3225 $channel = $CHANNEL{$channel};
2850 3226
2851 $self->ext_msg (channel_info => $channel) 3227 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 3228 $channel = $channel->{id};
2855 3229
2856 } elsif (ref $channel) { 3230 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 3231 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 3232 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 3233 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 3234 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 3235 }
2863 3236
2864 $channel = $channel->{id}; 3237 $channel = $channel->{id};
2865 } 3238 }
2866 3239
2867 return unless @extra || length $msg; 3240 return unless @extra || length $msg;
2868 3241
2869 if ($self->can_msg) {
2870 # default colour, mask it out 3242 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3243 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 3244 if $color & cf::NDI_DEF;
2873 3245
2874 my $pkt = "msg " 3246 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 3247 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3248 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 3249 );
2878 3250
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 3251 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 3252}
2916 3253
2917=item $client->ext_msg ($type, @msg) 3254=item $client->ext_msg ($type, @msg)
2918 3255
2919Sends an ext event to the client. 3256Sends an ext event to the client.
2921=cut 3258=cut
2922 3259
2923sub cf::client::ext_msg($$@) { 3260sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 3261 my ($self, $type, @msg) = @_;
2925 3262
2926 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3263 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 }
2932}
2933
2934=item $client->ext_reply ($msgid, @msg)
2935
2936Sends an ext reply to the client.
2937
2938=cut
2939
2940sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_;
2942
2943 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 }
2950} 3264}
2951 3265
2952=item $success = $client->query ($flags, "text", \&cb) 3266=item $success = $client->query ($flags, "text", \&cb)
2953 3267
2954Queues a query to the client, calling the given callback with 3268Queues a query to the client, calling the given callback with
3009 my ($ns, $buf) = @_; 3323 my ($ns, $buf) = @_;
3010 3324
3011 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3325 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3012 3326
3013 if (ref $msg) { 3327 if (ref $msg) {
3014 my ($type, $reply, @payload) = 3328 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3015 "ARRAY" eq ref $msg
3016 ? @$msg
3017 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3018 3329
3019 my @reply;
3020
3021 if (my $cb = $EXTICMD{$type}) { 3330 if (my $cb = $EXTIACMD{$type}) {
3331 $cb->(
3332 $ns,
3333 sub {
3334 $ns->ext_msg ("reply-$reply", @_)
3335 if $reply;
3336 },
3337 @payload
3338 );
3339 } else {
3340 my @reply;
3341
3342 if (my $cb = $EXTICMD{$type}) {
3022 @reply = $cb->($ns, @payload); 3343 @reply = $cb->($ns, @payload);
3344 }
3345
3346 $ns->ext_msg ("reply-$reply", @reply)
3347 if $reply;
3023 } 3348 }
3024
3025 $ns->ext_reply ($reply, @reply)
3026 if $reply;
3027
3028 } else { 3349 } else {
3029 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3350 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3030 } 3351 }
3031 3352
3032 cf::override; 3353 cf::override;
3033 }, 3354 },
3034); 3355);
3054 3375
3055 $coro 3376 $coro
3056} 3377}
3057 3378
3058cf::client->attach ( 3379cf::client->attach (
3059 on_destroy => sub { 3380 on_client_destroy => sub {
3060 my ($ns) = @_; 3381 my ($ns) = @_;
3061 3382
3062 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3383 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3063 }, 3384 },
3064); 3385);
3080our $safe_hole = new Safe::Hole; 3401our $safe_hole = new Safe::Hole;
3081 3402
3082$SIG{FPE} = 'IGNORE'; 3403$SIG{FPE} = 'IGNORE';
3083 3404
3084$safe->permit_only (Opcode::opset qw( 3405$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math 3406 :base_core :base_mem :base_orig :base_math :base_loop
3086 grepstart grepwhile mapstart mapwhile 3407 grepstart grepwhile mapstart mapwhile
3087 sort time 3408 sort time
3088)); 3409));
3089 3410
3090# here we export the classes and methods available to script code 3411# here we export the classes and methods available to script code
3094The following functions and methods are available within a safe environment: 3415The following functions and methods are available within a safe environment:
3095 3416
3096 cf::object 3417 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3418 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3419 insert remove name archname title slaying race decrease split
3420 value
3099 3421
3100 cf::object::player 3422 cf::object::player
3101 player 3423 player
3102 3424
3103 cf::player 3425 cf::player
3109=cut 3431=cut
3110 3432
3111for ( 3433for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3434 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3113 insert remove inv nrof name archname title slaying race 3435 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3436 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3437 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3438 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3439 ["cf::map" => qw(trigger)],
3118) { 3440) {
3119 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3441 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3442 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3122 for @funs; 3443 for @funs;
3123} 3444}
3124 3445
3139 3460
3140 my $qcode = $code; 3461 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3462 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3463 $qcode =~ s/\n/\\n/g;
3143 3464
3465 %vars = (_dummy => 0) unless %vars;
3466
3467 my @res;
3144 local $_; 3468 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars;
3146 3469
3147 my $eval = 3470 my $eval =
3148 "do {\n" 3471 "do {\n"
3149 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3472 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150 . "#line 0 \"{$qcode}\"\n" 3473 . "#line 0 \"{$qcode}\"\n"
3151 . $code 3474 . $code
3152 . "\n}" 3475 . "\n}"
3153 ; 3476 ;
3154 3477
3478 if ($CFG{safe_eval}) {
3155 sub_generation_inc; 3479 sub_generation_inc;
3480 local @safe::cf::_safe_eval_args = values %vars;
3156 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3481 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157 sub_generation_inc; 3482 sub_generation_inc;
3483 } else {
3484 local @cf::_safe_eval_args = values %vars;
3485 @res = wantarray ? eval eval : scalar eval $eval;
3486 }
3158 3487
3159 if ($@) { 3488 if ($@) {
3160 warn "$@"; 3489 warn "$@",
3161 warn "while executing safe code '$code'\n"; 3490 "while executing safe code '$code'\n",
3162 warn "with arguments " . (join " ", %vars) . "\n"; 3491 "with arguments " . (join " ", %vars) . "\n";
3163 } 3492 }
3164 3493
3165 wantarray ? @res : $res[0] 3494 wantarray ? @res : $res[0]
3166} 3495}
3167 3496
3181=cut 3510=cut
3182 3511
3183sub register_script_function { 3512sub register_script_function {
3184 my ($fun, $cb) = @_; 3513 my ($fun, $cb) = @_;
3185 3514
3186 no strict 'refs'; 3515 $fun = "safe::$fun" if $CFG{safe_eval};
3187 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3516 *$fun = $safe_hole->wrap ($cb);
3188} 3517}
3189 3518
3190=back 3519=back
3191 3520
3192=cut 3521=cut
3193 3522
3194############################################################################# 3523#############################################################################
3195# the server's init and main functions 3524# the server's init and main functions
3196 3525
3526{
3527 package cf::face;
3528
3529 our %HASH; # hash => idx
3530 our @DATA; # dynamically-created facedata, only faceste 0 used
3531 our @FOFS; # file offset, if > 0
3532 our @SIZE; # size of face, in octets
3533 our @META; # meta hash of face, if any
3534 our $DATAFH; # facedata filehandle
3535
3536 # internal api, not finalised
3537 sub set {
3538 my ($name, $type, $data) = @_;
3539
3540 my $idx = cf::face::find $name;
3541
3542 if ($idx) {
3543 delete $HASH{cf::face::get_chksum $idx};
3544 } else {
3545 $idx = cf::face::alloc $name;
3546 }
3547
3548 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3549
3550 cf::face::set_type $idx, $type;
3551 cf::face::set_csum $idx, 0, $hash;
3552
3553 # we need to destroy the SV itself, not just modify it, as a running ix
3554 # might hold a reference to it: "delete" achieves that.
3555 delete $FOFS[0][$idx];
3556 delete $DATA[0][$idx];
3557 $DATA[0][$idx] = $data;
3558 $SIZE[0][$idx] = length $data;
3559 delete $META[$idx];
3560 $HASH{$hash} = $idx;#d#
3561
3562 $idx
3563 }
3564
3565 sub _get_data($$$) {
3566 my ($idx, $set, $cb) = @_;
3567
3568 if (defined $DATA[$set][$idx]) {
3569 $cb->($DATA[$set][$idx]);
3570 } elsif (my $fofs = $FOFS[$set][$idx]) {
3571 my $size = $SIZE[$set][$idx];
3572 my $buf;
3573 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3574 if ($_[0] == $size) {
3575 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3576 $cb->($buf);
3577 } else {
3578 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3579 }
3580 };
3581 } else {
3582 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3583 }
3584 }
3585
3586 # rather ineffient
3587 sub cf::face::get_data($;$) {
3588 my ($idx, $set) = @_;
3589
3590 _get_data $idx, $set, Coro::rouse_cb;
3591 Coro::rouse_wait
3592 }
3593
3594 sub cf::face::ix {
3595 my ($ns, $set, $idx, $pri) = @_;
3596
3597 _get_data $idx, $set, sub {
3598 $ns->ix_send ($idx, $pri, $_[0]);
3599 };
3600 }
3601}
3602
3197sub load_facedata($) { 3603sub load_facedata($) {
3198 my ($path) = @_; 3604 my ($path) = @_;
3199 3605
3200 # HACK to clear player env face cache, we need some signal framework
3201 # for this (global event?)
3202 %ext::player_env::MUSIC_FACE_CACHE = ();
3203
3204 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3606 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3205 3607
3206 warn "loading facedata from $path\n"; 3608 trace "loading facedata from $path\n";
3207 3609
3208 my $facedata; 3610 my $facedata = decode_storable load_file "$path/faceinfo";
3209 0 < aio_load $path, $facedata
3210 or die "$path: $!";
3211
3212 $facedata = Coro::Storable::thaw $facedata;
3213 3611
3214 $facedata->{version} == 2 3612 $facedata->{version} == 2
3215 or cf::cleanup "$path: version mismatch, cannot proceed."; 3613 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3216 3614
3217 # patch in the exptable 3615 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3218 $facedata->{resource}{"res/exp_table"} = { 3616 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3219 type => FT_RSRC, 3617
3220 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3618 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3221 }; 3619
3222 cf::cede_to_tick; 3620 # BEGIN ATOMIC
3621 # from here on, everything must be atomic - no thread switch allowed
3622 my $t1 = EV::time;
3223 3623
3224 { 3624 {
3225 my $faces = $facedata->{faceinfo}; 3625 my $faces = $facedata->{faceinfo};
3226 3626
3227 while (my ($face, $info) = each %$faces) { 3627 for my $face (sort keys %$faces) {
3628 my $info = $faces->{$face};
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3629 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3630
3230 cf::face::set_visibility $idx, $info->{visibility}; 3631 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3632 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3633 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3634 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3234 3635 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3235 cf::cede_to_tick; 3636 $cf::face::HASH{$info->{hash64}} = $idx;
3637 delete $cf::face::META[$idx];
3236 } 3638 }
3237 3639
3238 while (my ($face, $info) = each %$faces) { 3640 while (my ($face, $info) = each %$faces) {
3239 next unless $info->{smooth}; 3641 next unless $info->{smooth};
3240 3642
3243 3645
3244 if (my $smooth = cf::face::find $info->{smooth}) { 3646 if (my $smooth = cf::face::find $info->{smooth}) {
3245 cf::face::set_smooth $idx, $smooth; 3647 cf::face::set_smooth $idx, $smooth;
3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3648 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3247 } else { 3649 } else {
3248 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3650 error "smooth face '$info->{smooth}' not found for face '$face'";
3249 } 3651 }
3250
3251 cf::cede_to_tick;
3252 } 3652 }
3253 } 3653 }
3254 3654
3255 { 3655 {
3256 my $anims = $facedata->{animinfo}; 3656 my $anims = $facedata->{animinfo};
3257 3657
3258 while (my ($anim, $info) = each %$anims) { 3658 while (my ($anim, $info) = each %$anims) {
3259 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3659 cf::anim::set $anim, $info->{frames}, $info->{facings};
3260 cf::cede_to_tick;
3261 } 3660 }
3262 3661
3263 cf::anim::invalidate_all; # d'oh 3662 cf::anim::invalidate_all; # d'oh
3264 } 3663 }
3265 3664
3266 { 3665 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3666 my $res = $facedata->{resource};
3270 3667
3271 while (my ($name, $info) = each %$res) { 3668 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3669 if (defined (my $type = $info->{type})) {
3670 # TODO: different hash - must free and use new index, or cache ixface data queue
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3671 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3672
3276 if ($info->{type} & 1) {
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3673 cf::face::set_type $idx, $type;
3674 cf::face::set_csum $idx, 0, $info->{hash};
3675 $cf::face::SIZE[0][$idx] = $info->{size};
3676 $cf::face::FOFS[0][$idx] = $info->{fofs};
3677 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3678 $cf::face::HASH{$info->{hash}} = $idx;
3291 } else { 3679 } else {
3292 $RESOURCE{$name} = $info; 3680# $RESOURCE{$name} = $info; # unused
3293 } 3681 }
3294
3295 cf::cede_to_tick;
3296 } 3682 }
3297 } 3683 }
3684
3685 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3686
3687 # HACK to clear player env face cache, we need some signal framework
3688 # for this (global event?)
3689 %ext::player_env::MUSIC_FACE_CACHE = ();
3690
3691 # END ATOMIC
3692
3693 cf::debug "facedata atomic update time ", EV::time - $t1;
3298 3694
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3695 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3300 3696
3697 aio_close $fh if $fh; # close old facedata
3698
3301 1 3699 1
3302} 3700}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3323 3701
3324register_exticmd fx_want => sub { 3702register_exticmd fx_want => sub {
3325 my ($ns, $want) = @_; 3703 my ($ns, $want) = @_;
3326 3704
3327 while (my ($k, $v) = each %$want) { 3705 while (my ($k, $v) = each %$want) {
3335 my $status = load_resource_file_ $_[0]; 3713 my $status = load_resource_file_ $_[0];
3336 get_slot 0.1, 100; 3714 get_slot 0.1, 100;
3337 cf::arch::commit_load; 3715 cf::arch::commit_load;
3338 3716
3339 $status 3717 $status
3718}
3719
3720sub reload_exp_table {
3721 _reload_exp_table;
3722
3723 cf::face::set
3724 "res/exp_table" => FT_RSRC,
3725 JSON::XS->new->utf8->canonical->encode (
3726 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3727 );
3728}
3729
3730sub reload_materials {
3731 _reload_materials;
3340} 3732}
3341 3733
3342sub reload_regions { 3734sub reload_regions {
3343 # HACK to clear player env face cache, we need some signal framework 3735 # HACK to clear player env face cache, we need some signal framework
3344 # for this (global event?) 3736 # for this (global event?)
3352 if exists $_->{match}; 3744 if exists $_->{match};
3353 } 3745 }
3354} 3746}
3355 3747
3356sub reload_facedata { 3748sub reload_facedata {
3357 load_facedata "$DATADIR/facedata" 3749 load_facedata $DATADIR
3358 or die "unable to load facedata\n"; 3750 or die "unable to load facedata\n";
3359} 3751}
3360 3752
3361sub reload_archetypes { 3753sub reload_archetypes {
3362 load_resource_file "$DATADIR/archetypes" 3754 load_resource_file "$DATADIR/archetypes"
3363 or die "unable to load archetypes\n"; 3755 or die "unable to load archetypes\n";
3756
3757 cf::face::set
3758 "res/skill_info" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3761 );
3762
3763 cf::face::set
3764 "res/spell_paths" => FT_RSRC,
3765 JSON::XS->new->utf8->canonical->encode (
3766 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3767 );
3364} 3768}
3365 3769
3366sub reload_treasures { 3770sub reload_treasures {
3367 load_resource_file "$DATADIR/treasures" 3771 load_resource_file "$DATADIR/treasures"
3368 or die "unable to load treasurelists\n"; 3772 or die "unable to load treasurelists\n";
3369} 3773}
3370 3774
3775sub reload_sound {
3776 trace "loading sound config from $DATADIR/sound\n";
3777
3778 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3779
3780 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3781 my $sound = $soundconf->{compat}[$_]
3782 or next;
3783
3784 my $face = cf::face::find "sound/$sound->[1]";
3785 cf::sound::set $sound->[0] => $face;
3786 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3787 }
3788
3789 while (my ($k, $v) = each %{$soundconf->{event}}) {
3790 my $face = cf::face::find "sound/$v";
3791 cf::sound::set $k => $face;
3792 }
3793}
3794
3371sub reload_resources { 3795sub reload_resources {
3372 warn "reloading resource files...\n"; 3796 trace "reloading resource files...\n";
3373 3797
3798 reload_materials;
3374 reload_facedata; 3799 reload_facedata;
3800 reload_exp_table;
3801 reload_sound;
3375 reload_archetypes; 3802 reload_archetypes;
3376 reload_regions; 3803 reload_regions;
3377 reload_treasures; 3804 reload_treasures;
3378 3805
3379 warn "finished reloading resource files\n"; 3806 trace "finished reloading resource files\n";
3380} 3807}
3381 3808
3382sub reload_config { 3809sub reload_config {
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3810 trace "reloading config file...\n";
3384 or return;
3385 3811
3386 local $/; 3812 my $config = load_file "$CONFDIR/config";
3387 *CFG = YAML::Load <$fh>; 3813 utf8::decode $config;
3814 *CFG = decode_yaml $config;
3388 3815
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3816 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3390 3817
3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3818 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3819 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3393 3820
3394 if (exists $CFG{mlockall}) { 3821 if (exists $CFG{mlockall}) {
3417 3844
3418 seek $fh, 0, 0; 3845 seek $fh, 0, 0;
3419 print $fh $$; 3846 print $fh $$;
3420} 3847}
3421 3848
3849sub main_loop {
3850 trace "EV::loop starting\n";
3851 if (1) {
3852 EV::loop;
3853 }
3854 trace "EV::loop returned\n";
3855 goto &main_loop unless $REALLY_UNLOOP;
3856}
3857
3422sub main { 3858sub main {
3423 cf::init_globals; # initialise logging 3859 cf::init_globals; # initialise logging
3424 3860
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3861 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3862 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3863 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3864 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429 3865
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3866 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3867
3438 # we must not ever block the main coroutine 3868 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3869 $Coro::idle = sub {
3440 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3870 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3441 (async { 3871 (async {
3442 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3872 $Coro::current->{desc} = "IDLE BUG HANDLER";
3443 EV::loop EV::LOOP_ONESHOT; 3873 EV::loop EV::LOOP_ONESHOT;
3444 })->prio (Coro::PRIO_MAX); 3874 })->prio (Coro::PRIO_MAX);
3445 }; 3875 };
3446 3876
3447 evthread_start IO::AIO::poll_fileno; 3877 evthread_start IO::AIO::poll_fileno;
3448 3878
3449 cf::sync_job { 3879 cf::sync_job {
3880 cf::incloader::init ();
3881
3882 db_init;
3883
3884 cf::init_anim;
3885 cf::init_attackmess;
3886 cf::init_dynamic;
3887
3888 cf::load_settings;
3889
3450 reload_resources; 3890 reload_resources;
3451 reload_config; 3891 reload_config;
3452 db_init;
3453 3892
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3893 cf::init_uuid;
3457 cf::init_signals; 3894 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills; 3895 cf::init_skills;
3460 3896
3461 cf::init_beforeplay; 3897 cf::init_beforeplay;
3462 3898
3463 atomic; 3899 atomic;
3465 load_extensions; 3901 load_extensions;
3466 3902
3467 utime time, time, $RUNTIMEFILE; 3903 utime time, time, $RUNTIMEFILE;
3468 3904
3469 # no (long-running) fork's whatsoever before this point(!) 3905 # no (long-running) fork's whatsoever before this point(!)
3906 use POSIX ();
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3907 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471 3908
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3909 cf::_post_init 0;
3473 }; 3910 };
3474 3911
3475 EV::loop; 3912 cf::object::thawer::errors_are_fatal 0;
3913 info "parse errors in files are no longer fatal from this point on.\n";
3914
3915 AE::postpone {
3916 undef &main; # free gobs of memory :)
3917 };
3918
3919 goto &main_loop;
3476} 3920}
3477 3921
3478############################################################################# 3922#############################################################################
3479# initialisation and cleanup 3923# initialisation and cleanup
3480 3924
3481# install some emergency cleanup handlers 3925# install some emergency cleanup handlers
3482BEGIN { 3926BEGIN {
3483 our %SIGWATCHER = (); 3927 our %SIGWATCHER = ();
3484 for my $signal (qw(INT HUP TERM)) { 3928 for my $signal (qw(INT HUP TERM)) {
3485 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3929 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3486 cf::cleanup "SIG$signal"; 3930 cf::cleanup "SIG$signal";
3487 }; 3931 };
3488 } 3932 }
3489} 3933}
3490 3934
3491sub write_runtime_sync { 3935sub write_runtime_sync {
3936 my $t0 = AE::time;
3937
3492 # first touch the runtime file to show we are still running: 3938 # first touch the runtime file to show we are still running:
3493 # the fsync below can take a very very long time. 3939 # the fsync below can take a very very long time.
3494 3940
3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3941 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496 3942
3497 my $guard = cf::lock_acquire "write_runtime"; 3943 my $guard = cf::lock_acquire "write_runtime";
3498 3944
3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3945 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500 or return; 3946 or return;
3501 3947
3502 my $value = $cf::RUNTIME + 90 + 10; 3948 my $value = $cf::RUNTIME + 90 + 10;
3503 # 10 is the runtime save interval, for a monotonic clock 3949 # 10 is the runtime save interval, for a monotonic clock
3504 # 60 allows for the watchdog to kill the server. 3950 # 60 allows for the watchdog to kill the server.
3517 or return; 3963 or return;
3518 3964
3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3965 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520 and return; 3966 and return;
3521 3967
3522 warn "runtime file written.\n"; 3968 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3523 3969
3524 1 3970 1
3525} 3971}
3526 3972
3527our $uuid_lock; 3973our $uuid_lock;
3539 or return; 3985 or return;
3540 3986
3541 my $value = uuid_seq uuid_cur; 3987 my $value = uuid_seq uuid_cur;
3542 3988
3543 unless ($value) { 3989 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n"; 3990 info "cowardly refusing to write zero uuid value!\n";
3545 return; 3991 return;
3546 } 3992 }
3547 3993
3548 my $value = uuid_str $value + $uuid_skip; 3994 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0; 3995 $uuid_skip = 0;
3559 or return; 4005 or return;
3560 4006
3561 aio_rename "$uuid~", $uuid 4007 aio_rename "$uuid~", $uuid
3562 and return; 4008 and return;
3563 4009
3564 warn "uuid file written ($value).\n"; 4010 trace "uuid file written ($value).\n";
3565 4011
3566 1 4012 1
3567 4013
3568} 4014}
3569 4015
3575} 4021}
3576 4022
3577sub emergency_save() { 4023sub emergency_save() {
3578 my $freeze_guard = cf::freeze_mainloop; 4024 my $freeze_guard = cf::freeze_mainloop;
3579 4025
3580 warn "emergency_perl_save: enter\n"; 4026 info "emergency_perl_save: enter\n";
4027
4028 # this is a trade-off: we want to be very quick here, so
4029 # save all maps without fsync, and later call a global sync
4030 # (which in turn might be very very slow)
4031 local $USE_FSYNC = 0;
3581 4032
3582 cf::sync_job { 4033 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so 4034 cf::write_runtime_sync; # external watchdog should not bark
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587 4035
3588 # use a peculiar iteration method to avoid tripping on perl 4036 # use a peculiar iteration method to avoid tripping on perl
3589 # refcount bugs in for. also avoids problems with players 4037 # refcount bugs in for. also avoids problems with players
3590 # and maps saved/destroyed asynchronously. 4038 # and maps saved/destroyed asynchronously.
3591 warn "emergency_perl_save: begin player save\n"; 4039 info "emergency_perl_save: begin player save\n";
3592 for my $login (keys %cf::PLAYER) { 4040 for my $login (keys %cf::PLAYER) {
3593 my $pl = $cf::PLAYER{$login} or next; 4041 my $pl = $cf::PLAYER{$login} or next;
3594 $pl->valid or next; 4042 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4043 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3596 $pl->save; 4044 $pl->save;
3597 } 4045 }
3598 warn "emergency_perl_save: end player save\n"; 4046 info "emergency_perl_save: end player save\n";
3599 4047
4048 cf::write_runtime_sync; # external watchdog should not bark
4049
3600 warn "emergency_perl_save: begin map save\n"; 4050 info "emergency_perl_save: begin map save\n";
3601 for my $path (keys %cf::MAP) { 4051 for my $path (keys %cf::MAP) {
3602 my $map = $cf::MAP{$path} or next; 4052 my $map = $cf::MAP{$path} or next;
3603 $map->valid or next; 4053 $map->valid or next;
3604 $map->save; 4054 $map->save;
3605 } 4055 }
3606 warn "emergency_perl_save: end map save\n"; 4056 info "emergency_perl_save: end map save\n";
3607 4057
4058 cf::write_runtime_sync; # external watchdog should not bark
4059
3608 warn "emergency_perl_save: begin database checkpoint\n"; 4060 info "emergency_perl_save: begin database checkpoint\n";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 4061 BDB::db_env_txn_checkpoint $DB_ENV;
3610 warn "emergency_perl_save: end database checkpoint\n"; 4062 info "emergency_perl_save: end database checkpoint\n";
3611 4063
3612 warn "emergency_perl_save: begin write uuid\n"; 4064 info "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1; 4065 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n"; 4066 info "emergency_perl_save: end write uuid\n";
4067
4068 cf::write_runtime_sync; # external watchdog should not bark
4069
4070 trace "emergency_perl_save: syncing database to disk";
4071 BDB::db_env_txn_checkpoint $DB_ENV;
4072
4073 info "emergency_perl_save: starting sync\n";
4074 IO::AIO::aio_sync sub {
4075 info "emergency_perl_save: finished sync\n";
4076 };
4077
4078 cf::write_runtime_sync; # external watchdog should not bark
4079
4080 trace "emergency_perl_save: flushing outstanding aio requests";
4081 while (IO::AIO::nreqs || BDB::nreqs) {
4082 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4083 }
4084
4085 cf::write_runtime_sync; # external watchdog should not bark
3615 }; 4086 };
3616 4087
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3622 warn "emergency_perl_save: leave\n"; 4088 info "emergency_perl_save: leave\n";
3623} 4089}
3624 4090
3625sub post_cleanup { 4091sub post_cleanup {
3626 my ($make_core) = @_; 4092 my ($make_core) = @_;
3627 4093
4094 IO::AIO::flush;
4095
3628 warn Carp::longmess "post_cleanup backtrace" 4096 error Carp::longmess "post_cleanup backtrace"
3629 if $make_core; 4097 if $make_core;
3630 4098
3631 my $fh = pidfile; 4099 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$; 4100 unlink $PIDFILE if <$fh> == $$;
3633} 4101}
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4121 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) { 4122 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"}; 4123 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4124# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 } 4125 }
3658 warn "cleared package $pkg\n";#d#
3659} 4126}
3660 4127
3661sub do_reload_perl() { 4128sub do_reload_perl() {
3662 # can/must only be called in main 4129 # can/must only be called in main
3663 if ($Coro::current != $Coro::main) { 4130 unless (in_main) {
3664 warn "can only reload from main coroutine"; 4131 error "can only reload from main coroutine";
3665 return; 4132 return;
3666 } 4133 }
3667 4134
3668 return if $RELOAD++; 4135 return if $RELOAD++;
3669 4136
3670 my $t1 = EV::time; 4137 my $t1 = AE::time;
3671 4138
3672 while ($RELOAD) { 4139 while ($RELOAD) {
3673 warn "reloading..."; 4140 cf::get_slot 0.1, -1, "reload_perl";
4141 info "perl_reload: reloading...";
3674 4142
3675 warn "entering sync_job"; 4143 trace "perl_reload: entering sync_job";
3676 4144
3677 cf::sync_job { 4145 cf::sync_job {
3678 cf::write_runtime_sync; # external watchdog should not bark
3679 cf::emergency_save; 4146 #cf::emergency_save;
3680 cf::write_runtime_sync; # external watchdog should not bark
3681 4147
3682 warn "syncing database to disk";
3683 BDB::db_env_txn_checkpoint $DB_ENV;
3684
3685 # if anything goes wrong in here, we should simply crash as we already saved
3686
3687 warn "flushing outstanding aio requests";
3688 while (IO::AIO::nreqs || BDB::nreqs) {
3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3690 }
3691
3692 warn "cancelling all extension coros"; 4148 trace "perl_reload: cancelling all extension coros";
3693 $_->cancel for values %EXT_CORO; 4149 $_->cancel for values %EXT_CORO;
3694 %EXT_CORO = (); 4150 %EXT_CORO = ();
3695 4151
3696 warn "removing commands"; 4152 trace "perl_reload: removing commands";
3697 %COMMAND = (); 4153 %COMMAND = ();
3698 4154
3699 warn "removing ext/exti commands"; 4155 trace "perl_reload: removing ext/exti commands";
3700 %EXTCMD = (); 4156 %EXTCMD = ();
3701 %EXTICMD = (); 4157 %EXTICMD = ();
3702 4158
3703 warn "unloading/nuking all extensions"; 4159 trace "perl_reload: unloading/nuking all extensions";
3704 for my $pkg (@EXTS) { 4160 for my $pkg (@EXTS) {
3705 warn "... unloading $pkg"; 4161 trace "... unloading $pkg";
3706 4162
3707 if (my $cb = $pkg->can ("unload")) { 4163 if (my $cb = $pkg->can ("unload")) {
3708 eval { 4164 eval {
3709 $cb->($pkg); 4165 $cb->($pkg);
3710 1 4166 1
3711 } or warn "$pkg unloaded, but with errors: $@"; 4167 } or error "$pkg unloaded, but with errors: $@";
3712 } 4168 }
3713 4169
3714 warn "... clearing $pkg"; 4170 trace "... clearing $pkg";
3715 clear_package $pkg; 4171 clear_package $pkg;
3716 } 4172 }
3717 4173
3718 warn "unloading all perl modules loaded from $LIBDIR"; 4174 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) { 4175 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4176 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721 4177
3722 warn "... unloading $k"; 4178 trace "... unloading $k";
3723 delete $INC{$k}; 4179 delete $INC{$k};
3724 4180
3725 $k =~ s/\.pm$//; 4181 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g; 4182 $k =~ s/\//::/g;
3727 4183
3730 } 4186 }
3731 4187
3732 clear_package $k; 4188 clear_package $k;
3733 } 4189 }
3734 4190
3735 warn "getting rid of safe::, as good as possible"; 4191 trace "perl_reload: getting rid of safe::, as good as possible";
3736 clear_package "safe::$_" 4192 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4193 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 4194
3739 warn "unloading cf.pm \"a bit\""; 4195 trace "perl_reload: unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 4196 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 4197 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 4198
3743 # don't, removes xs symbols, too, 4199 # don't, removes xs symbols, too,
3744 # and global variables created in xs 4200 # and global variables created in xs
3745 #clear_package __PACKAGE__; 4201 #clear_package __PACKAGE__;
3746 4202
3747 warn "unload completed, starting to reload now"; 4203 info "perl_reload: unload completed, starting to reload now";
3748 4204
3749 warn "reloading cf.pm"; 4205 trace "perl_reload: reloading cf.pm";
3750 require cf; 4206 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4207 cf::_connect_to_perl_1;
3752 4208
3753 warn "loading config and database again"; 4209 trace "perl_reload: loading config and database again";
3754 cf::reload_config; 4210 cf::reload_config;
3755 4211
3756 warn "loading extensions"; 4212 trace "perl_reload: loading extensions";
3757 cf::load_extensions; 4213 cf::load_extensions;
3758 4214
3759 if ($REATTACH_ON_RELOAD) { 4215 if ($REATTACH_ON_RELOAD) {
3760 warn "reattaching attachments to objects/players"; 4216 trace "perl_reload: reattaching attachments to objects/players";
3761 _global_reattach; # objects, sockets 4217 _global_reattach; # objects, sockets
3762 warn "reattaching attachments to maps"; 4218 trace "perl_reload: reattaching attachments to maps";
3763 reattach $_ for values %MAP; 4219 reattach $_ for values %MAP;
3764 warn "reattaching attachments to players"; 4220 trace "perl_reload: reattaching attachments to players";
3765 reattach $_ for values %PLAYER; 4221 reattach $_ for values %PLAYER;
3766 } 4222 }
3767 4223
3768 warn "running post_init jobs"; 4224 cf::_post_init 1;
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770 4225
3771 warn "leaving sync_job"; 4226 trace "perl_reload: leaving sync_job";
3772 4227
3773 1 4228 1
3774 } or do { 4229 } or do {
3775 warn $@; 4230 error $@;
3776 cf::cleanup "error while reloading, exiting."; 4231 cf::cleanup "perl_reload: error, exiting.";
3777 }; 4232 };
3778 4233
3779 warn "reloaded";
3780 --$RELOAD; 4234 --$RELOAD;
3781 } 4235 }
3782 4236
3783 $t1 = EV::time - $t1; 4237 $t1 = AE::time - $t1;
3784 warn "reload completed in ${t1}s\n"; 4238 info "perl_reload: completed in ${t1}s\n";
3785}; 4239};
3786 4240
3787our $RELOAD_WATCHER; # used only during reload 4241our $RELOAD_WATCHER; # used only during reload
3788 4242
3789sub reload_perl() { 4243sub reload_perl() {
3791 # coro crashes during coro_state_free->destroy here. 4245 # coro crashes during coro_state_free->destroy here.
3792 4246
3793 $RELOAD_WATCHER ||= cf::async { 4247 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions; 4248 Coro::AIO::aio_wait cache_extensions;
3795 4249
3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4250 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3797 do_reload_perl; 4251 do_reload_perl;
3798 undef $RELOAD_WATCHER; 4252 undef $RELOAD_WATCHER;
3799 }; 4253 };
3800 }; 4254 };
3801} 4255}
3810 reload_perl; 4264 reload_perl;
3811 }; 4265 };
3812 } 4266 }
3813}; 4267};
3814 4268
3815unshift @INC, $LIBDIR; 4269#############################################################################
3816 4270
3817my $bug_warning = 0; 4271my $bug_warning = 0;
3818 4272
3819our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN;
3821
3822sub wait_for_tick { 4273sub wait_for_tick() {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3824 4275
3825 my $signal = new Coro::Signal; 4276 $WAIT_FOR_TICK->wait;
3826 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait;
3828} 4277}
3829 4278
3830sub wait_for_tick_begin { 4279sub wait_for_tick_begin() {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 4280 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3832 4281
3833 my $signal = new Coro::Signal; 4282 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 4283 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 4284 $signal->wait;
3836} 4285}
3840 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4289 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3841 unless ++$bug_warning > 10; 4290 unless ++$bug_warning > 10;
3842 return; 4291 return;
3843 } 4292 }
3844 4293
3845 cf::server_tick; # one server iteration 4294 cf::one_tick; # one server iteration
4295
4296 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3846 4297
3847 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4298 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4299 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3849 Coro::async_pool { 4300 Coro::async_pool {
3850 $Coro::current->{desc} = "runtime saver"; 4301 $Coro::current->{desc} = "runtime saver";
3851 write_runtime_sync 4302 write_runtime_sync
3852 or warn "ERROR: unable to write runtime file: $!"; 4303 or error "ERROR: unable to write runtime file: $!";
3853 }; 4304 };
3854 } 4305 }
3855 4306
3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4307 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3857 $sig->send; 4308 $sig->send;
3858 } 4309 }
3859 while (my $sig = shift @WAIT_FOR_TICK) { 4310 $WAIT_FOR_TICK->broadcast;
3860 $sig->send;
3861 }
3862 4311
3863 $LOAD = ($NOW - $TICK_START) / $TICK; 4312 $LOAD = ($NOW - $TICK_START) / $TICK;
3864 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4313 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3865 4314
3866 if (0) { 4315 if (0) {
3867 if ($NEXT_TICK) { 4316 if ($NEXT_TICK) {
3868 my $jitter = $TICK_START - $NEXT_TICK; 4317 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4318 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d# 4319 debug "jitter $JITTER\n";#d#
3871 } 4320 }
3872 } 4321 }
3873} 4322}
3874 4323
3875{ 4324{
3876 # configure BDB 4325 # configure BDB
4326 info "initialising database";
3877 4327
3878 BDB::min_parallel 8; 4328 BDB::min_parallel 16;
3879 BDB::max_poll_reqs $TICK * 0.1; 4329 BDB::max_poll_reqs $TICK * 0.1;
3880 $AnyEvent::BDB::WATCHER->priority (1); 4330 #$AnyEvent::BDB::WATCHER->priority (1);
3881 4331
3882 unless ($DB_ENV) { 4332 unless ($DB_ENV) {
3883 $DB_ENV = BDB::db_env_create; 4333 $DB_ENV = BDB::db_env_create;
3884 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4334 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3885 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4335 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3910 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4360 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3911 }; 4361 };
3912 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4362 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3913 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4363 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3914 }; 4364 };
4365
4366 info "database initialised";
3915} 4367}
3916 4368
3917{ 4369{
3918 # configure IO::AIO 4370 # configure IO::AIO
3919 4371
4372 info "initialising aio";
3920 IO::AIO::min_parallel 8; 4373 IO::AIO::min_parallel 8;
3921 IO::AIO::max_poll_time $TICK * 0.1; 4374 IO::AIO::max_poll_time $TICK * 0.1;
3922 undef $AnyEvent::AIO::WATCHER; 4375 undef $AnyEvent::AIO::WATCHER;
4376 info "aio initialised";
3923} 4377}
3924 4378
3925my $_log_backtrace; 4379our $_log_backtrace;
4380our $_log_backtrace_last;
3926 4381
3927sub _log_backtrace { 4382sub _log_backtrace {
3928 my ($msg, @addr) = @_; 4383 my ($msg, @addr) = @_;
3929 4384
3930 $msg =~ s/\n//; 4385 $msg =~ s/\n$//;
3931 4386
4387 if ($_log_backtrace_last eq $msg) {
4388 LOG llevInfo, "[ABT] $msg\n";
4389 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3932 # limit the # of concurrent backtraces 4390 # limit the # of concurrent backtraces
3933 if ($_log_backtrace < 2) { 4391 } elsif ($_log_backtrace < 2) {
4392 $_log_backtrace_last = $msg;
3934 ++$_log_backtrace; 4393 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg; 4394 my $perl_bt = Carp::longmess $msg;
3936 async { 4395 async {
3937 $Coro::current->{desc} = "abt $msg"; 4396 $Coro::current->{desc} = "abt $msg";
3938 4397
3958 LOG llevInfo, "[ABT] $_\n" for @bt; 4417 LOG llevInfo, "[ABT] $_\n" for @bt;
3959 --$_log_backtrace; 4418 --$_log_backtrace;
3960 }; 4419 };
3961 } else { 4420 } else {
3962 LOG llevInfo, "[ABT] $msg\n"; 4421 LOG llevInfo, "[ABT] $msg\n";
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4422 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3964 } 4423 }
3965} 4424}
3966 4425
3967# load additional modules 4426# load additional modules
3968use cf::pod; 4427require "cf/$_.pm" for @EXTRA_MODULES;
4428cf::_connect_to_perl_2;
3969 4429
3970END { cf::emergency_save } 4430END { cf::emergency_save }
3971 4431
39721 44321
3973 4433

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines