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.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.621 by root, Fri Nov 18 20:55:00 2016 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 1.86; 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.32 (); 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;
23use Coro::BDB; 52use Coro::BDB 1.6;
24use Coro::Storable; 53use Coro::Storable;
25use Coro::Util (); 54use Coro::Util ();
26 55
56use Guard ();
27use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
28use BDB (); 58use BDB ();
29use Data::Dumper; 59use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 60use Fcntl;
32use YAML (); 61use YAML::XS ();
33use IO::AIO 2.51 (); 62use IO::AIO ();
34use Time::HiRes;
35use Compress::LZF; 63use Compress::LZF;
36use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
37 67
38# configure various modules to our taste 68# configure various modules to our taste
39# 69#
40$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 78
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 79# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 81
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83
84our @ORIG_INC;
47 85
48our %COMMAND = (); 86our %COMMAND = ();
49our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
50 88
51our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
53our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
56 96
57our $RELOAD; # number of reloads so far 97our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
59 101
60our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
61our $DATADIR = datadir; 104our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
65our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 115our $PIDFILE = "$LOCALDIR/pid";
116our $RUNTIMEFILE = "$LOCALDIR/runtime";
117
118#our %RESOURCE; # unused
119
120our $OUTPUT_RATE_MIN = 3000;
121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
72 125
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 128our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 129our $USE_FSYNC = 1; # use fsync to write maps - default on
79 130
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 134our $DB_ENV;
85 135
136our @EXTRA_MODULES = qw(pod match mapscript incloader);
137
86our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
87 140
88our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
90our $NOW; 144our $NOW;
91 145
92our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 151our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 152
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 153our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 154our $LOADAVG; # same thing, but with alpha-smoothing
155our $JITTER; # average jitter
101our $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;
102 165
103binmode STDOUT; 166binmode STDOUT;
104binmode STDERR; 167binmode STDERR;
105 168
106# read virtual server time, if available 169# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 170unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 171 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 172 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 173 $RUNTIME = <$fh> + 0.;
111} 174}
175
176eval "sub TICK() { $TICK } 1" or die;
112 177
113mkdir $_ 178mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 179 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 180
116our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
117 182
118sub cf::map::normalise; 183sub cf::map::normalise;
119 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
120############################################################################# 189#############################################################################
121 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
122=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
123 203
124=over 4 204=over 4
125 205
126=item $cf::UPTIME 206=item $cf::UPTIME
127 207
128The 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.
129 224
130=item $cf::RUNTIME 225=item $cf::RUNTIME
131 226
132The 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
133every server tick. 228every server tick.
134 229
135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
138 233
139Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
140directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
142database environment. 237database environment.
143 238
144=item $cf::NOW
145
146The time of the last (current) server tick.
147
148=item $cf::TICK
149
150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG 239=item $cf::LOADAVG
153 240
154The 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
155(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
156objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
164Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 252from wherever your confdir points to.
166 253
167=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
168 255
169These 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.
170returns 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
171per 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();
172 277
173=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
174 279
175This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
176C<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
177that call. 282that call.
178 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
179=back 290=back
180 291
181=cut 292=cut
182 293
183BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
184 *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 {
185 my $msg = join "", @_; 301 my $msg = join "", @_;
186 302
187 $msg .= "\n" 303 $msg .= "\n"
188 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
189 305
190 $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;
191 307
192 LOG llevError, $msg; 308 LOG llevWarn, $msg;
193 }; 309};
194}
195 310
196$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
198 313
199 if ($Coro::current == $Coro::main) {#d# 314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d# 318 return;#d#
202 }#d# 319 }#d#
203 320
204 # kill coroutine otherwise 321 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate 322 Coro::terminate
207}; 323};
208
209$SIG{__DIE__} = sub { }; #d#?
210 324
211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
221for my $pkg (qw( 335for my $pkg (qw(
222 cf::global cf::attachable 336 cf::global cf::attachable
223 cf::object cf::object::player 337 cf::object cf::object::player
224 cf::client cf::player 338 cf::client cf::player
225 cf::arch cf::living 339 cf::arch cf::living
340 cf::map cf::mapspace
226 cf::map cf::party cf::region 341 cf::party cf::region
227)) { 342)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 344}
231 345
232$EV::DIED = sub { 346$EV::DIED = sub {
233 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
234}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
235 354
236############################################################################# 355#############################################################################
237 356
238=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
239 358
260 $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;
261 $d 380 $d
262 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
263} 382}
264 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
265=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
266 437
267Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
268 439
269=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
275our $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
276 447
277sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
279 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
482=item cf::post_init { BLOCK }
483
484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
485but I<before> the server starts ticking again.
486
487The codeblock will have a single boolean argument to indicate whether this
488is a reload or not.
489
490=cut
491
492sub post_init(&) {
493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
511}
512
280=item cf::lock_wait $string 513=item cf::lock_wait $string
281 514
282Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
283 516
284=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
285 518
286Wait 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
287a 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,
288for example when the coroutine gets canceled), the lock is automatically 521for example when the coroutine gets canceled), the lock is automatically
289returned. 522returned.
290 523
291Locks 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
292deadlocked coro. 525deadlocked coro.
298 531
299Return 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.
300 533
301=cut 534=cut
302 535
303our %LOCK; 536our $LOCKS = new Coro::SemaphoreSet;
304our %LOCKER;#d#
305 537
306sub lock_wait($) { 538sub lock_wait($) {
307 my ($key) = @_; 539 $LOCKS->wait ($_[0]);
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
313
314 # wait for lock, if any
315 while ($LOCK{$key}) {
316 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule;
318 }
319} 540}
320 541
321sub lock_acquire($) { 542sub lock_acquire($) {
322 my ($key) = @_; 543 $LOCKS->guard ($_[0])
323
324 # wait, to be sure we are not locked
325 lock_wait $key;
326
327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
329
330 Coro::guard {
331 delete $LOCKER{$key};#d#
332 # wake up all waiters, to be on the safe side
333 $_->ready for @{ delete $LOCK{$key} };
334 }
335} 544}
336 545
337sub lock_active($) { 546sub lock_active($) {
338 my ($key) = @_; 547 $LOCKS->count ($_[0]) < 1
339
340 ! ! $LOCK{$key}
341} 548}
342 549
343sub freeze_mainloop { 550sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 551 tick_inhibit_inc;
345 552
346 my $guard = Coro::guard { 553 &Guard::guard (\&tick_inhibit_dec);
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 554}
352 555
353=item cf::periodic $interval, $cb 556=item cf::periodic $interval, $cb
354 557
355Like 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
356get spread over timer. 559get spread over time.
357 560
358=cut 561=cut
359 562
360sub periodic($$) { 563sub periodic($$) {
361 my ($interval, $cb) = @_; 564 my ($interval, $cb) = @_;
365 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
366} 569}
367 570
368=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
369 572
370Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
371This 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
372of 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.
373 580
374The 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
375used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
376 583
377Useful for short background jobs. 584Useful for short background jobs.
378 585
379=cut 586=cut
380 587
381our @SLOT_QUEUE; 588our @SLOT_QUEUE;
382our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
383 591
384$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
387 595
388 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
389 598
390 while () { 599 while () {
391 next_job: 600 next_job:
601
602 Coro::cede;
603
392 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
393 if ($avail > 0.01) { 605
394 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
608 $busy = 0;
396 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send; 610 $job->[2]->send;
398 Coro::cede;
399 goto next_job; 611 goto next_job;
400 } 612 } else {
613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
401 } 614 }
402 } 615 }
403 616
404 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
405 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
406 push @cf::WAIT_FOR_TICK, $signal;
407 $signal->wait;
408 } else { 619 } else {
620 $busy = 0;
409 Coro::schedule; 621 Coro::schedule;
410 } 622 }
411 } 623 }
412}; 624};
413 625
414sub get_slot($;$$) { 626sub get_slot($;$$) {
627 return if tick_inhibit || $Coro::current == $Coro::main;
628
415 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
416 630
417 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
418 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
419 634
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
434BEGIN { *async = \&Coro::async_pool } 649BEGIN { *async = \&Coro::async_pool }
435 650
436=item cf::sync_job { BLOCK } 651=item cf::sync_job { BLOCK }
437 652
438The design of Deliantra requires that the main coroutine ($Coro::main) 653The design of Deliantra requires that the main coroutine ($Coro::main)
439is always able to handle events or runnable, as Deliantra is only 654is always able to handle events or is runnable, as Deliantra is only
440partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 655partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
441acceptable. 656acceptable.
442 657
443If it must be done, put the blocking parts into C<sync_job>. This will run 658If it must be done, put the blocking parts into C<sync_job>. This will run
444the given BLOCK in another coroutine while waiting for the result. The 659the given BLOCK in another coroutine while waiting for the result. The
448=cut 663=cut
449 664
450sub sync_job(&) { 665sub sync_job(&) {
451 my ($job) = @_; 666 my ($job) = @_;
452 667
453 if ($Coro::current == $Coro::main) { 668 if (in_main) {
454 my $time = EV::time; 669 my $time = AE::time;
455 670
456 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
458 673
459 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
460 675
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
464 677
465 my $busy = 1; 678 my $busy = 1;
466 my @res; 679 my @res;
467 680
468 (async { 681 (async {
469 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
470 @res = eval { $job->() }; 683 @res = eval { $job->() };
471 warn $@ if $@; 684 error $@ if $@;
472 undef $busy; 685 undef $busy;
473 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
474 687
475 while ($busy) { 688 while ($busy) {
476 if (Coro::nready) { 689 if (Coro::nready) {
477 Coro::cede_notself; 690 Coro::cede_notself;
478 } else { 691 } else {
479 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
480 } 693 }
481 } 694 }
482 695
483 $time = EV::time - $time; 696 my $time = AE::time - $time;
484 697
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
489 699
490 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
491 } else { 701 } else {
492 # we are in another coroutine, how wonderful, everything just works 702 # we are in another coroutine, how wonderful, everything just works
493 703
513 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
514 724
515 $coro 725 $coro
516} 726}
517 727
518=item fork_call { }, $args 728=item fork_call { }, @args
519 729
520Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
521process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
522Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
523never block itself or use any form of event handling. 733never block itself or use any form of event handling.
524 734
525=cut 735=cut
526 736
737sub post_fork {
738 reset_signals;
739}
740
527sub fork_call(&@) { 741sub fork_call(&@) {
528 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
529 743
530 # we seemingly have to make a local copy of the whole thing,
531 # otherwise perl prematurely frees the stuff :/
532 # TODO: investigate and fix (likely this will be rather laborious)
533
534 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
535 reset_signals; 745 cf::post_fork;
536 &$cb 746 &$cb
537 }, @args; 747 } @args;
538 748
539 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
540} 788}
541 789
542=item $value = cf::db_get $family => $key 790=item $value = cf::db_get $family => $key
543 791
544Returns a single value from the environment database. 792Returns a single value from the environment database.
554within each server. 802within each server.
555 803
556=cut 804=cut
557 805
558sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
559 my ($name) = @_; 810 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
561 812
562 eval { 813 eval {
563 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
573} 824}
574 825
575our $DB; 826our $DB;
576 827
577sub db_init { 828sub db_init {
578 cf::sync_job {
579 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
580 };
581} 830}
582 831
583sub db_get($$) { 832sub db_get($$) {
584 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
585 834
586 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
587 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
588 839
589 $! ? () 840 $! ? ()
590 : $data 841 : $data
591 }
592} 842}
593 843
594sub db_put($$$) { 844sub db_put($$$) {
595 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
596 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
624 874
625 my @data; 875 my @data;
626 my $md5; 876 my $md5;
627 877
628 for (0 .. $#$src) { 878 for (0 .. $#$src) {
629 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
630 or Carp::croak "$src->[$_]: $!";
631 } 880 }
632 881
633 # if processing is expensive, check 882 # if processing is expensive, check
634 # checksum first 883 # checksum first
635 if (1) { 884 if (1) {
648 897
649 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
650 } 899 }
651 } 900 }
652 901
653 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
654 my $data = $process->(\@data); 903 my $data = $process->(\@data);
655 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
656 905
657 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
658 907
659 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
660 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
661 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
662 911
672 921
673=cut 922=cut
674 923
675sub datalog($@) { 924sub datalog($@) {
676 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
677 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
678} 927}
679 928
680=back 929=back
681 930
682=cut 931=cut
683 932
684############################################################################# 933#############################################################################
685 934
686=head2 ATTACHABLE OBJECTS 935=head2 ATTACHABLE OBJECTS
687 936
688Many 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
689attach callbacks/event handlers (a collection of which is called an "attachment") 938attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 939to it. All such attachable objects support the following methods.
691 940
692In 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>
693C<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
743=item cf::CLASS::attachment $name, ... 992=item cf::CLASS::attachment $name, ...
744 993
745Register an attachment by C<$name> through which attachable objects of the 994Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 995given CLASS can refer to this attachment.
747 996
748Some classes such as crossfire maps and objects can specify attachments 997Some classes such as deliantra maps and objects can specify attachments
749that 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.
750 999
751These calls expect any number of the following handler/hook descriptions: 1000These calls expect any number of the following handler/hook descriptions:
752 1001
753=over 4 1002=over 4
877 1126
878 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
879 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
880 1129
881 } elsif (ref $type) { 1130 } elsif (ref $type) {
882 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
883 1132
884 } else { 1133 } else {
885 shift @arg; 1134 shift @arg;
886 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
887 } 1136 }
888 } 1137 }
889} 1138}
890 1139
891sub _object_attach { 1140sub _object_attach {
901 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
902 } 1151 }
903 1152
904 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
905 } else { 1154 } else {
906 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
907 } 1156 }
908 1157
909 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
910} 1159}
911 1160
970 1219
971 for (@$callbacks) { 1220 for (@$callbacks) {
972 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
973 1222
974 if ($@) { 1223 if ($@) {
975 warn "$@";
976 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
977 override; 1225 override;
978 } 1226 }
979 1227
980 return 1 if $override; 1228 return 1 if $override;
981 } 1229 }
1044 1292
1045sub reattach { 1293sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1294 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1295 my ($obj) = @_;
1048 1296
1297 # no longer needed after getting rid of delete_package?
1049 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
1050 1299
1051 my $registry = $obj->registry; 1300 my $registry = $obj->registry;
1052 1301
1053 @$registry = (); 1302 @$registry = ();
1054 1303
1059 for (@$attach) { 1308 for (@$attach) {
1060 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1061 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1062 } 1311 }
1063 } else { 1312 } else {
1064 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1065 } 1314 }
1066 } 1315 }
1067} 1316}
1068 1317
1069cf::attachable->attach ( 1318cf::attachable->attach (
1096 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1097 1346
1098 sync_job { 1347 sync_job {
1099 if (length $$rdata) { 1348 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1103 1353
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1355 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 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 }
1108 close $fh; 1361 aio_close $fh;
1109 1362
1110 if (@$objs) { 1363 if (@$objs) {
1111 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) {
1112 chmod SAVE_MODE, $fh; 1365 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1115 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 }
1116 close $fh; 1372 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1374 }
1119 } else { 1375 } else {
1120 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1121 } 1377 }
1122 1378
1123 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1380
1381 $filename =~ s%/[^/]+$%%;
1382 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1383 } else {
1125 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1126 } 1385 }
1127 } else { 1386 } else {
1128 aio_unlink $filename; 1387 aio_unlink $filename;
1129 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1130 } 1389 }
1154 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs}; 1414 $av = $st->{objs};
1156 } 1415 }
1157 1416
1158 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1159 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1160 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1161 1421
1162 ($data, $av) 1422 ($data, $av)
1163} 1423}
1164 1424
1165=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1169=cut 1429=cut
1170 1430
1171############################################################################# 1431#############################################################################
1172# command handling &c 1432# command handling &c
1173 1433
1174=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1175 1435
1176Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1177$name. 1437$name.
1178 1438
1179=cut 1439=cut
1185 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1186 1446
1187 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1188} 1448}
1189 1449
1190=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1191 1451
1192Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1193extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1194received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1195the 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
1196has logged in successfully. 1456has logged in successfully.
1197 1457
1198If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1199called.
1200 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
1201=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1202 1466
1203Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1204exticmd 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
1205are 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
1206is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1207log-in. 1471log-in.
1208 1472
1209If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1210called.
1211 1474
1212=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1213 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
1214sub register_extcmd { 1482sub register_extcmd($$) {
1215 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1216 1484
1217 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1218} 1486}
1219 1487
1220sub register_exticmd { 1488sub register_async_extcmd($$) {
1221 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1222 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1223 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1224} 1498}
1225 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1226cf::player->attach ( 1508cf::player->attach (
1227 on_command => sub { 1509 on_unknown_command => sub {
1228 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1229 1511
1230 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1231 or return; 1513 or return;
1232 1514
1240 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1241 1523
1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1243 1525
1244 if (ref $msg) { 1526 if (ref $msg) {
1245 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1246 "ARRAY" eq ref $msg
1247 ? @$msg
1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1249 1528
1250 my @reply;
1251
1252 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}) {
1253 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1254 } 1547 }
1255 1548
1256 $pl->ext_reply ($reply, @reply)
1257 if $reply;
1258
1259 } else { 1549 } else {
1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1261 } 1551 }
1262 1552
1263 cf::override; 1553 cf::override;
1264 }, 1554 },
1265); 1555);
1266 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
1267sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1268 cf::sync_job { 1586 cf::sync_job {
1269 my %todo; 1587 my %todo;
1270 1588
1271 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1272 next unless -r $path; 1590 next unless -r $path;
1290 1608
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1611
1294 $ext{source} = 1612 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1296 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1297 . $source 1615 . $source
1298 . "\n};\n1"; 1616 . "\n};\n1";
1299 1617
1300 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1301 } 1619 }
1302 1620
1621 my $pass = 0;
1303 my %done; 1622 my %done;
1304 while (%todo) { 1623 while (%todo) {
1305 my $progress; 1624 my $progress;
1306 1625
1626 ++$pass;
1627
1628 ext:
1307 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1308 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1309 goto skip 1631 next ext
1310 unless exists $done{$_}; 1632 unless exists $done{$_};
1311 } 1633 }
1312 1634
1313 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1314 1636
1315 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 $@) {
1316 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1317 : "$v->{base}: extension inactive.\n";
1318 1650
1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1319 if (exists $v->{meta}{mandatory}) { 1652 if exists $v->{meta}{mandatory};
1320 warn $msg; 1653
1321 warn "mandatory extension failed to load, exiting.\n"; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1322 exit 1; 1655 delete $todo{$k};
1323 } 1656 } else {
1324 1657 $done{$k} = delete $todo{$k};
1325 warn $msg; 1658 push @EXTS, $v->{pkg};
1659 $progress = 1;
1660
1661 info "$v->{base}: extension inactive.\n"
1662 unless $active;
1326 } 1663 }
1327
1328 $done{$k} = delete $todo{$k};
1329 push @EXTS, $v->{pkg};
1330 $progress = 1;
1331 } 1664 }
1332 1665
1333 skip: 1666 unless ($progress) {
1334 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1335 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 }
1336 } 1676 }
1337 }; 1677 };
1338} 1678}
1339 1679
1340############################################################################# 1680#############################################################################
1341 1681
1342=back 1682=back
1343 1683
1344=head2 CORE EXTENSIONS 1684=head2 CORE EXTENSIONS
1345 1685
1346Functions and methods that extend core crossfire objects. 1686Functions and methods that extend core deliantra objects.
1347 1687
1348=cut 1688=cut
1349 1689
1350package cf::player; 1690package cf::player;
1351 1691
1394 1734
1395sub exists($) { 1735sub exists($) {
1396 my ($login) = @_; 1736 my ($login) = @_;
1397 1737
1398 $cf::PLAYER{$login} 1738 $cf::PLAYER{$login}
1399 or cf::sync_job { !aio_stat path $login } 1739 or !aio_stat path $login
1400} 1740}
1401 1741
1402sub find($) { 1742sub find($) {
1403 return $cf::PLAYER{$_[0]} || do { 1743 return $cf::PLAYER{$_[0]} || do {
1404 my $login = $_[0]; 1744 my $login = $_[0];
1416 my $f = new_from_file cf::object::thawer path $login 1756 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1757 or return;
1418 1758
1419 my $pl = cf::player::load_pl $f 1759 my $pl = cf::player::load_pl $f
1420 or return; 1760 or return;
1761
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1762 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1763 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1424 } 1765 }
1425 } 1766 }
1426} 1767}
1427 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
1428sub save($) { 1782sub save($) {
1429 my ($pl) = @_; 1783 my ($pl) = @_;
1430 1784
1431 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1432 1786
1435 1789
1436 return if $pl->{deny_save}; 1790 return if $pl->{deny_save};
1437 1791
1438 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1439 $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];
1440 1799
1441 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1801 cf::cede_to_tick;
1443} 1802}
1444 1803
1476 my ($pl) = @_; 1835 my ($pl) = @_;
1477 1836
1478 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1479 1838
1480 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1481 $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
1482 1841
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1484 $pl->deactivate; 1843 $pl->deactivate;
1844
1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1486 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1487 1850
1488 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1490 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1528 1891
1529 for my $login (@$dirs) { 1892 for my $login (@$dirs) {
1530 my $path = path $login; 1893 my $path = path $login;
1531 1894
1532 # a .pst is a dead give-away for a valid player 1895 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1896 # if no pst file found, open and chekc for blocked users
1897 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1898 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1899 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1900 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1901 }
1538 1902
1542 1906
1543 \@logins 1907 \@logins
1544} 1908}
1545 1909
1546=item $player->maps 1910=item $player->maps
1911
1912=item cf::player::maps $login
1547 1913
1548Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1549player. May block. 1915player. May block.
1550 1916
1551=cut 1917=cut
1569 } 1935 }
1570 1936
1571 \@paths 1937 \@paths
1572} 1938}
1573 1939
1574=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1575 1941
1576Expand crossfire pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1577
1578=cut
1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1591sub expand_cfpod {
1592 my ($self, $pod) = @_;
1593
1594 my $xml;
1595
1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1599
1600 $group =~ s/&/&amp;/g;
1601 $group =~ s/</&lt;/g;
1602
1603 $xml .= $group;
1604 } elsif ($pod =~ m%\G
1605 ([BCGHITU])
1606 <
1607 (?:
1608 ([^<>]*) (?{ $group = $^N })
1609 | < $interior >
1610 )
1611 >
1612 %gcsx
1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1633 "")
1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1645
1646 for ($xml) {
1647 # create single paragraphs (very hackish)
1648 s/(?<=\S)\n(?=\w)/ /g;
1649
1650 # compress some whitespace
1651 s/\s+\n/\n/g; # ws line-ends
1652 s/\n\n+/\n/g; # double lines
1653 s/^\n+//; # beginning lines
1654 s/\n+$//; # ending lines
1655 }
1656
1657 $xml
1658}
1659
1660no re 'eval';
1661
1662sub hintmode {
1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1664 $_[0]{hintmode}
1665}
1666
1667=item $player->ext_reply ($msgid, @msg)
1668
1669Sends an ext reply to the player.
1670
1671=cut
1672
1673sub ext_reply($$@) {
1674 my ($self, $id, @msg) = @_;
1675
1676 $self->ns->ext_reply ($id, @msg)
1677}
1678 1943
1679=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1680 1945
1681Sends an ext event to the client. 1946Sends an ext event to the client.
1682 1947
1702 1967
1703=cut 1968=cut
1704 1969
1705sub find_by_path($) { 1970sub find_by_path($) {
1706 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1707 1974
1708 my ($match, $specificity); 1975 my ($match, $specificity);
1709 1976
1710 for my $region (list) { 1977 for my $region (list) {
1711 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1737our $MAX_RESET = 3600; 2004our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 2005our $DEFAULT_RESET = 3000;
1739 2006
1740sub generate_random_map { 2007sub generate_random_map {
1741 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1742 # mit "rum" bekleckern, nicht 2009
2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
2011
1743 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1747 $rmp->{exit_on_final_map},
1748 $rmp->{xsize}, $rmp->{ysize},
1749 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1750 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1752 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1753 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1754 (cf::region::find $rmp->{region}), $rmp->{custom}
1755 )
1756} 2013}
1757 2014
1758=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1759 2016
1760Register 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
1765 2022
1766sub register { 2023sub register {
1767 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1768 my $pkg = caller; 2025 my $pkg = caller;
1769 2026
1770 no strict;
1771 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1772 2028
1773 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1774} 2030}
1775 2031
1776# also paths starting with '/' 2032# also paths starting with '/'
1777$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1778 2034
1779sub thawer_merge { 2035sub thawer_merge {
1780 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1781 2037
1782 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1787} 2043}
1788 2044
1789sub normalise { 2045sub normalise {
1790 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1791 2047
1792 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1793 2049
1794 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1795 2051
1796 # map plan: 2052 # map plan:
1797 # 2053 #
1812 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1813 $path = "$base/$path"; 2069 $path = "$base/$path";
1814 } 2070 }
1815 2071
1816 for ($path) { 2072 for ($path) {
1817 redo if s{//}{/};
1818 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1819 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1820 } 2075 }
1821 2076
1822 $path 2077 $path
1836 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1837 return $self; 2092 return $self;
1838 } 2093 }
1839 } 2094 }
1840 2095
1841 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1842 () 2097 ()
1843} 2098}
1844 2099
2100# may re-bless or do other evil things
1845sub init { 2101sub init {
1846 my ($self) = @_; 2102 my ($self) = @_;
1847 2103
1848 $self 2104 $self
1849} 2105}
1868 2124
1869# the temporary/swap location 2125# the temporary/swap location
1870sub save_path { 2126sub save_path {
1871 my ($self) = @_; 2127 my ($self) = @_;
1872 2128
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2129 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 2130 "$TMPDIR/$path.map"
1875} 2131}
1876 2132
1877# the unique path, undef == no special unique path 2133# the unique path, undef == no special unique path
1878sub uniq_path { 2134sub uniq_path {
1879 my ($self) = @_; 2135 my ($self) = @_;
1880 2136
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1883}
1884
1885# and all this just because we cannot iterate over
1886# all maps in C++...
1887sub change_all_map_light {
1888 my ($change) = @_;
1889
1890 $_->change_map_light ($change)
1891 for grep $_->outdoor, values %cf::MAP;
1892} 2139}
1893 2140
1894sub decay_objects { 2141sub decay_objects {
1895 my ($self) = @_; 2142 my ($self) = @_;
1896 2143
1923 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1924 2171
1925 1 2172 1
1926} 2173}
1927 2174
2175# used to laod the header of an original map
1928sub load_header_orig { 2176sub load_header_orig {
1929 my ($self) = @_; 2177 my ($self) = @_;
1930 2178
1931 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1932} 2180}
1933 2181
2182# used to laod the header of an instantiated map
1934sub load_header_temp { 2183sub load_header_temp {
1935 my ($self) = @_; 2184 my ($self) = @_;
1936 2185
1937 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1938} 2187}
1939 2188
2189# called after loading the header from an instantiated map
1940sub prepare_temp { 2190sub prepare_temp {
1941 my ($self) = @_; 2191 my ($self) = @_;
1942 2192
1943 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1944 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1945 # safety 2195 # safety
1946 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1947 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1948} 2198}
1949 2199
2200# called after loading the header from an original map
1950sub prepare_orig { 2201sub prepare_orig {
1951 my ($self) = @_; 2202 my ($self) = @_;
1952 2203
1953 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1954 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1978 2229
1979sub find; 2230sub find;
1980sub find { 2231sub find {
1981 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1982 2233
2234 cf::cede_to_tick;
2235
1983 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1984 2237
1985 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1987 2240
1988 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1992 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
1993 or return; 2243 or return;
1994 2244
1995 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
1996 2246
1998 or return; 2248 or return;
1999 2249
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2250 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 2251 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 2252 #$cf::WAIT_FOR_TICK->wait;
2253 undef $guard2;
2003 undef $guard1; 2254 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 2255 $map->reset;
2006 return find $path; 2256 return find $path;
2007 } 2257 }
2008 2258
2009 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
2010 } 2260 }
2011} 2261}
2012 2262
2013sub pre_load { } 2263sub pre_load { }
2014sub post_load { } 2264#sub post_load { } # XS
2015 2265
2016sub load { 2266sub load {
2017 my ($self) = @_; 2267 my ($self) = @_;
2018 2268
2019 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2022 2272
2023 { 2273 {
2024 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2025 2275
2026 return unless $self->valid; 2276 return unless $self->valid;
2027 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2028
2029 $self->in_memory (cf::MAP_LOADING);
2030 2278
2031 $self->alloc; 2279 $self->alloc;
2032 2280
2033 $self->pre_load; 2281 $self->pre_load;
2034 cf::cede_to_tick; 2282 cf::cede_to_tick;
2035 2283
2284 if (exists $self->{load_path}) {
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2286 $f->skip_block;
2038 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2039 or return; 2288 or return;
2040 2289
2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2290 $self->post_load_original
2042 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2043 2292
2044 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2294 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2048 $self->clear_unique_items; 2297 $self->clear_unique_items;
2049 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2051 } 2301 }
2052 } 2302 }
2053 }
2054 2303
2055 $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);
2056 2311
2057 cf::cede_to_tick; 2312 cf::cede_to_tick;
2058 # now do the right thing for maps 2313 # now do the right thing for maps
2059 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2060 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2064 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2320 $self->decay_objects;
2066 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2067 $self->update_buttons; 2322 $self->update_buttons;
2068 cf::cede_to_tick; 2323 cf::cede_to_tick;
2069 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2070 cf::cede_to_tick;
2071 $self->activate;
2072 } 2325 }
2073 2326
2074 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2076
2077 $self->in_memory (cf::MAP_IN_MEMORY);
2078 } 2329 }
2079 2330
2080 $self->post_load; 2331 $self->post_load;
2081}
2082 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
2083sub customise_for { 2339sub customise_for {
2084 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2085 2341
2086 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2343 if $self->per_player;
2090# if $self->per_party; 2346# if $self->per_party;
2091 2347
2092 $self 2348 $self
2093} 2349}
2094 2350
2095# find and load all maps in the 3x3 area around a map
2096sub load_neighbours {
2097 my ($map) = @_;
2098
2099 my @neigh; # diagonal neighbours
2100
2101 for (0 .. 3) {
2102 my $neigh = $map->tile_path ($_)
2103 or next;
2104 $neigh = find $neigh, $map
2105 or next;
2106 $neigh->load;
2107
2108 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 }
2112
2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
2115 my $neigh = find $path, $origin
2116 or next;
2117 $neigh->load;
2118 }
2119}
2120
2121sub find_sync { 2351sub find_sync {
2122 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2123 2353
2124 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
2125} 2359}
2126 2360
2127sub do_load_sync { 2361sub do_load_sync {
2128 my ($map) = @_; 2362 my ($map) = @_;
2129 2363
2364 # it's a bug to call this from the main context
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2132 2367
2133 cf::sync_job { $map->load }; 2368 $map->load;
2134} 2369}
2135 2370
2136our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2138 2373
2139sub find_async { 2374sub find_async {
2140 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2141 2376
2142 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2143 2378
2144 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2380 return $map if !$load || $map->linkable;
2146 } 2381 }
2147 2382
2148 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2149 2384
2150 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher"; 2386 $Coro::current->{desc} = "map prefetcher";
2152 2387
2153 while (%MAP_PREFETCH) { 2388 while (%MAP_PREFETCH) {
2154 while (my ($k, $v) = each %MAP_PREFETCH) { 2389 for my $k (keys %MAP_PREFETCH) {
2155 if (my $map = find $k) { 2390 if (my $map = find $k) {
2156 $map->load if $v; 2391 $map->load if $MAP_PREFETCH{$k};
2157 } 2392 }
2158 2393
2159 delete $MAP_PREFETCH{$k}; 2394 delete $MAP_PREFETCH{$k};
2160 } 2395 }
2161 } 2396 }
2164 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2165 2400
2166 () 2401 ()
2167} 2402}
2168 2403
2404# common code, used by both ->save and ->swapout
2169sub save { 2405sub _save {
2170 my ($self) = @_; 2406 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2407
2174 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2175 2409
2176 return unless $self->dirty; 2410 return unless $self->dirty;
2177 2411
2186 2420
2187 cf::async { 2421 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2422 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2423 $_->contr->save for $self->players;
2190 }; 2424 };
2425
2426 cf::get_slot 0.02;
2191 2427
2192 if ($uniq) { 2428 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2429 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2430 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2431 } else {
2196 $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);
2197 } 2433 }
2198} 2434}
2199 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2200sub swap_out { 2444sub swap_out {
2201 my ($self) = @_; 2445 my ($self) = @_;
2202 2446
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2208 return if $self->players; 2451 return if $self->players;
2209 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
2210 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2211 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
2212 $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};
2213 2503
2214 $self->deactivate; 2504 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2506 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path;
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2507
2262 $self->unlink_save; 2508 $self->unlink_save;
2263 $self->destroy; 2509 $self->destroy;
2264} 2510}
2265 2511
2273 2519
2274 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2275 2521
2276 $self->unlink_save; 2522 $self->unlink_save;
2277 2523
2278 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2529
2332 2578
2333sub unique_maps() { 2579sub unique_maps() {
2334 [ 2580 [
2335 map { 2581 map {
2336 utf8::decode $_; 2582 utf8::decode $_;
2337 /\.map$/ 2583 s/\.map$//; # TODO future compatibility hack
2584 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2585 ? ()
2338 ? normalise $_ 2586 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2588 ]
2342} 2589}
2343 2590
2344package 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}
2345 2622
2346=back 2623=back
2347 2624
2348=head3 cf::object 2625=head3 cf::object
2349 2626
2353 2630
2354=over 4 2631=over 4
2355 2632
2356=item $ob->inv_recursive 2633=item $ob->inv_recursive
2357 2634
2358Returns 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.
2359 2637
2360=cut 2638=cut
2361 2639
2362sub inv_recursive_; 2640sub inv_recursive_;
2363sub inv_recursive_ { 2641sub inv_recursive_ {
2368 inv_recursive_ inv $_[0] 2646 inv_recursive_ inv $_[0]
2369} 2647}
2370 2648
2371=item $ref = $ob->ref 2649=item $ref = $ob->ref
2372 2650
2373creates 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.
2374 2652
2375=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2376 2654
2377returns 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,
2378even if the object actually exists. May block. 2656even if the object actually exists. May block.
2379 2657
2380=cut 2658=cut
2381 2659
2382sub deref { 2660sub deref {
2410can 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
2411dialogue with the given NPC character. 2689dialogue with the given NPC character.
2412 2690
2413=cut 2691=cut
2414 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
2415# rough implementation of a future "reply" method that works 2707# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2708# with dialog boxes.
2417#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
2418sub cf::object::player::reply($$$;$) { 2710sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2711 my ($self, $npc, $msg, $flags) = @_;
2430 my $dialog = $pl->{npc_dialog}; 2722 my $dialog = $pl->{npc_dialog};
2431 $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));
2432 2724
2433 } else { 2725 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2726 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2727 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2728 }
2437 } 2729 }
2438} 2730}
2439 2731
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2732=item $object->send_msg ($channel, $msg, $color, [extra...])
2450=item $player_object->may ("access") 2742=item $player_object->may ("access")
2451 2743
2452Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2453(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2454 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
2455=cut 2772=cut
2456 2773
2457sub cf::object::player::may { 2774sub cf::object::player::may {
2458 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2459 2776
2460 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2461 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2462 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2463 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2464} 2781}
2465 2782
2466=item $player_object->enter_link 2783=item $player_object->enter_link
2467 2784
2468Freezes 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}>).
2469 2786
2470The 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.
2471I<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.
2472 2791
2473Will 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.
2474 2799
2475=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2476 2801
2477Moves 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
2478map. 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
2496sub cf::object::player::enter_link { 2821sub cf::object::player::enter_link {
2497 my ($self) = @_; 2822 my ($self) = @_;
2498 2823
2499 $self->deactivate_recursive; 2824 $self->deactivate_recursive;
2500 2825
2826 ++$self->{_link_recursion};
2827
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2828 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2829
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2830 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2831 if $self->map && $self->map->{path} ne "{link}";
2505 2832
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2833 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2834}
2508 2835
2509sub cf::object::player::leave_link { 2836sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2837 my ($self, $map, $x, $y) = @_;
2511 2838
2528 ($x, $y) = (-1, -1) 2855 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2856 unless (defined $x) && (defined $y);
2530 2857
2531 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2534 2861
2535 $map->load; 2862 $map->load;
2536 $map->load_neighbours;
2537 2863
2538 return unless $self->contr->active; 2864 return unless $self->contr->active;
2539 $self->activate_recursive;
2540 2865
2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2542 $self->enter_map ($map, $x, $y); 2867 if ($self->enter_map ($map, $x, $y)) {
2543} 2868 # entering was successful
2869 delete $self->{_link_recursion};
2870 # only activate afterwards, to support waiting in hooks
2871 $self->activate_recursive;
2872 }
2544 2873
2874}
2875
2545=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)]])
2546 2877
2547Moves 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
2548her, loading and preparing them map, calling the provided $check callback 2879her, loading and preparing them map, calling the provided $check callback
2549that 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
2550the 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
2551be called at the end of this process. 2882be called at the end of this process.
2552 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
2553=cut 2887=cut
2554 2888
2555our $GOTOGEN; 2889our $GOTOGEN;
2556 2890
2557sub cf::object::player::goto { 2891sub cf::object::player::goto {
2558 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 }
2559 2899
2560 # 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
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2901 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2902
2563 $self->enter_link; 2903 $self->enter_link;
2583 ($path, $x, $y) = (undef, undef, undef); 2923 ($path, $x, $y) = (undef, undef, undef);
2584 } 2924 }
2585 } 2925 }
2586 2926
2587 my $map = eval { 2927 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2928 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2589 2929
2590 if ($map) { 2930 if ($map) {
2591 $map = $map->customise_for ($self); 2931 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2932 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2933 } else {
2594 $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);
2595 } 2935 }
2596 2936
2597 $map 2937 $map
2605 if ($gen == $self->{_goto_generation}) { 2945 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2946 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2947 $self->leave_link ($map, $x, $y);
2608 } 2948 }
2609 2949
2610 $done->() if $done; 2950 $done->($self) if $done;
2611 })->prio (1); 2951 })->prio (1);
2612} 2952}
2613 2953
2614=item $player_object->enter_exit ($exit_object) 2954=item $player_object->enter_exit ($exit_object)
2615 2955
2635} 2975}
2636 2976
2637sub prepare_random_map { 2977sub prepare_random_map {
2638 my ($exit) = @_; 2978 my ($exit) = @_;
2639 2979
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2980 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2981 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2982 # that depends on the exit object
2645 2983
2646 my $rmp = parse_random_map_params $exit->msg; 2984 my $rmp = parse_random_map_params $exit->msg;
2648 if ($exit->map) { 2986 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2987 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2988 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2989 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2990 $rmp->{origin_y} = $exit->y;
2991
2992 $exit->map->touch;
2653 } 2993 }
2654 2994
2655 $rmp->{random_seed} ||= $exit->random_seed; 2995 $rmp->{random_seed} ||= $exit->random_seed;
2656 2996
2657 my $data = cf::encode_json $rmp; 2997 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2998 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2999 my $meta = "$RANDOMDIR/$md5.meta";
2660 3000
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 3001 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 3002 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 3003 undef $fh;
2664 aio_rename "$meta~", $meta; 3004 aio_rename "$meta~", $meta;
2665 3005
3006 my $slaying = "?random/$md5";
3007
3008 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 3009 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 3010 $exit->msg (undef);
3011 }
2668 } 3012 }
2669} 3013}
2670 3014
2671sub cf::object::player::enter_exit { 3015sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 3016 my ($self, $exit) = @_;
2673 3017
2674 return unless $self->type == cf::PLAYER; 3018 return unless $self->type == cf::PLAYER;
2675 3019
2676 if ($exit->slaying eq "/!") {
2677 #TODO: this should de-fi-ni-te-ly not be a sync-job
2678 # the problem is that $exit might not survive long enough
2679 # so it needs to be done right now, right here
2680 cf::sync_job { prepare_random_map $exit };
2681 }
2682
2683 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2684 my $hp = $exit->stats->hp;
2685 my $sp = $exit->stats->sp;
2686
2687 $self->enter_link; 3020 $self->enter_link;
2688 3021
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2693 (async { 3022 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 3023 $Coro::current->{desc} = "enter_exit";
2695 3024
2696 $self->deactivate_recursive; # just to be sure
2697 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
2698 $self->goto ($slaying, $hp, $sp); 3055 $self->goto ($map, $x, $y);
2699 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
2700 1; 3061 1
2701 }) { 3062 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 3063 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "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. "
2704 . "Please report this to the dungeon master!", 3065 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 3066 cf::NDI_UNIQUE | cf::NDI_RED);
2706 3067
2707 warn "ERROR in enter_exit: $@"; 3068 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 3069 $self->leave_link;
2709 } 3070 }
2710 })->prio (1); 3071 })->prio (1);
2711} 3072}
2712 3073
2713=head3 cf::client 3074=head3 cf::client
2714 3075
2715=over 4 3076=over 4
2716 3077
2717=item $client->send_drawinfo ($text, $flags) 3078=item $client->send_big_packet ($pkt)
2718 3079
2719Sends a drawinfo packet to the client. Circumvents output buffering so 3080Like C<send_packet>, but tries to compress large packets, and fragments
2720should not be used under normal circumstances. 3081them as required.
2721 3082
2722=cut 3083=cut
2723 3084
3085our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3086
2724sub cf::client::send_drawinfo { 3087sub cf::client::send_big_packet {
2725 my ($self, $text, $flags) = @_; 3088 my ($self, $pkt) = @_;
2726 3089
2727 utf8::encode $text; 3090 # try lzf for large packets
2728 $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);
2729} 3101}
2730 3102
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 3104
2733Send 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
2734client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
2735the 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
2736the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
2737 3109
2738=cut 3110=cut
2739 3111
2740# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 3113our %CHANNEL = (
3114 "c/motd" => {
3115 id => "infobox",
3116 title => "MOTD",
3117 reply => undef,
3118 tooltip => "The message of the day",
3119 },
2742 "c/identify" => { 3120 "c/identify" => {
2743 id => "infobox", 3121 id => "infobox",
2744 title => "Identify", 3122 title => "Identify",
2745 reply => undef, 3123 reply => undef,
2746 tooltip => "Items recently identified", 3124 tooltip => "Items recently identified",
2748 "c/examine" => { 3126 "c/examine" => {
2749 id => "infobox", 3127 id => "infobox",
2750 title => "Examine", 3128 title => "Examine",
2751 reply => undef, 3129 reply => undef,
2752 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",
2753 }, 3137 },
2754 "c/book" => { 3138 "c/book" => {
2755 id => "infobox", 3139 id => "infobox",
2756 title => "Book", 3140 title => "Book",
2757 reply => undef, 3141 reply => undef,
2773 id => "infobox", 3157 id => "infobox",
2774 title => "Body Parts", 3158 title => "Body Parts",
2775 reply => undef, 3159 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available", 3160 tooltip => "Shows which body parts you posess and are available",
2777 }, 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 },
2778 "c/uptime" => { 3198 "c/uptime" => {
2779 id => "infobox", 3199 id => "infobox",
2780 title => "Uptime", 3200 title => "Uptime",
2781 reply => undef, 3201 reply => undef,
2782 tooltip => "How long the server has been running since last restart", 3202 tooltip => "How long the server has been running since last restart",
2785 id => "infobox", 3205 id => "infobox",
2786 title => "Map Info", 3206 title => "Map Info",
2787 reply => undef, 3207 reply => undef,
2788 tooltip => "Information related to the maps", 3208 tooltip => "Information related to the maps",
2789 }, 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,
2790); 3230);
2791 3231
2792sub cf::client::send_msg { 3232sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 3233 my ($self, $channel, $msg, $color, @extra) = @_;
2794 3234
2795 $msg = $self->pl->expand_cfpod ($msg); 3235 $msg = $self->pl->expand_cfpod ($msg)
3236 unless $color & cf::NDI_VERBATIM;
2796 3237
2797 $color &= cf::NDI_CLIENT_MASK; # just in case... 3238 $color &= cf::NDI_CLIENT_MASK; # just in case...
2798 3239
2799 # check predefined channels, for the benefit of C 3240 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) { 3241 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel}; 3242 $channel = $CHANNEL{$channel};
2802 3243
2803 $self->ext_msg (channel_info => $channel) 3244 $self->ext_msg (channel_info => $channel);
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id}; 3245 $channel = $channel->{id};
2807 3246
2808 } elsif (ref $channel) { 3247 } elsif (ref $channel) {
2809 # send meta info to client, if not yet sent 3248 # send meta info to client, if not yet sent
2810 unless (exists $self->{channel}{$channel->{id}}) { 3249 unless (exists $self->{channel}{$channel->{id}}) {
2811 $self->{channel}{$channel->{id}} = $channel; 3250 $self->{channel}{$channel->{id}} = $channel;
2812 $self->ext_msg (channel_info => $channel) 3251 $self->ext_msg (channel_info => $channel);
2813 if $self->can_msg;
2814 } 3252 }
2815 3253
2816 $channel = $channel->{id}; 3254 $channel = $channel->{id};
2817 } 3255 }
2818 3256
2819 return unless @extra || length $msg; 3257 return unless @extra || length $msg;
2820 3258
2821 if ($self->can_msg) {
2822 # default colour, mask it out 3259 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3260 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF; 3261 if $color & cf::NDI_DEF;
2825 3262
2826 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3263 my $pkt = "msg "
3264 . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3265 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2828 } else { 3266 );
2829 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones
2831 for ($msg) {
2832 1 while
2833 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2834 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2835 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2836 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2837 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2838 }
2839 3267
2840 $color &= cf::NDI_COLOR_MASK; 3268 $self->send_big_packet ($pkt);
2841
2842 utf8::encode $msg;
2843
2844 if (0 && $msg =~ /\[/) {
2845 # COMMAND/INFO
2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2847 } else {
2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2849 $self->send_packet ("drawinfo $color $msg")
2850 }
2851 }
2852 }
2853} 3269}
2854 3270
2855=item $client->ext_msg ($type, @msg) 3271=item $client->ext_msg ($type, @msg)
2856 3272
2857Sends an ext event to the client. 3273Sends an ext event to the client.
2859=cut 3275=cut
2860 3276
2861sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
2862 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
2863 3279
2864 if ($self->extcmd == 2) {
2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2866 } elsif ($self->extcmd == 1) { # TODO: remove
2867 push @msg, msgtype => "event_$type";
2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2869 }
2870}
2871
2872=item $client->ext_reply ($msgid, @msg)
2873
2874Sends an ext reply to the client.
2875
2876=cut
2877
2878sub cf::client::ext_reply($$@) {
2879 my ($self, $id, @msg) = @_;
2880
2881 if ($self->extcmd == 2) {
2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2883 } elsif ($self->extcmd == 1) {
2884 #TODO: version 1, remove
2885 unshift @msg, msgtype => "reply", msgid => $id;
2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2887 }
2888} 3281}
2889 3282
2890=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
2891 3284
2892Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
2912 3305
2913 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
2914 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
2915 3308
2916 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;
2917} 3349}
2918 3350
2919cf::client->attach ( 3351cf::client->attach (
2920 on_connect => sub { 3352 on_connect => sub {
2921 my ($ns) = @_; 3353 my ($ns) = @_;
2947 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
2948 3380
2949 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2950 3382
2951 if (ref $msg) { 3383 if (ref $msg) {
2952 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2953 "ARRAY" eq ref $msg
2954 ? @$msg
2955 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2956 3385
2957 my @reply;
2958
2959 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}) {
2960 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
2961 } 3404 }
2962
2963 $ns->ext_reply ($reply, @reply)
2964 if $reply;
2965
2966 } else { 3405 } else {
2967 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";
2968 } 3407 }
2969 3408
2970 cf::override; 3409 cf::override;
2971 }, 3410 },
2972); 3411);
2992 3431
2993 $coro 3432 $coro
2994} 3433}
2995 3434
2996cf::client->attach ( 3435cf::client->attach (
2997 on_destroy => sub { 3436 on_client_destroy => sub {
2998 my ($ns) = @_; 3437 my ($ns) = @_;
2999 3438
3000 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3439 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3001 }, 3440 },
3002); 3441);
3018our $safe_hole = new Safe::Hole; 3457our $safe_hole = new Safe::Hole;
3019 3458
3020$SIG{FPE} = 'IGNORE'; 3459$SIG{FPE} = 'IGNORE';
3021 3460
3022$safe->permit_only (Opcode::opset qw( 3461$safe->permit_only (Opcode::opset qw(
3023 :base_core :base_mem :base_orig :base_math 3462 :base_core :base_mem :base_orig :base_math :base_loop
3024 grepstart grepwhile mapstart mapwhile 3463 grepstart grepwhile mapstart mapwhile
3025 sort time 3464 sort time
3026)); 3465));
3027 3466
3028# here we export the classes and methods available to script code 3467# here we export the classes and methods available to script code
3031 3470
3032The following functions and methods are available within a safe environment: 3471The following functions and methods are available within a safe environment:
3033 3472
3034 cf::object 3473 cf::object
3035 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
3036 insert remove name archname title slaying race decrease_ob_nr 3475 insert remove name archname title slaying race decrease split
3476 value
3037 3477
3038 cf::object::player 3478 cf::object::player
3039 player 3479 player
3040 3480
3041 cf::player 3481 cf::player
3046 3486
3047=cut 3487=cut
3048 3488
3049for ( 3489for (
3050 ["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
3051 insert remove inv name archname title slaying race 3491 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3492 decrease split destroy change_exp value msg lore send_msg)],
3053 ["cf::object::player" => qw(player)], 3493 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3494 ["cf::player" => qw(peaceful send_msg)],
3055 ["cf::map" => qw(trigger)], 3495 ["cf::map" => qw(trigger)],
3056) { 3496) {
3057 no strict 'refs';
3058 my ($pkg, @funs) = @$_; 3497 my ($pkg, @funs) = @$_;
3059 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3498 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3060 for @funs; 3499 for @funs;
3061} 3500}
3062 3501
3077 3516
3078 my $qcode = $code; 3517 my $qcode = $code;
3079 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3518 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3080 $qcode =~ s/\n/\\n/g; 3519 $qcode =~ s/\n/\\n/g;
3081 3520
3521 %vars = (_dummy => 0) unless %vars;
3522
3523 my @res;
3082 local $_; 3524 local $_;
3083 local @safe::cf::_safe_eval_args = values %vars;
3084 3525
3085 my $eval = 3526 my $eval =
3086 "do {\n" 3527 "do {\n"
3087 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3528 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3088 . "#line 0 \"{$qcode}\"\n" 3529 . "#line 0 \"{$qcode}\"\n"
3089 . $code 3530 . $code
3090 . "\n}" 3531 . "\n}"
3091 ; 3532 ;
3092 3533
3534 if ($CFG{safe_eval}) {
3093 sub_generation_inc; 3535 sub_generation_inc;
3536 local @safe::cf::_safe_eval_args = values %vars;
3094 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3537 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3095 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 }
3096 3543
3097 if ($@) { 3544 if ($@) {
3098 warn "$@"; 3545 warn "$@",
3099 warn "while executing safe code '$code'\n"; 3546 "while executing safe code '$code'\n",
3100 warn "with arguments " . (join " ", %vars) . "\n"; 3547 "with arguments " . (join " ", %vars) . "\n";
3101 } 3548 }
3102 3549
3103 wantarray ? @res : $res[0] 3550 wantarray ? @res : $res[0]
3104} 3551}
3105 3552
3119=cut 3566=cut
3120 3567
3121sub register_script_function { 3568sub register_script_function {
3122 my ($fun, $cb) = @_; 3569 my ($fun, $cb) = @_;
3123 3570
3124 no strict 'refs'; 3571 $fun = "safe::$fun" if $CFG{safe_eval};
3125 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3572 *$fun = $safe_hole->wrap ($cb);
3126} 3573}
3127 3574
3128=back 3575=back
3129 3576
3130=cut 3577=cut
3131 3578
3132############################################################################# 3579#############################################################################
3133# the server's init and main functions 3580# the server's init and main functions
3134 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
3135sub load_facedata($) { 3659sub load_facedata($) {
3136 my ($path) = @_; 3660 my ($path) = @_;
3137 3661
3138 # HACK to clear player env face cache, we need some signal framework
3139 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = ();
3141
3142 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3143 3663
3144 warn "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3145 3665
3146 my $facedata; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3147 0 < aio_load $path, $facedata
3148 or die "$path: $!";
3149
3150 $facedata = Coro::Storable::thaw $facedata;
3151 3667
3152 $facedata->{version} == 2 3668 $facedata->{version} == 2
3153 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3154 3670
3155 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3156 $facedata->{resource}{"res/exp_table"} = { 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3157 type => FT_RSRC, 3673
3158 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
3159 }; 3675
3160 cf::cede_to_tick; 3676 # BEGIN ATOMIC
3677 # from here on, everything must be atomic - no thread switch allowed
3678 my $t1 = EV::time;
3161 3679
3162 { 3680 {
3163 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3164 3682
3165 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3166 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167 3686
3168 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3169 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3170 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};
3171 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};
3172 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3173 cf::cede_to_tick; 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3693 delete $cf::face::META[$idx];
3174 } 3694 }
3175 3695
3176 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3177 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3178 3698
3181 3701
3182 if (my $smooth = cf::face::find $info->{smooth}) { 3702 if (my $smooth = cf::face::find $info->{smooth}) {
3183 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3185 } else { 3705 } else {
3186 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3187 } 3707 }
3188
3189 cf::cede_to_tick;
3190 } 3708 }
3191 } 3709 }
3192 3710
3193 { 3711 {
3194 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3195 3713
3196 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3197 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3198 cf::cede_to_tick;
3199 } 3716 }
3200 3717
3201 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3202 } 3719 }
3203 3720
3204 { 3721 {
3205 # TODO: for gcfclient pleasure, we should give resources
3206 # that gcfclient doesn't grok a >10000 face index.
3207 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3208 3723
3209 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) { 3725 if (defined (my $type = $info->{type})) {
3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3211 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3212 my $data;
3213 3728
3214 if ($info->{type} & 1) {
3215 # prepend meta info
3216
3217 my $meta = $enc->encode ({
3218 name => $name,
3219 %{ $info->{meta} || {} },
3220 });
3221
3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type}; 3729 cf::face::set_type $idx, $type;
3730 cf::face::set_csum $idx, 0, $info->{hash};
3731 $cf::face::SIZE[0][$idx] = $info->{size};
3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3734 $cf::face::HASH{$info->{hash}} = $idx;
3229 } else { 3735 } else {
3230 $RESOURCE{$name} = $info; 3736# $RESOURCE{$name} = $info; # unused
3231 } 3737 }
3232
3233 cf::cede_to_tick;
3234 } 3738 }
3235 } 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;
3236 3750
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3238 3752
3753 aio_close $fh if $fh; # close old facedata
3754
3239 1 3755 1
3240} 3756}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
3261 3757
3262register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3263 my ($ns, $want) = @_; 3759 my ($ns, $want) = @_;
3264 3760
3265 while (my ($k, $v) = each %$want) { 3761 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3762 $ns->fx_want ($k, $v);
3267 } 3763 }
3268}; 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}
3269 3789
3270sub reload_regions { 3790sub reload_regions {
3271 # 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
3272 # for this (global event?) 3792 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3793 %ext::player_env::MUSIC_FACE_CACHE = ();
3280 if exists $_->{match}; 3800 if exists $_->{match};
3281 } 3801 }
3282} 3802}
3283 3803
3284sub reload_facedata { 3804sub reload_facedata {
3285 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3286 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3287} 3807}
3288 3808
3289sub reload_archetypes { 3809sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references 3812
3293 # this really needs to be done in an extra post-pass 3813 cf::face::set
3294 # (which needs to be synchronous, so solve it differently) 3814 "res/skill_info" => FT_RSRC,
3295 load_resource_file "$DATADIR/archetypes" 3815 JSON::XS->new->utf8->canonical->encode (
3296 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;
3297} 3838}
3298 3839
3299sub reload_treasures { 3840sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3302} 3843}
3303 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
3304sub reload_resources { 3865sub reload_resources {
3305 warn "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3306 3867
3868 reload_materials;
3869 reload_facedata;
3870 reload_exp_table;
3871 reload_sound;
3872 reload_archetypes;
3307 reload_regions; 3873 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3874 reload_treasures;
3312 3875
3313 warn "finished reloading resource files\n"; 3876 trace "finished reloading resource files\n";
3314}
3315
3316sub init {
3317 reload_resources;
3318} 3877}
3319 3878
3320sub reload_config { 3879sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3880 trace "reloading config file...\n";
3322 or return;
3323 3881
3324 local $/; 3882 my $config = load_file "$CONFDIR/config";
3325 *CFG = YAML::Load <$fh>; 3883 utf8::decode $config;
3884 *CFG = decode_yaml $config;
3326 3885
3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3886 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3328 3887
3329 $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};
3330 $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};
3331 3890
3332 if (exists $CFG{mlockall}) { 3891 if (exists $CFG{mlockall}) {
3336 }; 3895 };
3337 warn $@ if $@; 3896 warn $@ if $@;
3338 } 3897 }
3339} 3898}
3340 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
3341sub 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
3342 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3343 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3344 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#
3345 (async { 3941 (async {
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3348 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3349 }; 3945 };
3350 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;
3351 reload_config; 3961 reload_config;
3352 db_init; 3962
3963 cf::init_uuid;
3964 cf::init_signals;
3965 cf::init_skills;
3966
3967 cf::init_beforeplay;
3968
3969 atomic;
3970
3353 load_extensions; 3971 load_extensions;
3354 3972
3355 $TICK_WATCHER->start; 3973 utime time, time, $RUNTIMEFILE;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3974
3357 EV::loop; 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;
3358} 3990}
3359 3991
3360############################################################################# 3992#############################################################################
3361# initialisation and cleanup 3993# initialisation and cleanup
3362 3994
3363# install some emergency cleanup handlers 3995# install some emergency cleanup handlers
3364BEGIN { 3996BEGIN {
3365 our %SIGWATCHER = (); 3997 our %SIGWATCHER = ();
3366 for my $signal (qw(INT HUP TERM)) { 3998 for my $signal (qw(INT HUP TERM)) {
3367 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3999 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3368 cf::cleanup "SIG$signal"; 4000 cf::cleanup "SIG$signal";
3369 }; 4001 };
3370 } 4002 }
3371} 4003}
3372 4004
3373sub write_runtime { 4005sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime"; 4006 my $t0 = AE::time;
3375 4007
3376 # first touch the runtime file to show we are still running: 4008 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 4009 # the fsync below can take a very very long time.
3378 4010
3379 IO::AIO::aio_utime $runtime, undef, undef; 4011 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3380 4012
3381 my $guard = cf::lock_acquire "write_runtime"; 4013 my $guard = cf::lock_acquire "write_runtime";
3382 4014
3383 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4015 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3384 or return; 4016 or return;
3385 4017
3386 my $value = $cf::RUNTIME + 90 + 10; 4018 my $value = $cf::RUNTIME + 90 + 10;
3387 # 10 is the runtime save interval, for a monotonic clock 4019 # 10 is the runtime save interval, for a monotonic clock
3388 # 60 allows for the watchdog to kill the server. 4020 # 60 allows for the watchdog to kill the server.
3398 aio_utime $fh, undef, undef; 4030 aio_utime $fh, undef, undef;
3399 4031
3400 close $fh 4032 close $fh
3401 or return; 4033 or return;
3402 4034
3403 aio_rename "$runtime~", $runtime 4035 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3404 and return; 4036 and return;
3405 4037
3406 warn "runtime file written.\n"; 4038 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3407 4039
3408 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 };
3409} 4091}
3410 4092
3411sub emergency_save() { 4093sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 4094 my $freeze_guard = cf::freeze_mainloop;
3413 4095
3414 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;
3415 4102
3416 cf::sync_job { 4103 cf::sync_job {
4104 cf::write_runtime_sync; # external watchdog should not bark
4105
3417 # use a peculiar iteration method to avoid tripping on perl 4106 # use a peculiar iteration method to avoid tripping on perl
3418 # refcount bugs in for. also avoids problems with players 4107 # refcount bugs in for. also avoids problems with players
3419 # and maps saved/destroyed asynchronously. 4108 # and maps saved/destroyed asynchronously.
3420 warn "begin emergency player save\n"; 4109 info "emergency_perl_save: begin player save\n";
3421 for my $login (keys %cf::PLAYER) { 4110 for my $login (keys %cf::PLAYER) {
3422 my $pl = $cf::PLAYER{$login} or next; 4111 my $pl = $cf::PLAYER{$login} or next;
3423 $pl->valid or next; 4112 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4113 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3425 $pl->save; 4114 $pl->save;
3426 } 4115 }
3427 warn "end emergency player save\n"; 4116 info "emergency_perl_save: end player save\n";
3428 4117
3429 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";
3430 for my $path (keys %cf::MAP) { 4121 for my $path (keys %cf::MAP) {
3431 my $map = $cf::MAP{$path} or next; 4122 my $map = $cf::MAP{$path} or next;
3432 $map->valid or next; 4123 $map->valid or next;
3433 $map->save; 4124 $map->save;
3434 } 4125 }
3435 warn "end emergency map save\n"; 4126 info "emergency_perl_save: end map save\n";
3436 4127
3437 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";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 4131 BDB::db_env_txn_checkpoint $DB_ENV;
3439 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
3440 }; 4156 };
3441 4157
3442 warn "leave emergency perl save\n"; 4158 info "emergency_perl_save: leave\n";
3443} 4159}
3444 4160
3445sub post_cleanup { 4161sub post_cleanup {
3446 my ($make_core) = @_; 4162 my ($make_core) = @_;
3447 4163
4164 IO::AIO::flush;
4165
3448 warn Carp::longmess "post_cleanup backtrace" 4166 error Carp::longmess "post_cleanup backtrace"
3449 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 }
3450} 4196}
3451 4197
3452sub do_reload_perl() { 4198sub do_reload_perl() {
3453 # can/must only be called in main 4199 # can/must only be called in main
3454 if ($Coro::current != $Coro::main) { 4200 unless (in_main) {
3455 warn "can only reload from main coroutine"; 4201 error "can only reload from main coroutine";
3456 return; 4202 return;
3457 } 4203 }
3458 4204
3459 warn "reloading..."; 4205 return if $RELOAD++;
3460 4206
3461 warn "entering sync_job"; 4207 my $t1 = AE::time;
3462 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
3463 cf::sync_job { 4215 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark
3465 cf::emergency_save; 4216 #cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark
3467 4217
3468 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV;
3470
3471 # if anything goes wrong in here, we should simply crash as we already saved
3472
3473 warn "flushing outstanding aio requests";
3474 for (;;) {
3475 BDB::flush;
3476 IO::AIO::flush;
3477 Coro::cede_notself;
3478 last unless IO::AIO::nreqs || BDB::nreqs;
3479 warn "iterate...";
3480 }
3481
3482 ++$RELOAD;
3483
3484 warn "cancelling all extension coros"; 4218 trace "perl_reload: cancelling all extension coros";
3485 $_->cancel for values %EXT_CORO; 4219 $_->cancel for values %EXT_CORO;
3486 %EXT_CORO = (); 4220 %EXT_CORO = ();
3487 4221
3488 warn "removing commands"; 4222 trace "perl_reload: removing commands";
3489 %COMMAND = (); 4223 %COMMAND = ();
3490 4224
3491 warn "removing ext/exti commands"; 4225 trace "perl_reload: removing ext/exti commands";
3492 %EXTCMD = (); 4226 %EXTCMD = ();
3493 %EXTICMD = (); 4227 %EXTICMD = ();
3494 4228
3495 warn "unloading/nuking all extensions"; 4229 trace "perl_reload: unloading/nuking all extensions";
3496 for my $pkg (@EXTS) { 4230 for my $pkg (@EXTS) {
3497 warn "... unloading $pkg"; 4231 trace "... unloading $pkg";
3498 4232
3499 if (my $cb = $pkg->can ("unload")) { 4233 if (my $cb = $pkg->can ("unload")) {
3500 eval { 4234 eval {
3501 $cb->($pkg); 4235 $cb->($pkg);
3502 1 4236 1
3503 } 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;
3504 } 4242 }
3505 4243
3506 warn "... nuking $pkg";
3507 Symbol::delete_package $pkg;
3508 }
3509
3510 warn "unloading all perl modules loaded from $LIBDIR"; 4244 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3511 while (my ($k, $v) = each %INC) { 4245 while (my ($k, $v) = each %INC) {
3512 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3513 4247
3514 warn "... unloading $k"; 4248 trace "... unloading $k";
3515 delete $INC{$k}; 4249 delete $INC{$k};
3516 4250
3517 $k =~ s/\.pm$//; 4251 $k =~ s/\.pm$//;
3518 $k =~ s/\//::/g; 4252 $k =~ s/\//::/g;
3519 4253
3520 if (my $cb = $k->can ("unload_module")) { 4254 if (my $cb = $k->can ("unload_module")) {
3521 $cb->(); 4255 $cb->();
4256 }
4257
4258 clear_package $k;
3522 } 4259 }
3523 4260
3524 Symbol::delete_package $k;
3525 }
3526
3527 warn "getting rid of safe::, as good as possible"; 4261 trace "perl_reload: getting rid of safe::, as good as possible";
3528 Symbol::delete_package "safe::$_" 4262 clear_package "safe::$_"
3529 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);
3530 4264
3531 warn "unloading cf.pm \"a bit\""; 4265 trace "perl_reload: unloading cf.pm \"a bit\"";
3532 delete $INC{"cf.pm"}; 4266 delete $INC{"cf.pm"};
3533 delete $INC{"cf/pod.pm"}; 4267 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3534 4268
3535 # don't, removes xs symbols, too, 4269 # don't, removes xs symbols, too,
3536 # and global variables created in xs 4270 # and global variables created in xs
3537 #Symbol::delete_package __PACKAGE__; 4271 #clear_package __PACKAGE__;
3538 4272
3539 warn "unload completed, starting to reload now"; 4273 info "perl_reload: unload completed, starting to reload now";
3540 4274
3541 warn "reloading cf.pm"; 4275 trace "perl_reload: reloading cf.pm";
3542 require cf; 4276 require cf;
3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4277 cf::_connect_to_perl_1;
3544 4278
3545 warn "loading config and database again"; 4279 trace "perl_reload: loading config and database again";
3546 cf::reload_config; 4280 cf::reload_config;
3547 4281
3548 warn "loading extensions"; 4282 trace "perl_reload: loading extensions";
3549 cf::load_extensions; 4283 cf::load_extensions;
3550 4284
4285 if ($REATTACH_ON_RELOAD) {
3551 warn "reattaching attachments to objects/players"; 4286 trace "perl_reload: reattaching attachments to objects/players";
3552 _global_reattach; # objects, sockets 4287 _global_reattach; # objects, sockets
3553 warn "reattaching attachments to maps"; 4288 trace "perl_reload: reattaching attachments to maps";
3554 reattach $_ for values %MAP; 4289 reattach $_ for values %MAP;
3555 warn "reattaching attachments to players"; 4290 trace "perl_reload: reattaching attachments to players";
3556 reattach $_ for values %PLAYER; 4291 reattach $_ for values %PLAYER;
4292 }
3557 4293
3558 warn "leaving sync_job"; 4294 cf::_post_init 1;
3559 4295
4296 trace "perl_reload: leaving sync_job";
4297
3560 1 4298 1
3561 } or do { 4299 } or do {
3562 warn $@; 4300 error $@;
3563 warn "error while reloading, exiting."; 4301 cf::cleanup "perl_reload: error, exiting.";
3564 exit 1; 4302 };
4303
4304 --$RELOAD;
3565 }; 4305 }
3566 4306
3567 warn "reloaded"; 4307 $t1 = AE::time - $t1;
4308 info "perl_reload: completed in ${t1}s\n";
3568}; 4309};
3569 4310
3570our $RELOAD_WATCHER; # used only during reload 4311our $RELOAD_WATCHER; # used only during reload
3571 4312
3572sub reload_perl() { 4313sub reload_perl() {
3573 # doing reload synchronously and two reloads happen back-to-back, 4314 # doing reload synchronously and two reloads happen back-to-back,
3574 # coro crashes during coro_state_free->destroy here. 4315 # coro crashes during coro_state_free->destroy here.
3575 4316
4317 $RELOAD_WATCHER ||= cf::async {
4318 Coro::AIO::aio_wait cache_extensions;
4319
3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4320 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3577 do_reload_perl; 4321 do_reload_perl;
3578 undef $RELOAD_WATCHER; 4322 undef $RELOAD_WATCHER;
4323 };
3579 }; 4324 };
3580} 4325}
3581 4326
3582register_command "reload" => sub { 4327register_command "reload" => sub {
3583 my ($who, $arg) = @_; 4328 my ($who, $arg) = @_;
3589 reload_perl; 4334 reload_perl;
3590 }; 4335 };
3591 } 4336 }
3592}; 4337};
3593 4338
3594unshift @INC, $LIBDIR; 4339#############################################################################
3595 4340
3596my $bug_warning = 0; 4341my $bug_warning = 0;
3597 4342
3598our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN;
3600
3601sub wait_for_tick { 4343sub wait_for_tick() {
3602 return unless $TICK_WATCHER->is_active; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3603 return if $Coro::current == $Coro::main;
3604 4345
3605 my $signal = new Coro::Signal; 4346 $WAIT_FOR_TICK->wait;
3606 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait;
3608} 4347}
3609 4348
3610sub wait_for_tick_begin { 4349sub wait_for_tick_begin() {
3611 return unless $TICK_WATCHER->is_active; 4350 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3612 return if $Coro::current == $Coro::main;
3613 4351
3614 my $signal = new Coro::Signal; 4352 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 4353 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 4354 $signal->wait;
3617} 4355}
3618 4356
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4357sub tick {
3620 if ($Coro::current != $Coro::main) { 4358 if ($Coro::current != $Coro::main) {
3621 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"
3622 unless ++$bug_warning > 10; 4360 unless ++$bug_warning > 10;
3623 return; 4361 return;
3624 } 4362 }
3625 4363
3626 $NOW = $tick_start = EV::now; 4364 cf::one_tick; # one server iteration
3627 4365
3628 cf::server_tick; # one server iteration 4366 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 4367
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4368 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4369 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 4370 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 4371 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 4372 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 4373 or error "ERROR: unable to write runtime file: $!";
3639 }; 4374 };
3640 } 4375 }
3641 4376
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4377 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3643 $sig->send; 4378 $sig->send;
3644 } 4379 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 4380 $WAIT_FOR_TICK->broadcast;
3646 $sig->send;
3647 }
3648 4381
3649 $LOAD = ($NOW - $tick_start) / $TICK; 4382 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 4384
3652 _post_tick; 4385 if (0) {
3653}; 4386 if ($NEXT_TICK) {
3654$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}
3655 4393
3656{ 4394{
3657 # configure BDB 4395 # configure BDB
4396 info "initialising database";
3658 4397
3659 BDB::min_parallel 8; 4398 BDB::min_parallel 16;
3660 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
3662 4401
3663 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3666 | 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;
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4407 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4408 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3669 4409
3670 cf::sync_job { 4410 cf::sync_job {
3671 eval { 4411 eval {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 }; 4431 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 }; 4434 };
4435
4436 info "database initialised";
3695} 4437}
3696 4438
3697{ 4439{
3698 # configure IO::AIO 4440 # configure IO::AIO
3699 4441
4442 info "initialising aio";
3700 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
3703} 4447}
3704 4448
3705my $_log_backtrace; 4449our $_log_backtrace;
4450our $_log_backtrace_last;
3706 4451
3707sub _log_backtrace { 4452sub _log_backtrace {
3708 my ($msg, @addr) = @_; 4453 my ($msg, @addr) = @_;
3709 4454
3710 $msg =~ s/\n//; 4455 $msg =~ s/\n$//;
3711 4456
4457 if ($_log_backtrace_last eq $msg) {
4458 LOG llevInfo, "[ABT] $msg\n";
4459 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3712 # limit the # of concurrent backtraces 4460 # limit the # of concurrent backtraces
3713 if ($_log_backtrace < 2) { 4461 } elsif ($_log_backtrace < 2) {
4462 $_log_backtrace_last = $msg;
3714 ++$_log_backtrace; 4463 ++$_log_backtrace;
4464 my $perl_bt = Carp::longmess $msg;
3715 async { 4465 async {
3716 $Coro::current->{desc} = "abt $msg"; 4466 $Coro::current->{desc} = "abt $msg";
3717 4467
3718 my @bt = fork_call { 4468 my @bt = fork_call {
3719 @addr = map { sprintf "%x", $_ } @addr; 4469 @addr = map { sprintf "%x", $_ } @addr;
3730 } 4480 }
3731 4481
3732 @funcs 4482 @funcs
3733 }; 4483 };
3734 4484
3735 LOG llevInfo, "[ABT] $msg\n"; 4485 LOG llevInfo, "[ABT] $perl_bt\n";
4486 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3736 LOG llevInfo, "[ABT] $_\n" for @bt; 4487 LOG llevInfo, "[ABT] $_\n" for @bt;
3737 --$_log_backtrace; 4488 --$_log_backtrace;
3738 }; 4489 };
3739 } else { 4490 } else {
3740 LOG llevInfo, "[ABT] $msg\n"; 4491 LOG llevInfo, "[ABT] $msg\n";
3741 LOG llevInfo, "[ABT] [suppressed]\n"; 4492 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3742 } 4493 }
3743} 4494}
3744 4495
3745# load additional modules 4496# load additional modules
3746use cf::pod; 4497require "cf/$_.pm" for @EXTRA_MODULES;
4498cf::_connect_to_perl_2;
3747 4499
3748END { cf::emergency_save } 4500END { cf::emergency_save }
3749 4501
37501 45021
3751 4503

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines