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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines