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.431 by elmex, Sun May 4 19:27:27 2008 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 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($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 627 return if tick_inhibit || $Coro::current == $Coro::main;
433 628
434 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
435 630
436 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
437 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
438 634
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
467=cut 663=cut
468 664
469sub sync_job(&) { 665sub sync_job(&) {
470 my ($job) = @_; 666 my ($job) = @_;
471 667
472 if ($Coro::current == $Coro::main) { 668 if (in_main) {
473 my $time = EV::time; 669 my $time = AE::time;
474 670
475 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
477 673
478 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
479 675
480 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
481 677
482 my $busy = 1; 678 my $busy = 1;
483 my @res; 679 my @res;
484 680
485 (async { 681 (async {
486 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 683 @res = eval { $job->() };
488 warn $@ if $@; 684 error $@ if $@;
489 undef $busy; 685 undef $busy;
490 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
491 687
492 while ($busy) { 688 while ($busy) {
493 if (Coro::nready) { 689 if (Coro::nready) {
495 } else { 691 } else {
496 EV::loop EV::LOOP_ONESHOT; 692 EV::loop EV::LOOP_ONESHOT;
497 } 693 }
498 } 694 }
499 695
500 my $time = EV::time - $time; 696 my $time = AE::time - $time;
501 697
502 $TICK_START += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
503 699
504 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
505 } else { 701 } else {
527 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
528 724
529 $coro 725 $coro
530} 726}
531 727
532=item fork_call { }, $args 728=item fork_call { }, @args
533 729
534Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 733never block itself or use any form of event handling.
538 734
539=cut 735=cut
540 736
737sub post_fork {
738 reset_signals;
739}
740
541sub fork_call(&@) { 741sub fork_call(&@) {
542 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
543 743
544 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious)
547
548 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
549 reset_signals; 745 cf::post_fork;
550 &$cb 746 &$cb
551 }, @args; 747 } @args;
552 748
553 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 )
554} 761}
555 762
556=item $coin = coin_from_name $name 763=item $coin = coin_from_name $name
557 764
558=cut 765=cut
595within each server. 802within each server.
596 803
597=cut 804=cut
598 805
599sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
600 my ($name) = @_; 810 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
602 812
603 eval { 813 eval {
604 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
614} 824}
615 825
616our $DB; 826our $DB;
617 827
618sub db_init { 828sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
621 };
622} 830}
623 831
624sub db_get($$) { 832sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
626 834
627 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
628 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
629 839
630 $! ? () 840 $! ? ()
631 : $data 841 : $data
632 }
633} 842}
634 843
635sub db_put($$$) { 844sub db_put($$$) {
636 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 874
666 my @data; 875 my @data;
667 my $md5; 876 my $md5;
668 877
669 for (0 .. $#$src) { 878 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 880 }
673 881
674 # if processing is expensive, check 882 # if processing is expensive, check
675 # checksum first 883 # checksum first
676 if (1) { 884 if (1) {
689 897
690 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
691 } 899 }
692 } 900 }
693 901
694 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
695 my $data = $process->(\@data); 903 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
697 905
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 907
700 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
703 911
713 921
714=cut 922=cut
715 923
716sub datalog($@) { 924sub datalog($@) {
717 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 927}
720 928
721=back 929=back
722 930
723=cut 931=cut
724 932
725############################################################################# 933#############################################################################
726 934
727=head2 ATTACHABLE OBJECTS 935=head2 ATTACHABLE OBJECTS
728 936
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 938attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 939to it. All such attachable objects support the following methods.
732 940
733In 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>
734C<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
784=item cf::CLASS::attachment $name, ... 992=item cf::CLASS::attachment $name, ...
785 993
786Register an attachment by C<$name> through which attachable objects of the 994Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 995given CLASS can refer to this attachment.
788 996
789Some classes such as crossfire maps and objects can specify attachments 997Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 999
792These calls expect any number of the following handler/hook descriptions: 1000These calls expect any number of the following handler/hook descriptions:
793 1001
794=over 4 1002=over 4
918 1126
919 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1129
922 } elsif (ref $type) { 1130 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
924 1132
925 } else { 1133 } else {
926 shift @arg; 1134 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
928 } 1136 }
929 } 1137 }
930} 1138}
931 1139
932sub _object_attach { 1140sub _object_attach {
942 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
943 } 1151 }
944 1152
945 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
946 } else { 1154 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1156 }
949 1157
950 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
951} 1159}
952 1160
1011 1219
1012 for (@$callbacks) { 1220 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1014 1222
1015 if ($@) { 1223 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1225 override;
1019 } 1226 }
1020 1227
1021 return 1 if $override; 1228 return 1 if $override;
1022 } 1229 }
1085 1292
1086sub reattach { 1293sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1294 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1295 my ($obj) = @_;
1089 1296
1297 # no longer needed after getting rid of delete_package?
1090 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
1091 1299
1092 my $registry = $obj->registry; 1300 my $registry = $obj->registry;
1093 1301
1094 @$registry = (); 1302 @$registry = ();
1095 1303
1100 for (@$attach) { 1308 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1103 } 1311 }
1104 } else { 1312 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1314 }
1107 } 1315 }
1108} 1316}
1109 1317
1110cf::attachable->attach ( 1318cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1138 1346
1139 sync_job { 1347 sync_job {
1140 if (length $$rdata) { 1348 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1144 1353
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 aio_close $fh; 1361 aio_close $fh;
1150 1362
1151 if (@$objs) { 1363 if (@$objs) {
1152 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) {
1153 aio_chmod $fh, SAVE_MODE; 1365 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 aio_close $fh; 1372 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1374 }
1160 } else { 1375 } else {
1161 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1162 } 1377 }
1163 1378
1164 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1380
1381 $filename =~ s%/[^/]+$%%;
1382 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1383 } else {
1166 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1167 } 1385 }
1168 } else { 1386 } else {
1169 aio_unlink $filename; 1387 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1171 } 1389 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1414 $av = $st->{objs};
1197 } 1415 }
1198 1416
1199 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1202 1421
1203 ($data, $av) 1422 ($data, $av)
1204} 1423}
1205 1424
1206=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1210=cut 1429=cut
1211 1430
1212############################################################################# 1431#############################################################################
1213# command handling &c 1432# command handling &c
1214 1433
1215=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1216 1435
1217Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1218$name. 1437$name.
1219 1438
1220=cut 1439=cut
1226 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1227 1446
1228 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1229} 1448}
1230 1449
1231=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1232 1451
1233Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1234extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1235received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1236the 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
1237has logged in successfully. 1456has logged in successfully.
1238 1457
1239If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1240called.
1241 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
1242=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1243 1466
1244Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1245exticmd 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
1246are 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
1247is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1248log-in. 1471log-in.
1249 1472
1250If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1251called.
1252 1474
1253=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1254 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
1255sub register_extcmd { 1482sub register_extcmd($$) {
1256 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1257 1484
1258 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1259} 1486}
1260 1487
1261sub register_exticmd { 1488sub register_async_extcmd($$) {
1262 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1263 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1264 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1265} 1498}
1266 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1267cf::player->attach ( 1508cf::player->attach (
1268 on_command => sub { 1509 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1270 1511
1271 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1272 or return; 1513 or return;
1273 1514
1281 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1282 1523
1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1284 1525
1285 if (ref $msg) { 1526 if (ref $msg) {
1286 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290 1528
1291 my @reply;
1292
1293 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}) {
1294 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1295 } 1547 }
1296 1548
1297 $pl->ext_reply ($reply, @reply)
1298 if $reply;
1299
1300 } else { 1549 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1551 }
1303 1552
1304 cf::override; 1553 cf::override;
1305 }, 1554 },
1306); 1555);
1307 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
1308sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1309 cf::sync_job { 1586 cf::sync_job {
1310 my %todo; 1587 my %todo;
1311 1588
1312 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1590 next unless -r $path;
1331 1608
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1611
1335 $ext{source} = 1612 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1338 . $source 1615 . $source
1339 . "\n};\n1"; 1616 . "\n};\n1";
1340 1617
1341 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1342 } 1619 }
1343 1620
1621 my $pass = 0;
1344 my %done; 1622 my %done;
1345 while (%todo) { 1623 while (%todo) {
1346 my $progress; 1624 my $progress;
1347 1625
1626 ++$pass;
1627
1628 ext:
1348 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1631 next ext
1351 unless exists $done{$_}; 1632 unless exists $done{$_};
1352 } 1633 }
1353 1634
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1636
1356 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 $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1650
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1652 if exists $v->{meta}{mandatory};
1364 1653
1365 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;
1366 } 1663 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1664 }
1372 1665
1373 skip: 1666 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 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 }
1376 } 1676 }
1377 }; 1677 };
1378} 1678}
1379 1679
1380############################################################################# 1680#############################################################################
1381 1681
1382=back 1682=back
1383 1683
1384=head2 CORE EXTENSIONS 1684=head2 CORE EXTENSIONS
1385 1685
1386Functions and methods that extend core crossfire objects. 1686Functions and methods that extend core deliantra objects.
1387 1687
1388=cut 1688=cut
1389 1689
1390package cf::player; 1690package cf::player;
1391 1691
1434 1734
1435sub exists($) { 1735sub exists($) {
1436 my ($login) = @_; 1736 my ($login) = @_;
1437 1737
1438 $cf::PLAYER{$login} 1738 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1739 or !aio_stat path $login
1440} 1740}
1441 1741
1442sub find($) { 1742sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1743 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1744 my $login = $_[0];
1464 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1465 } 1765 }
1466 } 1766 }
1467} 1767}
1468 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
1469sub save($) { 1782sub save($) {
1470 my ($pl) = @_; 1783 my ($pl) = @_;
1471 1784
1472 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1473 1786
1478 1791
1479 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1480 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1481 1794
1482 cf::get_slot 0.01; 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];
1483 1799
1484 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1485 cf::cede_to_tick; 1801 cf::cede_to_tick;
1486} 1802}
1487 1803
1519 my ($pl) = @_; 1835 my ($pl) = @_;
1520 1836
1521 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1522 1838
1523 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1524 $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
1525 1841
1526 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1527 $pl->deactivate; 1843 $pl->deactivate;
1844
1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1528 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1529 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1530 1850
1531 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1532 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1533 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1587 \@logins 1907 \@logins
1588} 1908}
1589 1909
1590=item $player->maps 1910=item $player->maps
1591 1911
1912=item cf::player::maps $login
1913
1592Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1593player. May block. 1915player. May block.
1594 1916
1595=cut 1917=cut
1596 1918
1613 } 1935 }
1614 1936
1615 \@paths 1937 \@paths
1616} 1938}
1617 1939
1618=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1619 1941
1620Expand crossfire pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1621
1622=cut
1623
1624use re 'eval';
1625
1626my $group;
1627my $interior; $interior = qr{
1628 # match a pod interior sequence sans C<< >>
1629 (?:
1630 \ (.*?)\ (?{ $group = $^N })
1631 | < (??{$interior}) >
1632 )
1633}x;
1634
1635sub expand_cfpod {
1636 my ($self, $pod) = @_;
1637
1638 my $xml;
1639
1640 while () {
1641 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1642 $group = $1;
1643
1644 $group =~ s/&/&amp;/g;
1645 $group =~ s/</&lt;/g;
1646
1647 $xml .= $group;
1648 } elsif ($pod =~ m%\G
1649 ([BCGHITU])
1650 <
1651 (?:
1652 ([^<>]*) (?{ $group = $^N })
1653 | < $interior >
1654 )
1655 >
1656 %gcsx
1657 ) {
1658 my ($code, $data) = ($1, $group);
1659
1660 if ($code eq "B") {
1661 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1662 } elsif ($code eq "I") {
1663 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1664 } elsif ($code eq "U") {
1665 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1666 } elsif ($code eq "C") {
1667 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1668 } elsif ($code eq "T") {
1669 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1670 } elsif ($code eq "G") {
1671 my ($male, $female) = split /\|/, $data;
1672 $data = $self->gender ? $female : $male;
1673 $xml .= expand_cfpod ($self, $data);
1674 } elsif ($code eq "H") {
1675 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1676 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1677 "")
1678 [$self->{hintmode}];
1679 } else {
1680 $xml .= "error processing '$code($data)' directive";
1681 }
1682 } else {
1683 if ($pod =~ /\G(.+)/) {
1684 warn "parse error while expanding $pod (at $1)";
1685 }
1686 last;
1687 }
1688 }
1689
1690 for ($xml) {
1691 # create single paragraphs (very hackish)
1692 s/(?<=\S)\n(?=\w)/ /g;
1693
1694 # compress some whitespace
1695 s/\s+\n/\n/g; # ws line-ends
1696 s/\n\n+/\n/g; # double lines
1697 s/^\n+//; # beginning lines
1698 s/\n+$//; # ending lines
1699 }
1700
1701 $xml
1702}
1703
1704no re 'eval';
1705
1706sub hintmode {
1707 $_[0]{hintmode} = $_[1] if @_ > 1;
1708 $_[0]{hintmode}
1709}
1710
1711=item $player->ext_reply ($msgid, @msg)
1712
1713Sends an ext reply to the player.
1714
1715=cut
1716
1717sub ext_reply($$@) {
1718 my ($self, $id, @msg) = @_;
1719
1720 $self->ns->ext_reply ($id, @msg)
1721}
1722 1943
1723=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1724 1945
1725Sends an ext event to the client. 1946Sends an ext event to the client.
1726 1947
1746 1967
1747=cut 1968=cut
1748 1969
1749sub find_by_path($) { 1970sub find_by_path($) {
1750 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1751 1974
1752 my ($match, $specificity); 1975 my ($match, $specificity);
1753 1976
1754 for my $region (list) { 1977 for my $region (list) {
1755 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1784sub generate_random_map { 2007sub generate_random_map {
1785 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1786 2009
1787 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
1788 2011
1789 # mit "rum" bekleckern, nicht
1790 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1791 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1792 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1793 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1794 $rmp->{exit_on_final_map},
1795 $rmp->{xsize}, $rmp->{ysize},
1796 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1797 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1798 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1799 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1800 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1801 (cf::region::find $rmp->{region}), $rmp->{custom}
1802 )
1803} 2013}
1804 2014
1805=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1806 2016
1807Register 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
1812 2022
1813sub register { 2023sub register {
1814 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1815 my $pkg = caller; 2025 my $pkg = caller;
1816 2026
1817 no strict;
1818 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1819 2028
1820 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1821} 2030}
1822 2031
1823# also paths starting with '/' 2032# also paths starting with '/'
1824$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1825 2034
1826sub thawer_merge { 2035sub thawer_merge {
1827 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1828 2037
1829 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1834} 2043}
1835 2044
1836sub normalise { 2045sub normalise {
1837 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1838 2047
1839 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1840 2049
1841 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1842 2051
1843 # map plan: 2052 # map plan:
1844 # 2053 #
1859 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1860 $path = "$base/$path"; 2069 $path = "$base/$path";
1861 } 2070 }
1862 2071
1863 for ($path) { 2072 for ($path) {
1864 redo if s{//}{/};
1865 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1866 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1867 } 2075 }
1868 2076
1869 $path 2077 $path
1883 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1884 return $self; 2092 return $self;
1885 } 2093 }
1886 } 2094 }
1887 2095
1888 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1889 () 2097 ()
1890} 2098}
1891 2099
2100# may re-bless or do other evil things
1892sub init { 2101sub init {
1893 my ($self) = @_; 2102 my ($self) = @_;
1894 2103
1895 $self 2104 $self
1896} 2105}
1927 2136
1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1929 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1930} 2139}
1931 2140
1932# and all this just because we cannot iterate over
1933# all maps in C++...
1934sub change_all_map_light {
1935 my ($change) = @_;
1936
1937 $_->change_map_light ($change)
1938 for grep $_->outdoor, values %cf::MAP;
1939}
1940
1941sub decay_objects { 2141sub decay_objects {
1942 my ($self) = @_; 2142 my ($self) = @_;
1943 2143
1944 return if $self->{deny_reset}; 2144 return if $self->{deny_reset};
1945 2145
1970 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1971 2171
1972 1 2172 1
1973} 2173}
1974 2174
2175# used to laod the header of an original map
1975sub load_header_orig { 2176sub load_header_orig {
1976 my ($self) = @_; 2177 my ($self) = @_;
1977 2178
1978 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1979} 2180}
1980 2181
2182# used to laod the header of an instantiated map
1981sub load_header_temp { 2183sub load_header_temp {
1982 my ($self) = @_; 2184 my ($self) = @_;
1983 2185
1984 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1985} 2187}
1986 2188
2189# called after loading the header from an instantiated map
1987sub prepare_temp { 2190sub prepare_temp {
1988 my ($self) = @_; 2191 my ($self) = @_;
1989 2192
1990 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1991 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1992 # safety 2195 # safety
1993 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1994 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1995} 2198}
1996 2199
2200# called after loading the header from an original map
1997sub prepare_orig { 2201sub prepare_orig {
1998 my ($self) = @_; 2202 my ($self) = @_;
1999 2203
2000 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
2001 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
2025 2229
2026sub find; 2230sub find;
2027sub find { 2231sub find {
2028 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2029 2233
2234 cf::cede_to_tick;
2235
2030 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2031 2237
2032 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2033 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2034 2240
2035 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2036 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2037 my $guard2 = cf::lock_acquire "map_find:$path";
2038
2039 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
2040 or return; 2243 or return;
2041 2244
2042 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
2043 2246
2055 2258
2056 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
2057 } 2260 }
2058} 2261}
2059 2262
2060sub pre_load { } 2263sub pre_load { }
2061sub post_load { } 2264#sub post_load { } # XS
2062 2265
2063sub load { 2266sub load {
2064 my ($self) = @_; 2267 my ($self) = @_;
2065 2268
2066 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
2069 2272
2070 { 2273 {
2071 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2072 2275
2073 return unless $self->valid; 2276 return unless $self->valid;
2074 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2075
2076 $self->in_memory (cf::MAP_LOADING);
2077 2278
2078 $self->alloc; 2279 $self->alloc;
2079 2280
2080 $self->pre_load; 2281 $self->pre_load;
2081 cf::cede_to_tick; 2282 cf::cede_to_tick;
2082 2283
2284 if (exists $self->{load_path}) {
2083 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2084 $f->skip_block; 2286 $f->skip_block;
2085 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2086 or return; 2288 or return;
2087 2289
2088 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2290 $self->post_load_original
2089 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2090 2292
2091 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2092 utf8::encode $uniq; 2294 utf8::encode $uniq;
2093 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2094 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2095 $self->clear_unique_items; 2297 $self->clear_unique_items;
2096 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2097 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2098 } 2301 }
2099 } 2302 }
2100 }
2101 2303
2102 $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);
2103 2311
2104 cf::cede_to_tick; 2312 cf::cede_to_tick;
2105 # now do the right thing for maps 2313 # now do the right thing for maps
2106 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2107 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2111 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2112 $self->decay_objects; 2320 $self->decay_objects;
2113 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2114 $self->update_buttons; 2322 $self->update_buttons;
2115 cf::cede_to_tick; 2323 cf::cede_to_tick;
2116 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
2117 cf::cede_to_tick;
2118 $self->activate;
2119 } 2325 }
2120 2326
2121 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2122 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2123
2124 $self->in_memory (cf::MAP_ACTIVE);
2125 } 2329 }
2126 2330
2127 $self->post_load; 2331 $self->post_load;
2128}
2129 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
2130sub customise_for { 2339sub customise_for {
2131 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
2132 2341
2133 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
2134 if $self->per_player; 2343 if $self->per_player;
2137# if $self->per_party; 2346# if $self->per_party;
2138 2347
2139 $self 2348 $self
2140} 2349}
2141 2350
2142# find and load all maps in the 3x3 area around a map
2143sub load_neighbours {
2144 my ($map) = @_;
2145
2146 my @neigh; # diagonal neighbours
2147
2148 for (0 .. 3) {
2149 my $neigh = $map->tile_path ($_)
2150 or next;
2151 $neigh = find $neigh, $map
2152 or next;
2153 $neigh->load;
2154
2155 push @neigh,
2156 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2157 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2158 }
2159
2160 for (grep defined $_->[0], @neigh) {
2161 my ($path, $origin) = @$_;
2162 my $neigh = find $path, $origin
2163 or next;
2164 $neigh->load;
2165 }
2166}
2167
2168sub find_sync { 2351sub find_sync {
2169 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2170 2353
2171 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
2172} 2359}
2173 2360
2174sub do_load_sync { 2361sub do_load_sync {
2175 my ($map) = @_; 2362 my ($map) = @_;
2176 2363
2364 # it's a bug to call this from the main context
2177 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2178 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2179 2367
2180 cf::sync_job { $map->load }; 2368 $map->load;
2181} 2369}
2182 2370
2183our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2184our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2185 2373
2186sub find_async { 2374sub find_async {
2187 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2188 2376
2189 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2190 2378
2191 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2192 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2193 } 2381 }
2194 2382
2195 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2196 2384
2197 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2211 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2212 2400
2213 () 2401 ()
2214} 2402}
2215 2403
2404# common code, used by both ->save and ->swapout
2216sub save { 2405sub _save {
2217 my ($self) = @_; 2406 my ($self) = @_;
2218
2219 my $lock = cf::lock_acquire "map_data:$self->{path}";
2220 2407
2221 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2222 2409
2223 return unless $self->dirty; 2410 return unless $self->dirty;
2224 2411
2244 } else { 2431 } else {
2245 $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);
2246 } 2433 }
2247} 2434}
2248 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2249sub swap_out { 2444sub swap_out {
2250 my ($self) = @_; 2445 my ($self) = @_;
2251 2446
2252 # save first because save cedes
2253 $self->save;
2254
2255 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2256 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2257 return if $self->players; 2451 return if $self->players;
2258 return if $self->in_memory != cf::MAP_ACTIVE; 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
2259 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2260 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
2261 $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};
2262 2503
2263 $self->deactivate; 2504 $self->deactivate;
2264 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2265 $self->clear; 2506 $self->clear;
2266}
2267
2268sub reset_at {
2269 my ($self) = @_;
2270
2271 # TODO: safety, remove and allow resettable per-player maps
2272 return 1e99 if $self->{deny_reset};
2273
2274 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2275 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2276
2277 $time + $to
2278}
2279
2280sub should_reset {
2281 my ($self) = @_;
2282
2283 $self->reset_at <= $cf::RUNTIME
2284}
2285
2286sub reset {
2287 my ($self) = @_;
2288
2289 my $lock = cf::lock_acquire "map_data:$self->{path}";
2290
2291 return if $self->players;
2292
2293 warn "resetting map ", $self->path;
2294
2295 $self->in_memory (cf::MAP_SWAPPED);
2296
2297 # need to save uniques path
2298 unless ($self->{deny_save}) {
2299 my $uniq = $self->uniq_path; utf8::encode $uniq;
2300
2301 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2302 if $uniq;
2303 }
2304
2305 delete $cf::MAP{$self->path};
2306
2307 $self->deactivate;
2308 $_->clear_links_to ($self) for values %cf::MAP;
2309 $self->clear;
2310 2507
2311 $self->unlink_save; 2508 $self->unlink_save;
2312 $self->destroy; 2509 $self->destroy;
2313} 2510}
2314 2511
2322 2519
2323 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2324 2521
2325 $self->unlink_save; 2522 $self->unlink_save;
2326 2523
2327 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2328 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2329 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2330 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2331 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2332 2529
2389 : normalise $_ 2586 : normalise $_
2390 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2391 ] 2588 ]
2392} 2589}
2393 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
2394=back 2623=back
2395 2624
2396=head3 cf::object 2625=head3 cf::object
2397 2626
2398=cut 2627=cut
2421 2650
2422Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2423 2652
2424=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2425 2654
2426returns 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,
2427even if the object actually exists. May block. 2656even if the object actually exists. May block.
2428 2657
2429=cut 2658=cut
2430 2659
2431sub deref { 2660sub deref {
2463 2692
2464our $SAY_CHANNEL = { 2693our $SAY_CHANNEL = {
2465 id => "say", 2694 id => "say",
2466 title => "Map", 2695 title => "Map",
2467 reply => "say ", 2696 reply => "say ",
2468 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2697 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2469}; 2698};
2470 2699
2471our $CHAT_CHANNEL = { 2700our $CHAT_CHANNEL = {
2472 id => "chat", 2701 id => "chat",
2473 title => "Chat", 2702 title => "Chat",
2528 2757
2529=item $player_object->enter_link 2758=item $player_object->enter_link
2530 2759
2531Freezes 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}>).
2532 2761
2533The 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.
2534I<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.
2535 2766
2536Will never block. 2767Will never block.
2537 2768
2538=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
2539 2770
2559sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2560 my ($self) = @_; 2791 my ($self) = @_;
2561 2792
2562 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2563 2794
2795 ++$self->{_link_recursion};
2796
2564 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2565 2798
2566 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2567 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2568 2801
2569 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2802 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2570} 2803}
2571 2804
2572sub cf::object::player::leave_link { 2805sub cf::object::player::leave_link {
2573 my ($self, $map, $x, $y) = @_; 2806 my ($self, $map, $x, $y) = @_;
2574 2807
2591 ($x, $y) = (-1, -1) 2824 ($x, $y) = (-1, -1)
2592 unless (defined $x) && (defined $y); 2825 unless (defined $x) && (defined $y);
2593 2826
2594 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2595 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2596 if $x <=0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2597 2830
2598 $map->load; 2831 $map->load;
2599 $map->load_neighbours;
2600 2832
2601 return unless $self->contr->active; 2833 return unless $self->contr->active;
2602 $self->activate_recursive;
2603 2834
2604 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2605 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2606} 2837 # entering was successful
2838 delete $self->{_link_recursion};
2839 # only activate afterwards, to support waiting in hooks
2840 $self->activate_recursive;
2841 }
2607 2842
2843}
2844
2608=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)]])
2609 2846
2610Moves 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
2611her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2612that 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
2613the 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
2614be called at the end of this process. 2851be called at the end of this process.
2615 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
2616=cut 2856=cut
2617 2857
2618our $GOTOGEN; 2858our $GOTOGEN;
2619 2859
2620sub cf::object::player::goto { 2860sub cf::object::player::goto {
2621 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 }
2622 2868
2623 # 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
2624 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2625 2871
2626 $self->enter_link; 2872 $self->enter_link;
2646 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2647 } 2893 }
2648 } 2894 }
2649 2895
2650 my $map = eval { 2896 my $map = eval {
2651 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2652 2898
2653 if ($map) { 2899 if ($map) {
2654 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2655 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2656 } else { 2902 } else {
2657 $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);
2658 } 2904 }
2659 2905
2660 $map 2906 $map
2668 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2669 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2670 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2671 } 2917 }
2672 2918
2673 $done->() if $done; 2919 $done->($self) if $done;
2674 })->prio (1); 2920 })->prio (1);
2675} 2921}
2676 2922
2677=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2678 2924
2746 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2747 2993
2748 unless (eval { 2994 unless (eval {
2749 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2750 2996
2751 # random map handling
2752 {
2753 my $guard = cf::lock_acquire "exit_prepare:$exit";
2754
2755 prepare_random_map $exit
2756 if $exit->slaying eq "/!";
2757 }
2758
2759 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2760 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2761 my $y = $exit->stats->sp; 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 }
2762 3023
2763 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2764 3025
2765 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2766 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
2767 if $exit->flag (cf::FLAG_DAMNED); 3028 if $exit->flag (cf::FLAG_DAMNED);
2768 3029
2769 1 3030 1
2770 }) { 3031 }) {
2771 $self->message ("Something went wrong deep within the crossfire server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2772 . "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. "
2773 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2774 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2775 3036
2776 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2777 $self->leave_link; 3038 $self->leave_link;
2778 } 3039 }
2779 })->prio (1); 3040 })->prio (1);
2780} 3041}
2781 3042
2793sub cf::client::send_drawinfo { 3054sub cf::client::send_drawinfo {
2794 my ($self, $text, $flags) = @_; 3055 my ($self, $text, $flags) = @_;
2795 3056
2796 utf8::encode $text; 3057 utf8::encode $text;
2797 $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);
2798} 3084}
2799 3085
2800=item $client->send_msg ($channel, $msg, $color, [extra...]) 3086=item $client->send_msg ($channel, $msg, $color, [extra...])
2801 3087
2802Send 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
2806 3092
2807=cut 3093=cut
2808 3094
2809# non-persistent channels (usually the info channel) 3095# non-persistent channels (usually the info channel)
2810our %CHANNEL = ( 3096our %CHANNEL = (
3097 "c/motd" => {
3098 id => "infobox",
3099 title => "MOTD",
3100 reply => undef,
3101 tooltip => "The message of the day",
3102 },
2811 "c/identify" => { 3103 "c/identify" => {
2812 id => "infobox", 3104 id => "infobox",
2813 title => "Identify", 3105 title => "Identify",
2814 reply => undef, 3106 reply => undef,
2815 tooltip => "Items recently identified", 3107 tooltip => "Items recently identified",
2817 "c/examine" => { 3109 "c/examine" => {
2818 id => "infobox", 3110 id => "infobox",
2819 title => "Examine", 3111 title => "Examine",
2820 reply => undef, 3112 reply => undef,
2821 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",
2822 }, 3120 },
2823 "c/book" => { 3121 "c/book" => {
2824 id => "infobox", 3122 id => "infobox",
2825 title => "Book", 3123 title => "Book",
2826 reply => undef, 3124 reply => undef,
2842 id => "infobox", 3140 id => "infobox",
2843 title => "Body Parts", 3141 title => "Body Parts",
2844 reply => undef, 3142 reply => undef,
2845 tooltip => "Shows which body parts you posess and are available", 3143 tooltip => "Shows which body parts you posess and are available",
2846 }, 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 },
2847 "c/uptime" => { 3181 "c/uptime" => {
2848 id => "infobox", 3182 id => "infobox",
2849 title => "Uptime", 3183 title => "Uptime",
2850 reply => undef, 3184 reply => undef,
2851 tooltip => "How long the server has been running since last restart", 3185 tooltip => "How long the server has been running since last restart",
2860 id => "party", 3194 id => "party",
2861 title => "Party", 3195 title => "Party",
2862 reply => "gsay ", 3196 reply => "gsay ",
2863 tooltip => "Messages and chat related to your party", 3197 tooltip => "Messages and chat related to your party",
2864 }, 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/say" => $SAY_CHANNEL,
3206 "c/chat" => $CHAT_CHANNEL,
2865); 3207);
2866 3208
2867sub cf::client::send_msg { 3209sub cf::client::send_msg {
2868 my ($self, $channel, $msg, $color, @extra) = @_; 3210 my ($self, $channel, $msg, $color, @extra) = @_;
2869 3211
2870 $msg = $self->pl->expand_cfpod ($msg); 3212 $msg = $self->pl->expand_cfpod ($msg)
3213 unless $color & cf::NDI_VERBATIM;
2871 3214
2872 $color &= cf::NDI_CLIENT_MASK; # just in case... 3215 $color &= cf::NDI_CLIENT_MASK; # just in case...
2873 3216
2874 # check predefined channels, for the benefit of C 3217 # check predefined channels, for the benefit of C
2875 if ($CHANNEL{$channel}) { 3218 if ($CHANNEL{$channel}) {
2876 $channel = $CHANNEL{$channel}; 3219 $channel = $CHANNEL{$channel};
2877 3220
2878 $self->ext_msg (channel_info => $channel) 3221 $self->ext_msg (channel_info => $channel);
2879 if $self->can_msg;
2880
2881 $channel = $channel->{id}; 3222 $channel = $channel->{id};
2882 3223
2883 } elsif (ref $channel) { 3224 } elsif (ref $channel) {
2884 # send meta info to client, if not yet sent 3225 # send meta info to client, if not yet sent
2885 unless (exists $self->{channel}{$channel->{id}}) { 3226 unless (exists $self->{channel}{$channel->{id}}) {
2886 $self->{channel}{$channel->{id}} = $channel; 3227 $self->{channel}{$channel->{id}} = $channel;
2887 $self->ext_msg (channel_info => $channel) 3228 $self->ext_msg (channel_info => $channel);
2888 if $self->can_msg;
2889 } 3229 }
2890 3230
2891 $channel = $channel->{id}; 3231 $channel = $channel->{id};
2892 } 3232 }
2893 3233
2894 return unless @extra || length $msg; 3234 return unless @extra || length $msg;
2895 3235
2896 if ($self->can_msg) {
2897 # default colour, mask it out 3236 # default colour, mask it out
2898 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3237 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2899 if $color & cf::NDI_DEF; 3238 if $color & cf::NDI_DEF;
2900 3239
2901 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3240 my $pkt = "msg "
3241 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3242 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 } else { 3243 );
2904 if ($color >= 0) {
2905 # replace some tags by gcfclient-compatible ones
2906 for ($msg) {
2907 1 while
2908 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2909 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2910 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2911 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2912 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2913 }
2914 3244
2915 $color &= cf::NDI_COLOR_MASK; 3245 $self->send_big_packet ($pkt);
2916
2917 utf8::encode $msg;
2918
2919 if (0 && $msg =~ /\[/) {
2920 # COMMAND/INFO
2921 $self->send_packet ("drawextinfo $color 10 8 $msg")
2922 } else {
2923 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2924 $self->send_packet ("drawinfo $color $msg")
2925 }
2926 }
2927 }
2928} 3246}
2929 3247
2930=item $client->ext_msg ($type, @msg) 3248=item $client->ext_msg ($type, @msg)
2931 3249
2932Sends an ext event to the client. 3250Sends an ext event to the client.
2934=cut 3252=cut
2935 3253
2936sub cf::client::ext_msg($$@) { 3254sub cf::client::ext_msg($$@) {
2937 my ($self, $type, @msg) = @_; 3255 my ($self, $type, @msg) = @_;
2938 3256
2939 if ($self->extcmd == 2) {
2940 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3257 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2941 } elsif ($self->extcmd == 1) { # TODO: remove
2942 push @msg, msgtype => "event_$type";
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2944 }
2945}
2946
2947=item $client->ext_reply ($msgid, @msg)
2948
2949Sends an ext reply to the client.
2950
2951=cut
2952
2953sub cf::client::ext_reply($$@) {
2954 my ($self, $id, @msg) = @_;
2955
2956 if ($self->extcmd == 2) {
2957 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2958 } elsif ($self->extcmd == 1) {
2959 #TODO: version 1, remove
2960 unshift @msg, msgtype => "reply", msgid => $id;
2961 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2962 }
2963} 3258}
2964 3259
2965=item $success = $client->query ($flags, "text", \&cb) 3260=item $success = $client->query ($flags, "text", \&cb)
2966 3261
2967Queues a query to the client, calling the given callback with 3262Queues a query to the client, calling the given callback with
3022 my ($ns, $buf) = @_; 3317 my ($ns, $buf) = @_;
3023 3318
3024 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3319 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3025 3320
3026 if (ref $msg) { 3321 if (ref $msg) {
3027 my ($type, $reply, @payload) = 3322 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3028 "ARRAY" eq ref $msg
3029 ? @$msg
3030 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3031 3323
3032 my @reply;
3033
3034 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTIACMD{$type}) {
3325 $cb->(
3326 $ns,
3327 sub {
3328 $ns->ext_msg ("reply-$reply", @_)
3329 if $reply;
3330 },
3331 @payload
3332 );
3333 } else {
3334 my @reply;
3335
3336 if (my $cb = $EXTICMD{$type}) {
3035 @reply = $cb->($ns, @payload); 3337 @reply = $cb->($ns, @payload);
3338 }
3339
3340 $ns->ext_msg ("reply-$reply", @reply)
3341 if $reply;
3036 } 3342 }
3037
3038 $ns->ext_reply ($reply, @reply)
3039 if $reply;
3040
3041 } else { 3343 } else {
3042 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3344 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3043 } 3345 }
3044 3346
3045 cf::override; 3347 cf::override;
3046 }, 3348 },
3047); 3349);
3067 3369
3068 $coro 3370 $coro
3069} 3371}
3070 3372
3071cf::client->attach ( 3373cf::client->attach (
3072 on_destroy => sub { 3374 on_client_destroy => sub {
3073 my ($ns) = @_; 3375 my ($ns) = @_;
3074 3376
3075 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3377 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3076 }, 3378 },
3077); 3379);
3093our $safe_hole = new Safe::Hole; 3395our $safe_hole = new Safe::Hole;
3094 3396
3095$SIG{FPE} = 'IGNORE'; 3397$SIG{FPE} = 'IGNORE';
3096 3398
3097$safe->permit_only (Opcode::opset qw( 3399$safe->permit_only (Opcode::opset qw(
3098 :base_core :base_mem :base_orig :base_math 3400 :base_core :base_mem :base_orig :base_math :base_loop
3099 grepstart grepwhile mapstart mapwhile 3401 grepstart grepwhile mapstart mapwhile
3100 sort time 3402 sort time
3101)); 3403));
3102 3404
3103# here we export the classes and methods available to script code 3405# here we export the classes and methods available to script code
3107The following functions and methods are available within a safe environment: 3409The following functions and methods are available within a safe environment:
3108 3410
3109 cf::object 3411 cf::object
3110 contr pay_amount pay_player map x y force_find force_add destroy 3412 contr pay_amount pay_player map x y force_find force_add destroy
3111 insert remove name archname title slaying race decrease split 3413 insert remove name archname title slaying race decrease split
3414 value
3112 3415
3113 cf::object::player 3416 cf::object::player
3114 player 3417 player
3115 3418
3116 cf::player 3419 cf::player
3122=cut 3425=cut
3123 3426
3124for ( 3427for (
3125 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3428 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3126 insert remove inv nrof name archname title slaying race 3429 insert remove inv nrof name archname title slaying race
3127 decrease split destroy)], 3430 decrease split destroy change_exp value msg lore send_msg)],
3128 ["cf::object::player" => qw(player)], 3431 ["cf::object::player" => qw(player)],
3129 ["cf::player" => qw(peaceful)], 3432 ["cf::player" => qw(peaceful send_msg)],
3130 ["cf::map" => qw(trigger)], 3433 ["cf::map" => qw(trigger)],
3131) { 3434) {
3132 no strict 'refs';
3133 my ($pkg, @funs) = @$_; 3435 my ($pkg, @funs) = @$_;
3134 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3436 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3135 for @funs; 3437 for @funs;
3136} 3438}
3137 3439
3152 3454
3153 my $qcode = $code; 3455 my $qcode = $code;
3154 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3456 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3155 $qcode =~ s/\n/\\n/g; 3457 $qcode =~ s/\n/\\n/g;
3156 3458
3459 %vars = (_dummy => 0) unless %vars;
3460
3461 my @res;
3157 local $_; 3462 local $_;
3158 local @safe::cf::_safe_eval_args = values %vars;
3159 3463
3160 my $eval = 3464 my $eval =
3161 "do {\n" 3465 "do {\n"
3162 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3466 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3163 . "#line 0 \"{$qcode}\"\n" 3467 . "#line 0 \"{$qcode}\"\n"
3164 . $code 3468 . $code
3165 . "\n}" 3469 . "\n}"
3166 ; 3470 ;
3167 3471
3472 if ($CFG{safe_eval}) {
3168 sub_generation_inc; 3473 sub_generation_inc;
3474 local @safe::cf::_safe_eval_args = values %vars;
3169 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3475 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3170 sub_generation_inc; 3476 sub_generation_inc;
3477 } else {
3478 local @cf::_safe_eval_args = values %vars;
3479 @res = wantarray ? eval eval : scalar eval $eval;
3480 }
3171 3481
3172 if ($@) { 3482 if ($@) {
3173 warn "$@"; 3483 warn "$@",
3174 warn "while executing safe code '$code'\n"; 3484 "while executing safe code '$code'\n",
3175 warn "with arguments " . (join " ", %vars) . "\n"; 3485 "with arguments " . (join " ", %vars) . "\n";
3176 } 3486 }
3177 3487
3178 wantarray ? @res : $res[0] 3488 wantarray ? @res : $res[0]
3179} 3489}
3180 3490
3194=cut 3504=cut
3195 3505
3196sub register_script_function { 3506sub register_script_function {
3197 my ($fun, $cb) = @_; 3507 my ($fun, $cb) = @_;
3198 3508
3199 no strict 'refs'; 3509 $fun = "safe::$fun" if $CFG{safe_eval};
3200 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3510 *$fun = $safe_hole->wrap ($cb);
3201} 3511}
3202 3512
3203=back 3513=back
3204 3514
3205=cut 3515=cut
3206 3516
3207############################################################################# 3517#############################################################################
3208# the server's init and main functions 3518# the server's init and main functions
3209 3519
3520{
3521 package cf::face;
3522
3523 our %HASH; # hash => idx
3524 our @DATA; # dynamically-created facedata, only faceste 0 used
3525 our @FOFS; # file offset, if > 0
3526 our @SIZE; # size of face, in octets
3527 our @META; # meta hash of face, if any
3528 our $DATAFH; # facedata filehandle
3529
3530 # internal api, not finalised
3531 sub set {
3532 my ($name, $type, $data) = @_;
3533
3534 my $idx = cf::face::find $name;
3535
3536 if ($idx) {
3537 delete $HASH{cf::face::get_chksum $idx};
3538 } else {
3539 $idx = cf::face::alloc $name;
3540 }
3541
3542 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3543
3544 cf::face::set_type $idx, $type;
3545 cf::face::set_csum $idx, 0, $hash;
3546
3547 # we need to destroy the SV itself, not just modify it, as a running ix
3548 # might hold a reference to it: "delete" achieves that.
3549 delete $FOFS[0][$idx];
3550 delete $DATA[0][$idx];
3551 $DATA[0][$idx] = $data;
3552 $SIZE[0][$idx] = length $data;
3553 delete $META[$idx];
3554 $HASH{$hash} = $idx;#d#
3555
3556 $idx
3557 }
3558
3559 sub _get_data($$$) {
3560 my ($idx, $set, $cb) = @_;
3561
3562 if (defined $DATA[$set][$idx]) {
3563 $cb->($DATA[$set][$idx]);
3564 } elsif (my $fofs = $FOFS[$set][$idx]) {
3565 my $size = $SIZE[$set][$idx];
3566 my $buf;
3567 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3568 if ($_[0] == $size) {
3569 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3570 $cb->($buf);
3571 } else {
3572 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3573 }
3574 };
3575 } else {
3576 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3577 }
3578 }
3579
3580 # rather ineffient
3581 sub cf::face::get_data($;$) {
3582 my ($idx, $set) = @_;
3583
3584 _get_data $idx, $set, Coro::rouse_cb;
3585 Coro::rouse_wait
3586 }
3587
3588 sub cf::face::ix {
3589 my ($ns, $set, $idx, $pri) = @_;
3590
3591 _get_data $idx, $set, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594 }
3595}
3596
3210sub load_facedata($) { 3597sub load_facedata($) {
3211 my ($path) = @_; 3598 my ($path) = @_;
3212 3599
3213 # HACK to clear player env face cache, we need some signal framework
3214 # for this (global event?)
3215 %ext::player_env::MUSIC_FACE_CACHE = ();
3216
3217 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3600 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3218 3601
3219 warn "loading facedata from $path\n"; 3602 trace "loading facedata from $path\n";
3220 3603
3221 my $facedata; 3604 my $facedata = decode_storable load_file "$path/faceinfo";
3222 0 < aio_load $path, $facedata
3223 or die "$path: $!";
3224
3225 $facedata = Coro::Storable::thaw $facedata;
3226 3605
3227 $facedata->{version} == 2 3606 $facedata->{version} == 2
3228 or cf::cleanup "$path: version mismatch, cannot proceed."; 3607 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3229 3608
3230 # patch in the exptable 3609 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3231 $facedata->{resource}{"res/exp_table"} = { 3610 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3232 type => FT_RSRC, 3611
3233 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3612 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3234 }; 3613
3235 cf::cede_to_tick; 3614 # BEGIN ATOMIC
3615 # from here on, everything must be atomic - no thread switch allowed
3616 my $t1 = EV::time;
3236 3617
3237 { 3618 {
3238 my $faces = $facedata->{faceinfo}; 3619 my $faces = $facedata->{faceinfo};
3239 3620
3240 while (my ($face, $info) = each %$faces) { 3621 for my $face (sort keys %$faces) {
3622 my $info = $faces->{$face};
3241 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3623 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3242 3624
3243 cf::face::set_visibility $idx, $info->{visibility}; 3625 cf::face::set_visibility $idx, $info->{visibility};
3244 cf::face::set_magicmap $idx, $info->{magicmap}; 3626 cf::face::set_magicmap $idx, $info->{magicmap};
3245 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3627 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3246 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3628 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3247 3629 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3248 cf::cede_to_tick; 3630 $cf::face::HASH{$info->{hash64}} = $idx;
3631 delete $cf::face::META[$idx];
3249 } 3632 }
3250 3633
3251 while (my ($face, $info) = each %$faces) { 3634 while (my ($face, $info) = each %$faces) {
3252 next unless $info->{smooth}; 3635 next unless $info->{smooth};
3253 3636
3256 3639
3257 if (my $smooth = cf::face::find $info->{smooth}) { 3640 if (my $smooth = cf::face::find $info->{smooth}) {
3258 cf::face::set_smooth $idx, $smooth; 3641 cf::face::set_smooth $idx, $smooth;
3259 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3642 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3260 } else { 3643 } else {
3261 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3644 error "smooth face '$info->{smooth}' not found for face '$face'";
3262 } 3645 }
3263
3264 cf::cede_to_tick;
3265 } 3646 }
3266 } 3647 }
3267 3648
3268 { 3649 {
3269 my $anims = $facedata->{animinfo}; 3650 my $anims = $facedata->{animinfo};
3270 3651
3271 while (my ($anim, $info) = each %$anims) { 3652 while (my ($anim, $info) = each %$anims) {
3272 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3653 cf::anim::set $anim, $info->{frames}, $info->{facings};
3273 cf::cede_to_tick;
3274 } 3654 }
3275 3655
3276 cf::anim::invalidate_all; # d'oh 3656 cf::anim::invalidate_all; # d'oh
3277 } 3657 }
3278 3658
3279 { 3659 {
3280 # TODO: for gcfclient pleasure, we should give resources
3281 # that gcfclient doesn't grok a >10000 face index.
3282 my $res = $facedata->{resource}; 3660 my $res = $facedata->{resource};
3283 3661
3284 while (my ($name, $info) = each %$res) { 3662 while (my ($name, $info) = each %$res) {
3285 if (defined $info->{type}) { 3663 if (defined (my $type = $info->{type})) {
3664 # TODO: different hash - must free and use new index, or cache ixface data queue
3286 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3665 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3287 my $data;
3288 3666
3289 if ($info->{type} & 1) {
3290 # prepend meta info
3291
3292 my $meta = $enc->encode ({
3293 name => $name,
3294 %{ $info->{meta} || {} },
3295 });
3296
3297 $data = pack "(w/a*)*", $meta, $info->{data};
3298 } else {
3299 $data = $info->{data};
3300 }
3301
3302 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3303 cf::face::set_type $idx, $info->{type}; 3667 cf::face::set_type $idx, $type;
3668 cf::face::set_csum $idx, 0, $info->{hash};
3669 $cf::face::SIZE[0][$idx] = $info->{size};
3670 $cf::face::FOFS[0][$idx] = $info->{fofs};
3671 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3672 $cf::face::HASH{$info->{hash}} = $idx;
3304 } else { 3673 } else {
3305 $RESOURCE{$name} = $info; 3674# $RESOURCE{$name} = $info; # unused
3306 } 3675 }
3307
3308 cf::cede_to_tick;
3309 } 3676 }
3310 } 3677 }
3678
3679 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3680
3681 # HACK to clear player env face cache, we need some signal framework
3682 # for this (global event?)
3683 %ext::player_env::MUSIC_FACE_CACHE = ();
3684
3685 # END ATOMIC
3686
3687 cf::debug "facedata atomic update time ", EV::time - $t1;
3311 3688
3312 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3689 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3313 3690
3691 aio_close $fh if $fh; # close old facedata
3692
3314 1 3693 1
3315} 3694}
3316
3317cf::global->attach (on_resource_update => sub {
3318 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3319 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3320
3321 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3322 my $sound = $soundconf->{compat}[$_]
3323 or next;
3324
3325 my $face = cf::face::find "sound/$sound->[1]";
3326 cf::sound::set $sound->[0] => $face;
3327 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3328 }
3329
3330 while (my ($k, $v) = each %{$soundconf->{event}}) {
3331 my $face = cf::face::find "sound/$v";
3332 cf::sound::set $k => $face;
3333 }
3334 }
3335});
3336 3695
3337register_exticmd fx_want => sub { 3696register_exticmd fx_want => sub {
3338 my ($ns, $want) = @_; 3697 my ($ns, $want) = @_;
3339 3698
3340 while (my ($k, $v) = each %$want) { 3699 while (my ($k, $v) = each %$want) {
3348 my $status = load_resource_file_ $_[0]; 3707 my $status = load_resource_file_ $_[0];
3349 get_slot 0.1, 100; 3708 get_slot 0.1, 100;
3350 cf::arch::commit_load; 3709 cf::arch::commit_load;
3351 3710
3352 $status 3711 $status
3712}
3713
3714sub reload_exp_table {
3715 _reload_exp_table;
3716
3717 cf::face::set
3718 "res/exp_table" => FT_RSRC,
3719 JSON::XS->new->utf8->canonical->encode (
3720 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3721 );
3722}
3723
3724sub reload_materials {
3725 _reload_materials;
3353} 3726}
3354 3727
3355sub reload_regions { 3728sub reload_regions {
3356 # HACK to clear player env face cache, we need some signal framework 3729 # HACK to clear player env face cache, we need some signal framework
3357 # for this (global event?) 3730 # for this (global event?)
3365 if exists $_->{match}; 3738 if exists $_->{match};
3366 } 3739 }
3367} 3740}
3368 3741
3369sub reload_facedata { 3742sub reload_facedata {
3370 load_facedata "$DATADIR/facedata" 3743 load_facedata $DATADIR
3371 or die "unable to load facedata\n"; 3744 or die "unable to load facedata\n";
3372} 3745}
3373 3746
3374sub reload_archetypes { 3747sub reload_archetypes {
3375 load_resource_file "$DATADIR/archetypes" 3748 load_resource_file "$DATADIR/archetypes"
3376 or die "unable to load archetypes\n"; 3749 or die "unable to load archetypes\n";
3750
3751 cf::face::set
3752 "res/skill_info" => FT_RSRC,
3753 JSON::XS->new->utf8->canonical->encode (
3754 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3755 );
3756
3757 cf::face::set
3758 "res/spell_paths" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3761 );
3377} 3762}
3378 3763
3379sub reload_treasures { 3764sub reload_treasures {
3380 load_resource_file "$DATADIR/treasures" 3765 load_resource_file "$DATADIR/treasures"
3381 or die "unable to load treasurelists\n"; 3766 or die "unable to load treasurelists\n";
3382} 3767}
3383 3768
3769sub reload_sound {
3770 trace "loading sound config from $DATADIR/sound\n";
3771
3772 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3773
3774 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3775 my $sound = $soundconf->{compat}[$_]
3776 or next;
3777
3778 my $face = cf::face::find "sound/$sound->[1]";
3779 cf::sound::set $sound->[0] => $face;
3780 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3781 }
3782
3783 while (my ($k, $v) = each %{$soundconf->{event}}) {
3784 my $face = cf::face::find "sound/$v";
3785 cf::sound::set $k => $face;
3786 }
3787}
3788
3384sub reload_resources { 3789sub reload_resources {
3385 warn "reloading resource files...\n"; 3790 trace "reloading resource files...\n";
3386 3791
3792 reload_materials;
3387 reload_facedata; 3793 reload_facedata;
3794 reload_exp_table;
3795 reload_sound;
3388 reload_archetypes; 3796 reload_archetypes;
3389 reload_regions; 3797 reload_regions;
3390 reload_treasures; 3798 reload_treasures;
3391 3799
3392 warn "finished reloading resource files\n"; 3800 trace "finished reloading resource files\n";
3393}
3394
3395sub init {
3396 my $guard = freeze_mainloop;
3397
3398 reload_resources;
3399} 3801}
3400 3802
3401sub reload_config { 3803sub reload_config {
3402 open my $fh, "<:utf8", "$CONFDIR/config" 3804 trace "reloading config file...\n";
3403 or return;
3404 3805
3405 local $/; 3806 my $config = load_file "$CONFDIR/config";
3406 *CFG = YAML::Load <$fh>; 3807 utf8::decode $config;
3808 *CFG = decode_yaml $config;
3407 3809
3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3810 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3409 3811
3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3812 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3813 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3412 3814
3413 if (exists $CFG{mlockall}) { 3815 if (exists $CFG{mlockall}) {
3417 }; 3819 };
3418 warn $@ if $@; 3820 warn $@ if $@;
3419 } 3821 }
3420} 3822}
3421 3823
3824sub pidfile() {
3825 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3826 or die "$PIDFILE: $!";
3827 flock $fh, &Fcntl::LOCK_EX
3828 or die "$PIDFILE: flock: $!";
3829 $fh
3830}
3831
3832# make sure only one server instance is running at any one time
3833sub atomic {
3834 my $fh = pidfile;
3835
3836 my $pid = <$fh>;
3837 kill 9, $pid if $pid > 0;
3838
3839 seek $fh, 0, 0;
3840 print $fh $$;
3841}
3842
3843sub main_loop {
3844 trace "EV::loop starting\n";
3845 if (1) {
3846 EV::loop;
3847 }
3848 trace "EV::loop returned\n";
3849 goto &main_loop unless $REALLY_UNLOOP;
3850}
3851
3422sub main { 3852sub main {
3853 cf::init_globals; # initialise logging
3854
3855 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3856 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3857 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3858 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3859
3860 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3861
3423 # we must not ever block the main coroutine 3862 # we must not ever block the main coroutine
3424 local $Coro::idle = sub { 3863 $Coro::idle = sub {
3425 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3864 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3426 (async { 3865 (async {
3427 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3866 $Coro::current->{desc} = "IDLE BUG HANDLER";
3428 EV::loop EV::LOOP_ONESHOT; 3867 EV::loop EV::LOOP_ONESHOT;
3429 })->prio (Coro::PRIO_MAX); 3868 })->prio (Coro::PRIO_MAX);
3430 }; 3869 };
3431 3870
3432 { 3871 evthread_start IO::AIO::poll_fileno;
3433 my $guard = freeze_mainloop; 3872
3873 cf::sync_job {
3874 cf::incloader::init ();
3875
3876 db_init;
3877
3878 cf::init_anim;
3879 cf::init_attackmess;
3880 cf::init_dynamic;
3881
3882 cf::load_settings;
3883
3884 reload_resources;
3434 reload_config; 3885 reload_config;
3435 db_init; 3886
3887 cf::init_uuid;
3888 cf::init_signals;
3889 cf::init_skills;
3890
3891 cf::init_beforeplay;
3892
3893 atomic;
3894
3436 load_extensions; 3895 load_extensions;
3437 3896
3438 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3897 utime time, time, $RUNTIMEFILE;
3439 evthread_start IO::AIO::poll_fileno; 3898
3899 # no (long-running) fork's whatsoever before this point(!)
3900 use POSIX ();
3901 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3902
3903 cf::_post_init 0;
3440 } 3904 };
3441 3905
3442 EV::loop; 3906 cf::object::thawer::errors_are_fatal 0;
3907 info "parse errors in files are no longer fatal from this point on.\n";
3908
3909 AE::postpone {
3910 undef &main; # free gobs of memory :)
3911 };
3912
3913 goto &main_loop;
3443} 3914}
3444 3915
3445############################################################################# 3916#############################################################################
3446# initialisation and cleanup 3917# initialisation and cleanup
3447 3918
3448# install some emergency cleanup handlers 3919# install some emergency cleanup handlers
3449BEGIN { 3920BEGIN {
3450 our %SIGWATCHER = (); 3921 our %SIGWATCHER = ();
3451 for my $signal (qw(INT HUP TERM)) { 3922 for my $signal (qw(INT HUP TERM)) {
3452 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3923 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3453 cf::cleanup "SIG$signal"; 3924 cf::cleanup "SIG$signal";
3454 }; 3925 };
3455 } 3926 }
3456} 3927}
3457 3928
3458sub write_runtime_sync { 3929sub write_runtime_sync {
3459 my $runtime = "$LOCALDIR/runtime"; 3930 my $t0 = AE::time;
3460 3931
3461 # first touch the runtime file to show we are still running: 3932 # first touch the runtime file to show we are still running:
3462 # the fsync below can take a very very long time. 3933 # the fsync below can take a very very long time.
3463 3934
3464 IO::AIO::aio_utime $runtime, undef, undef; 3935 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3465 3936
3466 my $guard = cf::lock_acquire "write_runtime"; 3937 my $guard = cf::lock_acquire "write_runtime";
3467 3938
3468 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3939 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3469 or return; 3940 or return;
3470 3941
3471 my $value = $cf::RUNTIME + 90 + 10; 3942 my $value = $cf::RUNTIME + 90 + 10;
3472 # 10 is the runtime save interval, for a monotonic clock 3943 # 10 is the runtime save interval, for a monotonic clock
3473 # 60 allows for the watchdog to kill the server. 3944 # 60 allows for the watchdog to kill the server.
3483 aio_utime $fh, undef, undef; 3954 aio_utime $fh, undef, undef;
3484 3955
3485 close $fh 3956 close $fh
3486 or return; 3957 or return;
3487 3958
3488 aio_rename "$runtime~", $runtime 3959 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3489 and return; 3960 and return;
3490 3961
3491 warn "runtime file written.\n"; 3962 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3492 3963
3493 1 3964 1
3494} 3965}
3495 3966
3496our $uuid_lock; 3967our $uuid_lock;
3505 my $uuid = "$LOCALDIR/uuid"; 3976 my $uuid = "$LOCALDIR/uuid";
3506 3977
3507 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3978 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3508 or return; 3979 or return;
3509 3980
3510 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3981 my $value = uuid_seq uuid_cur;
3982
3983 unless ($value) {
3984 info "cowardly refusing to write zero uuid value!\n";
3985 return;
3986 }
3987
3988 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0; 3989 $uuid_skip = 0;
3512 3990
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3991 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return; 3992 and return;
3515 3993
3521 or return; 3999 or return;
3522 4000
3523 aio_rename "$uuid~", $uuid 4001 aio_rename "$uuid~", $uuid
3524 and return; 4002 and return;
3525 4003
3526 warn "uuid file written ($value).\n"; 4004 trace "uuid file written ($value).\n";
3527 4005
3528 1 4006 1
3529 4007
3530} 4008}
3531 4009
3537} 4015}
3538 4016
3539sub emergency_save() { 4017sub emergency_save() {
3540 my $freeze_guard = cf::freeze_mainloop; 4018 my $freeze_guard = cf::freeze_mainloop;
3541 4019
3542 warn "enter emergency perl save\n"; 4020 info "emergency_perl_save: enter\n";
4021
4022 # this is a trade-off: we want to be very quick here, so
4023 # save all maps without fsync, and later call a global sync
4024 # (which in turn might be very very slow)
4025 local $USE_FSYNC = 0;
3543 4026
3544 cf::sync_job { 4027 cf::sync_job {
4028 cf::write_runtime_sync; # external watchdog should not bark
4029
3545 # use a peculiar iteration method to avoid tripping on perl 4030 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 4031 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 4032 # and maps saved/destroyed asynchronously.
3548 warn "begin emergency player save\n"; 4033 info "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 4034 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 4035 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 4036 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4037 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 4038 $pl->save;
3554 } 4039 }
3555 warn "end emergency player save\n"; 4040 info "emergency_perl_save: end player save\n";
3556 4041
3557 warn "begin emergency map save\n"; 4042 cf::write_runtime_sync; # external watchdog should not bark
4043
4044 info "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 4045 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 4046 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 4047 $map->valid or next;
3561 $map->save; 4048 $map->save;
3562 } 4049 }
3563 warn "end emergency map save\n"; 4050 info "emergency_perl_save: end map save\n";
3564 4051
3565 warn "begin emergency database checkpoint\n"; 4052 cf::write_runtime_sync; # external watchdog should not bark
4053
4054 info "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 4055 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "end emergency database checkpoint\n"; 4056 info "emergency_perl_save: end database checkpoint\n";
3568 4057
3569 warn "begin write uuid\n"; 4058 info "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 4059 write_uuid_sync 1;
3571 warn "end write uuid\n"; 4060 info "emergency_perl_save: end write uuid\n";
4061
4062 cf::write_runtime_sync; # external watchdog should not bark
4063
4064 trace "emergency_perl_save: syncing database to disk";
4065 BDB::db_env_txn_checkpoint $DB_ENV;
4066
4067 info "emergency_perl_save: starting sync\n";
4068 IO::AIO::aio_sync sub {
4069 info "emergency_perl_save: finished sync\n";
4070 };
4071
4072 cf::write_runtime_sync; # external watchdog should not bark
4073
4074 trace "emergency_perl_save: flushing outstanding aio requests";
4075 while (IO::AIO::nreqs || BDB::nreqs) {
4076 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4077 }
4078
4079 cf::write_runtime_sync; # external watchdog should not bark
3572 }; 4080 };
3573 4081
3574 warn "leave emergency perl save\n"; 4082 info "emergency_perl_save: leave\n";
3575} 4083}
3576 4084
3577sub post_cleanup { 4085sub post_cleanup {
3578 my ($make_core) = @_; 4086 my ($make_core) = @_;
3579 4087
4088 IO::AIO::flush;
4089
3580 warn Carp::longmess "post_cleanup backtrace" 4090 error Carp::longmess "post_cleanup backtrace"
3581 if $make_core; 4091 if $make_core;
4092
4093 my $fh = pidfile;
4094 unlink $PIDFILE if <$fh> == $$;
4095}
4096
4097# a safer delete_package, copied from Symbol
4098sub clear_package($) {
4099 my $pkg = shift;
4100
4101 # expand to full symbol table name if needed
4102 unless ($pkg =~ /^main::.*::$/) {
4103 $pkg = "main$pkg" if $pkg =~ /^::/;
4104 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4105 $pkg .= '::' unless $pkg =~ /::$/;
4106 }
4107
4108 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4109 my $stem_symtab = *{$stem}{HASH};
4110
4111 defined $stem_symtab and exists $stem_symtab->{$leaf}
4112 or return;
4113
4114 # clear all symbols
4115 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4116 for my $name (keys %$leaf_symtab) {
4117 _gv_clear *{"$pkg$name"};
4118# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4119 }
3582} 4120}
3583 4121
3584sub do_reload_perl() { 4122sub do_reload_perl() {
3585 # can/must only be called in main 4123 # can/must only be called in main
3586 if ($Coro::current != $Coro::main) { 4124 unless (in_main) {
3587 warn "can only reload from main coroutine"; 4125 error "can only reload from main coroutine";
3588 return; 4126 return;
3589 } 4127 }
3590 4128
3591 warn "reloading..."; 4129 return if $RELOAD++;
3592 4130
3593 warn "entering sync_job"; 4131 my $t1 = AE::time;
3594 4132
4133 while ($RELOAD) {
4134 cf::get_slot 0.1, -1, "reload_perl";
4135 info "perl_reload: reloading...";
4136
4137 trace "perl_reload: entering sync_job";
4138
3595 cf::sync_job { 4139 cf::sync_job {
3596 cf::write_runtime_sync; # external watchdog should not bark
3597 cf::emergency_save; 4140 #cf::emergency_save;
3598 cf::write_runtime_sync; # external watchdog should not bark
3599 4141
3600 warn "syncing database to disk";
3601 BDB::db_env_txn_checkpoint $DB_ENV;
3602
3603 # if anything goes wrong in here, we should simply crash as we already saved
3604
3605 warn "flushing outstanding aio requests";
3606 for (;;) {
3607 BDB::flush;
3608 IO::AIO::flush;
3609 Coro::cede_notself;
3610 last unless IO::AIO::nreqs || BDB::nreqs;
3611 warn "iterate...";
3612 }
3613
3614 ++$RELOAD;
3615
3616 warn "cancelling all extension coros"; 4142 trace "perl_reload: cancelling all extension coros";
3617 $_->cancel for values %EXT_CORO; 4143 $_->cancel for values %EXT_CORO;
3618 %EXT_CORO = (); 4144 %EXT_CORO = ();
3619 4145
3620 warn "removing commands"; 4146 trace "perl_reload: removing commands";
3621 %COMMAND = (); 4147 %COMMAND = ();
3622 4148
3623 warn "removing ext/exti commands"; 4149 trace "perl_reload: removing ext/exti commands";
3624 %EXTCMD = (); 4150 %EXTCMD = ();
3625 %EXTICMD = (); 4151 %EXTICMD = ();
3626 4152
3627 warn "unloading/nuking all extensions"; 4153 trace "perl_reload: unloading/nuking all extensions";
3628 for my $pkg (@EXTS) { 4154 for my $pkg (@EXTS) {
3629 warn "... unloading $pkg"; 4155 trace "... unloading $pkg";
3630 4156
3631 if (my $cb = $pkg->can ("unload")) { 4157 if (my $cb = $pkg->can ("unload")) {
3632 eval { 4158 eval {
3633 $cb->($pkg); 4159 $cb->($pkg);
3634 1 4160 1
3635 } or warn "$pkg unloaded, but with errors: $@"; 4161 } or error "$pkg unloaded, but with errors: $@";
4162 }
4163
4164 trace "... clearing $pkg";
4165 clear_package $pkg;
3636 } 4166 }
3637 4167
3638 warn "... nuking $pkg";
3639 Symbol::delete_package $pkg;
3640 }
3641
3642 warn "unloading all perl modules loaded from $LIBDIR"; 4168 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3643 while (my ($k, $v) = each %INC) { 4169 while (my ($k, $v) = each %INC) {
3644 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4170 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3645 4171
3646 warn "... unloading $k"; 4172 trace "... unloading $k";
3647 delete $INC{$k}; 4173 delete $INC{$k};
3648 4174
3649 $k =~ s/\.pm$//; 4175 $k =~ s/\.pm$//;
3650 $k =~ s/\//::/g; 4176 $k =~ s/\//::/g;
3651 4177
3652 if (my $cb = $k->can ("unload_module")) { 4178 if (my $cb = $k->can ("unload_module")) {
3653 $cb->(); 4179 $cb->();
4180 }
4181
4182 clear_package $k;
3654 } 4183 }
3655 4184
3656 Symbol::delete_package $k;
3657 }
3658
3659 warn "getting rid of safe::, as good as possible"; 4185 trace "perl_reload: getting rid of safe::, as good as possible";
3660 Symbol::delete_package "safe::$_" 4186 clear_package "safe::$_"
3661 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4187 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3662 4188
3663 warn "unloading cf.pm \"a bit\""; 4189 trace "perl_reload: unloading cf.pm \"a bit\"";
3664 delete $INC{"cf.pm"}; 4190 delete $INC{"cf.pm"};
3665 delete $INC{"cf/pod.pm"}; 4191 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3666 4192
3667 # don't, removes xs symbols, too, 4193 # don't, removes xs symbols, too,
3668 # and global variables created in xs 4194 # and global variables created in xs
3669 #Symbol::delete_package __PACKAGE__; 4195 #clear_package __PACKAGE__;
3670 4196
3671 warn "unload completed, starting to reload now"; 4197 info "perl_reload: unload completed, starting to reload now";
3672 4198
3673 warn "reloading cf.pm"; 4199 trace "perl_reload: reloading cf.pm";
3674 require cf; 4200 require cf;
3675 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4201 cf::_connect_to_perl_1;
3676 4202
3677 warn "loading config and database again"; 4203 trace "perl_reload: loading config and database again";
3678 cf::reload_config; 4204 cf::reload_config;
3679 4205
3680 warn "loading extensions"; 4206 trace "perl_reload: loading extensions";
3681 cf::load_extensions; 4207 cf::load_extensions;
3682 4208
4209 if ($REATTACH_ON_RELOAD) {
3683 warn "reattaching attachments to objects/players"; 4210 trace "perl_reload: reattaching attachments to objects/players";
3684 _global_reattach; # objects, sockets 4211 _global_reattach; # objects, sockets
3685 warn "reattaching attachments to maps"; 4212 trace "perl_reload: reattaching attachments to maps";
3686 reattach $_ for values %MAP; 4213 reattach $_ for values %MAP;
3687 warn "reattaching attachments to players"; 4214 trace "perl_reload: reattaching attachments to players";
3688 reattach $_ for values %PLAYER; 4215 reattach $_ for values %PLAYER;
4216 }
3689 4217
3690 warn "leaving sync_job"; 4218 cf::_post_init 1;
3691 4219
4220 trace "perl_reload: leaving sync_job";
4221
3692 1 4222 1
3693 } or do { 4223 } or do {
3694 warn $@; 4224 error $@;
3695 cf::cleanup "error while reloading, exiting."; 4225 cf::cleanup "perl_reload: error, exiting.";
4226 };
4227
4228 --$RELOAD;
3696 }; 4229 }
3697 4230
3698 warn "reloaded"; 4231 $t1 = AE::time - $t1;
4232 info "perl_reload: completed in ${t1}s\n";
3699}; 4233};
3700 4234
3701our $RELOAD_WATCHER; # used only during reload 4235our $RELOAD_WATCHER; # used only during reload
3702 4236
3703sub reload_perl() { 4237sub reload_perl() {
3704 # doing reload synchronously and two reloads happen back-to-back, 4238 # doing reload synchronously and two reloads happen back-to-back,
3705 # coro crashes during coro_state_free->destroy here. 4239 # coro crashes during coro_state_free->destroy here.
3706 4240
4241 $RELOAD_WATCHER ||= cf::async {
4242 Coro::AIO::aio_wait cache_extensions;
4243
3707 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4244 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3708 do_reload_perl; 4245 do_reload_perl;
3709 undef $RELOAD_WATCHER; 4246 undef $RELOAD_WATCHER;
4247 };
3710 }; 4248 };
3711} 4249}
3712 4250
3713register_command "reload" => sub { 4251register_command "reload" => sub {
3714 my ($who, $arg) = @_; 4252 my ($who, $arg) = @_;
3720 reload_perl; 4258 reload_perl;
3721 }; 4259 };
3722 } 4260 }
3723}; 4261};
3724 4262
3725unshift @INC, $LIBDIR; 4263#############################################################################
3726 4264
3727my $bug_warning = 0; 4265my $bug_warning = 0;
3728 4266
3729our @WAIT_FOR_TICK;
3730our @WAIT_FOR_TICK_BEGIN;
3731
3732sub wait_for_tick { 4267sub wait_for_tick() {
3733 return if tick_inhibit || $Coro::current == $Coro::main; 4268 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3734 4269
3735 my $signal = new Coro::Signal; 4270 $WAIT_FOR_TICK->wait;
3736 push @WAIT_FOR_TICK, $signal;
3737 $signal->wait;
3738} 4271}
3739 4272
3740sub wait_for_tick_begin { 4273sub wait_for_tick_begin() {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3742 4275
3743 my $signal = new Coro::Signal; 4276 my $signal = new Coro::Signal;
3744 push @WAIT_FOR_TICK_BEGIN, $signal; 4277 push @WAIT_FOR_TICK_BEGIN, $signal;
3745 $signal->wait; 4278 $signal->wait;
3746} 4279}
3750 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4283 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3751 unless ++$bug_warning > 10; 4284 unless ++$bug_warning > 10;
3752 return; 4285 return;
3753 } 4286 }
3754 4287
3755 cf::server_tick; # one server iteration 4288 cf::one_tick; # one server iteration
4289
4290 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3756 4291
3757 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4292 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3758 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4293 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3759 Coro::async_pool { 4294 Coro::async_pool {
3760 $Coro::current->{desc} = "runtime saver"; 4295 $Coro::current->{desc} = "runtime saver";
3761 write_runtime_sync 4296 write_runtime_sync
3762 or warn "ERROR: unable to write runtime file: $!"; 4297 or error "ERROR: unable to write runtime file: $!";
3763 }; 4298 };
3764 } 4299 }
3765 4300
3766 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4301 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3767 $sig->send; 4302 $sig->send;
3768 } 4303 }
3769 while (my $sig = shift @WAIT_FOR_TICK) { 4304 $WAIT_FOR_TICK->broadcast;
3770 $sig->send;
3771 }
3772 4305
3773 $LOAD = ($NOW - $TICK_START) / $TICK; 4306 $LOAD = ($NOW - $TICK_START) / $TICK;
3774 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4307 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3775 4308
3776 if (0) { 4309 if (0) {
3777 if ($NEXT_TICK) { 4310 if ($NEXT_TICK) {
3778 my $jitter = $TICK_START - $NEXT_TICK; 4311 my $jitter = $TICK_START - $NEXT_TICK;
3779 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4312 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3780 warn "jitter $JITTER\n";#d# 4313 debug "jitter $JITTER\n";#d#
3781 } 4314 }
3782 } 4315 }
3783} 4316}
3784 4317
3785{ 4318{
3786 # configure BDB 4319 # configure BDB
4320 info "initialising database";
3787 4321
3788 BDB::min_parallel 8; 4322 BDB::min_parallel 16;
3789 BDB::max_poll_reqs $TICK * 0.1; 4323 BDB::max_poll_reqs $TICK * 0.1;
3790 $Coro::BDB::WATCHER->priority (1); 4324 #$AnyEvent::BDB::WATCHER->priority (1);
3791 4325
3792 unless ($DB_ENV) { 4326 unless ($DB_ENV) {
3793 $DB_ENV = BDB::db_env_create; 4327 $DB_ENV = BDB::db_env_create;
3794 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4328 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3795 | BDB::LOG_AUTOREMOVE, 1); 4329 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4330 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4331 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4332 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3798 4333
3799 cf::sync_job { 4334 cf::sync_job {
3800 eval { 4335 eval {
3819 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4354 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3820 }; 4355 };
3821 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4356 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3822 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4357 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3823 }; 4358 };
4359
4360 info "database initialised";
3824} 4361}
3825 4362
3826{ 4363{
3827 # configure IO::AIO 4364 # configure IO::AIO
3828 4365
4366 info "initialising aio";
3829 IO::AIO::min_parallel 8; 4367 IO::AIO::min_parallel 8;
3830 IO::AIO::max_poll_time $TICK * 0.1; 4368 IO::AIO::max_poll_time $TICK * 0.1;
3831 $Coro::AIO::WATCHER->priority (1); 4369 undef $AnyEvent::AIO::WATCHER;
4370 info "aio initialised";
3832} 4371}
3833 4372
3834my $_log_backtrace; 4373our $_log_backtrace;
4374our $_log_backtrace_last;
3835 4375
3836sub _log_backtrace { 4376sub _log_backtrace {
3837 my ($msg, @addr) = @_; 4377 my ($msg, @addr) = @_;
3838 4378
3839 $msg =~ s/\n//; 4379 $msg =~ s/\n$//;
3840 4380
4381 if ($_log_backtrace_last eq $msg) {
4382 LOG llevInfo, "[ABT] $msg\n";
4383 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3841 # limit the # of concurrent backtraces 4384 # limit the # of concurrent backtraces
3842 if ($_log_backtrace < 2) { 4385 } elsif ($_log_backtrace < 2) {
4386 $_log_backtrace_last = $msg;
3843 ++$_log_backtrace; 4387 ++$_log_backtrace;
4388 my $perl_bt = Carp::longmess $msg;
3844 async { 4389 async {
3845 $Coro::current->{desc} = "abt $msg"; 4390 $Coro::current->{desc} = "abt $msg";
3846 4391
3847 my @bt = fork_call { 4392 my @bt = fork_call {
3848 @addr = map { sprintf "%x", $_ } @addr; 4393 @addr = map { sprintf "%x", $_ } @addr;
3859 } 4404 }
3860 4405
3861 @funcs 4406 @funcs
3862 }; 4407 };
3863 4408
3864 LOG llevInfo, "[ABT] $msg\n"; 4409 LOG llevInfo, "[ABT] $perl_bt\n";
4410 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3865 LOG llevInfo, "[ABT] $_\n" for @bt; 4411 LOG llevInfo, "[ABT] $_\n" for @bt;
3866 --$_log_backtrace; 4412 --$_log_backtrace;
3867 }; 4413 };
3868 } else { 4414 } else {
3869 LOG llevInfo, "[ABT] $msg\n"; 4415 LOG llevInfo, "[ABT] $msg\n";
3870 LOG llevInfo, "[ABT] [suppressed]\n"; 4416 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3871 } 4417 }
3872} 4418}
3873 4419
3874# load additional modules 4420# load additional modules
3875use cf::pod; 4421require "cf/$_.pm" for @EXTRA_MODULES;
4422cf::_connect_to_perl_2;
3876 4423
3877END { cf::emergency_save } 4424END { cf::emergency_save }
3878 4425
38791 44261
3880 4427

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines