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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines