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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines