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.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.611 by root, Tue Nov 20 14:54:17 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines