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.396 by root, Wed Nov 14 08:09:46 2007 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use EV; 30use EV;
10use Opcode; 31use Opcode;
11use Safe; 32use Safe;
12use Safe::Hole; 33use Safe::Hole;
13use Storable (); 34use Storable ();
35use Carp ();
14 36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
15use Coro 4.1 (); 41use Coro ();
16use Coro::State; 42use Coro::State;
17use Coro::Handle; 43use Coro::Handle;
18use Coro::EV; 44use Coro::EV;
45use Coro::AnyEvent;
19use Coro::Timer; 46use Coro::Timer;
20use Coro::Signal; 47use Coro::Signal;
21use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
50use Coro::AnyEvent;
22use Coro::AIO; 51use Coro::AIO;
52use Coro::BDB 1.6;
23use Coro::Storable; 53use Coro::Storable;
24use Coro::Util (); 54use Coro::Util ();
25 55
56use Guard ();
26use JSON::XS (); 57use JSON::XS 2.01 ();
27use BDB (); 58use BDB ();
28use Data::Dumper; 59use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 60use Fcntl;
31use YAML::Syck (); 61use YAML::XS ();
32use IO::AIO 2.51 (); 62use IO::AIO ();
33use Time::HiRes;
34use Compress::LZF; 63use Compress::LZF;
35use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
36 67
37# configure various modules to our taste 68# configure various modules to our taste
38# 69#
39$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 78
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 79# strictly for debugging
44$YAML::Syck::ImplicitUnicode = 1; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 81
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83
84our @ORIG_INC;
49 85
50our %COMMAND = (); 86our %COMMAND = ();
51our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
52 88
53our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
54our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
55our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
58 96
59our $RELOAD; # number of reloads so far 97our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
61 101
62our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
63our $DATADIR = datadir; 104our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
67our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
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;
73 125
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 128our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 129our $USE_FSYNC = 1; # use fsync to write maps - default on
81 130
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 134our $DB_ENV;
87 135
136our @EXTRA_MODULES = qw(pod match mapscript incloader);
137
88our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
89 140
90our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
144our $NOW;
92 145
93our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
94our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
95our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
96 149
97# used to convert map paths into valid unix filenames by replacing / by ∕ 150# used to convert map paths into valid unix filenames by replacing / by ∕
98our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 151our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
99 152
100our $LOAD; # a number between 0 (idle) and 1 (too many objects) 153our $LOAD; # a number between 0 (idle) and 1 (too many objects)
101our $LOADAVG; # same thing, but with alpha-smoothing 154our $LOADAVG; # same thing, but with alpha-smoothing
155our $JITTER; # average jitter
102our $tick_start; # for load detecting purposes 156our $TICK_START; # for load detecting purposes
157
158our @POST_INIT;
159
160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
103 165
104binmode STDOUT; 166binmode STDOUT;
105binmode STDERR; 167binmode STDERR;
106 168
107# read virtual server time, if available 169# read virtual server time, if available
108unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 170unless ($RUNTIME || !-e $RUNTIMEFILE) {
109 open my $fh, "<", "$LOCALDIR/runtime" 171 open my $fh, "<", $RUNTIMEFILE
110 or die "unable to read runtime file: $!"; 172 or die "unable to read $RUNTIMEFILE file: $!";
111 $RUNTIME = <$fh> + 0.; 173 $RUNTIME = <$fh> + 0.;
112} 174}
175
176eval "sub TICK() { $TICK } 1" or die;
113 177
114mkdir $_ 178mkdir $_
115 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 179 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
116 180
117our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
118 182
119sub cf::map::normalise; 183sub cf::map::normalise;
120 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
121############################################################################# 189#############################################################################
122 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
123=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
124 203
125=over 4 204=over 4
126 205
127=item $cf::UPTIME 206=item $cf::UPTIME
128 207
129The 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.
130 224
131=item $cf::RUNTIME 225=item $cf::RUNTIME
132 226
133The 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
134every server tick. 228every server tick.
135 229
136=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
137$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
138$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
139 233
140Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
141directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
142unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
143database environment. 237database environment.
144 238
145=item $cf::NOW
146
147The time of the last (current) server tick.
148
149=item $cf::TICK
150
151The interval between server ticks, in seconds.
152
153=item $cf::LOADAVG 239=item $cf::LOADAVG
154 240
155The 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
156(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
157objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
165Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
166from wherever your confdir points to. 252from wherever your confdir points to.
167 253
168=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
169 255
170These 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.
171returns 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
172per 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();
173 277
174=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
175 279
176This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
177C<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
178that call. 282that call.
179 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
180=back 290=back
181 291
182=cut 292=cut
183 293
184BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
185 *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 {
186 my $msg = join "", @_; 301 my $msg = join "", @_;
187 302
188 $msg .= "\n" 303 $msg .= "\n"
189 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
190 305
191 $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;
192 307
193 LOG llevError, $msg; 308 LOG llevWarn, $msg;
194 }; 309};
195} 310
311$Coro::State::DIEHOOK = sub {
312 return unless $^S eq 0; # "eq", not "=="
313
314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
317 error "DIEHOOK called in main context, Coro bug?\n";#d#
318 return;#d#
319 }#d#
320
321 # kill coroutine otherwise
322 Coro::terminate
323};
196 324
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 335for my $pkg (qw(
208 cf::global cf::attachable 336 cf::global cf::attachable
209 cf::object cf::object::player 337 cf::object cf::object::player
210 cf::client cf::player 338 cf::client cf::player
211 cf::arch cf::living 339 cf::arch cf::living
340 cf::map cf::mapspace
212 cf::map cf::party cf::region 341 cf::party cf::region
213)) { 342)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 344}
217 345
218$EV::DIED = sub { 346$EV::DIED = sub {
219 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
220}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
221 354
222############################################################################# 355#############################################################################
223 356
224=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
225 358
246 $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;
247 $d 380 $d
248 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
249} 382}
250 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
251=item $ref = cf::from_json $json 436=item $ref = cf::decode_json $json
252 437
253Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
254 439
255=item $json = cf::to_json $ref 440=item $json = cf::encode_json $ref
256 441
257Converts a perl data structure into its JSON representation. 442Converts a perl data structure into its JSON representation.
258 443
259=cut 444=cut
260 445
261our $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
262 447
263sub to_json ($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
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}
265 512
266=item cf::lock_wait $string 513=item cf::lock_wait $string
267 514
268Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
269 516
270=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
271 518
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 521for example when the coroutine gets canceled), the lock is automatically
275returned. 522returned.
276 523
277Locks 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
278deadlocked coro. 525deadlocked coro.
284 531
285Return 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.
286 533
287=cut 534=cut
288 535
289our %LOCK; 536our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 537
292sub lock_wait($) { 538sub lock_wait($) {
293 my ($key) = @_; 539 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 540}
306 541
307sub lock_acquire($) { 542sub lock_acquire($) {
308 my ($key) = @_; 543 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 544}
322 545
323sub lock_active($) { 546sub lock_active($) {
324 my ($key) = @_; 547 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 548}
328 549
329sub freeze_mainloop { 550sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 551 tick_inhibit_inc;
331 552
332 my $guard = Coro::guard { 553 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start;
334 };
335 $TICK_WATCHER->stop;
336 $guard
337} 554}
338 555
339=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
340 557
341Like 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
342get spread over timer. 559get spread over time.
343 560
344=cut 561=cut
345 562
346sub periodic($$) { 563sub periodic($$) {
347 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
351 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
352} 569}
353 570
354=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
355 572
356Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
357This 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
358of 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.
359 580
360The 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
361used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
362 583
363Useful for short background jobs. 584Useful for short background jobs.
364 585
365=cut 586=cut
366 587
367our @SLOT_QUEUE; 588our @SLOT_QUEUE;
368our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
369 591
370$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
371$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
372 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
373 595
374 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
375 598
376 while () { 599 while () {
377 next_job: 600 next_job:
601
602 Coro::cede;
603
378 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
379 if ($avail > 0.01) { 605
380 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
381 if ($SLOT_QUEUE[$_][0] < $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
608 $busy = 0;
382 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
383 $job->[2]->send; 610 $job->[2]->send;
384 Coro::cede;
385 goto next_job; 611 goto next_job;
386 } 612 } else {
613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
387 } 614 }
388 } 615 }
389 616
390 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
391 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
392 push @cf::WAIT_FOR_TICK, $signal;
393 $signal->wait;
394 } else { 619 } else {
620 $busy = 0;
395 Coro::schedule; 621 Coro::schedule;
396 } 622 }
397 } 623 }
398}; 624};
399 625
400sub get_slot($;$$) { 626sub get_slot($;$$) {
627 return if tick_inhibit || $Coro::current == $Coro::main;
628
401 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
402 630
403 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
404 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
405 634
406 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
407 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
408 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
434=cut 663=cut
435 664
436sub sync_job(&) { 665sub sync_job(&) {
437 my ($job) = @_; 666 my ($job) = @_;
438 667
439 if ($Coro::current == $Coro::main) { 668 if (in_main) {
440 my $time = EV::time; 669 my $time = AE::time;
441 670
442 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
443 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
444 673
445 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
446 675
447 # TODO: use suspend/resume instead
448 # (but this is cancel-safe)
449 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
450 677
451 my $busy = 1; 678 my $busy = 1;
452 my @res; 679 my @res;
453 680
454 (async { 681 (async {
455 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
456 @res = eval { $job->() }; 683 @res = eval { $job->() };
457 warn $@ if $@; 684 error $@ if $@;
458 undef $busy; 685 undef $busy;
459 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
460 687
461 while ($busy) { 688 while ($busy) {
462 if (Coro::nready) { 689 if (Coro::nready) {
463 Coro::cede_notself; 690 Coro::cede_notself;
464 } else { 691 } else {
465 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
466 } 693 }
467 } 694 }
468 695
469 $time = EV::time - $time; 696 my $time = AE::time - $time;
470 697
471 LOG llevError | logBacktrace, Carp::longmess "long sync job"
472 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
473
474 $tick_start += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
475 699
476 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
477 } else { 701 } else {
478 # we are in another coroutine, how wonderful, everything just works 702 # we are in another coroutine, how wonderful, everything just works
479 703
499 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
500 724
501 $coro 725 $coro
502} 726}
503 727
504=item fork_call { }, $args 728=item fork_call { }, @args
505 729
506Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
507process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
508Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
509never block itself or use any form of event handling. 733never block itself or use any form of event handling.
510 734
511=cut 735=cut
512 736
737sub post_fork {
738 reset_signals;
739}
740
513sub fork_call(&@) { 741sub fork_call(&@) {
514 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
515 743
516 # we seemingly have to make a local copy of the whole thing,
517 # otherwise perl prematurely frees the stuff :/
518 # TODO: investigate and fix (likely this will be rather laborious)
519
520 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
521 reset_signals; 745 cf::post_fork;
522 &$cb 746 &$cb
523 }, @args; 747 } @args;
524 748
525 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 )
761}
762
763=item $coin = coin_from_name $name
764
765=cut
766
767our %coin_alias = (
768 "silver" => "silvercoin",
769 "silvercoin" => "silvercoin",
770 "silvercoins" => "silvercoin",
771 "gold" => "goldcoin",
772 "goldcoin" => "goldcoin",
773 "goldcoins" => "goldcoin",
774 "platinum" => "platinacoin",
775 "platinumcoin" => "platinacoin",
776 "platinumcoins" => "platinacoin",
777 "platina" => "platinacoin",
778 "platinacoin" => "platinacoin",
779 "platinacoins" => "platinacoin",
780 "royalty" => "royalty",
781 "royalties" => "royalty",
782);
783
784sub coin_from_name($) {
785 $coin_alias{$_[0]}
786 ? cf::arch::find $coin_alias{$_[0]}
787 : undef
526} 788}
527 789
528=item $value = cf::db_get $family => $key 790=item $value = cf::db_get $family => $key
529 791
530Returns a single value from the environment database. 792Returns a single value from the environment database.
540within each server. 802within each server.
541 803
542=cut 804=cut
543 805
544sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
545 my ($name) = @_; 810 my ($name) = @_;
546 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
547 812
548 eval { 813 eval {
549 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
559} 824}
560 825
561our $DB; 826our $DB;
562 827
563sub db_init { 828sub db_init {
564 cf::sync_job {
565 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
566 };
567} 830}
568 831
569sub db_get($$) { 832sub db_get($$) {
570 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
571 834
572 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
573 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
574 839
575 $! ? () 840 $! ? ()
576 : $data 841 : $data
577 }
578} 842}
579 843
580sub db_put($$$) { 844sub db_put($$$) {
581 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
582 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
610 874
611 my @data; 875 my @data;
612 my $md5; 876 my $md5;
613 877
614 for (0 .. $#$src) { 878 for (0 .. $#$src) {
615 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
616 or Carp::croak "$src->[$_]: $!";
617 } 880 }
618 881
619 # if processing is expensive, check 882 # if processing is expensive, check
620 # checksum first 883 # checksum first
621 if (1) { 884 if (1) {
634 897
635 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
636 } 899 }
637 } 900 }
638 901
639 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
640 my $data = $process->(\@data); 903 my $data = $process->(\@data);
641 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
642 905
643 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
644 907
645 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
646 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
647 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
648 911
658 921
659=cut 922=cut
660 923
661sub datalog($@) { 924sub datalog($@) {
662 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
663 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
664} 927}
665 928
666=back 929=back
667 930
668=cut 931=cut
669 932
670############################################################################# 933#############################################################################
671 934
672=head2 ATTACHABLE OBJECTS 935=head2 ATTACHABLE OBJECTS
673 936
674Many 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
675attach callbacks/event handlers (a collection of which is called an "attachment") 938attach callbacks/event handlers (a collection of which is called an "attachment")
676to it. All such attachable objects support the following methods. 939to it. All such attachable objects support the following methods.
677 940
678In 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>
679C<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
729=item cf::CLASS::attachment $name, ... 992=item cf::CLASS::attachment $name, ...
730 993
731Register an attachment by C<$name> through which attachable objects of the 994Register an attachment by C<$name> through which attachable objects of the
732given CLASS can refer to this attachment. 995given CLASS can refer to this attachment.
733 996
734Some classes such as crossfire maps and objects can specify attachments 997Some classes such as deliantra maps and objects can specify attachments
735that 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.
736 999
737These calls expect any number of the following handler/hook descriptions: 1000These calls expect any number of the following handler/hook descriptions:
738 1001
739=over 4 1002=over 4
863 1126
864 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
865 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
866 1129
867 } elsif (ref $type) { 1130 } elsif (ref $type) {
868 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
869 1132
870 } else { 1133 } else {
871 shift @arg; 1134 shift @arg;
872 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
873 } 1136 }
874 } 1137 }
875} 1138}
876 1139
877sub _object_attach { 1140sub _object_attach {
887 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
888 } 1151 }
889 1152
890 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
891 } else { 1154 } else {
892 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
893 } 1156 }
894 1157
895 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
896} 1159}
897 1160
956 1219
957 for (@$callbacks) { 1220 for (@$callbacks) {
958 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
959 1222
960 if ($@) { 1223 if ($@) {
961 warn "$@";
962 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
963 override; 1225 override;
964 } 1226 }
965 1227
966 return 1 if $override; 1228 return 1 if $override;
967 } 1229 }
968 1230
969 0 1231 0
970} 1232}
971 1233
972=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1234=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
973 1235
974=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1236=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
975 1237
976Generate an object-specific event with the given arguments. 1238Generate an object-specific event with the given arguments.
977 1239
1030 1292
1031sub reattach { 1293sub reattach {
1032 # basically do the same as instantiate, without calling instantiate 1294 # basically do the same as instantiate, without calling instantiate
1033 my ($obj) = @_; 1295 my ($obj) = @_;
1034 1296
1297 # no longer needed after getting rid of delete_package?
1035 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
1036 1299
1037 my $registry = $obj->registry; 1300 my $registry = $obj->registry;
1038 1301
1039 @$registry = (); 1302 @$registry = ();
1040 1303
1045 for (@$attach) { 1308 for (@$attach) {
1046 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1047 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1048 } 1311 }
1049 } else { 1312 } else {
1050 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1051 } 1314 }
1052 } 1315 }
1053} 1316}
1054 1317
1055cf::attachable->attach ( 1318cf::attachable->attach (
1056 prio => -1000000, 1319 prio => -1000000,
1057 on_instantiate => sub { 1320 on_instantiate => sub {
1058 my ($obj, $data) = @_; 1321 my ($obj, $data) = @_;
1059 1322
1060 $data = from_json $data; 1323 $data = decode_json $data;
1061 1324
1062 for (@$data) { 1325 for (@$data) {
1063 my ($name, $args) = @$_; 1326 my ($name, $args) = @$_;
1064 1327
1065 $obj->attach ($name, %{$args || {} }); 1328 $obj->attach ($name, %{$args || {} });
1082 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1083 1346
1084 sync_job { 1347 sync_job {
1085 if (length $$rdata) { 1348 if (length $$rdata) {
1086 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1087 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1088 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1089 1353
1090 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1091 chmod SAVE_MODE, $fh; 1355 aio_chmod $fh, SAVE_MODE;
1092 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1093 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 }
1094 close $fh; 1361 aio_close $fh;
1095 1362
1096 if (@$objs) { 1363 if (@$objs) {
1097 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) {
1098 chmod SAVE_MODE, $fh; 1365 aio_chmod $fh, SAVE_MODE;
1099 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1100 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1101 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 }
1102 close $fh; 1372 aio_close $fh;
1103 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1104 } 1374 }
1105 } else { 1375 } else {
1106 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1107 } 1377 }
1108 1378
1109 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1380
1381 $filename =~ s%/[^/]+$%%;
1382 aio_pathsync $filename if $cf::USE_FSYNC;
1110 } else { 1383 } else {
1111 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1112 } 1385 }
1113 } else { 1386 } else {
1114 aio_unlink $filename; 1387 aio_unlink $filename;
1115 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1116 } 1389 }
1140 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1141 $av = $st->{objs}; 1414 $av = $st->{objs};
1142 } 1415 }
1143 1416
1144 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1145 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1146 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1147 1421
1148 ($data, $av) 1422 ($data, $av)
1149} 1423}
1150 1424
1151=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1155=cut 1429=cut
1156 1430
1157############################################################################# 1431#############################################################################
1158# command handling &c 1432# command handling &c
1159 1433
1160=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1161 1435
1162Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1163$name. 1437$name.
1164 1438
1165=cut 1439=cut
1171 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1172 1446
1173 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1174} 1448}
1175 1449
1176=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1177 1451
1178Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1179extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1180received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1181the 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
1182has logged in successfully. 1456has logged in successfully.
1183 1457
1184If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1185called.
1186 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
1187=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1188 1466
1189Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1190exticmd 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
1191are 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
1192is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1193log-in. 1471log-in.
1194 1472
1195If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1196called.
1197 1474
1198=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1199 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
1200sub register_extcmd { 1482sub register_extcmd($$) {
1201 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1202 1484
1203 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1204} 1486}
1205 1487
1206sub register_exticmd { 1488sub register_async_extcmd($$) {
1207 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1208 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1209 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1210} 1498}
1211 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1212cf::player->attach ( 1508cf::player->attach (
1213 on_command => sub { 1509 on_unknown_command => sub {
1214 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1215 1511
1216 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1217 or return; 1513 or return;
1218 1514
1226 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1227 1523
1228 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1229 1525
1230 if (ref $msg) { 1526 if (ref $msg) {
1231 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1232 "ARRAY" eq ref $msg
1233 ? @$msg
1234 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1235 1528
1236 my @reply;
1237
1238 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}) {
1239 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1240 } 1547 }
1241 1548
1242 $pl->ext_reply ($reply, @reply)
1243 if $reply;
1244
1245 } else { 1549 } else {
1246 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1247 } 1551 }
1248 1552
1249 cf::override; 1553 cf::override;
1250 }, 1554 },
1251); 1555);
1252 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
1253sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1254 cf::sync_job { 1586 cf::sync_job {
1255 my %todo; 1587 my %todo;
1256 1588
1257 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1258 next unless -r $path; 1590 next unless -r $path;
1276 1608
1277 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1278 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1279 1611
1280 $ext{source} = 1612 $ext{source} =
1281 "package $pkg; use strict; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1282 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1283 . $source 1615 . $source
1284 . "\n};\n1"; 1616 . "\n};\n1";
1285 1617
1286 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1287 } 1619 }
1288 1620
1621 my $pass = 0;
1289 my %done; 1622 my %done;
1290 while (%todo) { 1623 while (%todo) {
1291 my $progress; 1624 my $progress;
1292 1625
1626 ++$pass;
1627
1628 ext:
1293 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1294 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1295 goto skip 1631 next ext
1296 unless exists $done{$_}; 1632 unless exists $done{$_};
1297 } 1633 }
1298 1634
1299 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1300 1636
1301 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 $@) {
1302 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1303 : "$v->{base}: extension inactive.\n";
1304 1650
1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1305 if (exists $v->{meta}{mandatory}) { 1652 if exists $v->{meta}{mandatory};
1306 warn $msg; 1653
1307 warn "mandatory extension failed to load, exiting.\n"; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1308 exit 1; 1655 delete $todo{$k};
1309 } 1656 } else {
1310 1657 $done{$k} = delete $todo{$k};
1311 warn $msg; 1658 push @EXTS, $v->{pkg};
1659 $progress = 1;
1660
1661 info "$v->{base}: extension inactive.\n"
1662 unless $active;
1312 } 1663 }
1313
1314 $done{$k} = delete $todo{$k};
1315 push @EXTS, $v->{pkg};
1316 $progress = 1;
1317 } 1664 }
1318 1665
1319 skip: 1666 unless ($progress) {
1320 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1321 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 }
1322 } 1676 }
1323 }; 1677 };
1324} 1678}
1325 1679
1326############################################################################# 1680#############################################################################
1327 1681
1328=back 1682=back
1329 1683
1330=head2 CORE EXTENSIONS 1684=head2 CORE EXTENSIONS
1331 1685
1332Functions and methods that extend core crossfire objects. 1686Functions and methods that extend core deliantra objects.
1333 1687
1334=cut 1688=cut
1335 1689
1336package cf::player; 1690package cf::player;
1337 1691
1380 1734
1381sub exists($) { 1735sub exists($) {
1382 my ($login) = @_; 1736 my ($login) = @_;
1383 1737
1384 $cf::PLAYER{$login} 1738 $cf::PLAYER{$login}
1385 or cf::sync_job { !aio_stat path $login } 1739 or !aio_stat path $login
1386} 1740}
1387 1741
1388sub find($) { 1742sub find($) {
1389 return $cf::PLAYER{$_[0]} || do { 1743 return $cf::PLAYER{$_[0]} || do {
1390 my $login = $_[0]; 1744 my $login = $_[0];
1402 my $f = new_from_file cf::object::thawer path $login 1756 my $f = new_from_file cf::object::thawer path $login
1403 or return; 1757 or return;
1404 1758
1405 my $pl = cf::player::load_pl $f 1759 my $pl = cf::player::load_pl $f
1406 or return; 1760 or return;
1761
1407 local $cf::PLAYER_LOADING{$login} = $pl; 1762 local $cf::PLAYER_LOADING{$login} = $pl;
1408 $f->resolve_delayed_derefs; 1763 $f->resolve_delayed_derefs;
1409 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1410 } 1765 }
1411 } 1766 }
1412} 1767}
1413 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
1414sub save($) { 1782sub save($) {
1415 my ($pl) = @_; 1783 my ($pl) = @_;
1416 1784
1417 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1418 1786
1421 1789
1422 return if $pl->{deny_save}; 1790 return if $pl->{deny_save};
1423 1791
1424 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1425 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1794
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];
1426 1799
1427 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1428 cf::cede_to_tick; 1801 cf::cede_to_tick;
1429} 1802}
1430 1803
1462 my ($pl) = @_; 1835 my ($pl) = @_;
1463 1836
1464 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1465 1838
1466 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1467 $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
1468 1841
1469 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1470 $pl->deactivate; 1843 $pl->deactivate;
1844
1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1471 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1472 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1473 1850
1474 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1475 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1476 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1514 1891
1515 for my $login (@$dirs) { 1892 for my $login (@$dirs) {
1516 my $path = path $login; 1893 my $path = path $login;
1517 1894
1518 # a .pst is a dead give-away for a valid player 1895 # a .pst is a dead give-away for a valid player
1519 unless (-e "$path.pst") { 1896 # if no pst file found, open and chekc for blocked users
1897 if (aio_stat "$path.pst") {
1520 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1898 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1521 aio_read $fh, 0, 512, my $buf, 0 or next; 1899 aio_read $fh, 0, 512, my $buf, 0 or next;
1522 $buf !~ /^password -------------$/m or next; # official not-valid tag 1900 $buf !~ /^password -------------$/m or next; # official not-valid tag
1523 } 1901 }
1524 1902
1528 1906
1529 \@logins 1907 \@logins
1530} 1908}
1531 1909
1532=item $player->maps 1910=item $player->maps
1911
1912=item cf::player::maps $login
1533 1913
1534Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1535player. May block. 1915player. May block.
1536 1916
1537=cut 1917=cut
1555 } 1935 }
1556 1936
1557 \@paths 1937 \@paths
1558} 1938}
1559 1939
1560=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1561 1941
1562Expand crossfire pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1563
1564=cut
1565
1566use re 'eval';
1567
1568my $group;
1569my $interior; $interior = qr{
1570 # match a pod interior sequence sans C<< >>
1571 (?:
1572 \ (.*?)\ (?{ $group = $^N })
1573 | < (??{$interior}) >
1574 )
1575}x;
1576
1577sub expand_cfpod {
1578 my ($self, $pod) = @_;
1579
1580 my $xml;
1581
1582 while () {
1583 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1584 $group = $1;
1585
1586 $group =~ s/&/&amp;/g;
1587 $group =~ s/</&lt;/g;
1588
1589 $xml .= $group;
1590 } elsif ($pod =~ m%\G
1591 ([BCGHITU])
1592 <
1593 (?:
1594 ([^<>]*) (?{ $group = $^N })
1595 | < $interior >
1596 )
1597 >
1598 %gcsx
1599 ) {
1600 my ($code, $data) = ($1, $group);
1601
1602 if ($code eq "B") {
1603 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1604 } elsif ($code eq "I") {
1605 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1606 } elsif ($code eq "U") {
1607 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1608 } elsif ($code eq "C") {
1609 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1610 } elsif ($code eq "T") {
1611 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1612 } elsif ($code eq "G") {
1613 my ($male, $female) = split /\|/, $data;
1614 $data = $self->gender ? $female : $male;
1615 $xml .= expand_cfpod ($self, $data);
1616 } elsif ($code eq "H") {
1617 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1618 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1619 "")
1620 [$self->{hintmode}];
1621 } else {
1622 $xml .= "error processing '$code($data)' directive";
1623 }
1624 } else {
1625 if ($pod =~ /\G(.+)/) {
1626 warn "parse error while expanding $pod (at $1)";
1627 }
1628 last;
1629 }
1630 }
1631
1632 for ($xml) {
1633 # create single paragraphs (very hackish)
1634 s/(?<=\S)\n(?=\w)/ /g;
1635
1636 # compress some whitespace
1637 s/\s+\n/\n/g; # ws line-ends
1638 s/\n\n+/\n/g; # double lines
1639 s/^\n+//; # beginning lines
1640 s/\n+$//; # ending lines
1641 }
1642
1643 $xml
1644}
1645
1646no re 'eval';
1647
1648sub hintmode {
1649 $_[0]{hintmode} = $_[1] if @_ > 1;
1650 $_[0]{hintmode}
1651}
1652
1653=item $player->ext_reply ($msgid, @msg)
1654
1655Sends an ext reply to the player.
1656
1657=cut
1658
1659sub ext_reply($$@) {
1660 my ($self, $id, @msg) = @_;
1661
1662 $self->ns->ext_reply ($id, @msg)
1663}
1664 1943
1665=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1666 1945
1667Sends an ext event to the client. 1946Sends an ext event to the client.
1668 1947
1688 1967
1689=cut 1968=cut
1690 1969
1691sub find_by_path($) { 1970sub find_by_path($) {
1692 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1693 1974
1694 my ($match, $specificity); 1975 my ($match, $specificity);
1695 1976
1696 for my $region (list) { 1977 for my $region (list) {
1697 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1723our $MAX_RESET = 3600; 2004our $MAX_RESET = 3600;
1724our $DEFAULT_RESET = 3000; 2005our $DEFAULT_RESET = 3000;
1725 2006
1726sub generate_random_map { 2007sub generate_random_map {
1727 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1728 # mit "rum" bekleckern, nicht 2009
2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
2011
1729 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740 (cf::region::find $rmp->{region}), $rmp->{custom}
1741 )
1742} 2013}
1743 2014
1744=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1745 2016
1746Register 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
1751 2022
1752sub register { 2023sub register {
1753 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 2025 my $pkg = caller;
1755 2026
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 2028
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 2030}
1761 2031
1762# also paths starting with '/' 2032# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 2034
1765sub thawer_merge { 2035sub thawer_merge {
1766 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1767 2037
1768 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1773} 2043}
1774 2044
1775sub normalise { 2045sub normalise {
1776 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1777 2047
1778 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1779 2049
1780 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1781 2051
1782 # map plan: 2052 # map plan:
1783 # 2053 #
1798 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 2069 $path = "$base/$path";
1800 } 2070 }
1801 2071
1802 for ($path) { 2072 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1806 } 2075 }
1807 2076
1808 $path 2077 $path
1822 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1823 return $self; 2092 return $self;
1824 } 2093 }
1825 } 2094 }
1826 2095
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 2097 ()
1829} 2098}
1830 2099
2100# may re-bless or do other evil things
1831sub init { 2101sub init {
1832 my ($self) = @_; 2102 my ($self) = @_;
1833 2103
1834 $self 2104 $self
1835} 2105}
1854 2124
1855# the temporary/swap location 2125# the temporary/swap location
1856sub save_path { 2126sub save_path {
1857 my ($self) = @_; 2127 my ($self) = @_;
1858 2128
1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2129 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1860 "$TMPDIR/$path.map" 2130 "$TMPDIR/$path.map"
1861} 2131}
1862 2132
1863# the unique path, undef == no special unique path 2133# the unique path, undef == no special unique path
1864sub uniq_path { 2134sub uniq_path {
1865 my ($self) = @_; 2135 my ($self) = @_;
1866 2136
1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1868 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1869}
1870
1871# and all this just because we cannot iterate over
1872# all maps in C++...
1873sub change_all_map_light {
1874 my ($change) = @_;
1875
1876 $_->change_map_light ($change)
1877 for grep $_->outdoor, values %cf::MAP;
1878} 2139}
1879 2140
1880sub decay_objects { 2141sub decay_objects {
1881 my ($self) = @_; 2142 my ($self) = @_;
1882 2143
1909 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1910 2171
1911 1 2172 1
1912} 2173}
1913 2174
2175# used to laod the header of an original map
1914sub load_header_orig { 2176sub load_header_orig {
1915 my ($self) = @_; 2177 my ($self) = @_;
1916 2178
1917 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1918} 2180}
1919 2181
2182# used to laod the header of an instantiated map
1920sub load_header_temp { 2183sub load_header_temp {
1921 my ($self) = @_; 2184 my ($self) = @_;
1922 2185
1923 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1924} 2187}
1925 2188
2189# called after loading the header from an instantiated map
1926sub prepare_temp { 2190sub prepare_temp {
1927 my ($self) = @_; 2191 my ($self) = @_;
1928 2192
1929 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1930 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1931 # safety 2195 # safety
1932 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1933 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1934} 2198}
1935 2199
2200# called after loading the header from an original map
1936sub prepare_orig { 2201sub prepare_orig {
1937 my ($self) = @_; 2202 my ($self) = @_;
1938 2203
1939 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1940 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1964 2229
1965sub find; 2230sub find;
1966sub find { 2231sub find {
1967 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1968 2233
2234 cf::cede_to_tick;
2235
1969 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1970 2237
1971 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1972 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1973 2240
1974 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1975 my $guard1 = cf::lock_acquire "map_find:$path";
1976 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977
1978 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
1979 or return; 2243 or return;
1980 2244
1981 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
1982 2246
1984 or return; 2248 or return;
1985 2249
1986 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2250 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1987 # doing this can freeze the server in a sync job, obviously 2251 # doing this can freeze the server in a sync job, obviously
1988 #$cf::WAIT_FOR_TICK->wait; 2252 #$cf::WAIT_FOR_TICK->wait;
2253 undef $guard2;
1989 undef $guard1; 2254 undef $guard1;
1990 undef $guard2;
1991 $map->reset; 2255 $map->reset;
1992 return find $path; 2256 return find $path;
1993 } 2257 }
1994 2258
1995 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1996 } 2260 }
1997} 2261}
1998 2262
1999sub pre_load { } 2263sub pre_load { }
2000sub post_load { } 2264#sub post_load { } # XS
2001 2265
2002sub load { 2266sub load {
2003 my ($self) = @_; 2267 my ($self) = @_;
2004 2268
2005 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2008 2272
2009 { 2273 {
2010 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2011 2275
2012 return unless $self->valid; 2276 return unless $self->valid;
2013 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2014
2015 $self->in_memory (cf::MAP_LOADING);
2016 2278
2017 $self->alloc; 2279 $self->alloc;
2018 2280
2019 $self->pre_load; 2281 $self->pre_load;
2020 cf::cede_to_tick; 2282 cf::cede_to_tick;
2021 2283
2284 if (exists $self->{load_path}) {
2022 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2023 $f->skip_block; 2286 $f->skip_block;
2024 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2025 or return; 2288 or return;
2026 2289
2027 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2290 $self->post_load_original
2028 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2029 2292
2030 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2031 utf8::encode $uniq; 2294 utf8::encode $uniq;
2032 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2033 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2034 $self->clear_unique_items; 2297 $self->clear_unique_items;
2035 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2036 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2037 } 2301 }
2038 } 2302 }
2039 }
2040 2303
2041 $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);
2042 2311
2043 cf::cede_to_tick; 2312 cf::cede_to_tick;
2044 # now do the right thing for maps 2313 # now do the right thing for maps
2045 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2046 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2050 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2051 $self->decay_objects; 2320 $self->decay_objects;
2052 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2053 $self->update_buttons; 2322 $self->update_buttons;
2054 cf::cede_to_tick; 2323 cf::cede_to_tick;
2055 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2056 cf::cede_to_tick;
2057 $self->activate;
2058 } 2325 }
2059 2326
2060 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2061 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2062
2063 $self->in_memory (cf::MAP_IN_MEMORY);
2064 } 2329 }
2065 2330
2066 $self->post_load; 2331 $self->post_load;
2067}
2068 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
2069sub customise_for { 2339sub customise_for {
2070 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2071 2341
2072 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2073 if $self->per_player; 2343 if $self->per_player;
2076# if $self->per_party; 2346# if $self->per_party;
2077 2347
2078 $self 2348 $self
2079} 2349}
2080 2350
2081# find and load all maps in the 3x3 area around a map
2082sub load_neighbours {
2083 my ($map) = @_;
2084
2085 my @neigh; # diagonal neighbours
2086
2087 for (0 .. 3) {
2088 my $neigh = $map->tile_path ($_)
2089 or next;
2090 $neigh = find $neigh, $map
2091 or next;
2092 $neigh->load;
2093
2094 push @neigh,
2095 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2096 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2097 }
2098
2099 for (grep defined $_->[0], @neigh) {
2100 my ($path, $origin) = @$_;
2101 my $neigh = find $path, $origin
2102 or next;
2103 $neigh->load;
2104 }
2105}
2106
2107sub find_sync { 2351sub find_sync {
2108 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2109 2353
2110 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
2111} 2359}
2112 2360
2113sub do_load_sync { 2361sub do_load_sync {
2114 my ($map) = @_; 2362 my ($map) = @_;
2115 2363
2364 # it's a bug to call this from the main context
2116 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2117 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2118 2367
2119 cf::sync_job { $map->load }; 2368 $map->load;
2120} 2369}
2121 2370
2122our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2123our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2124 2373
2125sub find_async { 2374sub find_async {
2126 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2127 2376
2128 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2129 2378
2130 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2131 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2380 return $map if !$load || $map->linkable;
2132 } 2381 }
2133 2382
2134 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2135 2384
2136 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2137 $Coro::current->{desc} = "map prefetcher"; 2386 $Coro::current->{desc} = "map prefetcher";
2138 2387
2139 while (%MAP_PREFETCH) { 2388 while (%MAP_PREFETCH) {
2140 while (my ($k, $v) = each %MAP_PREFETCH) { 2389 for my $k (keys %MAP_PREFETCH) {
2141 if (my $map = find $k) { 2390 if (my $map = find $k) {
2142 $map->load if $v; 2391 $map->load if $v;
2143 } 2392 }
2144 2393
2145 delete $MAP_PREFETCH{$k}; 2394 delete $MAP_PREFETCH{$k};
2150 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2151 2400
2152 () 2401 ()
2153} 2402}
2154 2403
2404# common code, used by both ->save and ->swapout
2155sub save { 2405sub _save {
2156 my ($self) = @_; 2406 my ($self) = @_;
2157
2158 my $lock = cf::lock_acquire "map_data:$self->{path}";
2159 2407
2160 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2161 2409
2162 return unless $self->dirty; 2410 return unless $self->dirty;
2163 2411
2172 2420
2173 cf::async { 2421 cf::async {
2174 $Coro::current->{desc} = "map player save"; 2422 $Coro::current->{desc} = "map player save";
2175 $_->contr->save for $self->players; 2423 $_->contr->save for $self->players;
2176 }; 2424 };
2425
2426 cf::get_slot 0.02;
2177 2427
2178 if ($uniq) { 2428 if ($uniq) {
2179 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2429 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2430 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2181 } else { 2431 } else {
2182 $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);
2183 } 2433 }
2184} 2434}
2185 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2186sub swap_out { 2444sub swap_out {
2187 my ($self) = @_; 2445 my ($self) = @_;
2188 2446
2189 # save first because save cedes
2190 $self->save;
2191
2192 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2193 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2194 return if $self->players; 2451 return if $self->players;
2195 return if $self->in_memory != cf::MAP_IN_MEMORY; 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
2196 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2197 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
2198 $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};
2199 2503
2200 $self->deactivate; 2504 $self->deactivate;
2201 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2202 $self->clear; 2506 $self->clear;
2203}
2204
2205sub reset_at {
2206 my ($self) = @_;
2207
2208 # TODO: safety, remove and allow resettable per-player maps
2209 return 1e99 if $self->{deny_reset};
2210
2211 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2212 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2213
2214 $time + $to
2215}
2216
2217sub should_reset {
2218 my ($self) = @_;
2219
2220 $self->reset_at <= $cf::RUNTIME
2221}
2222
2223sub reset {
2224 my ($self) = @_;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227
2228 return if $self->players;
2229
2230 warn "resetting map ", $self->path;
2231
2232 $self->in_memory (cf::MAP_SWAPPED);
2233
2234 # need to save uniques path
2235 unless ($self->{deny_save}) {
2236 my $uniq = $self->uniq_path; utf8::encode $uniq;
2237
2238 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2239 if $uniq;
2240 }
2241
2242 delete $cf::MAP{$self->path};
2243
2244 $self->deactivate;
2245 $_->clear_links_to ($self) for values %cf::MAP;
2246 $self->clear;
2247 2507
2248 $self->unlink_save; 2508 $self->unlink_save;
2249 $self->destroy; 2509 $self->destroy;
2250} 2510}
2251 2511
2259 2519
2260 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2261 2521
2262 $self->unlink_save; 2522 $self->unlink_save;
2263 2523
2264 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2265 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2266 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2267 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2268 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2269 2529
2318 2578
2319sub unique_maps() { 2579sub unique_maps() {
2320 [ 2580 [
2321 map { 2581 map {
2322 utf8::decode $_; 2582 utf8::decode $_;
2323 /\.map$/ 2583 s/\.map$//; # TODO future compatibility hack
2584 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2585 ? ()
2324 ? normalise $_ 2586 : normalise $_
2325 : ()
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2588 ]
2328} 2589}
2329 2590
2330package cf; 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}
2331 2622
2332=back 2623=back
2333 2624
2334=head3 cf::object 2625=head3 cf::object
2335 2626
2339 2630
2340=over 4 2631=over 4
2341 2632
2342=item $ob->inv_recursive 2633=item $ob->inv_recursive
2343 2634
2344Returns the inventory of the object _and_ their inventories, recursively. 2635Returns the inventory of the object I<and> their inventories, recursively,
2636but I<not> the object itself.
2345 2637
2346=cut 2638=cut
2347 2639
2348sub inv_recursive_; 2640sub inv_recursive_;
2349sub inv_recursive_ { 2641sub inv_recursive_ {
2354 inv_recursive_ inv $_[0] 2646 inv_recursive_ inv $_[0]
2355} 2647}
2356 2648
2357=item $ref = $ob->ref 2649=item $ref = $ob->ref
2358 2650
2359creates and returns a persistent reference to an objetc that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2360 2652
2361=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2362 2654
2363returns 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,
2364even if the object actually exists. May block. 2656even if the object actually exists. May block.
2365 2657
2366=cut 2658=cut
2367 2659
2368sub deref { 2660sub deref {
2396can be C<undef>. Does the right thing when the player is currently in a 2688can be C<undef>. Does the right thing when the player is currently in a
2397dialogue with the given NPC character. 2689dialogue with the given NPC character.
2398 2690
2399=cut 2691=cut
2400 2692
2693our $SAY_CHANNEL = {
2694 id => "say",
2695 title => "Map",
2696 reply => "say ",
2697 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2698};
2699
2700our $CHAT_CHANNEL = {
2701 id => "chat",
2702 title => "Chat",
2703 reply => "chat ",
2704 tooltip => "Player chat and shouts, global to the server.",
2705};
2706
2401# rough implementation of a future "reply" method that works 2707# rough implementation of a future "reply" method that works
2402# with dialog boxes. 2708# with dialog boxes.
2403#TODO: the first argument must go, split into a $npc->reply_to ( method 2709#TODO: the first argument must go, split into a $npc->reply_to ( method
2404sub cf::object::player::reply($$$;$) { 2710sub cf::object::player::reply($$$;$) {
2405 my ($self, $npc, $msg, $flags) = @_; 2711 my ($self, $npc, $msg, $flags) = @_;
2416 my $dialog = $pl->{npc_dialog}; 2722 my $dialog = $pl->{npc_dialog};
2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2723 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2418 2724
2419 } else { 2725 } else {
2420 $msg = $npc->name . " says: $msg" if $npc; 2726 $msg = $npc->name . " says: $msg" if $npc;
2421 $self->message ($msg, $flags); 2727 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2422 } 2728 }
2423 } 2729 }
2424} 2730}
2425 2731
2426=item $object->send_msg ($channel, $msg, $color, [extra...]) 2732=item $object->send_msg ($channel, $msg, $color, [extra...])
2436=item $player_object->may ("access") 2742=item $player_object->may ("access")
2437 2743
2438Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2439(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2440 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2441=cut 2772=cut
2442 2773
2443sub cf::object::player::may { 2774sub cf::object::player::may {
2444 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2445 2776
2446 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2447 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2448 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2449 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2450} 2781}
2451 2782
2452=item $player_object->enter_link 2783=item $player_object->enter_link
2453 2784
2454Freezes the player and moves him/her to a special map (C<{link}>). 2785Freezes the player and moves him/her to a special map (C<{link}>).
2455 2786
2456The player should be reasonably safe there for short amounts of time. You 2787The player should be reasonably safe there for short amounts of time (e.g.
2457I<MUST> call C<leave_link> as soon as possible, though. 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2789though, as the player cannot control the character while it is on the link
2790map.
2458 2791
2459Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2460 2799
2461=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2462 2801
2463Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2464map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
2482sub cf::object::player::enter_link { 2821sub cf::object::player::enter_link {
2483 my ($self) = @_; 2822 my ($self) = @_;
2484 2823
2485 $self->deactivate_recursive; 2824 $self->deactivate_recursive;
2486 2825
2826 ++$self->{_link_recursion};
2827
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2828 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2829
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2830 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2831 if $self->map && $self->map->{path} ne "{link}";
2491 2832
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2833 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2834}
2494 2835
2495sub cf::object::player::leave_link { 2836sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2837 my ($self, $map, $x, $y) = @_;
2497 2838
2514 ($x, $y) = (-1, -1) 2855 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2856 unless (defined $x) && (defined $y);
2516 2857
2517 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2520 2861
2521 $map->load; 2862 $map->load;
2522 $map->load_neighbours;
2523 2863
2524 return unless $self->contr->active; 2864 return unless $self->contr->active;
2525 $self->activate_recursive;
2526 2865
2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2528 $self->enter_map ($map, $x, $y); 2867 if ($self->enter_map ($map, $x, $y)) {
2529} 2868 # entering was successful
2869 delete $self->{_link_recursion};
2870 # only activate afterwards, to support waiting in hooks
2871 $self->activate_recursive;
2872 }
2530 2873
2874}
2875
2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2876=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2532 2877
2533Moves the player to the given map-path and coordinates by first freezing 2878Moves the player to the given map-path and coordinates by first freezing
2534her, loading and preparing them map, calling the provided $check callback 2879her, loading and preparing them map, calling the provided $check callback
2535that has to return the map if sucecssful, and then unfreezes the player on 2880that has to return the map if sucecssful, and then unfreezes the player on
2536the new (success) or old (failed) map position. In either case, $done will 2881the new (success) or old (failed) map position. In either case, $done will
2537be called at the end of this process. 2882be called at the end of this process.
2538 2883
2884Note that $check will be called with a potentially non-loaded map, so if
2885it needs a loaded map it has to call C<< ->load >>.
2886
2539=cut 2887=cut
2540 2888
2541our $GOTOGEN; 2889our $GOTOGEN;
2542 2890
2543sub cf::object::player::goto { 2891sub cf::object::player::goto {
2544 my ($self, $path, $x, $y, $check, $done) = @_; 2892 my ($self, $path, $x, $y, $check, $done) = @_;
2893
2894 if ($self->{_link_recursion} >= $MAX_LINKS) {
2895 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2896 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2897 ($path, $x, $y) = @$EMERGENCY_POSITION;
2898 }
2545 2899
2546 # do generation counting so two concurrent goto's will be executed in-order 2900 # do generation counting so two concurrent goto's will be executed in-order
2547 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2901 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2548 2902
2549 $self->enter_link; 2903 $self->enter_link;
2569 ($path, $x, $y) = (undef, undef, undef); 2923 ($path, $x, $y) = (undef, undef, undef);
2570 } 2924 }
2571 } 2925 }
2572 2926
2573 my $map = eval { 2927 my $map = eval {
2574 my $map = defined $path ? cf::map::find $path : undef; 2928 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2575 2929
2576 if ($map) { 2930 if ($map) {
2577 $map = $map->customise_for ($self); 2931 $map = $map->customise_for ($self);
2578 $map = $check->($map) if $check && $map; 2932 $map = $check->($map, $x, $y, $self) if $check && $map;
2579 } else { 2933 } else {
2580 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2934 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2581 } 2935 }
2582 2936
2583 $map 2937 $map
2591 if ($gen == $self->{_goto_generation}) { 2945 if ($gen == $self->{_goto_generation}) {
2592 delete $self->{_goto_generation}; 2946 delete $self->{_goto_generation};
2593 $self->leave_link ($map, $x, $y); 2947 $self->leave_link ($map, $x, $y);
2594 } 2948 }
2595 2949
2596 $done->() if $done; 2950 $done->($self) if $done;
2597 })->prio (1); 2951 })->prio (1);
2598} 2952}
2599 2953
2600=item $player_object->enter_exit ($exit_object) 2954=item $player_object->enter_exit ($exit_object)
2601 2955
2621} 2975}
2622 2976
2623sub prepare_random_map { 2977sub prepare_random_map {
2624 my ($exit) = @_; 2978 my ($exit) = @_;
2625 2979
2626 my $guard = cf::lock_acquire "exit_prepare:$exit";
2627
2628 # all this does is basically replace the /! path by 2980 # all this does is basically replace the /! path by
2629 # a new random map path (?random/...) with a seed 2981 # a new random map path (?random/...) with a seed
2630 # that depends on the exit object 2982 # that depends on the exit object
2631 2983
2632 my $rmp = parse_random_map_params $exit->msg; 2984 my $rmp = parse_random_map_params $exit->msg;
2634 if ($exit->map) { 2986 if ($exit->map) {
2635 $rmp->{region} = $exit->region->name; 2987 $rmp->{region} = $exit->region->name;
2636 $rmp->{origin_map} = $exit->map->path; 2988 $rmp->{origin_map} = $exit->map->path;
2637 $rmp->{origin_x} = $exit->x; 2989 $rmp->{origin_x} = $exit->x;
2638 $rmp->{origin_y} = $exit->y; 2990 $rmp->{origin_y} = $exit->y;
2991
2992 $exit->map->touch;
2639 } 2993 }
2640 2994
2641 $rmp->{random_seed} ||= $exit->random_seed; 2995 $rmp->{random_seed} ||= $exit->random_seed;
2642 2996
2643 my $data = cf::to_json $rmp; 2997 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2644 my $md5 = Digest::MD5::md5_hex $data; 2998 my $md5 = Digest::MD5::md5_hex $data;
2645 my $meta = "$RANDOMDIR/$md5.meta"; 2999 my $meta = "$RANDOMDIR/$md5.meta";
2646 3000
2647 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 3001 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2648 aio_write $fh, 0, (length $data), $data, 0; 3002 aio_write $fh, 0, (length $data), $data, 0;
2649 undef $fh; 3003 undef $fh;
2650 aio_rename "$meta~", $meta; 3004 aio_rename "$meta~", $meta;
2651 3005
3006 my $slaying = "?random/$md5";
3007
3008 if ($exit->valid) {
2652 $exit->slaying ("?random/$md5"); 3009 $exit->slaying ("?random/$md5");
2653 $exit->msg (undef); 3010 $exit->msg (undef);
3011 }
2654 } 3012 }
2655} 3013}
2656 3014
2657sub cf::object::player::enter_exit { 3015sub cf::object::player::enter_exit {
2658 my ($self, $exit) = @_; 3016 my ($self, $exit) = @_;
2659 3017
2660 return unless $self->type == cf::PLAYER; 3018 return unless $self->type == cf::PLAYER;
2661 3019
2662 if ($exit->slaying eq "/!") {
2663 #TODO: this should de-fi-ni-te-ly not be a sync-job
2664 # the problem is that $exit might not survive long enough
2665 # so it needs to be done right now, right here
2666 cf::sync_job { prepare_random_map $exit };
2667 }
2668
2669 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2670 my $hp = $exit->stats->hp;
2671 my $sp = $exit->stats->sp;
2672
2673 $self->enter_link; 3020 $self->enter_link;
2674 3021
2675 # if exit is damned, update players death & WoR home-position
2676 $self->contr->savebed ($slaying, $hp, $sp)
2677 if $exit->flag (FLAG_DAMNED);
2678
2679 (async { 3022 (async {
2680 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 3023 $Coro::current->{desc} = "enter_exit";
2681 3024
2682 $self->deactivate_recursive; # just to be sure
2683 unless (eval { 3025 unless (eval {
3026 $self->deactivate_recursive; # just to be sure
3027
3028 my $map = cf::map::normalise $exit->slaying, $exit->map;
3029 my $x = $exit->stats->hp;
3030 my $y = $exit->stats->sp;
3031
3032 # special map handling
3033 my $slaying = $exit->slaying;
3034
3035 # special map handling
3036 if ($slaying eq "/!") {
3037 my $guard = cf::lock_acquire "exit_prepare:$exit";
3038
3039 prepare_random_map $exit
3040 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3041
3042 $map = $exit->slaying;
3043
3044 } elsif ($slaying eq '!up') {
3045 $map = $exit->map->tile_path (cf::TILE_UP);
3046 $x = $exit->x;
3047 $y = $exit->y;
3048
3049 } elsif ($slaying eq '!down') {
3050 $map = $exit->map->tile_path (cf::TILE_DOWN);
3051 $x = $exit->x;
3052 $y = $exit->y;
3053 }
3054
2684 $self->goto ($slaying, $hp, $sp); 3055 $self->goto ($map, $x, $y);
2685 3056
3057 # if exit is damned, update players death & WoR home-position
3058 $self->contr->savebed ($map, $x, $y)
3059 if $exit->flag (cf::FLAG_DAMNED);
3060
2686 1; 3061 1
2687 }) { 3062 }) {
2688 $self->message ("Something went wrong deep within the crossfire server. " 3063 $self->message ("Something went wrong deep within the deliantra server. "
2689 . "I'll try to bring you back to the map you were before. " 3064 . "I'll try to bring you back to the map you were before. "
2690 . "Please report this to the dungeon master!", 3065 . "Please report this to the dungeon master!",
2691 cf::NDI_UNIQUE | cf::NDI_RED); 3066 cf::NDI_UNIQUE | cf::NDI_RED);
2692 3067
2693 warn "ERROR in enter_exit: $@"; 3068 error "ERROR in enter_exit: $@";
2694 $self->leave_link; 3069 $self->leave_link;
2695 } 3070 }
2696 })->prio (1); 3071 })->prio (1);
2697} 3072}
2698 3073
2699=head3 cf::client 3074=head3 cf::client
2700 3075
2701=over 4 3076=over 4
2702 3077
2703=item $client->send_drawinfo ($text, $flags) 3078=item $client->send_big_packet ($pkt)
2704 3079
2705Sends a drawinfo packet to the client. Circumvents output buffering so 3080Like C<send_packet>, but tries to compress large packets, and fragments
2706should not be used under normal circumstances. 3081them as required.
2707 3082
2708=cut 3083=cut
2709 3084
3085our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3086
2710sub cf::client::send_drawinfo { 3087sub cf::client::send_big_packet {
2711 my ($self, $text, $flags) = @_; 3088 my ($self, $pkt) = @_;
2712 3089
2713 utf8::encode $text; 3090 # try lzf for large packets
2714 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3091 $pkt = "lzf " . Compress::LZF::compress $pkt
3092 if 1024 <= length $pkt and $self->{can_lzf};
3093
3094 # split very large packets
3095 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3096 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3097 $pkt = "frag";
3098 }
3099
3100 $self->send_packet ($pkt);
2715} 3101}
2716 3102
2717=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
2718 3104
2719Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
2720client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
2721the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
2722the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
2723 3109
2724=cut 3110=cut
2725 3111
2726# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
2727our %CHANNEL = ( 3113our %CHANNEL = (
3114 "c/motd" => {
3115 id => "infobox",
3116 title => "MOTD",
3117 reply => undef,
3118 tooltip => "The message of the day",
3119 },
2728 "c/identify" => { 3120 "c/identify" => {
2729 id => "infobox", 3121 id => "infobox",
2730 title => "Identify", 3122 title => "Identify",
2731 reply => undef, 3123 reply => undef,
2732 tooltip => "Items recently identified", 3124 tooltip => "Items recently identified",
2734 "c/examine" => { 3126 "c/examine" => {
2735 id => "infobox", 3127 id => "infobox",
2736 title => "Examine", 3128 title => "Examine",
2737 reply => undef, 3129 reply => undef,
2738 tooltip => "Signs and other items you examined", 3130 tooltip => "Signs and other items you examined",
3131 },
3132 "c/shopinfo" => {
3133 id => "infobox",
3134 title => "Shop Info",
3135 reply => undef,
3136 tooltip => "What your bargaining skill tells you about the shop",
2739 }, 3137 },
2740 "c/book" => { 3138 "c/book" => {
2741 id => "infobox", 3139 id => "infobox",
2742 title => "Book", 3140 title => "Book",
2743 reply => undef, 3141 reply => undef,
2759 id => "infobox", 3157 id => "infobox",
2760 title => "Body Parts", 3158 title => "Body Parts",
2761 reply => undef, 3159 reply => undef,
2762 tooltip => "Shows which body parts you posess and are available", 3160 tooltip => "Shows which body parts you posess and are available",
2763 }, 3161 },
3162 "c/statistics" => {
3163 id => "infobox",
3164 title => "Statistics",
3165 reply => undef,
3166 tooltip => "Shows your primary statistics",
3167 },
3168 "c/skills" => {
3169 id => "infobox",
3170 title => "Skills",
3171 reply => undef,
3172 tooltip => "Shows your experience per skill and item power",
3173 },
3174 "c/shopitems" => {
3175 id => "infobox",
3176 title => "Shop Items",
3177 reply => undef,
3178 tooltip => "Shows the items currently for sale in this shop",
3179 },
3180 "c/resistances" => {
3181 id => "infobox",
3182 title => "Resistances",
3183 reply => undef,
3184 tooltip => "Shows your resistances",
3185 },
3186 "c/pets" => {
3187 id => "infobox",
3188 title => "Pets",
3189 reply => undef,
3190 tooltip => "Shows information abotu your pets/a specific pet",
3191 },
3192 "c/perceiveself" => {
3193 id => "infobox",
3194 title => "Perceive Self",
3195 reply => undef,
3196 tooltip => "You gained detailed knowledge about yourself",
3197 },
2764 "c/uptime" => { 3198 "c/uptime" => {
2765 id => "infobox", 3199 id => "infobox",
2766 title => "Uptime", 3200 title => "Uptime",
2767 reply => undef, 3201 reply => undef,
2768 tooltip => "How long the server has been running since last restart", 3202 tooltip => "How long the server has been running since last restart",
2771 id => "infobox", 3205 id => "infobox",
2772 title => "Map Info", 3206 title => "Map Info",
2773 reply => undef, 3207 reply => undef,
2774 tooltip => "Information related to the maps", 3208 tooltip => "Information related to the maps",
2775 }, 3209 },
3210 "c/party" => {
3211 id => "party",
3212 title => "Party",
3213 reply => "gsay ",
3214 tooltip => "Messages and chat related to your party",
3215 },
3216 "c/death" => {
3217 id => "death",
3218 title => "Death",
3219 reply => undef,
3220 tooltip => "Reason for and more info about your most recent death",
3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3228 "c/say" => $SAY_CHANNEL,
3229 "c/chat" => $CHAT_CHANNEL,
2776); 3230);
2777 3231
2778sub cf::client::send_msg { 3232sub cf::client::send_msg {
2779 my ($self, $channel, $msg, $color, @extra) = @_; 3233 my ($self, $channel, $msg, $color, @extra) = @_;
2780 3234
2781 $msg = $self->pl->expand_cfpod ($msg); 3235 $msg = $self->pl->expand_cfpod ($msg)
3236 unless $color & cf::NDI_VERBATIM;
2782 3237
2783 $color &= cf::NDI_CLIENT_MASK; # just in case... 3238 $color &= cf::NDI_CLIENT_MASK; # just in case...
2784 3239
2785 # check predefined channels, for the benefit of C 3240 # check predefined channels, for the benefit of C
2786 if ($CHANNEL{$channel}) { 3241 if ($CHANNEL{$channel}) {
2787 $channel = $CHANNEL{$channel}; 3242 $channel = $CHANNEL{$channel};
2788 3243
2789 $self->ext_msg (channel_info => $channel) 3244 $self->ext_msg (channel_info => $channel);
2790 if $self->can_msg;
2791
2792 $channel = $channel->{id}; 3245 $channel = $channel->{id};
2793 3246
2794 } elsif (ref $channel) { 3247 } elsif (ref $channel) {
2795 # send meta info to client, if not yet sent 3248 # send meta info to client, if not yet sent
2796 unless (exists $self->{channel}{$channel->{id}}) { 3249 unless (exists $self->{channel}{$channel->{id}}) {
2797 $self->{channel}{$channel->{id}} = $channel; 3250 $self->{channel}{$channel->{id}} = $channel;
2798 $self->ext_msg (channel_info => $channel) 3251 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800 } 3252 }
2801 3253
2802 $channel = $channel->{id}; 3254 $channel = $channel->{id};
2803 } 3255 }
2804 3256
2805 return unless @extra || length $msg; 3257 return unless @extra || length $msg;
2806 3258
2807 if ($self->can_msg) {
2808 # default colour, mask it out 3259 # default colour, mask it out
2809 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3260 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2810 if $color & cf::NDI_DEF; 3261 if $color & cf::NDI_DEF;
2811 3262
2812 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3263 my $pkt = "msg "
3264 . $self->{json_coder}->encode (
2813 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3265 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2814 } else { 3266 );
2815 if ($color >= 0) {
2816 # replace some tags by gcfclient-compatible ones
2817 for ($msg) {
2818 1 while
2819 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2820 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2821 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2822 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2823 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2824 }
2825 3267
2826 $color &= cf::NDI_COLOR_MASK; 3268 $self->send_big_packet ($pkt);
2827
2828 utf8::encode $msg;
2829
2830 if (0 && $msg =~ /\[/) {
2831 # COMMAND/INFO
2832 $self->send_packet ("drawextinfo $color 10 8 $msg")
2833 } else {
2834 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2835 $self->send_packet ("drawinfo $color $msg")
2836 }
2837 }
2838 }
2839} 3269}
2840 3270
2841=item $client->ext_msg ($type, @msg) 3271=item $client->ext_msg ($type, @msg)
2842 3272
2843Sends an ext event to the client. 3273Sends an ext event to the client.
2845=cut 3275=cut
2846 3276
2847sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
2848 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
2849 3279
2850 if ($self->extcmd == 2) {
2851 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2852 } elsif ($self->extcmd == 1) { # TODO: remove
2853 push @msg, msgtype => "event_$type";
2854 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2855 }
2856}
2857
2858=item $client->ext_reply ($msgid, @msg)
2859
2860Sends an ext reply to the client.
2861
2862=cut
2863
2864sub cf::client::ext_reply($$@) {
2865 my ($self, $id, @msg) = @_;
2866
2867 if ($self->extcmd == 2) {
2868 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2869 } elsif ($self->extcmd == 1) {
2870 #TODO: version 1, remove
2871 unshift @msg, msgtype => "reply", msgid => $id;
2872 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2873 }
2874} 3281}
2875 3282
2876=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
2877 3284
2878Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
2898 3305
2899 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
2900 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
2901 3308
2902 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
2903} 3349}
2904 3350
2905cf::client->attach ( 3351cf::client->attach (
2906 on_connect => sub { 3352 on_connect => sub {
2907 my ($ns) = @_; 3353 my ($ns) = @_;
2933 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
2934 3380
2935 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2936 3382
2937 if (ref $msg) { 3383 if (ref $msg) {
2938 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2939 "ARRAY" eq ref $msg
2940 ? @$msg
2941 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2942 3385
2943 my @reply;
2944
2945 if (my $cb = $EXTICMD{$type}) { 3386 if (my $cb = $EXTIACMD{$type}) {
3387 $cb->(
3388 $ns,
3389 sub {
3390 $ns->ext_msg ("reply-$reply", @_)
3391 if $reply;
3392 },
3393 @payload
3394 );
3395 } else {
3396 my @reply;
3397
3398 if (my $cb = $EXTICMD{$type}) {
2946 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
2947 } 3404 }
2948
2949 $ns->ext_reply ($reply, @reply)
2950 if $reply;
2951
2952 } else { 3405 } else {
2953 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3406 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2954 } 3407 }
2955 3408
2956 cf::override; 3409 cf::override;
2957 }, 3410 },
2958); 3411);
2978 3431
2979 $coro 3432 $coro
2980} 3433}
2981 3434
2982cf::client->attach ( 3435cf::client->attach (
2983 on_destroy => sub { 3436 on_client_destroy => sub {
2984 my ($ns) = @_; 3437 my ($ns) = @_;
2985 3438
2986 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3439 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2987 }, 3440 },
2988); 3441);
3004our $safe_hole = new Safe::Hole; 3457our $safe_hole = new Safe::Hole;
3005 3458
3006$SIG{FPE} = 'IGNORE'; 3459$SIG{FPE} = 'IGNORE';
3007 3460
3008$safe->permit_only (Opcode::opset qw( 3461$safe->permit_only (Opcode::opset qw(
3009 :base_core :base_mem :base_orig :base_math 3462 :base_core :base_mem :base_orig :base_math :base_loop
3010 grepstart grepwhile mapstart mapwhile 3463 grepstart grepwhile mapstart mapwhile
3011 sort time 3464 sort time
3012)); 3465));
3013 3466
3014# here we export the classes and methods available to script code 3467# here we export the classes and methods available to script code
3017 3470
3018The following functions and methods are available within a safe environment: 3471The following functions and methods are available within a safe environment:
3019 3472
3020 cf::object 3473 cf::object
3021 contr pay_amount pay_player map x y force_find force_add destroy 3474 contr pay_amount pay_player map x y force_find force_add destroy
3022 insert remove name archname title slaying race decrease_ob_nr 3475 insert remove name archname title slaying race decrease split
3476 value
3023 3477
3024 cf::object::player 3478 cf::object::player
3025 player 3479 player
3026 3480
3027 cf::player 3481 cf::player
3032 3486
3033=cut 3487=cut
3034 3488
3035for ( 3489for (
3036 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3490 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3037 insert remove inv name archname title slaying race 3491 insert remove inv nrof name archname title slaying race
3038 decrease_ob_nr destroy)], 3492 decrease split destroy change_exp value msg lore send_msg)],
3039 ["cf::object::player" => qw(player)], 3493 ["cf::object::player" => qw(player)],
3040 ["cf::player" => qw(peaceful)], 3494 ["cf::player" => qw(peaceful send_msg)],
3041 ["cf::map" => qw(trigger)], 3495 ["cf::map" => qw(trigger)],
3042) { 3496) {
3043 no strict 'refs';
3044 my ($pkg, @funs) = @$_; 3497 my ($pkg, @funs) = @$_;
3045 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3498 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 for @funs; 3499 for @funs;
3047} 3500}
3048 3501
3063 3516
3064 my $qcode = $code; 3517 my $qcode = $code;
3065 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3518 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3066 $qcode =~ s/\n/\\n/g; 3519 $qcode =~ s/\n/\\n/g;
3067 3520
3521 %vars = (_dummy => 0) unless %vars;
3522
3523 my @res;
3068 local $_; 3524 local $_;
3069 local @safe::cf::_safe_eval_args = values %vars;
3070 3525
3071 my $eval = 3526 my $eval =
3072 "do {\n" 3527 "do {\n"
3073 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3528 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3074 . "#line 0 \"{$qcode}\"\n" 3529 . "#line 0 \"{$qcode}\"\n"
3075 . $code 3530 . $code
3076 . "\n}" 3531 . "\n}"
3077 ; 3532 ;
3078 3533
3534 if ($CFG{safe_eval}) {
3079 sub_generation_inc; 3535 sub_generation_inc;
3536 local @safe::cf::_safe_eval_args = values %vars;
3080 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3537 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3081 sub_generation_inc; 3538 sub_generation_inc;
3539 } else {
3540 local @cf::_safe_eval_args = values %vars;
3541 @res = wantarray ? eval eval : scalar eval $eval;
3542 }
3082 3543
3083 if ($@) { 3544 if ($@) {
3084 warn "$@"; 3545 warn "$@",
3085 warn "while executing safe code '$code'\n"; 3546 "while executing safe code '$code'\n",
3086 warn "with arguments " . (join " ", %vars) . "\n"; 3547 "with arguments " . (join " ", %vars) . "\n";
3087 } 3548 }
3088 3549
3089 wantarray ? @res : $res[0] 3550 wantarray ? @res : $res[0]
3090} 3551}
3091 3552
3105=cut 3566=cut
3106 3567
3107sub register_script_function { 3568sub register_script_function {
3108 my ($fun, $cb) = @_; 3569 my ($fun, $cb) = @_;
3109 3570
3110 no strict 'refs'; 3571 $fun = "safe::$fun" if $CFG{safe_eval};
3111 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3572 *$fun = $safe_hole->wrap ($cb);
3112} 3573}
3113 3574
3114=back 3575=back
3115 3576
3116=cut 3577=cut
3117 3578
3118############################################################################# 3579#############################################################################
3119# the server's init and main functions 3580# the server's init and main functions
3120 3581
3582{
3583 package cf::face;
3584
3585 our %HASH; # hash => idx
3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3592 # internal api, not finalised
3593 sub set {
3594 my ($name, $type, $data) = @_;
3595
3596 my $idx = cf::face::find $name;
3597
3598 if ($idx) {
3599 delete $HASH{cf::face::get_csum $idx};
3600 } else {
3601 $idx = cf::face::alloc $name;
3602 }
3603
3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3605
3606 cf::face::set_type $idx, $type;
3607 cf::face::set_csum $idx, 0, $hash;
3608
3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3616 $HASH{$hash} = $idx;#d#
3617
3618 $idx
3619 }
3620
3621 sub _get_data($$$) {
3622 my ($idx, $set, $cb) = @_;
3623
3624 if (defined $DATA[$set][$idx]) {
3625 $cb->($DATA[$set][$idx]);
3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3641
3642 # rather ineffient
3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3645
3646 _get_data $idx, $set, Coro::rouse_cb;
3647 Coro::rouse_wait
3648 }
3649
3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3652
3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3657}
3658
3121sub load_facedata($) { 3659sub load_facedata($) {
3122 my ($path) = @_; 3660 my ($path) = @_;
3123 3661
3124 # HACK to clear player env face cache, we need some signal framework
3125 # for this (global event?)
3126 %ext::player_env::MUSIC_FACE_CACHE = ();
3127
3128 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3129 3663
3130 warn "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3131 3665
3132 my $facedata; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3133 0 < aio_load $path, $facedata
3134 or die "$path: $!";
3135
3136 $facedata = Coro::Storable::thaw $facedata;
3137 3667
3138 $facedata->{version} == 2 3668 $facedata->{version} == 2
3139 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3140 3670
3141 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3142 $facedata->{resource}{"res/exp_table"} = { 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3143 type => FT_RSRC, 3673
3144 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3145 }; 3675
3146 cf::cede_to_tick; 3676 # BEGIN ATOMIC
3677 # from here on, everything must be atomic - no thread switch allowed
3678 my $t1 = EV::time;
3147 3679
3148 { 3680 {
3149 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3150 3682
3151 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3152 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3686
3153 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3154 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3155 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3156 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3157 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3158 cf::cede_to_tick; 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3693 delete $cf::face::META[$idx];
3159 } 3694 }
3160 3695
3161 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3162 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3698
3163 my $idx = cf::face::find $face 3699 my $idx = cf::face::find $face
3164 or next; 3700 or next;
3701
3165 if (my $smooth = cf::face::find $info->{smooth}) { 3702 if (my $smooth = cf::face::find $info->{smooth}) {
3166 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3167 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3168 } else { 3705 } else {
3169 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3170 } 3707 }
3171
3172 cf::cede_to_tick;
3173 } 3708 }
3174 } 3709 }
3175 3710
3176 { 3711 {
3177 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3178 3713
3179 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3180 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3181 cf::cede_to_tick;
3182 } 3716 }
3183 3717
3184 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3185 } 3719 }
3186 3720
3187 { 3721 {
3188 # TODO: for gcfclient pleasure, we should give resources
3189 # that gcfclient doesn't grok a >10000 face index.
3190 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3191 3723
3192 my $soundconf = delete $res->{"res/sound.conf"};
3193
3194 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3725 if (defined (my $type = $info->{type})) {
3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3195 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3196 my $data;
3197 3728
3198 if ($info->{type} & 1) { 3729 cf::face::set_type $idx, $type;
3199 # prepend meta info 3730 cf::face::set_csum $idx, 0, $info->{hash};
3200 3731 $cf::face::SIZE[0][$idx] = $info->{size};
3201 my $meta = $enc->encode ({ 3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3202 name => $name, 3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3203 %{ $info->{meta} || {} }, 3734 $cf::face::HASH{$info->{hash}} = $idx;
3204 });
3205
3206 $data = pack "(w/a*)*", $meta, $info->{data};
3207 } else { 3735 } else {
3208 $data = $info->{data}; 3736# $RESOURCE{$name} = $info; # unused
3209 } 3737 }
3210
3211 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3212 cf::face::set_type $idx, $info->{type};
3213
3214 cf::cede_to_tick;
3215 }
3216
3217 if ($soundconf) {
3218 $soundconf = $enc->decode (delete $soundconf->{data});
3219
3220 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3221 my $sound = $soundconf->{compat}[$_]
3222 or next;
3223
3224 my $face = cf::face::find "sound/$sound->[1]";
3225 cf::sound::set $sound->[0] => $face;
3226 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3227 } 3738 }
3228
3229 while (my ($k, $v) = each %{$soundconf->{event}}) {
3230 my $face = cf::face::find "sound/$v";
3231 cf::sound::set $k => $face;
3232 }
3233 }
3234 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3750
3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3752
3753 aio_close $fh if $fh; # close old facedata
3235 3754
3236 1 3755 1
3237} 3756}
3238 3757
3239register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3241 3760
3242 while (my ($k, $v) = each %$want) { 3761 while (my ($k, $v) = each %$want) {
3243 $ns->fx_want ($k, $v); 3762 $ns->fx_want ($k, $v);
3244 } 3763 }
3245}; 3764};
3765
3766sub load_resource_file($) {
3767 my $guard = lock_acquire "load_resource_file";
3768
3769 my $status = load_resource_file_ $_[0];
3770 get_slot 0.1, 100;
3771 cf::arch::commit_load;
3772
3773 $status
3774}
3775
3776sub reload_exp_table {
3777 _reload_exp_table;
3778
3779 cf::face::set
3780 "res/exp_table" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3783 );
3784}
3785
3786sub reload_materials {
3787 _reload_materials;
3788}
3246 3789
3247sub reload_regions { 3790sub reload_regions {
3248 # HACK to clear player env face cache, we need some signal framework 3791 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?) 3792 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = (); 3793 %ext::player_env::MUSIC_FACE_CACHE = ();
3257 if exists $_->{match}; 3800 if exists $_->{match};
3258 } 3801 }
3259} 3802}
3260 3803
3261sub reload_facedata { 3804sub reload_facedata {
3262 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3263 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3264} 3807}
3265 3808
3266sub reload_archetypes { 3809sub reload_archetypes {
3267 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3268 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3269 #d# NEED to laod twice to resolve forward references 3812
3270 # this really needs to be done in an extra post-pass 3813 cf::face::set
3271 # (which needs to be synchronous, so solve it differently) 3814 "res/skill_info" => FT_RSRC,
3272 load_resource_file "$DATADIR/archetypes" 3815 JSON::XS->new->utf8->canonical->encode (
3273 or die "unable to load archetypes\n"; 3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3817 );
3818
3819 cf::face::set
3820 "res/spell_paths" => FT_RSRC,
3821 JSON::XS->new->utf8->canonical->encode (
3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3274} 3838}
3275 3839
3276sub reload_treasures { 3840sub reload_treasures {
3277 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3278 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3279} 3843}
3280 3844
3845sub reload_sound {
3846 trace "loading sound config from $DATADIR/sound\n";
3847
3848 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3849
3850 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3851 my $sound = $soundconf->{compat}[$_]
3852 or next;
3853
3854 my $face = cf::face::find "sound/$sound->[1]";
3855 cf::sound::set $sound->[0] => $face;
3856 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3857 }
3858
3859 while (my ($k, $v) = each %{$soundconf->{event}}) {
3860 my $face = cf::face::find "sound/$v";
3861 cf::sound::set $k => $face;
3862 }
3863}
3864
3281sub reload_resources { 3865sub reload_resources {
3282 warn "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3283 3867
3868 reload_materials;
3869 reload_facedata;
3870 reload_exp_table;
3871 reload_sound;
3872 reload_archetypes;
3284 reload_regions; 3873 reload_regions;
3285 reload_facedata;
3286 #reload_archetypes;#d#
3287 reload_archetypes;
3288 reload_treasures; 3874 reload_treasures;
3289 3875
3290 warn "finished reloading resource files\n"; 3876 trace "finished reloading resource files\n";
3291}
3292
3293sub init {
3294 reload_resources;
3295} 3877}
3296 3878
3297sub reload_config { 3879sub reload_config {
3298 open my $fh, "<:utf8", "$CONFDIR/config" 3880 trace "reloading config file...\n";
3299 or return;
3300 3881
3301 local $/; 3882 my $config = load_file "$CONFDIR/config";
3302 *CFG = YAML::Syck::Load <$fh>; 3883 utf8::decode $config;
3884 *CFG = decode_yaml $config;
3303 3885
3304 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3886 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3305 3887
3306 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3888 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3307 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3889 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3308 3890
3309 if (exists $CFG{mlockall}) { 3891 if (exists $CFG{mlockall}) {
3313 }; 3895 };
3314 warn $@ if $@; 3896 warn $@ if $@;
3315 } 3897 }
3316} 3898}
3317 3899
3900sub pidfile() {
3901 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3902 or die "$PIDFILE: $!";
3903 flock $fh, &Fcntl::LOCK_EX
3904 or die "$PIDFILE: flock: $!";
3905 $fh
3906}
3907
3908# make sure only one server instance is running at any one time
3909sub atomic {
3910 my $fh = pidfile;
3911
3912 my $pid = <$fh>;
3913 kill 9, $pid if $pid > 0;
3914
3915 seek $fh, 0, 0;
3916 print $fh $$;
3917}
3918
3919sub main_loop {
3920 trace "EV::run starting\n";
3921 if (1) {
3922 EV::run;
3923 }
3924 trace "EV::run returned\n";
3925 goto &main_loop unless $REALLY_UNLOOP;
3926}
3927
3318sub main { 3928sub main {
3929 cf::init_globals; # initialise logging
3930
3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3932 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3935
3936 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3937
3319 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3320 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3321 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3322 (async { 3941 (async {
3323 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3324 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3325 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3326 }; 3945 };
3327 3946
3947 evthread_start IO::AIO::poll_fileno;
3948
3949 cf::sync_job {
3950 cf::incloader::init ();
3951
3952 db_init;
3953
3954 cf::init_anim;
3955 cf::init_attackmess;
3956 cf::init_dynamic;
3957
3958 cf::load_settings;
3959
3960 reload_resources;
3328 reload_config; 3961 reload_config;
3329 db_init; 3962
3963 cf::init_uuid;
3964 cf::init_signals;
3965 cf::init_skills;
3966
3967 cf::init_beforeplay;
3968
3969 atomic;
3970
3330 load_extensions; 3971 load_extensions;
3331 3972
3332 $TICK_WATCHER->start; 3973 utime time, time, $RUNTIMEFILE;
3333 EV::loop; 3974
3975 # no (long-running) fork's whatsoever before this point(!)
3976 use POSIX ();
3977 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3978
3979 cf::_post_init 0;
3980 };
3981
3982 cf::object::thawer::errors_are_fatal 0;
3983 info "parse errors in files are no longer fatal from this point on.\n";
3984
3985 AE::postpone {
3986 undef &main; # free gobs of memory :)
3987 };
3988
3989 goto &main_loop;
3334} 3990}
3335 3991
3336############################################################################# 3992#############################################################################
3337# initialisation and cleanup 3993# initialisation and cleanup
3338 3994
3339# install some emergency cleanup handlers 3995# install some emergency cleanup handlers
3340BEGIN { 3996BEGIN {
3341 our %SIGWATCHER = (); 3997 our %SIGWATCHER = ();
3342 for my $signal (qw(INT HUP TERM)) { 3998 for my $signal (qw(INT HUP TERM)) {
3343 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3999 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3344 cf::cleanup "SIG$signal"; 4000 cf::cleanup "SIG$signal";
3345 }; 4001 };
3346 } 4002 }
3347} 4003}
3348 4004
3349sub write_runtime { 4005sub write_runtime_sync {
3350 my $runtime = "$LOCALDIR/runtime"; 4006 my $t0 = AE::time;
3351 4007
3352 # first touch the runtime file to show we are still running: 4008 # first touch the runtime file to show we are still running:
3353 # the fsync below can take a very very long time. 4009 # the fsync below can take a very very long time.
3354 4010
3355 IO::AIO::aio_utime $runtime, undef, undef; 4011 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3356 4012
3357 my $guard = cf::lock_acquire "write_runtime"; 4013 my $guard = cf::lock_acquire "write_runtime";
3358 4014
3359 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4015 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3360 or return; 4016 or return;
3361 4017
3362 my $value = $cf::RUNTIME + 90 + 10; 4018 my $value = $cf::RUNTIME + 90 + 10;
3363 # 10 is the runtime save interval, for a monotonic clock 4019 # 10 is the runtime save interval, for a monotonic clock
3364 # 60 allows for the watchdog to kill the server. 4020 # 60 allows for the watchdog to kill the server.
3374 aio_utime $fh, undef, undef; 4030 aio_utime $fh, undef, undef;
3375 4031
3376 close $fh 4032 close $fh
3377 or return; 4033 or return;
3378 4034
3379 aio_rename "$runtime~", $runtime 4035 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3380 and return; 4036 and return;
3381 4037
3382 warn "runtime file written.\n"; 4038 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3383 4039
3384 1 4040 1
4041}
4042
4043our $uuid_lock;
4044our $uuid_skip;
4045
4046sub write_uuid_sync($) {
4047 $uuid_skip ||= $_[0];
4048
4049 return if $uuid_lock;
4050 local $uuid_lock = 1;
4051
4052 my $uuid = "$LOCALDIR/uuid";
4053
4054 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
4055 or return;
4056
4057 my $value = uuid_seq uuid_cur;
4058
4059 unless ($value) {
4060 info "cowardly refusing to write zero uuid value!\n";
4061 return;
4062 }
4063
4064 my $value = uuid_str $value + $uuid_skip;
4065 $uuid_skip = 0;
4066
4067 (aio_write $fh, 0, (length $value), $value, 0) <= 0
4068 and return;
4069
4070 # always fsync - this file is important
4071 aio_fsync $fh
4072 and return;
4073
4074 close $fh
4075 or return;
4076
4077 aio_rename "$uuid~", $uuid
4078 and return;
4079
4080 trace "uuid file written ($value).\n";
4081
4082 1
4083
4084}
4085
4086sub write_uuid($$) {
4087 my ($skip, $sync) = @_;
4088
4089 $sync ? write_uuid_sync $skip
4090 : async { write_uuid_sync $skip };
3385} 4091}
3386 4092
3387sub emergency_save() { 4093sub emergency_save() {
3388 my $freeze_guard = cf::freeze_mainloop; 4094 my $freeze_guard = cf::freeze_mainloop;
3389 4095
3390 warn "enter emergency perl save\n"; 4096 info "emergency_perl_save: enter\n";
4097
4098 # this is a trade-off: we want to be very quick here, so
4099 # save all maps without fsync, and later call a global sync
4100 # (which in turn might be very very slow)
4101 local $USE_FSYNC = 0;
3391 4102
3392 cf::sync_job { 4103 cf::sync_job {
4104 cf::write_runtime_sync; # external watchdog should not bark
4105
3393 # use a peculiar iteration method to avoid tripping on perl 4106 # use a peculiar iteration method to avoid tripping on perl
3394 # refcount bugs in for. also avoids problems with players 4107 # refcount bugs in for. also avoids problems with players
3395 # and maps saved/destroyed asynchronously. 4108 # and maps saved/destroyed asynchronously.
3396 warn "begin emergency player save\n"; 4109 info "emergency_perl_save: begin player save\n";
3397 for my $login (keys %cf::PLAYER) { 4110 for my $login (keys %cf::PLAYER) {
3398 my $pl = $cf::PLAYER{$login} or next; 4111 my $pl = $cf::PLAYER{$login} or next;
3399 $pl->valid or next; 4112 $pl->valid or next;
3400 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4113 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3401 $pl->save; 4114 $pl->save;
3402 } 4115 }
3403 warn "end emergency player save\n"; 4116 info "emergency_perl_save: end player save\n";
3404 4117
3405 warn "begin emergency map save\n"; 4118 cf::write_runtime_sync; # external watchdog should not bark
4119
4120 info "emergency_perl_save: begin map save\n";
3406 for my $path (keys %cf::MAP) { 4121 for my $path (keys %cf::MAP) {
3407 my $map = $cf::MAP{$path} or next; 4122 my $map = $cf::MAP{$path} or next;
3408 $map->valid or next; 4123 $map->valid or next;
3409 $map->save; 4124 $map->save;
3410 } 4125 }
3411 warn "end emergency map save\n"; 4126 info "emergency_perl_save: end map save\n";
3412 4127
3413 warn "begin emergency database checkpoint\n"; 4128 cf::write_runtime_sync; # external watchdog should not bark
4129
4130 info "emergency_perl_save: begin database checkpoint\n";
3414 BDB::db_env_txn_checkpoint $DB_ENV; 4131 BDB::db_env_txn_checkpoint $DB_ENV;
3415 warn "end emergency database checkpoint\n"; 4132 info "emergency_perl_save: end database checkpoint\n";
4133
4134 info "emergency_perl_save: begin write uuid\n";
4135 write_uuid_sync 1;
4136 info "emergency_perl_save: end write uuid\n";
4137
4138 cf::write_runtime_sync; # external watchdog should not bark
4139
4140 trace "emergency_perl_save: syncing database to disk";
4141 BDB::db_env_txn_checkpoint $DB_ENV;
4142
4143 info "emergency_perl_save: starting sync\n";
4144 IO::AIO::aio_sync sub {
4145 info "emergency_perl_save: finished sync\n";
4146 };
4147
4148 cf::write_runtime_sync; # external watchdog should not bark
4149
4150 trace "emergency_perl_save: flushing outstanding aio requests";
4151 while (IO::AIO::nreqs || BDB::nreqs) {
4152 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4153 }
4154
4155 cf::write_runtime_sync; # external watchdog should not bark
3416 }; 4156 };
3417 4157
3418 warn "leave emergency perl save\n"; 4158 info "emergency_perl_save: leave\n";
3419} 4159}
3420 4160
3421sub post_cleanup { 4161sub post_cleanup {
3422 my ($make_core) = @_; 4162 my ($make_core) = @_;
3423 4163
4164 IO::AIO::flush;
4165
3424 warn Carp::longmess "post_cleanup backtrace" 4166 error Carp::longmess "post_cleanup backtrace"
3425 if $make_core; 4167 if $make_core;
4168
4169 my $fh = pidfile;
4170 unlink $PIDFILE if <$fh> == $$;
4171}
4172
4173# a safer delete_package, copied from Symbol
4174sub clear_package($) {
4175 my $pkg = shift;
4176
4177 # expand to full symbol table name if needed
4178 unless ($pkg =~ /^main::.*::$/) {
4179 $pkg = "main$pkg" if $pkg =~ /^::/;
4180 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4181 $pkg .= '::' unless $pkg =~ /::$/;
4182 }
4183
4184 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4185 my $stem_symtab = *{$stem}{HASH};
4186
4187 defined $stem_symtab and exists $stem_symtab->{$leaf}
4188 or return;
4189
4190 # clear all symbols
4191 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4192 for my $name (keys %$leaf_symtab) {
4193 _gv_clear *{"$pkg$name"};
4194# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4195 }
3426} 4196}
3427 4197
3428sub do_reload_perl() { 4198sub do_reload_perl() {
3429 # can/must only be called in main 4199 # can/must only be called in main
3430 if ($Coro::current != $Coro::main) { 4200 unless (in_main) {
3431 warn "can only reload from main coroutine"; 4201 error "can only reload from main coroutine";
3432 return; 4202 return;
3433 } 4203 }
3434 4204
3435 warn "reloading..."; 4205 return if $RELOAD++;
3436 4206
3437 warn "entering sync_job"; 4207 my $t1 = AE::time;
3438 4208
4209 while ($RELOAD) {
4210 cf::get_slot 0.1, -1, "reload_perl";
4211 info "perl_reload: reloading...";
4212
4213 trace "perl_reload: entering sync_job";
4214
3439 cf::sync_job { 4215 cf::sync_job {
3440 cf::write_runtime; # external watchdog should not bark
3441 cf::emergency_save; 4216 #cf::emergency_save;
3442 cf::write_runtime; # external watchdog should not bark
3443 4217
3444 warn "syncing database to disk";
3445 BDB::db_env_txn_checkpoint $DB_ENV;
3446
3447 # if anything goes wrong in here, we should simply crash as we already saved
3448
3449 warn "flushing outstanding aio requests";
3450 for (;;) {
3451 BDB::flush;
3452 IO::AIO::flush;
3453 Coro::cede_notself;
3454 last unless IO::AIO::nreqs || BDB::nreqs;
3455 warn "iterate...";
3456 }
3457
3458 ++$RELOAD;
3459
3460 warn "cancelling all extension coros"; 4218 trace "perl_reload: cancelling all extension coros";
3461 $_->cancel for values %EXT_CORO; 4219 $_->cancel for values %EXT_CORO;
3462 %EXT_CORO = (); 4220 %EXT_CORO = ();
3463 4221
3464 warn "removing commands"; 4222 trace "perl_reload: removing commands";
3465 %COMMAND = (); 4223 %COMMAND = ();
3466 4224
3467 warn "removing ext/exti commands"; 4225 trace "perl_reload: removing ext/exti commands";
3468 %EXTCMD = (); 4226 %EXTCMD = ();
3469 %EXTICMD = (); 4227 %EXTICMD = ();
3470 4228
3471 warn "unloading/nuking all extensions"; 4229 trace "perl_reload: unloading/nuking all extensions";
3472 for my $pkg (@EXTS) { 4230 for my $pkg (@EXTS) {
3473 warn "... unloading $pkg"; 4231 trace "... unloading $pkg";
3474 4232
3475 if (my $cb = $pkg->can ("unload")) { 4233 if (my $cb = $pkg->can ("unload")) {
3476 eval { 4234 eval {
3477 $cb->($pkg); 4235 $cb->($pkg);
3478 1 4236 1
3479 } or warn "$pkg unloaded, but with errors: $@"; 4237 } or error "$pkg unloaded, but with errors: $@";
4238 }
4239
4240 trace "... clearing $pkg";
4241 clear_package $pkg;
3480 } 4242 }
3481 4243
3482 warn "... nuking $pkg";
3483 Symbol::delete_package $pkg;
3484 }
3485
3486 warn "unloading all perl modules loaded from $LIBDIR"; 4244 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3487 while (my ($k, $v) = each %INC) { 4245 while (my ($k, $v) = each %INC) {
3488 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3489 4247
3490 warn "... unloading $k"; 4248 trace "... unloading $k";
3491 delete $INC{$k}; 4249 delete $INC{$k};
3492 4250
3493 $k =~ s/\.pm$//; 4251 $k =~ s/\.pm$//;
3494 $k =~ s/\//::/g; 4252 $k =~ s/\//::/g;
3495 4253
3496 if (my $cb = $k->can ("unload_module")) { 4254 if (my $cb = $k->can ("unload_module")) {
3497 $cb->(); 4255 $cb->();
4256 }
4257
4258 clear_package $k;
3498 } 4259 }
3499 4260
3500 Symbol::delete_package $k;
3501 }
3502
3503 warn "getting rid of safe::, as good as possible"; 4261 trace "perl_reload: getting rid of safe::, as good as possible";
3504 Symbol::delete_package "safe::$_" 4262 clear_package "safe::$_"
3505 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4263 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3506 4264
3507 warn "unloading cf.pm \"a bit\""; 4265 trace "perl_reload: unloading cf.pm \"a bit\"";
3508 delete $INC{"cf.pm"}; 4266 delete $INC{"cf.pm"};
3509 delete $INC{"cf/pod.pm"}; 4267 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3510 4268
3511 # don't, removes xs symbols, too, 4269 # don't, removes xs symbols, too,
3512 # and global variables created in xs 4270 # and global variables created in xs
3513 #Symbol::delete_package __PACKAGE__; 4271 #clear_package __PACKAGE__;
3514 4272
3515 warn "unload completed, starting to reload now"; 4273 info "perl_reload: unload completed, starting to reload now";
3516 4274
3517 warn "reloading cf.pm"; 4275 trace "perl_reload: reloading cf.pm";
3518 require cf; 4276 require cf;
3519 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4277 cf::_connect_to_perl_1;
3520 4278
3521 warn "loading config and database again"; 4279 trace "perl_reload: loading config and database again";
3522 cf::reload_config; 4280 cf::reload_config;
3523 4281
3524 warn "loading extensions"; 4282 trace "perl_reload: loading extensions";
3525 cf::load_extensions; 4283 cf::load_extensions;
3526 4284
4285 if ($REATTACH_ON_RELOAD) {
3527 warn "reattaching attachments to objects/players"; 4286 trace "perl_reload: reattaching attachments to objects/players";
3528 _global_reattach; # objects, sockets 4287 _global_reattach; # objects, sockets
3529 warn "reattaching attachments to maps"; 4288 trace "perl_reload: reattaching attachments to maps";
3530 reattach $_ for values %MAP; 4289 reattach $_ for values %MAP;
3531 warn "reattaching attachments to players"; 4290 trace "perl_reload: reattaching attachments to players";
3532 reattach $_ for values %PLAYER; 4291 reattach $_ for values %PLAYER;
4292 }
3533 4293
3534 warn "leaving sync_job"; 4294 cf::_post_init 1;
3535 4295
4296 trace "perl_reload: leaving sync_job";
4297
3536 1 4298 1
3537 } or do { 4299 } or do {
3538 warn $@; 4300 error $@;
3539 warn "error while reloading, exiting."; 4301 cf::cleanup "perl_reload: error, exiting.";
3540 exit 1; 4302 };
4303
4304 --$RELOAD;
3541 }; 4305 }
3542 4306
3543 warn "reloaded"; 4307 $t1 = AE::time - $t1;
4308 info "perl_reload: completed in ${t1}s\n";
3544}; 4309};
3545 4310
3546our $RELOAD_WATCHER; # used only during reload 4311our $RELOAD_WATCHER; # used only during reload
3547 4312
3548sub reload_perl() { 4313sub reload_perl() {
3549 # doing reload synchronously and two reloads happen back-to-back, 4314 # doing reload synchronously and two reloads happen back-to-back,
3550 # coro crashes during coro_state_free->destroy here. 4315 # coro crashes during coro_state_free->destroy here.
3551 4316
4317 $RELOAD_WATCHER ||= cf::async {
4318 Coro::AIO::aio_wait cache_extensions;
4319
3552 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4320 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4321 do_reload_perl;
3553 undef $RELOAD_WATCHER; 4322 undef $RELOAD_WATCHER;
3554 do_reload_perl; 4323 };
3555 }; 4324 };
3556} 4325}
3557 4326
3558register_command "reload" => sub { 4327register_command "reload" => sub {
3559 my ($who, $arg) = @_; 4328 my ($who, $arg) = @_;
3565 reload_perl; 4334 reload_perl;
3566 }; 4335 };
3567 } 4336 }
3568}; 4337};
3569 4338
3570unshift @INC, $LIBDIR; 4339#############################################################################
3571 4340
3572my $bug_warning = 0; 4341my $bug_warning = 0;
3573 4342
3574our @WAIT_FOR_TICK;
3575our @WAIT_FOR_TICK_BEGIN;
3576
3577sub wait_for_tick { 4343sub wait_for_tick() {
3578 return unless $TICK_WATCHER->is_active; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3579 return if $Coro::current == $Coro::main;
3580 4345
3581 my $signal = new Coro::Signal; 4346 $WAIT_FOR_TICK->wait;
3582 push @WAIT_FOR_TICK, $signal;
3583 $signal->wait;
3584} 4347}
3585 4348
3586sub wait_for_tick_begin { 4349sub wait_for_tick_begin() {
3587 return unless $TICK_WATCHER->is_active; 4350 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3588 return if $Coro::current == $Coro::main;
3589 4351
3590 my $signal = new Coro::Signal; 4352 my $signal = new Coro::Signal;
3591 push @WAIT_FOR_TICK_BEGIN, $signal; 4353 push @WAIT_FOR_TICK_BEGIN, $signal;
3592 $signal->wait; 4354 $signal->wait;
3593} 4355}
3594 4356
3595$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4357sub tick {
3596 if ($Coro::current != $Coro::main) { 4358 if ($Coro::current != $Coro::main) {
3597 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4359 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3598 unless ++$bug_warning > 10; 4360 unless ++$bug_warning > 10;
3599 return; 4361 return;
3600 } 4362 }
3601 4363
3602 $NOW = $tick_start = EV::now; 4364 cf::one_tick; # one server iteration
3603 4365
3604 cf::server_tick; # one server iteration 4366 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3605
3606 $RUNTIME += $TICK;
3607 $NEXT_TICK += $TICK;
3608 4367
3609 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4368 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3610 $NEXT_RUNTIME_WRITE = $NOW + 10; 4369 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3611 Coro::async_pool { 4370 Coro::async_pool {
3612 $Coro::current->{desc} = "runtime saver"; 4371 $Coro::current->{desc} = "runtime saver";
3613 write_runtime 4372 write_runtime_sync
3614 or warn "ERROR: unable to write runtime file: $!"; 4373 or error "ERROR: unable to write runtime file: $!";
3615 }; 4374 };
3616 } 4375 }
3617 4376
3618 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4377 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3619 $sig->send; 4378 $sig->send;
3620 } 4379 }
3621 while (my $sig = shift @WAIT_FOR_TICK) { 4380 $WAIT_FOR_TICK->broadcast;
3622 $sig->send;
3623 }
3624 4381
3625 $LOAD = ($NOW - $tick_start) / $TICK; 4382 $LOAD = ($NOW - $TICK_START) / $TICK;
3626 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3627 4384
3628 _post_tick; 4385 if (0) {
3629}; 4386 if ($NEXT_TICK) {
3630$TICK_WATCHER->priority (EV::MAXPRI); 4387 my $jitter = $TICK_START - $NEXT_TICK;
4388 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4389 debug "jitter $JITTER\n";#d#
4390 }
4391 }
4392}
3631 4393
3632{ 4394{
4395 # configure BDB
4396 info "initialising database";
4397
3633 BDB::min_parallel 8; 4398 BDB::min_parallel 16;
3634 BDB::max_poll_time $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
3635 $BDB_POLL_WATCHER = EV::io BDB::poll_fileno, EV::READ, \&BDB::poll_cb; 4400 #$AnyEvent::BDB::WATCHER->priority (1);
3636
3637 BDB::set_sync_prepare {
3638 my $status;
3639 my $current = $Coro::current;
3640 (
3641 sub {
3642 $status = $!;
3643 $current->ready; undef $current;
3644 },
3645 sub {
3646 Coro::schedule while defined $current;
3647 $! = $status;
3648 },
3649 )
3650 };
3651 4401
3652 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
3653 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
3654 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3655 | BDB::LOG_AUTOREMOVE, 1); 4405 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4406 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3656 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4407 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3657 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4408 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3658 4409
3659 cf::sync_job { 4410 cf::sync_job {
3660 eval { 4411 eval {
3679 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3680 }; 4431 };
3681 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3682 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3683 }; 4434 };
4435
4436 info "database initialised";
3684} 4437}
3685 4438
3686{ 4439{
4440 # configure IO::AIO
4441
4442 info "initialising aio";
3687 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
3688
3689 undef $Coro::AIO::WATCHER;
3690 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
3691 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
3692} 4447}
3693 4448
3694my $_log_backtrace; 4449our $_log_backtrace;
4450our $_log_backtrace_last;
3695 4451
3696sub _log_backtrace { 4452sub _log_backtrace {
3697 my ($msg, @addr) = @_; 4453 my ($msg, @addr) = @_;
3698 4454
3699 $msg =~ s/\n//; 4455 $msg =~ s/\n$//;
3700 4456
4457 if ($_log_backtrace_last eq $msg) {
4458 LOG llevInfo, "[ABT] $msg\n";
4459 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3701 # limit the # of concurrent backtraces 4460 # limit the # of concurrent backtraces
3702 if ($_log_backtrace < 2) { 4461 } elsif ($_log_backtrace < 2) {
4462 $_log_backtrace_last = $msg;
3703 ++$_log_backtrace; 4463 ++$_log_backtrace;
4464 my $perl_bt = Carp::longmess $msg;
3704 async { 4465 async {
3705 $Coro::current->{desc} = "abt $msg"; 4466 $Coro::current->{desc} = "abt $msg";
3706 4467
3707 my @bt = fork_call { 4468 my @bt = fork_call {
3708 @addr = map { sprintf "%x", $_ } @addr; 4469 @addr = map { sprintf "%x", $_ } @addr;
3719 } 4480 }
3720 4481
3721 @funcs 4482 @funcs
3722 }; 4483 };
3723 4484
3724 LOG llevInfo, "[ABT] $msg\n"; 4485 LOG llevInfo, "[ABT] $perl_bt\n";
4486 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3725 LOG llevInfo, "[ABT] $_\n" for @bt; 4487 LOG llevInfo, "[ABT] $_\n" for @bt;
3726 --$_log_backtrace; 4488 --$_log_backtrace;
3727 }; 4489 };
3728 } else { 4490 } else {
3729 LOG llevInfo, "[ABT] $msg\n"; 4491 LOG llevInfo, "[ABT] $msg\n";
3730 LOG llevInfo, "[ABT] [suppressed]\n"; 4492 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3731 } 4493 }
3732} 4494}
3733 4495
3734# load additional modules 4496# load additional modules
3735use cf::pod; 4497require "cf/$_.pm" for @EXTRA_MODULES;
4498cf::_connect_to_perl_2;
3736 4499
3737END { cf::emergency_save } 4500END { cf::emergency_save }
3738 4501
37391 45021
3740 4503

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines