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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.614 by root, Mon Nov 26 15:12:16 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 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) {
493 } else { 691 } else {
494 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
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 )
761}
762
763=item $coin = coin_from_name $name
764
765=cut
766
767our %coin_alias = (
768 "silver" => "silvercoin",
769 "silvercoin" => "silvercoin",
770 "silvercoins" => "silvercoin",
771 "gold" => "goldcoin",
772 "goldcoin" => "goldcoin",
773 "goldcoins" => "goldcoin",
774 "platinum" => "platinacoin",
775 "platinumcoin" => "platinacoin",
776 "platinumcoins" => "platinacoin",
777 "platina" => "platinacoin",
778 "platinacoin" => "platinacoin",
779 "platinacoins" => "platinacoin",
780 "royalty" => "royalty",
781 "royalties" => "royalty",
782);
783
784sub coin_from_name($) {
785 $coin_alias{$_[0]}
786 ? cf::arch::find $coin_alias{$_[0]}
787 : undef
552} 788}
553 789
554=item $value = cf::db_get $family => $key 790=item $value = cf::db_get $family => $key
555 791
556Returns a single value from the environment database. 792Returns a single value from the environment database.
566within each server. 802within each server.
567 803
568=cut 804=cut
569 805
570sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
571 my ($name) = @_; 810 my ($name) = @_;
572 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
573 812
574 eval { 813 eval {
575 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
585} 824}
586 825
587our $DB; 826our $DB;
588 827
589sub db_init { 828sub db_init {
590 cf::sync_job {
591 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
592 };
593} 830}
594 831
595sub db_get($$) { 832sub db_get($$) {
596 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
597 834
598 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
599 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
600 839
601 $! ? () 840 $! ? ()
602 : $data 841 : $data
603 }
604} 842}
605 843
606sub db_put($$$) { 844sub db_put($$$) {
607 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
608 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
636 874
637 my @data; 875 my @data;
638 my $md5; 876 my $md5;
639 877
640 for (0 .. $#$src) { 878 for (0 .. $#$src) {
641 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
642 or Carp::croak "$src->[$_]: $!";
643 } 880 }
644 881
645 # if processing is expensive, check 882 # if processing is expensive, check
646 # checksum first 883 # checksum first
647 if (1) { 884 if (1) {
660 897
661 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
662 } 899 }
663 } 900 }
664 901
665 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
666 my $data = $process->(\@data); 903 my $data = $process->(\@data);
667 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
668 905
669 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
670 907
671 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
672 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
673 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
674 911
684 921
685=cut 922=cut
686 923
687sub datalog($@) { 924sub datalog($@) {
688 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
689 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
690} 927}
691 928
692=back 929=back
693 930
694=cut 931=cut
695 932
696############################################################################# 933#############################################################################
697 934
698=head2 ATTACHABLE OBJECTS 935=head2 ATTACHABLE OBJECTS
699 936
700Many 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
701attach callbacks/event handlers (a collection of which is called an "attachment") 938attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 939to it. All such attachable objects support the following methods.
703 940
704In 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>
705C<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
755=item cf::CLASS::attachment $name, ... 992=item cf::CLASS::attachment $name, ...
756 993
757Register an attachment by C<$name> through which attachable objects of the 994Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 995given CLASS can refer to this attachment.
759 996
760Some classes such as crossfire maps and objects can specify attachments 997Some classes such as deliantra maps and objects can specify attachments
761that 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.
762 999
763These calls expect any number of the following handler/hook descriptions: 1000These calls expect any number of the following handler/hook descriptions:
764 1001
765=over 4 1002=over 4
889 1126
890 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
891 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
892 1129
893 } elsif (ref $type) { 1130 } elsif (ref $type) {
894 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
895 1132
896 } else { 1133 } else {
897 shift @arg; 1134 shift @arg;
898 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
899 } 1136 }
900 } 1137 }
901} 1138}
902 1139
903sub _object_attach { 1140sub _object_attach {
913 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
914 } 1151 }
915 1152
916 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
917 } else { 1154 } else {
918 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
919 } 1156 }
920 1157
921 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
922} 1159}
923 1160
982 1219
983 for (@$callbacks) { 1220 for (@$callbacks) {
984 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
985 1222
986 if ($@) { 1223 if ($@) {
987 warn "$@";
988 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
989 override; 1225 override;
990 } 1226 }
991 1227
992 return 1 if $override; 1228 return 1 if $override;
993 } 1229 }
1056 1292
1057sub reattach { 1293sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1294 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1295 my ($obj) = @_;
1060 1296
1297 # no longer needed after getting rid of delete_package?
1061 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
1062 1299
1063 my $registry = $obj->registry; 1300 my $registry = $obj->registry;
1064 1301
1065 @$registry = (); 1302 @$registry = ();
1066 1303
1071 for (@$attach) { 1308 for (@$attach) {
1072 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1073 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1074 } 1311 }
1075 } else { 1312 } else {
1076 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1077 } 1314 }
1078 } 1315 }
1079} 1316}
1080 1317
1081cf::attachable->attach ( 1318cf::attachable->attach (
1108 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1109 1346
1110 sync_job { 1347 sync_job {
1111 if (length $$rdata) { 1348 if (length $$rdata) {
1112 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1115 1353
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1355 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 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 }
1120 close $fh; 1361 aio_close $fh;
1121 1362
1122 if (@$objs) { 1363 if (@$objs) {
1123 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) {
1124 chmod SAVE_MODE, $fh; 1365 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1127 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 }
1128 close $fh; 1372 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1374 }
1131 } else { 1375 } else {
1132 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1133 } 1377 }
1134 1378
1135 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1380
1381 $filename =~ s%/[^/]+$%%;
1382 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1383 } else {
1137 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1138 } 1385 }
1139 } else { 1386 } else {
1140 aio_unlink $filename; 1387 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1142 } 1389 }
1166 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1167 $av = $st->{objs}; 1414 $av = $st->{objs};
1168 } 1415 }
1169 1416
1170 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1171 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1172 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1173 1421
1174 ($data, $av) 1422 ($data, $av)
1175} 1423}
1176 1424
1177=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1181=cut 1429=cut
1182 1430
1183############################################################################# 1431#############################################################################
1184# command handling &c 1432# command handling &c
1185 1433
1186=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1187 1435
1188Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1189$name. 1437$name.
1190 1438
1191=cut 1439=cut
1197 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1198 1446
1199 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1200} 1448}
1201 1449
1202=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1203 1451
1204Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1205extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1206received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1207the 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
1208has logged in successfully. 1456has logged in successfully.
1209 1457
1210If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1211called.
1212 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
1213=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1214 1466
1215Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1216exticmd 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
1217are 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
1218is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1219log-in. 1471log-in.
1220 1472
1221If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1222called.
1223 1474
1224=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1225 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
1226sub register_extcmd { 1482sub register_extcmd($$) {
1227 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1228 1484
1229 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1230} 1486}
1231 1487
1232sub register_exticmd { 1488sub register_async_extcmd($$) {
1233 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1234 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1235 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1236} 1498}
1237 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1238cf::player->attach ( 1508cf::player->attach (
1239 on_command => sub { 1509 on_unknown_command => sub {
1240 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1241 1511
1242 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1243 or return; 1513 or return;
1244 1514
1252 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1253 1523
1254 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1255 1525
1256 if (ref $msg) { 1526 if (ref $msg) {
1257 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1258 "ARRAY" eq ref $msg
1259 ? @$msg
1260 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1261 1528
1262 my @reply;
1263
1264 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}) {
1265 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1266 } 1547 }
1267 1548
1268 $pl->ext_reply ($reply, @reply)
1269 if $reply;
1270
1271 } else { 1549 } else {
1272 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1273 } 1551 }
1274 1552
1275 cf::override; 1553 cf::override;
1276 }, 1554 },
1277); 1555);
1278 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
1279sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1280 cf::sync_job { 1586 cf::sync_job {
1281 my %todo; 1587 my %todo;
1282 1588
1283 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1284 next unless -r $path; 1590 next unless -r $path;
1302 1608
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1611
1306 $ext{source} = 1612 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1308 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1309 . $source 1615 . $source
1310 . "\n};\n1"; 1616 . "\n};\n1";
1311 1617
1312 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1313 } 1619 }
1314 1620
1621 my $pass = 0;
1315 my %done; 1622 my %done;
1316 while (%todo) { 1623 while (%todo) {
1317 my $progress; 1624 my $progress;
1318 1625
1626 ++$pass;
1627
1628 ext:
1319 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1320 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1321 goto skip 1631 next ext
1322 unless exists $done{$_}; 1632 unless exists $done{$_};
1323 } 1633 }
1324 1634
1325 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1326 1636
1327 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 $@) {
1328 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1329 : "$v->{base}: extension inactive.\n";
1330 1650
1331 if (exists $v->{meta}{mandatory}) {
1332 warn $msg;
1333 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1334 } 1652 if exists $v->{meta}{mandatory};
1335 1653
1336 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;
1337 } 1663 }
1338
1339 $done{$k} = delete $todo{$k};
1340 push @EXTS, $v->{pkg};
1341 $progress = 1;
1342 } 1664 }
1343 1665
1344 skip: 1666 unless ($progress) {
1345 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1346 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 }
1347 } 1676 }
1348 }; 1677 };
1349} 1678}
1350 1679
1351############################################################################# 1680#############################################################################
1352 1681
1353=back 1682=back
1354 1683
1355=head2 CORE EXTENSIONS 1684=head2 CORE EXTENSIONS
1356 1685
1357Functions and methods that extend core crossfire objects. 1686Functions and methods that extend core deliantra objects.
1358 1687
1359=cut 1688=cut
1360 1689
1361package cf::player; 1690package cf::player;
1362 1691
1405 1734
1406sub exists($) { 1735sub exists($) {
1407 my ($login) = @_; 1736 my ($login) = @_;
1408 1737
1409 $cf::PLAYER{$login} 1738 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1739 or !aio_stat path $login
1411} 1740}
1412 1741
1413sub find($) { 1742sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1743 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1744 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1756 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1757 or return;
1429 1758
1430 my $pl = cf::player::load_pl $f 1759 my $pl = cf::player::load_pl $f
1431 or return; 1760 or return;
1761
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1762 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1763 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1435 } 1765 }
1436 } 1766 }
1437} 1767}
1438 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
1439sub save($) { 1782sub save($) {
1440 my ($pl) = @_; 1783 my ($pl) = @_;
1441 1784
1442 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1443 1786
1446 1789
1447 return if $pl->{deny_save}; 1790 return if $pl->{deny_save};
1448 1791
1449 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1450 $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];
1451 1799
1452 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1801 cf::cede_to_tick;
1454} 1802}
1455 1803
1487 my ($pl) = @_; 1835 my ($pl) = @_;
1488 1836
1489 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1490 1838
1491 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1492 $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
1493 1841
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1495 $pl->deactivate; 1843 $pl->deactivate;
1844
1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1497 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1498 1850
1499 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1539 1891
1540 for my $login (@$dirs) { 1892 for my $login (@$dirs) {
1541 my $path = path $login; 1893 my $path = path $login;
1542 1894
1543 # a .pst is a dead give-away for a valid player 1895 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1896 # if no pst file found, open and chekc for blocked users
1897 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1898 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1899 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1900 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1901 }
1549 1902
1553 1906
1554 \@logins 1907 \@logins
1555} 1908}
1556 1909
1557=item $player->maps 1910=item $player->maps
1911
1912=item cf::player::maps $login
1558 1913
1559Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1560player. May block. 1915player. May block.
1561 1916
1562=cut 1917=cut
1580 } 1935 }
1581 1936
1582 \@paths 1937 \@paths
1583} 1938}
1584 1939
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1941
1587Expand crossfire pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677
1678=item $player->ext_reply ($msgid, @msg)
1679
1680Sends an ext reply to the player.
1681
1682=cut
1683
1684sub ext_reply($$@) {
1685 my ($self, $id, @msg) = @_;
1686
1687 $self->ns->ext_reply ($id, @msg)
1688}
1689 1943
1690=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1691 1945
1692Sends an ext event to the client. 1946Sends an ext event to the client.
1693 1947
1713 1967
1714=cut 1968=cut
1715 1969
1716sub find_by_path($) { 1970sub find_by_path($) {
1717 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1718 1974
1719 my ($match, $specificity); 1975 my ($match, $specificity);
1720 1976
1721 for my $region (list) { 1977 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1748our $MAX_RESET = 3600; 2004our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 2005our $DEFAULT_RESET = 3000;
1750 2006
1751sub generate_random_map { 2007sub generate_random_map {
1752 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1753 # mit "rum" bekleckern, nicht 2009
2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
2011
1754 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1758 $rmp->{exit_on_final_map},
1759 $rmp->{xsize}, $rmp->{ysize},
1760 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1761 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1762 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1763 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1764 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1765 (cf::region::find $rmp->{region}), $rmp->{custom}
1766 )
1767} 2013}
1768 2014
1769=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1770 2016
1771Register 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
1776 2022
1777sub register { 2023sub register {
1778 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1779 my $pkg = caller; 2025 my $pkg = caller;
1780 2026
1781 no strict;
1782 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1783 2028
1784 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1785} 2030}
1786 2031
1787# also paths starting with '/' 2032# also paths starting with '/'
1788$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1789 2034
1790sub thawer_merge { 2035sub thawer_merge {
1791 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1792 2037
1793 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1798} 2043}
1799 2044
1800sub normalise { 2045sub normalise {
1801 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1802 2047
1803 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1804 2049
1805 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1806 2051
1807 # map plan: 2052 # map plan:
1808 # 2053 #
1823 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1824 $path = "$base/$path"; 2069 $path = "$base/$path";
1825 } 2070 }
1826 2071
1827 for ($path) { 2072 for ($path) {
1828 redo if s{//}{/};
1829 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1830 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1831 } 2075 }
1832 2076
1833 $path 2077 $path
1847 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1848 return $self; 2092 return $self;
1849 } 2093 }
1850 } 2094 }
1851 2095
1852 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1853 () 2097 ()
1854} 2098}
1855 2099
2100# may re-bless or do other evil things
1856sub init { 2101sub init {
1857 my ($self) = @_; 2102 my ($self) = @_;
1858 2103
1859 $self 2104 $self
1860} 2105}
1879 2124
1880# the temporary/swap location 2125# the temporary/swap location
1881sub save_path { 2126sub save_path {
1882 my ($self) = @_; 2127 my ($self) = @_;
1883 2128
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2129 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 2130 "$TMPDIR/$path.map"
1886} 2131}
1887 2132
1888# the unique path, undef == no special unique path 2133# the unique path, undef == no special unique path
1889sub uniq_path { 2134sub uniq_path {
1890 my ($self) = @_; 2135 my ($self) = @_;
1891 2136
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 2139}
1904 2140
1905sub decay_objects { 2141sub decay_objects {
1906 my ($self) = @_; 2142 my ($self) = @_;
1907 2143
1934 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1935 2171
1936 1 2172 1
1937} 2173}
1938 2174
2175# used to laod the header of an original map
1939sub load_header_orig { 2176sub load_header_orig {
1940 my ($self) = @_; 2177 my ($self) = @_;
1941 2178
1942 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1943} 2180}
1944 2181
2182# used to laod the header of an instantiated map
1945sub load_header_temp { 2183sub load_header_temp {
1946 my ($self) = @_; 2184 my ($self) = @_;
1947 2185
1948 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1949} 2187}
1950 2188
2189# called after loading the header from an instantiated map
1951sub prepare_temp { 2190sub prepare_temp {
1952 my ($self) = @_; 2191 my ($self) = @_;
1953 2192
1954 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1955 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1956 # safety 2195 # safety
1957 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1958 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1959} 2198}
1960 2199
2200# called after loading the header from an original map
1961sub prepare_orig { 2201sub prepare_orig {
1962 my ($self) = @_; 2202 my ($self) = @_;
1963 2203
1964 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1965 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1989 2229
1990sub find; 2230sub find;
1991sub find { 2231sub find {
1992 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1993 2233
2234 cf::cede_to_tick;
2235
1994 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1995 2237
1996 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1998 2240
1999 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
2004 or return; 2243 or return;
2005 2244
2006 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
2007 2246
2009 or return; 2248 or return;
2010 2249
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2250 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2251 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2252 #$cf::WAIT_FOR_TICK->wait;
2253 undef $guard2;
2014 undef $guard1; 2254 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2255 $map->reset;
2017 return find $path; 2256 return find $path;
2018 } 2257 }
2019 2258
2020 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
2021 } 2260 }
2022} 2261}
2023 2262
2024sub pre_load { } 2263sub pre_load { }
2025sub post_load { } 2264#sub post_load { } # XS
2026 2265
2027sub load { 2266sub load {
2028 my ($self) = @_; 2267 my ($self) = @_;
2029 2268
2030 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2033 2272
2034 { 2273 {
2035 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2036 2275
2037 return unless $self->valid; 2276 return unless $self->valid;
2038 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2039
2040 $self->in_memory (cf::MAP_LOADING);
2041 2278
2042 $self->alloc; 2279 $self->alloc;
2043 2280
2044 $self->pre_load; 2281 $self->pre_load;
2045 cf::cede_to_tick; 2282 cf::cede_to_tick;
2046 2283
2284 if (exists $self->{load_path}) {
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2286 $f->skip_block;
2049 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2050 or return; 2288 or return;
2051 2289
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2290 $self->post_load_original
2053 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2054 2292
2055 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2294 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2058 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2059 $self->clear_unique_items; 2297 $self->clear_unique_items;
2060 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2061 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2062 } 2301 }
2063 } 2302 }
2064 }
2065 2303
2066 $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);
2067 2311
2068 cf::cede_to_tick; 2312 cf::cede_to_tick;
2069 # now do the right thing for maps 2313 # now do the right thing for maps
2070 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2071 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2075 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2320 $self->decay_objects;
2077 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2078 $self->update_buttons; 2322 $self->update_buttons;
2079 cf::cede_to_tick; 2323 cf::cede_to_tick;
2080 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2081 cf::cede_to_tick;
2082 $self->activate;
2083 } 2325 }
2084 2326
2085 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2087
2088 $self->in_memory (cf::MAP_IN_MEMORY);
2089 } 2329 }
2090 2330
2091 $self->post_load; 2331 $self->post_load;
2092}
2093 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
2094sub customise_for { 2339sub customise_for {
2095 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2096 2341
2097 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2098 if $self->per_player; 2343 if $self->per_player;
2101# if $self->per_party; 2346# if $self->per_party;
2102 2347
2103 $self 2348 $self
2104} 2349}
2105 2350
2106# find and load all maps in the 3x3 area around a map
2107sub load_neighbours {
2108 my ($map) = @_;
2109
2110 my @neigh; # diagonal neighbours
2111
2112 for (0 .. 3) {
2113 my $neigh = $map->tile_path ($_)
2114 or next;
2115 $neigh = find $neigh, $map
2116 or next;
2117 $neigh->load;
2118
2119 push @neigh,
2120 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2121 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2122 }
2123
2124 for (grep defined $_->[0], @neigh) {
2125 my ($path, $origin) = @$_;
2126 my $neigh = find $path, $origin
2127 or next;
2128 $neigh->load;
2129 }
2130}
2131
2132sub find_sync { 2351sub find_sync {
2133 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2134 2353
2135 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
2136} 2359}
2137 2360
2138sub do_load_sync { 2361sub do_load_sync {
2139 my ($map) = @_; 2362 my ($map) = @_;
2140 2363
2364 # it's a bug to call this from the main context
2141 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2142 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2143 2367
2144 cf::sync_job { $map->load }; 2368 $map->load;
2145} 2369}
2146 2370
2147our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2148our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2149 2373
2150sub find_async { 2374sub find_async {
2151 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2152 2376
2153 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2154 2378
2155 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2380 return $map if !$load || $map->linkable;
2157 } 2381 }
2158 2382
2159 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2160 2384
2161 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2175 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2176 2400
2177 () 2401 ()
2178} 2402}
2179 2403
2404# common code, used by both ->save and ->swapout
2180sub save { 2405sub _save {
2181 my ($self) = @_; 2406 my ($self) = @_;
2182
2183 my $lock = cf::lock_acquire "map_data:$self->{path}";
2184 2407
2185 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2186 2409
2187 return unless $self->dirty; 2410 return unless $self->dirty;
2188 2411
2197 2420
2198 cf::async { 2421 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2422 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2423 $_->contr->save for $self->players;
2201 }; 2424 };
2425
2426 cf::get_slot 0.02;
2202 2427
2203 if ($uniq) { 2428 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2429 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2430 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2431 } else {
2207 $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);
2208 } 2433 }
2209} 2434}
2210 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2211sub swap_out { 2444sub swap_out {
2212 my ($self) = @_; 2445 my ($self) = @_;
2213 2446
2214 # save first because save cedes
2215 $self->save;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2219 return if $self->players; 2451 return if $self->players;
2220 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
2221 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2222 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
2223 $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};
2224 2503
2225 $self->deactivate; 2504 $self->deactivate;
2226 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2227 $self->clear; 2506 $self->clear;
2228}
2229
2230sub reset_at {
2231 my ($self) = @_;
2232
2233 # TODO: safety, remove and allow resettable per-player maps
2234 return 1e99 if $self->{deny_reset};
2235
2236 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2237 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2238
2239 $time + $to
2240}
2241
2242sub should_reset {
2243 my ($self) = @_;
2244
2245 $self->reset_at <= $cf::RUNTIME
2246}
2247
2248sub reset {
2249 my ($self) = @_;
2250
2251 my $lock = cf::lock_acquire "map_data:$self->{path}";
2252
2253 return if $self->players;
2254
2255 warn "resetting map ", $self->path;
2256
2257 $self->in_memory (cf::MAP_SWAPPED);
2258
2259 # need to save uniques path
2260 unless ($self->{deny_save}) {
2261 my $uniq = $self->uniq_path; utf8::encode $uniq;
2262
2263 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2264 if $uniq;
2265 }
2266
2267 delete $cf::MAP{$self->path};
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2271 $self->clear;
2272 2507
2273 $self->unlink_save; 2508 $self->unlink_save;
2274 $self->destroy; 2509 $self->destroy;
2275} 2510}
2276 2511
2284 2519
2285 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2286 2521
2287 $self->unlink_save; 2522 $self->unlink_save;
2288 2523
2289 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2290 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2291 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2292 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2293 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2294 2529
2343 2578
2344sub unique_maps() { 2579sub unique_maps() {
2345 [ 2580 [
2346 map { 2581 map {
2347 utf8::decode $_; 2582 utf8::decode $_;
2348 /\.map$/ 2583 s/\.map$//; # TODO future compatibility hack
2584 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2585 ? ()
2349 ? normalise $_ 2586 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2588 ]
2353} 2589}
2354 2590
2355package cf; 2591=item cf::map::static_maps
2592
2593Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2594file in the shared directory excluding F</styles> and F</editor>). May
2595block.
2596
2597=cut
2598
2599sub static_maps() {
2600 my @dirs = "";
2601 my @maps;
2602
2603 while (@dirs) {
2604 my $dir = shift @dirs;
2605
2606 next if $dir eq "/styles" || $dir eq "/editor";
2607
2608 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2609 or return;
2610
2611 for (@$files) {
2612 s/\.map$// or next;
2613 utf8::decode $_;
2614 push @maps, "$dir/$_";
2615 }
2616
2617 push @dirs, map "$dir/$_", @$dirs;
2618 }
2619
2620 \@maps
2621}
2356 2622
2357=back 2623=back
2358 2624
2359=head3 cf::object 2625=head3 cf::object
2360 2626
2364 2630
2365=over 4 2631=over 4
2366 2632
2367=item $ob->inv_recursive 2633=item $ob->inv_recursive
2368 2634
2369Returns the inventory of the object _and_ their inventories, recursively. 2635Returns the inventory of the object I<and> their inventories, recursively,
2636but I<not> the object itself.
2370 2637
2371=cut 2638=cut
2372 2639
2373sub inv_recursive_; 2640sub inv_recursive_;
2374sub inv_recursive_ { 2641sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2646 inv_recursive_ inv $_[0]
2380} 2647}
2381 2648
2382=item $ref = $ob->ref 2649=item $ref = $ob->ref
2383 2650
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2385 2652
2386=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2387 2654
2388returns 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,
2389even if the object actually exists. May block. 2656even if the object actually exists. May block.
2390 2657
2391=cut 2658=cut
2392 2659
2393sub deref { 2660sub deref {
2421can 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
2422dialogue with the given NPC character. 2689dialogue with the given NPC character.
2423 2690
2424=cut 2691=cut
2425 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
2426# rough implementation of a future "reply" method that works 2707# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2708# with dialog boxes.
2428#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
2429sub cf::object::player::reply($$$;$) { 2710sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2711 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2722 my $dialog = $pl->{npc_dialog};
2442 $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));
2443 2724
2444 } else { 2725 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2726 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2727 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2728 }
2448 } 2729 }
2449} 2730}
2450 2731
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2732=item $object->send_msg ($channel, $msg, $color, [extra...])
2461=item $player_object->may ("access") 2742=item $player_object->may ("access")
2462 2743
2463Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2464(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2465 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
2466=cut 2772=cut
2467 2773
2468sub cf::object::player::may { 2774sub cf::object::player::may {
2469 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2470 2776
2471 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2472 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2473 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2474 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2475} 2781}
2476 2782
2477=item $player_object->enter_link 2783=item $player_object->enter_link
2478 2784
2479Freezes 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}>).
2480 2786
2481The 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.
2482I<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.
2483 2791
2484Will never block. 2792Will never block.
2485 2793
2486=item $player_object->leave_link ($map, $x, $y) 2794=item $player_object->leave_link ($map, $x, $y)
2487 2795
2507sub cf::object::player::enter_link { 2815sub cf::object::player::enter_link {
2508 my ($self) = @_; 2816 my ($self) = @_;
2509 2817
2510 $self->deactivate_recursive; 2818 $self->deactivate_recursive;
2511 2819
2820 ++$self->{_link_recursion};
2821
2512 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2822 return if UNIVERSAL::isa $self->map, "ext::map_link";
2513 2823
2514 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2824 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2515 if $self->map && $self->map->{path} ne "{link}"; 2825 if $self->map && $self->map->{path} ne "{link}";
2516 2826
2517 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2827 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2518} 2828}
2519 2829
2520sub cf::object::player::leave_link { 2830sub cf::object::player::leave_link {
2521 my ($self, $map, $x, $y) = @_; 2831 my ($self, $map, $x, $y) = @_;
2522 2832
2539 ($x, $y) = (-1, -1) 2849 ($x, $y) = (-1, -1)
2540 unless (defined $x) && (defined $y); 2850 unless (defined $x) && (defined $y);
2541 2851
2542 # use -1 or undef as default coordinates, not 0, 0 2852 # use -1 or undef as default coordinates, not 0, 0
2543 ($x, $y) = ($map->enter_x, $map->enter_y) 2853 ($x, $y) = ($map->enter_x, $map->enter_y)
2544 if $x <=0 && $y <= 0; 2854 if $x <= 0 && $y <= 0;
2545 2855
2546 $map->load; 2856 $map->load;
2547 $map->load_neighbours;
2548 2857
2549 return unless $self->contr->active; 2858 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2859
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2860 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2861 if ($self->enter_map ($map, $x, $y)) {
2554} 2862 # entering was successful
2863 delete $self->{_link_recursion};
2864 # only activate afterwards, to support waiting in hooks
2865 $self->activate_recursive;
2866 }
2555 2867
2868}
2869
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2870=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2557 2871
2558Moves the player to the given map-path and coordinates by first freezing 2872Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2873her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2874that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2875the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2876be called at the end of this process.
2563 2877
2878Note that $check will be called with a potentially non-loaded map, so if
2879it needs a loaded map it has to call C<< ->load >>.
2880
2564=cut 2881=cut
2565 2882
2566our $GOTOGEN; 2883our $GOTOGEN;
2567 2884
2568sub cf::object::player::goto { 2885sub cf::object::player::goto {
2569 my ($self, $path, $x, $y, $check, $done) = @_; 2886 my ($self, $path, $x, $y, $check, $done) = @_;
2887
2888 if ($self->{_link_recursion} >= $MAX_LINKS) {
2889 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2890 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2891 ($path, $x, $y) = @$EMERGENCY_POSITION;
2892 }
2570 2893
2571 # do generation counting so two concurrent goto's will be executed in-order 2894 # do generation counting so two concurrent goto's will be executed in-order
2572 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2895 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2573 2896
2574 $self->enter_link; 2897 $self->enter_link;
2594 ($path, $x, $y) = (undef, undef, undef); 2917 ($path, $x, $y) = (undef, undef, undef);
2595 } 2918 }
2596 } 2919 }
2597 2920
2598 my $map = eval { 2921 my $map = eval {
2599 my $map = defined $path ? cf::map::find $path : undef; 2922 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2600 2923
2601 if ($map) { 2924 if ($map) {
2602 $map = $map->customise_for ($self); 2925 $map = $map->customise_for ($self);
2603 $map = $check->($map) if $check && $map; 2926 $map = $check->($map, $x, $y, $self) if $check && $map;
2604 } else { 2927 } else {
2605 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2928 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2606 } 2929 }
2607 2930
2608 $map 2931 $map
2616 if ($gen == $self->{_goto_generation}) { 2939 if ($gen == $self->{_goto_generation}) {
2617 delete $self->{_goto_generation}; 2940 delete $self->{_goto_generation};
2618 $self->leave_link ($map, $x, $y); 2941 $self->leave_link ($map, $x, $y);
2619 } 2942 }
2620 2943
2621 $done->() if $done; 2944 $done->($self) if $done;
2622 })->prio (1); 2945 })->prio (1);
2623} 2946}
2624 2947
2625=item $player_object->enter_exit ($exit_object) 2948=item $player_object->enter_exit ($exit_object)
2626 2949
2646} 2969}
2647 2970
2648sub prepare_random_map { 2971sub prepare_random_map {
2649 my ($exit) = @_; 2972 my ($exit) = @_;
2650 2973
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2974 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2975 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2976 # that depends on the exit object
2656 2977
2657 my $rmp = parse_random_map_params $exit->msg; 2978 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2980 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2981 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2982 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2983 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2984 $rmp->{origin_y} = $exit->y;
2985
2986 $exit->map->touch;
2664 } 2987 }
2665 2988
2666 $rmp->{random_seed} ||= $exit->random_seed; 2989 $rmp->{random_seed} ||= $exit->random_seed;
2667 2990
2668 my $data = cf::encode_json $rmp; 2991 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2992 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2993 my $meta = "$RANDOMDIR/$md5.meta";
2671 2994
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2995 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2996 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2997 undef $fh;
2675 aio_rename "$meta~", $meta; 2998 aio_rename "$meta~", $meta;
2676 2999
3000 my $slaying = "?random/$md5";
3001
3002 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 3003 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 3004 $exit->msg (undef);
3005 }
2679 } 3006 }
2680} 3007}
2681 3008
2682sub cf::object::player::enter_exit { 3009sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 3010 my ($self, $exit) = @_;
2684 3011
2685 return unless $self->type == cf::PLAYER; 3012 return unless $self->type == cf::PLAYER;
2686 3013
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 3014 $self->enter_link;
2699 3015
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 3016 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 3017 $Coro::current->{desc} = "enter_exit";
2706 3018
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 3019 unless (eval {
3020 $self->deactivate_recursive; # just to be sure
3021
3022 my $map = cf::map::normalise $exit->slaying, $exit->map;
3023 my $x = $exit->stats->hp;
3024 my $y = $exit->stats->sp;
3025
3026 # special map handling
3027 my $slaying = $exit->slaying;
3028
3029 # special map handling
3030 if ($slaying eq "/!") {
3031 my $guard = cf::lock_acquire "exit_prepare:$exit";
3032
3033 prepare_random_map $exit
3034 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3035
3036 $map = $exit->slaying;
3037
3038 } elsif ($slaying eq '!up') {
3039 $map = $exit->map->tile_path (cf::TILE_UP);
3040 $x = $exit->x;
3041 $y = $exit->y;
3042
3043 } elsif ($slaying eq '!down') {
3044 $map = $exit->map->tile_path (cf::TILE_DOWN);
3045 $x = $exit->x;
3046 $y = $exit->y;
3047 }
3048
2709 $self->goto ($slaying, $hp, $sp); 3049 $self->goto ($map, $x, $y);
2710 3050
3051 # if exit is damned, update players death & WoR home-position
3052 $self->contr->savebed ($map, $x, $y)
3053 if $exit->flag (cf::FLAG_DAMNED);
3054
2711 1; 3055 1
2712 }) { 3056 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 3057 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 3058 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 3059 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 3060 cf::NDI_UNIQUE | cf::NDI_RED);
2717 3061
2718 warn "ERROR in enter_exit: $@"; 3062 error "ERROR in enter_exit: $@";
2719 $self->leave_link; 3063 $self->leave_link;
2720 } 3064 }
2721 })->prio (1); 3065 })->prio (1);
2722} 3066}
2723 3067
2724=head3 cf::client 3068=head3 cf::client
2725 3069
2726=over 4 3070=over 4
2727 3071
2728=item $client->send_drawinfo ($text, $flags) 3072=item $client->send_big_packet ($pkt)
2729 3073
2730Sends a drawinfo packet to the client. Circumvents output buffering so 3074Like C<send_packet>, but tries to compress large packets, and fragments
2731should not be used under normal circumstances. 3075them as required.
2732 3076
2733=cut 3077=cut
2734 3078
3079our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3080
2735sub cf::client::send_drawinfo { 3081sub cf::client::send_big_packet {
2736 my ($self, $text, $flags) = @_; 3082 my ($self, $pkt) = @_;
2737 3083
2738 utf8::encode $text; 3084 # try lzf for large packets
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3085 $pkt = "lzf " . Compress::LZF::compress $pkt
3086 if 1024 <= length $pkt and $self->{can_lzf};
3087
3088 # split very large packets
3089 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3090 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3091 $pkt = "frag";
3092 }
3093
3094 $self->send_packet ($pkt);
2740} 3095}
2741 3096
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 3097=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 3098
2744Send a drawinfo or msg packet to the client, formatting the msg for the 3099Send a msg packet to the client, formatting the msg for the client if
2745client if neccessary. C<$type> should be a string identifying the type of 3100necessary. C<$type> should be a string identifying the type of the
2746the message, with C<log> being the default. If C<$color> is negative, suppress 3101message, with C<log> being the default. If C<$color> is negative, suppress
2747the message unless the client supports the msg packet. 3102the message unless the client supports the msg packet.
2748 3103
2749=cut 3104=cut
2750 3105
2751# non-persistent channels (usually the info channel) 3106# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 3107our %CHANNEL = (
3108 "c/motd" => {
3109 id => "infobox",
3110 title => "MOTD",
3111 reply => undef,
3112 tooltip => "The message of the day",
3113 },
2753 "c/identify" => { 3114 "c/identify" => {
2754 id => "infobox", 3115 id => "infobox",
2755 title => "Identify", 3116 title => "Identify",
2756 reply => undef, 3117 reply => undef,
2757 tooltip => "Items recently identified", 3118 tooltip => "Items recently identified",
2759 "c/examine" => { 3120 "c/examine" => {
2760 id => "infobox", 3121 id => "infobox",
2761 title => "Examine", 3122 title => "Examine",
2762 reply => undef, 3123 reply => undef,
2763 tooltip => "Signs and other items you examined", 3124 tooltip => "Signs and other items you examined",
3125 },
3126 "c/shopinfo" => {
3127 id => "infobox",
3128 title => "Shop Info",
3129 reply => undef,
3130 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 3131 },
2765 "c/book" => { 3132 "c/book" => {
2766 id => "infobox", 3133 id => "infobox",
2767 title => "Book", 3134 title => "Book",
2768 reply => undef, 3135 reply => undef,
2784 id => "infobox", 3151 id => "infobox",
2785 title => "Body Parts", 3152 title => "Body Parts",
2786 reply => undef, 3153 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 3154 tooltip => "Shows which body parts you posess and are available",
2788 }, 3155 },
3156 "c/statistics" => {
3157 id => "infobox",
3158 title => "Statistics",
3159 reply => undef,
3160 tooltip => "Shows your primary statistics",
3161 },
3162 "c/skills" => {
3163 id => "infobox",
3164 title => "Skills",
3165 reply => undef,
3166 tooltip => "Shows your experience per skill and item power",
3167 },
3168 "c/shopitems" => {
3169 id => "infobox",
3170 title => "Shop Items",
3171 reply => undef,
3172 tooltip => "Shows the items currently for sale in this shop",
3173 },
3174 "c/resistances" => {
3175 id => "infobox",
3176 title => "Resistances",
3177 reply => undef,
3178 tooltip => "Shows your resistances",
3179 },
3180 "c/pets" => {
3181 id => "infobox",
3182 title => "Pets",
3183 reply => undef,
3184 tooltip => "Shows information abotu your pets/a specific pet",
3185 },
3186 "c/perceiveself" => {
3187 id => "infobox",
3188 title => "Perceive Self",
3189 reply => undef,
3190 tooltip => "You gained detailed knowledge about yourself",
3191 },
2789 "c/uptime" => { 3192 "c/uptime" => {
2790 id => "infobox", 3193 id => "infobox",
2791 title => "Uptime", 3194 title => "Uptime",
2792 reply => undef, 3195 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 3196 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 3199 id => "infobox",
2797 title => "Map Info", 3200 title => "Map Info",
2798 reply => undef, 3201 reply => undef,
2799 tooltip => "Information related to the maps", 3202 tooltip => "Information related to the maps",
2800 }, 3203 },
3204 "c/party" => {
3205 id => "party",
3206 title => "Party",
3207 reply => "gsay ",
3208 tooltip => "Messages and chat related to your party",
3209 },
3210 "c/death" => {
3211 id => "death",
3212 title => "Death",
3213 reply => undef,
3214 tooltip => "Reason for and more info about your most recent death",
3215 },
3216 "c/fatal" => {
3217 id => "fatal",
3218 title => "Fatal Error",
3219 reply => undef,
3220 tooltip => "Reason for the server disconnect",
3221 },
3222 "c/say" => $SAY_CHANNEL,
3223 "c/chat" => $CHAT_CHANNEL,
2801); 3224);
2802 3225
2803sub cf::client::send_msg { 3226sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3227 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3228
2806 $msg = $self->pl->expand_cfpod ($msg); 3229 $msg = $self->pl->expand_cfpod ($msg)
3230 unless $color & cf::NDI_VERBATIM;
2807 3231
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 3232 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 3233
2810 # check predefined channels, for the benefit of C 3234 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 3235 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 3236 $channel = $CHANNEL{$channel};
2813 3237
2814 $self->ext_msg (channel_info => $channel) 3238 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 3239 $channel = $channel->{id};
2818 3240
2819 } elsif (ref $channel) { 3241 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 3242 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 3243 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 3244 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 3245 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 3246 }
2826 3247
2827 $channel = $channel->{id}; 3248 $channel = $channel->{id};
2828 } 3249 }
2829 3250
2830 return unless @extra || length $msg; 3251 return unless @extra || length $msg;
2831 3252
2832 if ($self->can_msg) {
2833 # default colour, mask it out 3253 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3254 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 3255 if $color & cf::NDI_DEF;
2836 3256
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3257 my $pkt = "msg "
3258 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3259 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 3260 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 3261
2851 $color &= cf::NDI_COLOR_MASK; 3262 $self->send_big_packet ($pkt);
2852
2853 utf8::encode $msg;
2854
2855 if (0 && $msg =~ /\[/) {
2856 # COMMAND/INFO
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 }
2864} 3263}
2865 3264
2866=item $client->ext_msg ($type, @msg) 3265=item $client->ext_msg ($type, @msg)
2867 3266
2868Sends an ext event to the client. 3267Sends an ext event to the client.
2870=cut 3269=cut
2871 3270
2872sub cf::client::ext_msg($$@) { 3271sub cf::client::ext_msg($$@) {
2873 my ($self, $type, @msg) = @_; 3272 my ($self, $type, @msg) = @_;
2874 3273
2875 if ($self->extcmd == 2) {
2876 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3274 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2877 } elsif ($self->extcmd == 1) { # TODO: remove
2878 push @msg, msgtype => "event_$type";
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 }
2881}
2882
2883=item $client->ext_reply ($msgid, @msg)
2884
2885Sends an ext reply to the client.
2886
2887=cut
2888
2889sub cf::client::ext_reply($$@) {
2890 my ($self, $id, @msg) = @_;
2891
2892 if ($self->extcmd == 2) {
2893 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2894 } elsif ($self->extcmd == 1) {
2895 #TODO: version 1, remove
2896 unshift @msg, msgtype => "reply", msgid => $id;
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2898 }
2899} 3275}
2900 3276
2901=item $success = $client->query ($flags, "text", \&cb) 3277=item $success = $client->query ($flags, "text", \&cb)
2902 3278
2903Queues a query to the client, calling the given callback with 3279Queues a query to the client, calling the given callback with
2923 3299
2924 $self->send_packet ($self->{query_queue}[0][0]) 3300 $self->send_packet ($self->{query_queue}[0][0])
2925 if @{ $self->{query_queue} } == 1; 3301 if @{ $self->{query_queue} } == 1;
2926 3302
2927 1 3303 1
3304}
3305
3306=item $client->update_command_faces
3307
3308=cut
3309
3310our %COMMAND_FACE;
3311
3312sub cf::client::update_command_faces {
3313 my ($self) = @_;
3314
3315 my @faces = grep $_,
3316 $COMMAND_FACE{preferred},
3317 $COMMAND_FACE{standard},
3318 $COMMAND_FACE{skill},
3319 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3320 $COMMAND_FACE{emote},
3321 ;
3322
3323 $self->send_face ($_)
3324 for @faces;
3325 $self->flush_fx;
3326
3327 $self->ext_msg (command_list => @faces);
3328}
3329
3330=item cf::client::set_command_face $type, $commands
3331
3332=cut
3333
3334sub cf::client::set_command_face {
3335 my ($type, $list) = @_;
3336
3337 my $idx = &cf::face::set ( #d# ugly forward reference
3338 "command_list/$type" => cf::FT_RSRC,
3339 JSON::XS->new->utf8->encode ([ sort @$list ])
3340 );
3341
3342 $COMMAND_FACE{$type} = $idx;
2928} 3343}
2929 3344
2930cf::client->attach ( 3345cf::client->attach (
2931 on_connect => sub { 3346 on_connect => sub {
2932 my ($ns) = @_; 3347 my ($ns) = @_;
2958 my ($ns, $buf) = @_; 3373 my ($ns, $buf) = @_;
2959 3374
2960 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3375 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2961 3376
2962 if (ref $msg) { 3377 if (ref $msg) {
2963 my ($type, $reply, @payload) = 3378 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2964 "ARRAY" eq ref $msg
2965 ? @$msg
2966 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2967 3379
2968 my @reply;
2969
2970 if (my $cb = $EXTICMD{$type}) { 3380 if (my $cb = $EXTIACMD{$type}) {
3381 $cb->(
3382 $ns,
3383 sub {
3384 $ns->ext_msg ("reply-$reply", @_)
3385 if $reply;
3386 },
3387 @payload
3388 );
3389 } else {
3390 my @reply;
3391
3392 if (my $cb = $EXTICMD{$type}) {
2971 @reply = $cb->($ns, @payload); 3393 @reply = $cb->($ns, @payload);
3394 }
3395
3396 $ns->ext_msg ("reply-$reply", @reply)
3397 if $reply;
2972 } 3398 }
2973
2974 $ns->ext_reply ($reply, @reply)
2975 if $reply;
2976
2977 } else { 3399 } else {
2978 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3400 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2979 } 3401 }
2980 3402
2981 cf::override; 3403 cf::override;
2982 }, 3404 },
2983); 3405);
3003 3425
3004 $coro 3426 $coro
3005} 3427}
3006 3428
3007cf::client->attach ( 3429cf::client->attach (
3008 on_destroy => sub { 3430 on_client_destroy => sub {
3009 my ($ns) = @_; 3431 my ($ns) = @_;
3010 3432
3011 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3433 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3012 }, 3434 },
3013); 3435);
3029our $safe_hole = new Safe::Hole; 3451our $safe_hole = new Safe::Hole;
3030 3452
3031$SIG{FPE} = 'IGNORE'; 3453$SIG{FPE} = 'IGNORE';
3032 3454
3033$safe->permit_only (Opcode::opset qw( 3455$safe->permit_only (Opcode::opset qw(
3034 :base_core :base_mem :base_orig :base_math 3456 :base_core :base_mem :base_orig :base_math :base_loop
3035 grepstart grepwhile mapstart mapwhile 3457 grepstart grepwhile mapstart mapwhile
3036 sort time 3458 sort time
3037)); 3459));
3038 3460
3039# here we export the classes and methods available to script code 3461# here we export the classes and methods available to script code
3042 3464
3043The following functions and methods are available within a safe environment: 3465The following functions and methods are available within a safe environment:
3044 3466
3045 cf::object 3467 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3468 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3469 insert remove name archname title slaying race decrease split
3470 value
3048 3471
3049 cf::object::player 3472 cf::object::player
3050 player 3473 player
3051 3474
3052 cf::player 3475 cf::player
3057 3480
3058=cut 3481=cut
3059 3482
3060for ( 3483for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3484 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3485 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3486 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3487 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3488 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3489 ["cf::map" => qw(trigger)],
3067) { 3490) {
3068 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3491 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3492 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3071 for @funs; 3493 for @funs;
3072} 3494}
3073 3495
3088 3510
3089 my $qcode = $code; 3511 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3512 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3513 $qcode =~ s/\n/\\n/g;
3092 3514
3515 %vars = (_dummy => 0) unless %vars;
3516
3517 my @res;
3093 local $_; 3518 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars;
3095 3519
3096 my $eval = 3520 my $eval =
3097 "do {\n" 3521 "do {\n"
3098 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3522 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3099 . "#line 0 \"{$qcode}\"\n" 3523 . "#line 0 \"{$qcode}\"\n"
3100 . $code 3524 . $code
3101 . "\n}" 3525 . "\n}"
3102 ; 3526 ;
3103 3527
3528 if ($CFG{safe_eval}) {
3104 sub_generation_inc; 3529 sub_generation_inc;
3530 local @safe::cf::_safe_eval_args = values %vars;
3105 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3531 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3106 sub_generation_inc; 3532 sub_generation_inc;
3533 } else {
3534 local @cf::_safe_eval_args = values %vars;
3535 @res = wantarray ? eval eval : scalar eval $eval;
3536 }
3107 3537
3108 if ($@) { 3538 if ($@) {
3109 warn "$@"; 3539 warn "$@",
3110 warn "while executing safe code '$code'\n"; 3540 "while executing safe code '$code'\n",
3111 warn "with arguments " . (join " ", %vars) . "\n"; 3541 "with arguments " . (join " ", %vars) . "\n";
3112 } 3542 }
3113 3543
3114 wantarray ? @res : $res[0] 3544 wantarray ? @res : $res[0]
3115} 3545}
3116 3546
3130=cut 3560=cut
3131 3561
3132sub register_script_function { 3562sub register_script_function {
3133 my ($fun, $cb) = @_; 3563 my ($fun, $cb) = @_;
3134 3564
3135 no strict 'refs'; 3565 $fun = "safe::$fun" if $CFG{safe_eval};
3136 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3566 *$fun = $safe_hole->wrap ($cb);
3137} 3567}
3138 3568
3139=back 3569=back
3140 3570
3141=cut 3571=cut
3142 3572
3143############################################################################# 3573#############################################################################
3144# the server's init and main functions 3574# the server's init and main functions
3145 3575
3576{
3577 package cf::face;
3578
3579 our %HASH; # hash => idx
3580 our @DATA; # dynamically-created facedata, only faceste 0 used
3581 our @FOFS; # file offset, if > 0
3582 our @SIZE; # size of face, in octets
3583 our @META; # meta hash of face, if any
3584 our $DATAFH; # facedata filehandle
3585
3586 # internal api, not finalised
3587 sub set {
3588 my ($name, $type, $data) = @_;
3589
3590 my $idx = cf::face::find $name;
3591
3592 if ($idx) {
3593 delete $HASH{cf::face::get_csum $idx};
3594 } else {
3595 $idx = cf::face::alloc $name;
3596 }
3597
3598 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3599
3600 cf::face::set_type $idx, $type;
3601 cf::face::set_csum $idx, 0, $hash;
3602
3603 # we need to destroy the SV itself, not just modify it, as a running ix
3604 # might hold a reference to it: "delete" achieves that.
3605 delete $FOFS[0][$idx];
3606 delete $DATA[0][$idx];
3607 $DATA[0][$idx] = $data;
3608 $SIZE[0][$idx] = length $data;
3609 delete $META[$idx];
3610 $HASH{$hash} = $idx;#d#
3611
3612 $idx
3613 }
3614
3615 sub _get_data($$$) {
3616 my ($idx, $set, $cb) = @_;
3617
3618 if (defined $DATA[$set][$idx]) {
3619 $cb->($DATA[$set][$idx]);
3620 } elsif (my $fofs = $FOFS[$set][$idx]) {
3621 my $size = $SIZE[$set][$idx];
3622 my $buf;
3623 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3624 if ($_[0] == $size) {
3625 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3626 $cb->($buf);
3627 } else {
3628 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3629 }
3630 };
3631 } else {
3632 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3633 }
3634 }
3635
3636 # rather ineffient
3637 sub cf::face::get_data($;$) {
3638 my ($idx, $set) = @_;
3639
3640 _get_data $idx, $set, Coro::rouse_cb;
3641 Coro::rouse_wait
3642 }
3643
3644 sub cf::face::ix {
3645 my ($ns, $set, $idx, $pri) = @_;
3646
3647 _get_data $idx, $set, sub {
3648 $ns->ix_send ($idx, $pri, $_[0]);
3649 };
3650 }
3651}
3652
3146sub load_facedata($) { 3653sub load_facedata($) {
3147 my ($path) = @_; 3654 my ($path) = @_;
3148 3655
3149 # HACK to clear player env face cache, we need some signal framework
3150 # for this (global event?)
3151 %ext::player_env::MUSIC_FACE_CACHE = ();
3152
3153 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3656 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3154 3657
3155 warn "loading facedata from $path\n"; 3658 trace "loading facedata from $path\n";
3156 3659
3157 my $facedata; 3660 my $facedata = decode_storable load_file "$path/faceinfo";
3158 0 < aio_load $path, $facedata
3159 or die "$path: $!";
3160
3161 $facedata = Coro::Storable::thaw $facedata;
3162 3661
3163 $facedata->{version} == 2 3662 $facedata->{version} == 2
3164 or cf::cleanup "$path: version mismatch, cannot proceed."; 3663 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3165 3664
3166 # patch in the exptable 3665 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3167 $facedata->{resource}{"res/exp_table"} = { 3666 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3168 type => FT_RSRC, 3667
3169 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3668 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3170 }; 3669
3171 cf::cede_to_tick; 3670 # BEGIN ATOMIC
3671 # from here on, everything must be atomic - no thread switch allowed
3672 my $t1 = EV::time;
3172 3673
3173 { 3674 {
3174 my $faces = $facedata->{faceinfo}; 3675 my $faces = $facedata->{faceinfo};
3175 3676
3176 while (my ($face, $info) = each %$faces) { 3677 for my $face (sort keys %$faces) {
3678 my $info = $faces->{$face};
3177 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3679 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3178 3680
3179 cf::face::set_visibility $idx, $info->{visibility}; 3681 cf::face::set_visibility $idx, $info->{visibility};
3180 cf::face::set_magicmap $idx, $info->{magicmap}; 3682 cf::face::set_magicmap $idx, $info->{magicmap};
3181 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3683 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3182 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3684 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3183 3685 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3184 cf::cede_to_tick; 3686 $cf::face::HASH{$info->{hash64}} = $idx;
3687 delete $cf::face::META[$idx];
3185 } 3688 }
3186 3689
3187 while (my ($face, $info) = each %$faces) { 3690 while (my ($face, $info) = each %$faces) {
3188 next unless $info->{smooth}; 3691 next unless $info->{smooth};
3189 3692
3192 3695
3193 if (my $smooth = cf::face::find $info->{smooth}) { 3696 if (my $smooth = cf::face::find $info->{smooth}) {
3194 cf::face::set_smooth $idx, $smooth; 3697 cf::face::set_smooth $idx, $smooth;
3195 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3698 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3196 } else { 3699 } else {
3197 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3700 error "smooth face '$info->{smooth}' not found for face '$face'";
3198 } 3701 }
3199
3200 cf::cede_to_tick;
3201 } 3702 }
3202 } 3703 }
3203 3704
3204 { 3705 {
3205 my $anims = $facedata->{animinfo}; 3706 my $anims = $facedata->{animinfo};
3206 3707
3207 while (my ($anim, $info) = each %$anims) { 3708 while (my ($anim, $info) = each %$anims) {
3208 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3709 cf::anim::set $anim, $info->{frames}, $info->{facings};
3209 cf::cede_to_tick;
3210 } 3710 }
3211 3711
3212 cf::anim::invalidate_all; # d'oh 3712 cf::anim::invalidate_all; # d'oh
3213 } 3713 }
3214 3714
3215 { 3715 {
3216 # TODO: for gcfclient pleasure, we should give resources
3217 # that gcfclient doesn't grok a >10000 face index.
3218 my $res = $facedata->{resource}; 3716 my $res = $facedata->{resource};
3219 3717
3220 while (my ($name, $info) = each %$res) { 3718 while (my ($name, $info) = each %$res) {
3221 if (defined $info->{type}) { 3719 if (defined (my $type = $info->{type})) {
3720 # TODO: different hash - must free and use new index, or cache ixface data queue
3222 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3721 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3223 my $data;
3224 3722
3225 if ($info->{type} & 1) {
3226 # prepend meta info
3227
3228 my $meta = $enc->encode ({
3229 name => $name,
3230 %{ $info->{meta} || {} },
3231 });
3232
3233 $data = pack "(w/a*)*", $meta, $info->{data};
3234 } else {
3235 $data = $info->{data};
3236 }
3237
3238 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3239 cf::face::set_type $idx, $info->{type}; 3723 cf::face::set_type $idx, $type;
3724 cf::face::set_csum $idx, 0, $info->{hash};
3725 $cf::face::SIZE[0][$idx] = $info->{size};
3726 $cf::face::FOFS[0][$idx] = $info->{fofs};
3727 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3728 $cf::face::HASH{$info->{hash}} = $idx;
3240 } else { 3729 } else {
3241 $RESOURCE{$name} = $info; 3730# $RESOURCE{$name} = $info; # unused
3242 } 3731 }
3243
3244 cf::cede_to_tick;
3245 } 3732 }
3246 } 3733 }
3734
3735 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3736
3737 # HACK to clear player env face cache, we need some signal framework
3738 # for this (global event?)
3739 %ext::player_env::MUSIC_FACE_CACHE = ();
3740
3741 # END ATOMIC
3742
3743 cf::debug "facedata atomic update time ", EV::time - $t1;
3247 3744
3248 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3745 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3249 3746
3747 aio_close $fh if $fh; # close old facedata
3748
3250 1 3749 1
3251} 3750}
3252
3253cf::global->attach (on_resource_update => sub {
3254 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3255 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3256
3257 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3258 my $sound = $soundconf->{compat}[$_]
3259 or next;
3260
3261 my $face = cf::face::find "sound/$sound->[1]";
3262 cf::sound::set $sound->[0] => $face;
3263 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3264 }
3265
3266 while (my ($k, $v) = each %{$soundconf->{event}}) {
3267 my $face = cf::face::find "sound/$v";
3268 cf::sound::set $k => $face;
3269 }
3270 }
3271});
3272 3751
3273register_exticmd fx_want => sub { 3752register_exticmd fx_want => sub {
3274 my ($ns, $want) = @_; 3753 my ($ns, $want) = @_;
3275 3754
3276 while (my ($k, $v) = each %$want) { 3755 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3756 $ns->fx_want ($k, $v);
3278 } 3757 }
3279}; 3758};
3759
3760sub load_resource_file($) {
3761 my $guard = lock_acquire "load_resource_file";
3762
3763 my $status = load_resource_file_ $_[0];
3764 get_slot 0.1, 100;
3765 cf::arch::commit_load;
3766
3767 $status
3768}
3769
3770sub reload_exp_table {
3771 _reload_exp_table;
3772
3773 cf::face::set
3774 "res/exp_table" => FT_RSRC,
3775 JSON::XS->new->utf8->canonical->encode (
3776 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3777 );
3778}
3779
3780sub reload_materials {
3781 _reload_materials;
3782}
3280 3783
3281sub reload_regions { 3784sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3785 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3786 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3787 %ext::player_env::MUSIC_FACE_CACHE = ();
3291 if exists $_->{match}; 3794 if exists $_->{match};
3292 } 3795 }
3293} 3796}
3294 3797
3295sub reload_facedata { 3798sub reload_facedata {
3296 load_facedata "$DATADIR/facedata" 3799 load_facedata $DATADIR
3297 or die "unable to load facedata\n"; 3800 or die "unable to load facedata\n";
3298} 3801}
3299 3802
3300sub reload_archetypes { 3803sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3804 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3805 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references 3806
3304 # this really needs to be done in an extra post-pass 3807 cf::face::set
3305 # (which needs to be synchronous, so solve it differently) 3808 "res/skill_info" => FT_RSRC,
3306 load_resource_file "$DATADIR/archetypes" 3809 JSON::XS->new->utf8->canonical->encode (
3307 or die "unable to load archetypes\n"; 3810 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3811 );
3812
3813 cf::face::set
3814 "res/spell_paths" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3817 );
3818
3819 # command completion
3820 my @commands;
3821
3822 for (0..cf::arch::skillvec_size - 1) {
3823 my $skill = cf::arch::skillvec $_;
3824 my $name = $skill->name;
3825 my $flags = cf::skill_flags $skill->subtype;
3826
3827 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3828 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3829 }
3830
3831 cf::client::set_command_face skill => \@commands;
3308} 3832}
3309 3833
3310sub reload_treasures { 3834sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3835 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3836 or die "unable to load treasurelists\n";
3313} 3837}
3314 3838
3839sub reload_sound {
3840 trace "loading sound config from $DATADIR/sound\n";
3841
3842 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3843
3844 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3845 my $sound = $soundconf->{compat}[$_]
3846 or next;
3847
3848 my $face = cf::face::find "sound/$sound->[1]";
3849 cf::sound::set $sound->[0] => $face;
3850 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3851 }
3852
3853 while (my ($k, $v) = each %{$soundconf->{event}}) {
3854 my $face = cf::face::find "sound/$v";
3855 cf::sound::set $k => $face;
3856 }
3857}
3858
3315sub reload_resources { 3859sub reload_resources {
3316 warn "reloading resource files...\n"; 3860 trace "reloading resource files...\n";
3317 3861
3862 reload_materials;
3863 reload_facedata;
3864 reload_exp_table;
3865 reload_sound;
3866 reload_archetypes;
3318 reload_regions; 3867 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3868 reload_treasures;
3323 3869
3324 warn "finished reloading resource files\n"; 3870 trace "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3871}
3330 3872
3331sub reload_config { 3873sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3874 trace "reloading config file...\n";
3333 or return;
3334 3875
3335 local $/; 3876 my $config = load_file "$CONFDIR/config";
3336 *CFG = YAML::Load <$fh>; 3877 utf8::decode $config;
3878 *CFG = decode_yaml $config;
3337 3879
3338 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3880 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3339 3881
3340 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3882 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3341 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3883 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3342 3884
3343 if (exists $CFG{mlockall}) { 3885 if (exists $CFG{mlockall}) {
3347 }; 3889 };
3348 warn $@ if $@; 3890 warn $@ if $@;
3349 } 3891 }
3350} 3892}
3351 3893
3894sub pidfile() {
3895 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3896 or die "$PIDFILE: $!";
3897 flock $fh, &Fcntl::LOCK_EX
3898 or die "$PIDFILE: flock: $!";
3899 $fh
3900}
3901
3902# make sure only one server instance is running at any one time
3903sub atomic {
3904 my $fh = pidfile;
3905
3906 my $pid = <$fh>;
3907 kill 9, $pid if $pid > 0;
3908
3909 seek $fh, 0, 0;
3910 print $fh $$;
3911}
3912
3913sub main_loop {
3914 trace "EV::loop starting\n";
3915 if (1) {
3916 EV::loop;
3917 }
3918 trace "EV::loop returned\n";
3919 goto &main_loop unless $REALLY_UNLOOP;
3920}
3921
3352sub main { 3922sub main {
3923 cf::init_globals; # initialise logging
3924
3925 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3926 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3927 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3928 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3929
3930 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3931
3353 # we must not ever block the main coroutine 3932 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3933 $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3934 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3935 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3936 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3937 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3938 })->prio (Coro::PRIO_MAX);
3360 }; 3939 };
3361 3940
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3941 evthread_start IO::AIO::poll_fileno;
3368 EV::loop; 3942
3943 cf::sync_job {
3944 cf::incloader::init ();
3945
3946 db_init;
3947
3948 cf::init_anim;
3949 cf::init_attackmess;
3950 cf::init_dynamic;
3951
3952 cf::load_settings;
3953
3954 reload_resources;
3955 reload_config;
3956
3957 cf::init_uuid;
3958 cf::init_signals;
3959 cf::init_skills;
3960
3961 cf::init_beforeplay;
3962
3963 atomic;
3964
3965 load_extensions;
3966
3967 utime time, time, $RUNTIMEFILE;
3968
3969 # no (long-running) fork's whatsoever before this point(!)
3970 use POSIX ();
3971 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3972
3973 cf::_post_init 0;
3974 };
3975
3976 cf::object::thawer::errors_are_fatal 0;
3977 info "parse errors in files are no longer fatal from this point on.\n";
3978
3979 AE::postpone {
3980 undef &main; # free gobs of memory :)
3981 };
3982
3983 goto &main_loop;
3369} 3984}
3370 3985
3371############################################################################# 3986#############################################################################
3372# initialisation and cleanup 3987# initialisation and cleanup
3373 3988
3374# install some emergency cleanup handlers 3989# install some emergency cleanup handlers
3375BEGIN { 3990BEGIN {
3376 our %SIGWATCHER = (); 3991 our %SIGWATCHER = ();
3377 for my $signal (qw(INT HUP TERM)) { 3992 for my $signal (qw(INT HUP TERM)) {
3378 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3993 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3379 cf::cleanup "SIG$signal"; 3994 cf::cleanup "SIG$signal";
3380 }; 3995 };
3381 } 3996 }
3382} 3997}
3383 3998
3384sub write_runtime { 3999sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime"; 4000 my $t0 = AE::time;
3386 4001
3387 # first touch the runtime file to show we are still running: 4002 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 4003 # the fsync below can take a very very long time.
3389 4004
3390 IO::AIO::aio_utime $runtime, undef, undef; 4005 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 4006
3392 my $guard = cf::lock_acquire "write_runtime"; 4007 my $guard = cf::lock_acquire "write_runtime";
3393 4008
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4009 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3395 or return; 4010 or return;
3396 4011
3397 my $value = $cf::RUNTIME + 90 + 10; 4012 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 4013 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 4014 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 4024 aio_utime $fh, undef, undef;
3410 4025
3411 close $fh 4026 close $fh
3412 or return; 4027 or return;
3413 4028
3414 aio_rename "$runtime~", $runtime 4029 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 4030 and return;
3416 4031
3417 warn "runtime file written.\n"; 4032 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3418 4033
3419 1 4034 1
4035}
4036
4037our $uuid_lock;
4038our $uuid_skip;
4039
4040sub write_uuid_sync($) {
4041 $uuid_skip ||= $_[0];
4042
4043 return if $uuid_lock;
4044 local $uuid_lock = 1;
4045
4046 my $uuid = "$LOCALDIR/uuid";
4047
4048 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
4049 or return;
4050
4051 my $value = uuid_seq uuid_cur;
4052
4053 unless ($value) {
4054 info "cowardly refusing to write zero uuid value!\n";
4055 return;
4056 }
4057
4058 my $value = uuid_str $value + $uuid_skip;
4059 $uuid_skip = 0;
4060
4061 (aio_write $fh, 0, (length $value), $value, 0) <= 0
4062 and return;
4063
4064 # always fsync - this file is important
4065 aio_fsync $fh
4066 and return;
4067
4068 close $fh
4069 or return;
4070
4071 aio_rename "$uuid~", $uuid
4072 and return;
4073
4074 trace "uuid file written ($value).\n";
4075
4076 1
4077
4078}
4079
4080sub write_uuid($$) {
4081 my ($skip, $sync) = @_;
4082
4083 $sync ? write_uuid_sync $skip
4084 : async { write_uuid_sync $skip };
3420} 4085}
3421 4086
3422sub emergency_save() { 4087sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 4088 my $freeze_guard = cf::freeze_mainloop;
3424 4089
3425 warn "enter emergency perl save\n"; 4090 info "emergency_perl_save: enter\n";
4091
4092 # this is a trade-off: we want to be very quick here, so
4093 # save all maps without fsync, and later call a global sync
4094 # (which in turn might be very very slow)
4095 local $USE_FSYNC = 0;
3426 4096
3427 cf::sync_job { 4097 cf::sync_job {
4098 cf::write_runtime_sync; # external watchdog should not bark
4099
3428 # use a peculiar iteration method to avoid tripping on perl 4100 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 4101 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 4102 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 4103 info "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 4104 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 4105 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 4106 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4107 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 4108 $pl->save;
3437 } 4109 }
3438 warn "end emergency player save\n"; 4110 info "emergency_perl_save: end player save\n";
3439 4111
3440 warn "begin emergency map save\n"; 4112 cf::write_runtime_sync; # external watchdog should not bark
4113
4114 info "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 4115 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 4116 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 4117 $map->valid or next;
3444 $map->save; 4118 $map->save;
3445 } 4119 }
3446 warn "end emergency map save\n"; 4120 info "emergency_perl_save: end map save\n";
3447 4121
3448 warn "begin emergency database checkpoint\n"; 4122 cf::write_runtime_sync; # external watchdog should not bark
4123
4124 info "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 4125 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 4126 info "emergency_perl_save: end database checkpoint\n";
4127
4128 info "emergency_perl_save: begin write uuid\n";
4129 write_uuid_sync 1;
4130 info "emergency_perl_save: end write uuid\n";
4131
4132 cf::write_runtime_sync; # external watchdog should not bark
4133
4134 trace "emergency_perl_save: syncing database to disk";
4135 BDB::db_env_txn_checkpoint $DB_ENV;
4136
4137 info "emergency_perl_save: starting sync\n";
4138 IO::AIO::aio_sync sub {
4139 info "emergency_perl_save: finished sync\n";
4140 };
4141
4142 cf::write_runtime_sync; # external watchdog should not bark
4143
4144 trace "emergency_perl_save: flushing outstanding aio requests";
4145 while (IO::AIO::nreqs || BDB::nreqs) {
4146 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4147 }
4148
4149 cf::write_runtime_sync; # external watchdog should not bark
3451 }; 4150 };
3452 4151
3453 warn "leave emergency perl save\n"; 4152 info "emergency_perl_save: leave\n";
3454} 4153}
3455 4154
3456sub post_cleanup { 4155sub post_cleanup {
3457 my ($make_core) = @_; 4156 my ($make_core) = @_;
3458 4157
4158 IO::AIO::flush;
4159
3459 warn Carp::longmess "post_cleanup backtrace" 4160 error Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 4161 if $make_core;
4162
4163 my $fh = pidfile;
4164 unlink $PIDFILE if <$fh> == $$;
4165}
4166
4167# a safer delete_package, copied from Symbol
4168sub clear_package($) {
4169 my $pkg = shift;
4170
4171 # expand to full symbol table name if needed
4172 unless ($pkg =~ /^main::.*::$/) {
4173 $pkg = "main$pkg" if $pkg =~ /^::/;
4174 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4175 $pkg .= '::' unless $pkg =~ /::$/;
4176 }
4177
4178 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4179 my $stem_symtab = *{$stem}{HASH};
4180
4181 defined $stem_symtab and exists $stem_symtab->{$leaf}
4182 or return;
4183
4184 # clear all symbols
4185 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4186 for my $name (keys %$leaf_symtab) {
4187 _gv_clear *{"$pkg$name"};
4188# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4189 }
3461} 4190}
3462 4191
3463sub do_reload_perl() { 4192sub do_reload_perl() {
3464 # can/must only be called in main 4193 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 4194 unless (in_main) {
3466 warn "can only reload from main coroutine"; 4195 error "can only reload from main coroutine";
3467 return; 4196 return;
3468 } 4197 }
3469 4198
3470 warn "reloading..."; 4199 return if $RELOAD++;
3471 4200
3472 warn "entering sync_job"; 4201 my $t1 = AE::time;
3473 4202
4203 while ($RELOAD) {
4204 cf::get_slot 0.1, -1, "reload_perl";
4205 info "perl_reload: reloading...";
4206
4207 trace "perl_reload: entering sync_job";
4208
3474 cf::sync_job { 4209 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark
3476 cf::emergency_save; 4210 #cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark
3478 4211
3479 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV;
3481
3482 # if anything goes wrong in here, we should simply crash as we already saved
3483
3484 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs;
3490 warn "iterate...";
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros"; 4212 trace "perl_reload: cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO; 4213 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = (); 4214 %EXT_CORO = ();
3498 4215
3499 warn "removing commands"; 4216 trace "perl_reload: removing commands";
3500 %COMMAND = (); 4217 %COMMAND = ();
3501 4218
3502 warn "removing ext/exti commands"; 4219 trace "perl_reload: removing ext/exti commands";
3503 %EXTCMD = (); 4220 %EXTCMD = ();
3504 %EXTICMD = (); 4221 %EXTICMD = ();
3505 4222
3506 warn "unloading/nuking all extensions"; 4223 trace "perl_reload: unloading/nuking all extensions";
3507 for my $pkg (@EXTS) { 4224 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg"; 4225 trace "... unloading $pkg";
3509 4226
3510 if (my $cb = $pkg->can ("unload")) { 4227 if (my $cb = $pkg->can ("unload")) {
3511 eval { 4228 eval {
3512 $cb->($pkg); 4229 $cb->($pkg);
3513 1 4230 1
3514 } or warn "$pkg unloaded, but with errors: $@"; 4231 } or error "$pkg unloaded, but with errors: $@";
4232 }
4233
4234 trace "... clearing $pkg";
4235 clear_package $pkg;
3515 } 4236 }
3516 4237
3517 warn "... nuking $pkg";
3518 Symbol::delete_package $pkg;
3519 }
3520
3521 warn "unloading all perl modules loaded from $LIBDIR"; 4238 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3522 while (my ($k, $v) = each %INC) { 4239 while (my ($k, $v) = each %INC) {
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4240 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 4241
3525 warn "... unloading $k"; 4242 trace "... unloading $k";
3526 delete $INC{$k}; 4243 delete $INC{$k};
3527 4244
3528 $k =~ s/\.pm$//; 4245 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g; 4246 $k =~ s/\//::/g;
3530 4247
3531 if (my $cb = $k->can ("unload_module")) { 4248 if (my $cb = $k->can ("unload_module")) {
3532 $cb->(); 4249 $cb->();
4250 }
4251
4252 clear_package $k;
3533 } 4253 }
3534 4254
3535 Symbol::delete_package $k;
3536 }
3537
3538 warn "getting rid of safe::, as good as possible"; 4255 trace "perl_reload: getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 4256 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4257 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 4258
3542 warn "unloading cf.pm \"a bit\""; 4259 trace "perl_reload: unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 4260 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 4261 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 4262
3546 # don't, removes xs symbols, too, 4263 # don't, removes xs symbols, too,
3547 # and global variables created in xs 4264 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 4265 #clear_package __PACKAGE__;
3549 4266
3550 warn "unload completed, starting to reload now"; 4267 info "perl_reload: unload completed, starting to reload now";
3551 4268
3552 warn "reloading cf.pm"; 4269 trace "perl_reload: reloading cf.pm";
3553 require cf; 4270 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4271 cf::_connect_to_perl_1;
3555 4272
3556 warn "loading config and database again"; 4273 trace "perl_reload: loading config and database again";
3557 cf::reload_config; 4274 cf::reload_config;
3558 4275
3559 warn "loading extensions"; 4276 trace "perl_reload: loading extensions";
3560 cf::load_extensions; 4277 cf::load_extensions;
3561 4278
4279 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 4280 trace "perl_reload: reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 4281 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 4282 trace "perl_reload: reattaching attachments to maps";
3565 reattach $_ for values %MAP; 4283 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 4284 trace "perl_reload: reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 4285 reattach $_ for values %PLAYER;
4286 }
3568 4287
3569 warn "leaving sync_job"; 4288 cf::_post_init 1;
3570 4289
4290 trace "perl_reload: leaving sync_job";
4291
3571 1 4292 1
3572 } or do { 4293 } or do {
3573 warn $@; 4294 error $@;
3574 cf::cleanup "error while reloading, exiting."; 4295 cf::cleanup "perl_reload: error, exiting.";
4296 };
4297
4298 --$RELOAD;
3575 }; 4299 }
3576 4300
3577 warn "reloaded"; 4301 $t1 = AE::time - $t1;
4302 info "perl_reload: completed in ${t1}s\n";
3578}; 4303};
3579 4304
3580our $RELOAD_WATCHER; # used only during reload 4305our $RELOAD_WATCHER; # used only during reload
3581 4306
3582sub reload_perl() { 4307sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 4308 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 4309 # coro crashes during coro_state_free->destroy here.
3585 4310
4311 $RELOAD_WATCHER ||= cf::async {
4312 Coro::AIO::aio_wait cache_extensions;
4313
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4314 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 4315 do_reload_perl;
3588 undef $RELOAD_WATCHER; 4316 undef $RELOAD_WATCHER;
4317 };
3589 }; 4318 };
3590} 4319}
3591 4320
3592register_command "reload" => sub { 4321register_command "reload" => sub {
3593 my ($who, $arg) = @_; 4322 my ($who, $arg) = @_;
3599 reload_perl; 4328 reload_perl;
3600 }; 4329 };
3601 } 4330 }
3602}; 4331};
3603 4332
3604unshift @INC, $LIBDIR; 4333#############################################################################
3605 4334
3606my $bug_warning = 0; 4335my $bug_warning = 0;
3607 4336
3608our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN;
3610
3611sub wait_for_tick { 4337sub wait_for_tick() {
3612 return if tick_inhibit; 4338 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3613 return if $Coro::current == $Coro::main;
3614 4339
3615 my $signal = new Coro::Signal; 4340 $WAIT_FOR_TICK->wait;
3616 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait;
3618} 4341}
3619 4342
3620sub wait_for_tick_begin { 4343sub wait_for_tick_begin() {
3621 return if tick_inhibit; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3622 return if $Coro::current == $Coro::main;
3623 4345
3624 my $signal = new Coro::Signal; 4346 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 4347 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 4348 $signal->wait;
3627} 4349}
3631 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4353 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3632 unless ++$bug_warning > 10; 4354 unless ++$bug_warning > 10;
3633 return; 4355 return;
3634 } 4356 }
3635 4357
3636 cf::server_tick; # one server iteration 4358 cf::one_tick; # one server iteration
4359
4360 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3637 4361
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4362 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4363 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 4364 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 4365 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 4366 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 4367 or error "ERROR: unable to write runtime file: $!";
3644 }; 4368 };
3645 } 4369 }
3646 4370
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4371 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3648 $sig->send; 4372 $sig->send;
3649 } 4373 }
3650 while (my $sig = shift @WAIT_FOR_TICK) { 4374 $WAIT_FOR_TICK->broadcast;
3651 $sig->send;
3652 }
3653 4375
3654 $LOAD = ($NOW - $TICK_START) / $TICK; 4376 $LOAD = ($NOW - $TICK_START) / $TICK;
3655 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4377 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3656 4378
3657 if (0) { 4379 if (0) {
3658 if ($NEXT_TICK) { 4380 if ($NEXT_TICK) {
3659 my $jitter = $TICK_START - $NEXT_TICK; 4381 my $jitter = $TICK_START - $NEXT_TICK;
3660 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4382 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3661 warn "jitter $JITTER\n";#d# 4383 debug "jitter $JITTER\n";#d#
3662 } 4384 }
3663 } 4385 }
3664} 4386}
3665 4387
3666{ 4388{
3667 # configure BDB 4389 # configure BDB
4390 info "initialising database";
3668 4391
3669 BDB::min_parallel 8; 4392 BDB::min_parallel 16;
3670 BDB::max_poll_reqs $TICK * 0.1; 4393 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 4394 #$AnyEvent::BDB::WATCHER->priority (1);
3672 4395
3673 unless ($DB_ENV) { 4396 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 4397 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4398 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 4399 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4400 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4401 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4402 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 4403
3680 cf::sync_job { 4404 cf::sync_job {
3681 eval { 4405 eval {
3700 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4424 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3701 }; 4425 };
3702 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4426 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3703 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4427 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3704 }; 4428 };
4429
4430 info "database initialised";
3705} 4431}
3706 4432
3707{ 4433{
3708 # configure IO::AIO 4434 # configure IO::AIO
3709 4435
4436 info "initialising aio";
3710 IO::AIO::min_parallel 8; 4437 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 4438 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 4439 undef $AnyEvent::AIO::WATCHER;
4440 info "aio initialised";
3713} 4441}
3714 4442
3715my $_log_backtrace; 4443our $_log_backtrace;
4444our $_log_backtrace_last;
3716 4445
3717sub _log_backtrace { 4446sub _log_backtrace {
3718 my ($msg, @addr) = @_; 4447 my ($msg, @addr) = @_;
3719 4448
3720 $msg =~ s/\n//; 4449 $msg =~ s/\n$//;
3721 4450
4451 if ($_log_backtrace_last eq $msg) {
4452 LOG llevInfo, "[ABT] $msg\n";
4453 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3722 # limit the # of concurrent backtraces 4454 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 4455 } elsif ($_log_backtrace < 2) {
4456 $_log_backtrace_last = $msg;
3724 ++$_log_backtrace; 4457 ++$_log_backtrace;
4458 my $perl_bt = Carp::longmess $msg;
3725 async { 4459 async {
3726 $Coro::current->{desc} = "abt $msg"; 4460 $Coro::current->{desc} = "abt $msg";
3727 4461
3728 my @bt = fork_call { 4462 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 4463 @addr = map { sprintf "%x", $_ } @addr;
3740 } 4474 }
3741 4475
3742 @funcs 4476 @funcs
3743 }; 4477 };
3744 4478
3745 LOG llevInfo, "[ABT] $msg\n"; 4479 LOG llevInfo, "[ABT] $perl_bt\n";
4480 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 4481 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 4482 --$_log_backtrace;
3748 }; 4483 };
3749 } else { 4484 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 4485 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 4486 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3752 } 4487 }
3753} 4488}
3754 4489
3755# load additional modules 4490# load additional modules
3756use cf::pod; 4491require "cf/$_.pm" for @EXTRA_MODULES;
4492cf::_connect_to_perl_2;
3757 4493
3758END { cf::emergency_save } 4494END { cf::emergency_save }
3759 4495
37601 44961
3761 4497

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines