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.419 by root, Sun Apr 13 01:34:09 2008 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines