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.376 by root, Mon Oct 1 00:44:44 2007 UTC vs.
Revision 1.615 by root, Sat Feb 23 22:37:39 2013 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
15use Coro 3.64 (); 41use Coro ();
16use Coro::State; 42use Coro::State;
17use Coro::Handle; 43use Coro::Handle;
44use Coro::EV;
18use Coro::Event; 45use Coro::AnyEvent;
19use Coro::Timer; 46use Coro::Timer;
20use Coro::Signal; 47use Coro::Signal;
21use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
50use Coro::AnyEvent;
22use Coro::AIO; 51use Coro::AIO;
52use Coro::BDB 1.6;
23use Coro::Storable; 53use Coro::Storable;
24use Coro::Util (); 54use Coro::Util ();
25 55
56use Guard ();
26use JSON::XS (); 57use JSON::XS 2.01 ();
27use BDB (); 58use BDB ();
28use Data::Dumper; 59use Data::Dumper;
29use Digest::MD5;
30use Fcntl; 60use Fcntl;
31use YAML::Syck (); 61use YAML::XS ();
32use IO::AIO 2.32 (); 62use IO::AIO ();
33use Time::HiRes;
34use Compress::LZF; 63use Compress::LZF;
35use Digest::MD5 (); 64use Digest::MD5 ();
65
66AnyEvent::detect;
36 67
37# configure various modules to our taste 68# configure various modules to our taste
38# 69#
39$Storable::canonical = 1; # reduce rsync transfers 70$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 78
43$Event::Eval = 1; # no idea why this is required, but it is 79# strictly for debugging
44 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 81
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83
84our @ORIG_INC;
51 85
52our %COMMAND = (); 86our %COMMAND = ();
53our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
54 88
55our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
56our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
57our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
60 96
61our $RELOAD; # number of reloads so far 97our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 98our @EVENT;
99our @REFLECT; # set by XS
100our %REFLECT; # set by us
63 101
64our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
65our $DATADIR = datadir; 104our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
69our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
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;
75 125
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 128our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 129our $USE_FSYNC = 1; # use fsync to write maps - default on
83 130
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 134our $DB_ENV;
89 135
136our @EXTRA_MODULES = qw(pod match mapscript incloader);
137
90our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
91 140
92our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
144our $NOW;
94 145
95our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
98 149
99# used to convert map paths into valid unix filenames by replacing / by ∕ 150# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 151our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 152
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 153our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 154our $LOADAVG; # same thing, but with alpha-smoothing
155our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 156our $TICK_START; # for load detecting purposes
157
158our @POST_INIT;
159
160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
105 165
106binmode STDOUT; 166binmode STDOUT;
107binmode STDERR; 167binmode STDERR;
108 168
109# read virtual server time, if available 169# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 170unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 171 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 172 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 173 $RUNTIME = <$fh> + 0.;
114} 174}
175
176eval "sub TICK() { $TICK } 1" or die;
115 177
116mkdir $_ 178mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 179 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 180
119our $EMERGENCY_POSITION; 181our $EMERGENCY_POSITION;
120 182
121sub cf::map::normalise; 183sub cf::map::normalise;
122 184
185sub in_main() {
186 $Coro::current == $Coro::main
187}
188
123############################################################################# 189#############################################################################
124 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
125=head2 GLOBAL VARIABLES 202=head2 GLOBAL VARIABLES
126 203
127=over 4 204=over 4
128 205
129=item $cf::UPTIME 206=item $cf::UPTIME
130 207
131The 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.
132 224
133=item $cf::RUNTIME 225=item $cf::RUNTIME
134 226
135The 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
136every server tick. 228every server tick.
137 229
138=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
139$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
140$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
141 233
142Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
143directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
144unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
145database environment. 237database environment.
146 238
147=item $cf::NOW
148
149The time of the last (current) server tick.
150
151=item $cf::TICK
152
153The interval between server ticks, in seconds.
154
155=item $cf::LOADAVG 239=item $cf::LOADAVG
156 240
157The 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
158(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
159objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
162 246
163The raw value load value from the last tick. 247The raw value load value from the last tick.
164 248
165=item %cf::CFG 249=item %cf::CFG
166 250
167Configuration for the server, loaded from C</etc/crossfire/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 252from wherever your confdir points to.
169 253
170=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
171 255
172These 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.
173returns 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
174per 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();
175 277
176=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
177 279
178This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
179C<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
180that call. 282that call.
181 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
182=back 290=back
183 291
184=cut 292=cut
185 293
186BEGIN { 294sub error(@) { LOG llevError, join "", @_ }
187 *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 {
188 my $msg = join "", @_; 301 my $msg = join "", @_;
189 302
190 $msg .= "\n" 303 $msg .= "\n"
191 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
192 305
193 $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;
194 307
195 LOG llevError, $msg; 308 LOG llevWarn, $msg;
196 }; 309};
197} 310
311$Coro::State::DIEHOOK = sub {
312 return unless $^S eq 0; # "eq", not "=="
313
314 error Carp::longmess $_[0];
315
316 if (in_main) {#d#
317 error "DIEHOOK called in main context, Coro bug?\n";#d#
318 return;#d#
319 }#d#
320
321 # kill coroutine otherwise
322 Coro::terminate
323};
198 324
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 325@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 326@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 327@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 328@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 335for my $pkg (qw(
210 cf::global cf::attachable 336 cf::global cf::attachable
211 cf::object cf::object::player 337 cf::object cf::object::player
212 cf::client cf::player 338 cf::client cf::player
213 cf::arch cf::living 339 cf::arch cf::living
340 cf::map cf::mapspace
214 cf::map cf::party cf::region 341 cf::party cf::region
215)) { 342)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 344}
219 345
220$Event::DIED = sub { 346$EV::DIED = sub {
221 warn "error in event callback: @_"; 347 warn "error in event callback: $@";
222}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
223 354
224############################################################################# 355#############################################################################
225 356
226=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
227 358
248 $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;
249 $d 380 $d
250 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
251} 382}
252 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
253=item $ref = cf::from_json $json 436=item $ref = cf::decode_json $json
254 437
255Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
256 439
257=item $json = cf::to_json $ref 440=item $json = cf::encode_json $ref
258 441
259Converts a perl data structure into its JSON representation. 442Converts a perl data structure into its JSON representation.
260 443
261=cut 444=cut
262 445
263our $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
264 447
265sub to_json ($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
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}
267 512
268=item cf::lock_wait $string 513=item cf::lock_wait $string
269 514
270Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
271 516
272=item my $lock = cf::lock_acquire $string 517=item my $lock = cf::lock_acquire $string
273 518
274Wait 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
275a 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,
276for example when the coroutine gets canceled), the lock is automatically 521for example when the coroutine gets canceled), the lock is automatically
277returned. 522returned.
278 523
279Locks 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
280deadlocked coro. 525deadlocked coro.
286 531
287Return 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.
288 533
289=cut 534=cut
290 535
291our %LOCK; 536our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 537
294sub lock_wait($) { 538sub lock_wait($) {
295 my ($key) = @_; 539 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 540}
308 541
309sub lock_acquire($) { 542sub lock_acquire($) {
310 my ($key) = @_; 543 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 544}
324 545
325sub lock_active($) { 546sub lock_active($) {
326 my ($key) = @_; 547 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 548}
330 549
331sub freeze_mainloop { 550sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 551 tick_inhibit_inc;
333 552
334 my $guard = Coro::guard { 553 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 554}
336 }; 555
337 $TICK_WATCHER->stop; 556=item cf::periodic $interval, $cb
338 $guard 557
558Like EV::periodic, but randomly selects a starting point so that the actions
559get spread over time.
560
561=cut
562
563sub periodic($$) {
564 my ($interval, $cb) = @_;
565
566 my $start = rand List::Util::min 180, $interval;
567
568 EV::periodic $start, $interval, 0, $cb
339} 569}
340 570
341=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
342 572
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
344This 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
345of 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.
346 580
347The 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
348used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
349 583
350Useful for short background jobs. 584Useful for short background jobs.
351 585
352=cut 586=cut
353 587
354our @SLOT_QUEUE; 588our @SLOT_QUEUE;
355our $SLOT_QUEUE; 589our $SLOT_QUEUE;
590our $SLOT_DECAY = 0.9;
356 591
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 592$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 593$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 594 $Coro::current->desc ("timeslot manager");
360 595
361 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
597 my $busy;
362 598
363 while () { 599 while () {
364 next_job: 600 next_job:
601
602 Coro::cede;
603
365 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 605
367 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
608 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 610 $job->[2]->send;
371 Coro::cede;
372 goto next_job; 611 goto next_job;
373 } 612 } else {
613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 614 }
375 } 615 }
376 616
377 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
378 # we do not use wait_For_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else { 619 } else {
620 $busy = 0;
382 Coro::schedule; 621 Coro::schedule;
383 } 622 }
384 } 623 }
385}; 624};
386 625
387sub get_slot($;$$) { 626sub get_slot($;$$) {
627 return if tick_inhibit || $Coro::current == $Coro::main;
628
388 my ($time, $pri, $name) = @_; 629 my ($time, $pri, $name) = @_;
389 630
390 $time = $TICK * .6 if $time > $TICK * .6; 631 $time = clamp $time, 0.01, $TICK * .6;
632
391 my $sig = new Coro::Signal; 633 my $sig = new Coro::Signal;
392 634
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 635 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 636 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 637 $SLOT_QUEUE->ready;
406 648
407BEGIN { *async = \&Coro::async_pool } 649BEGIN { *async = \&Coro::async_pool }
408 650
409=item cf::sync_job { BLOCK } 651=item cf::sync_job { BLOCK }
410 652
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 653The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 654is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 655partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 656acceptable.
415 657
416If it must be done, put the blocking parts into C<sync_job>. This will run 658If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 659the given BLOCK in another coroutine while waiting for the result. The
421=cut 663=cut
422 664
423sub sync_job(&) { 665sub sync_job(&) {
424 my ($job) = @_; 666 my ($job) = @_;
425 667
426 if ($Coro::current == $Coro::main) { 668 if (in_main) {
427 my $time = Event::time; 669 my $time = AE::time;
428 670
429 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
431 673
432 # TODO: use suspend/resume instead 674 #LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 675
434 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
435 677
436 my $busy = 1; 678 my $busy = 1;
437 my @res; 679 my @res;
438 680
439 (async { 681 (async {
440 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
441 @res = eval { $job->() }; 683 @res = eval { $job->() };
442 warn $@ if $@; 684 error $@ if $@;
443 undef $busy; 685 undef $busy;
444 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
445 687
446 while ($busy) { 688 while ($busy) {
447 Coro::cede or Event::one_event; 689 if (Coro::nready) {
690 Coro::cede_notself;
691 } else {
692 EV::loop EV::LOOP_ONESHOT;
448 } 693 }
694 }
449 695
450 $time = Event::time - $time; 696 my $time = AE::time - $time;
451 697
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 698 $TICK_START += $time; # do not account sync jobs to server load
456 699
457 wantarray ? @res : $res[0] 700 wantarray ? @res : $res[0]
458 } else { 701 } else {
459 # we are in another coroutine, how wonderful, everything just works 702 # we are in another coroutine, how wonderful, everything just works
460 703
480 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
481 724
482 $coro 725 $coro
483} 726}
484 727
485=item fork_call { }, $args 728=item fork_call { }, @args
486 729
487Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 733never block itself or use any form of event handling.
491 734
492=cut 735=cut
736
737sub post_fork {
738 reset_signals;
739}
493 740
494sub fork_call(&@) { 741sub fork_call(&@) {
495 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
496 743
497 # we seemingly have to make a local copy of the whole thing,
498 # otherwise perl prematurely frees the stuff :/
499 # TODO: investigate and fix (likely this will be rather laborious)
500
501 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
502 reset_signals; 745 cf::post_fork;
503 &$cb 746 &$cb
504 }, @args; 747 } @args;
505 748
506 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
750}
751
752sub objinfo {
753 (
754 "counter value" => cf::object::object_count,
755 "objects created" => cf::object::create_count,
756 "objects destroyed" => cf::object::destroy_count,
757 "freelist size" => cf::object::free_count,
758 "allocated objects" => cf::object::objects_size,
759 "active objects" => cf::object::actives_size,
760 )
761}
762
763=item $coin = coin_from_name $name
764
765=cut
766
767our %coin_alias = (
768 "silver" => "silvercoin",
769 "silvercoin" => "silvercoin",
770 "silvercoins" => "silvercoin",
771 "gold" => "goldcoin",
772 "goldcoin" => "goldcoin",
773 "goldcoins" => "goldcoin",
774 "platinum" => "platinacoin",
775 "platinumcoin" => "platinacoin",
776 "platinumcoins" => "platinacoin",
777 "platina" => "platinacoin",
778 "platinacoin" => "platinacoin",
779 "platinacoins" => "platinacoin",
780 "royalty" => "royalty",
781 "royalties" => "royalty",
782);
783
784sub coin_from_name($) {
785 $coin_alias{$_[0]}
786 ? cf::arch::find $coin_alias{$_[0]}
787 : undef
507} 788}
508 789
509=item $value = cf::db_get $family => $key 790=item $value = cf::db_get $family => $key
510 791
511Returns a single value from the environment database. 792Returns a single value from the environment database.
521within each server. 802within each server.
522 803
523=cut 804=cut
524 805
525sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
526 my ($name) = @_; 810 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
528 812
529 eval { 813 eval {
530 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
540} 824}
541 825
542our $DB; 826our $DB;
543 827
544sub db_init { 828sub db_init {
545 cf::sync_job {
546 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
547 };
548} 830}
549 831
550sub db_get($$) { 832sub db_get($$) {
551 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
552 834
553 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
554 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
555 839
556 $! ? () 840 $! ? ()
557 : $data 841 : $data
558 }
559} 842}
560 843
561sub db_put($$$) { 844sub db_put($$$) {
562 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
563 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
591 874
592 my @data; 875 my @data;
593 my $md5; 876 my $md5;
594 877
595 for (0 .. $#$src) { 878 for (0 .. $#$src) {
596 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
597 or Carp::croak "$src->[$_]: $!";
598 } 880 }
599 881
600 # if processing is expensive, check 882 # if processing is expensive, check
601 # checksum first 883 # checksum first
602 if (1) { 884 if (1) {
615 897
616 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
617 } 899 }
618 } 900 }
619 901
620 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
621 my $data = $process->(\@data); 903 my $data = $process->(\@data);
622 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
623 905
624 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
625 907
626 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
627 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
628 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
629 911
639 921
640=cut 922=cut
641 923
642sub datalog($@) { 924sub datalog($@) {
643 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
644 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
645} 927}
646 928
647=back 929=back
648 930
649=cut 931=cut
650 932
651############################################################################# 933#############################################################################
652 934
653=head2 ATTACHABLE OBJECTS 935=head2 ATTACHABLE OBJECTS
654 936
655Many 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
656attach callbacks/event handlers (a collection of which is called an "attachment") 938attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 939to it. All such attachable objects support the following methods.
658 940
659In 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>
660C<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
661Crossfire TRT). 943Deliantra).
662 944
663=over 4 945=over 4
664 946
665=item $attachable->attach ($attachment, key => $value...) 947=item $attachable->attach ($attachment, key => $value...)
666 948
710=item cf::CLASS::attachment $name, ... 992=item cf::CLASS::attachment $name, ...
711 993
712Register an attachment by C<$name> through which attachable objects of the 994Register an attachment by C<$name> through which attachable objects of the
713given CLASS can refer to this attachment. 995given CLASS can refer to this attachment.
714 996
715Some classes such as crossfire maps and objects can specify attachments 997Some classes such as deliantra maps and objects can specify attachments
716that 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.
717 999
718These calls expect any number of the following handler/hook descriptions: 1000These calls expect any number of the following handler/hook descriptions:
719 1001
720=over 4 1002=over 4
844 1126
845 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
846 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
847 1129
848 } elsif (ref $type) { 1130 } elsif (ref $type) {
849 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
850 1132
851 } else { 1133 } else {
852 shift @arg; 1134 shift @arg;
853 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
854 } 1136 }
855 } 1137 }
856} 1138}
857 1139
858sub _object_attach { 1140sub _object_attach {
868 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
869 } 1151 }
870 1152
871 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
872 } else { 1154 } else {
873 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
874 } 1156 }
875 1157
876 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
877} 1159}
878 1160
937 1219
938 for (@$callbacks) { 1220 for (@$callbacks) {
939 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
940 1222
941 if ($@) { 1223 if ($@) {
942 warn "$@";
943 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
944 override; 1225 override;
945 } 1226 }
946 1227
947 return 1 if $override; 1228 return 1 if $override;
948 } 1229 }
949 1230
950 0 1231 0
951} 1232}
952 1233
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1234=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1235
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1236=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1237
957Generate an object-specific event with the given arguments. 1238Generate an object-specific event with the given arguments.
958 1239
964 1245
965=cut 1246=cut
966 1247
967############################################################################# 1248#############################################################################
968# object support 1249# object support
969#
970 1250
1251sub _object_equal($$);
1252sub _object_equal($$) {
1253 my ($a, $b) = @_;
1254
1255 return 0 unless (ref $a) eq (ref $b);
1256
1257 if ("HASH" eq ref $a) {
1258 my @ka = keys %$a;
1259 my @kb = keys %$b;
1260
1261 return 0 if @ka != @kb;
1262
1263 for (0 .. $#ka) {
1264 return 0 unless $ka[$_] eq $kb[$_];
1265 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1266 }
1267
1268 } elsif ("ARRAY" eq ref $a) {
1269
1270 return 0 if @$a != @$b;
1271
1272 for (0 .. $#$a) {
1273 return 0 unless _object_equal $a->[$_], $b->[$_];
1274 }
1275
1276 } elsif ($a ne $b) {
1277 return 0;
1278 }
1279
1280 1
1281}
1282
1283our $SLOW_MERGES;#d#
971sub _can_merge { 1284sub _can_merge {
972 my ($ob1, $ob2) = @_; 1285 my ($ob1, $ob2) = @_;
973 1286
974 local $Storable::canonical = 1; 1287 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1288
978 $fob1 eq $fob2 1289 # we do the slow way here
1290 return _object_equal $ob1, $ob2
979} 1291}
980 1292
981sub reattach { 1293sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1294 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1295 my ($obj) = @_;
984 1296
1297 # no longer needed after getting rid of delete_package?
985 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
986 1299
987 my $registry = $obj->registry; 1300 my $registry = $obj->registry;
988 1301
989 @$registry = (); 1302 @$registry = ();
990 1303
995 for (@$attach) { 1308 for (@$attach) {
996 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
997 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
998 } 1311 }
999 } else { 1312 } else {
1000 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1001 } 1314 }
1002 } 1315 }
1003} 1316}
1004 1317
1005cf::attachable->attach ( 1318cf::attachable->attach (
1006 prio => -1000000, 1319 prio => -1000000,
1007 on_instantiate => sub { 1320 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1321 my ($obj, $data) = @_;
1009 1322
1010 $data = from_json $data; 1323 $data = decode_json $data;
1011 1324
1012 for (@$data) { 1325 for (@$data) {
1013 my ($name, $args) = @$_; 1326 my ($name, $args) = @$_;
1014 1327
1015 $obj->attach ($name, %{$args || {} }); 1328 $obj->attach ($name, %{$args || {} });
1032 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1033 1346
1034 sync_job { 1347 sync_job {
1035 if (length $$rdata) { 1348 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1039 1353
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1355 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 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 }
1044 close $fh; 1361 aio_close $fh;
1045 1362
1046 if (@$objs) { 1363 if (@$objs) {
1047 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) {
1048 chmod SAVE_MODE, $fh; 1365 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1366 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1367 aio_write $fh, 0, (length $data), $data, 0;
1051 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 }
1052 close $fh; 1372 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1373 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1374 }
1055 } else { 1375 } else {
1056 aio_unlink "$filename.pst"; 1376 aio_unlink "$filename.pst";
1057 } 1377 }
1058 1378
1059 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1380
1381 $filename =~ s%/[^/]+$%%;
1382 aio_pathsync $filename if $cf::USE_FSYNC;
1060 } else { 1383 } else {
1061 warn "FATAL: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1062 } 1385 }
1063 } else { 1386 } else {
1064 aio_unlink $filename; 1387 aio_unlink $filename;
1065 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1066 } 1389 }
1085 1408
1086 unless (aio_stat "$filename.pst") { 1409 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1410 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1411 or return;
1089 1412
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1413 my $st = eval { Coro::Storable::thaw $av };
1414 $av = $st->{objs};
1091 } 1415 }
1092 1416
1093 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1096 1421
1097 ($data, $av) 1422 ($data, $av)
1098} 1423}
1099 1424
1100=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
1104=cut 1429=cut
1105 1430
1106############################################################################# 1431#############################################################################
1107# command handling &c 1432# command handling &c
1108 1433
1109=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1110 1435
1111Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1112$name. 1437$name.
1113 1438
1114=cut 1439=cut
1120 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1121 1446
1122 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1123} 1448}
1124 1449
1125=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1126 1451
1127Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1128extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1129received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1130the 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
1131has logged in successfully. 1456has logged in successfully.
1132 1457
1133If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1134called.
1135 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
1136=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1137 1466
1138Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1139exticmd 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
1140are 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
1141is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1142log-in. 1471log-in.
1143 1472
1144If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1145called.
1146 1474
1147=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1148 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
1149sub register_extcmd { 1482sub register_extcmd($$) {
1150 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1151 1484
1152 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1153} 1486}
1154 1487
1155sub register_exticmd { 1488sub register_async_extcmd($$) {
1156 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1157 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1158 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1159} 1498}
1160 1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1504}
1505
1506use File::Glob ();
1507
1161cf::player->attach ( 1508cf::player->attach (
1162 on_command => sub { 1509 on_unknown_command => sub {
1163 my ($pl, $name, $params) = @_; 1510 my ($pl, $name, $params) = @_;
1164 1511
1165 my $cb = $COMMAND{$name} 1512 my $cb = $COMMAND{$name}
1166 or return; 1513 or return;
1167 1514
1175 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1176 1523
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1525
1179 if (ref $msg) { 1526 if (ref $msg) {
1180 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1181 "ARRAY" eq ref $msg
1182 ? @$msg
1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1184 1528
1185 my @reply;
1186
1187 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}) {
1188 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1189 } 1547 }
1190 1548
1191 $pl->ext_reply ($reply, @reply)
1192 if $reply;
1193
1194 } else { 1549 } else {
1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1196 } 1551 }
1197 1552
1198 cf::override; 1553 cf::override;
1199 }, 1554 },
1200); 1555);
1201 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
1202sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1203 cf::sync_job { 1586 cf::sync_job {
1204 my %todo; 1587 my %todo;
1205 1588
1206 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1207 next unless -r $path; 1590 next unless -r $path;
1225 1608
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1611
1229 $ext{source} = 1612 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1231 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1232 . $source 1615 . $source
1233 . "\n};\n1"; 1616 . "\n};\n1";
1234 1617
1235 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1236 } 1619 }
1237 1620
1621 my $pass = 0;
1238 my %done; 1622 my %done;
1239 while (%todo) { 1623 while (%todo) {
1240 my $progress; 1624 my $progress;
1241 1625
1626 ++$pass;
1627
1628 ext:
1242 while (my ($k, $v) = each %todo) { 1629 while (my ($k, $v) = each %todo) {
1243 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1244 goto skip 1631 next ext
1245 unless exists $done{$_}; 1632 unless exists $done{$_};
1246 } 1633 }
1247 1634
1248 warn "... loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1249 1636
1250 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 $@) {
1251 my $msg = $@ ? "$v->{path}: $@\n" 1649 error "$v->{path}: $@\n";
1252 : "$v->{base}: extension inactive.\n";
1253 1650
1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1254 if (exists $v->{meta}{mandatory}) { 1652 if exists $v->{meta}{mandatory};
1255 warn $msg; 1653
1256 warn "mandatory extension failed to load, exiting.\n"; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1257 exit 1; 1655 delete $todo{$k};
1258 } 1656 } else {
1259 1657 $done{$k} = delete $todo{$k};
1260 warn $msg; 1658 push @EXTS, $v->{pkg};
1659 $progress = 1;
1660
1661 info "$v->{base}: extension inactive.\n"
1662 unless $active;
1261 } 1663 }
1262
1263 $done{$k} = delete $todo{$k};
1264 push @EXTS, $v->{pkg};
1265 $progress = 1;
1266 } 1664 }
1267 1665
1268 skip: 1666 unless ($progress) {
1269 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1667 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1270 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 }
1271 } 1676 }
1272 }; 1677 };
1273} 1678}
1274 1679
1275############################################################################# 1680#############################################################################
1276 1681
1277=back 1682=back
1278 1683
1279=head2 CORE EXTENSIONS 1684=head2 CORE EXTENSIONS
1280 1685
1281Functions and methods that extend core crossfire objects. 1686Functions and methods that extend core deliantra objects.
1282 1687
1283=cut 1688=cut
1284 1689
1285package cf::player; 1690package cf::player;
1286 1691
1329 1734
1330sub exists($) { 1735sub exists($) {
1331 my ($login) = @_; 1736 my ($login) = @_;
1332 1737
1333 $cf::PLAYER{$login} 1738 $cf::PLAYER{$login}
1334 or cf::sync_job { !aio_stat path $login } 1739 or !aio_stat path $login
1335} 1740}
1336 1741
1337sub find($) { 1742sub find($) {
1338 return $cf::PLAYER{$_[0]} || do { 1743 return $cf::PLAYER{$_[0]} || do {
1339 my $login = $_[0]; 1744 my $login = $_[0];
1351 my $f = new_from_file cf::object::thawer path $login 1756 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1757 or return;
1353 1758
1354 my $pl = cf::player::load_pl $f 1759 my $pl = cf::player::load_pl $f
1355 or return; 1760 or return;
1761
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1762 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1763 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1764 $cf::PLAYER{$login} = $pl
1359 } 1765 }
1360 } 1766 }
1361} 1767}
1362 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
1363sub save($) { 1782sub save($) {
1364 my ($pl) = @_; 1783 my ($pl) = @_;
1365 1784
1366 return if $pl->{deny_save}; 1785 return if $pl->{deny_save};
1367 1786
1370 1789
1371 return if $pl->{deny_save}; 1790 return if $pl->{deny_save};
1372 1791
1373 aio_mkdir playerdir $pl, 0770; 1792 aio_mkdir playerdir $pl, 0770;
1374 $pl->{last_save} = $cf::RUNTIME; 1793 $pl->{last_save} = $cf::RUNTIME;
1794
1795 cf::get_slot 0.01;
1796
1797 # save slots, to be restored later
1798 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1375 1799
1376 $pl->save_pl ($path); 1800 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1801 cf::cede_to_tick;
1378} 1802}
1379 1803
1411 my ($pl) = @_; 1835 my ($pl) = @_;
1412 1836
1413 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1414 1838
1415 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1416 $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
1417 1841
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1419 $pl->deactivate; 1843 $pl->deactivate;
1844
1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1421 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1422 1850
1423 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1425 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1463 1891
1464 for my $login (@$dirs) { 1892 for my $login (@$dirs) {
1465 my $path = path $login; 1893 my $path = path $login;
1466 1894
1467 # a .pst is a dead give-away for a valid player 1895 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1896 # if no pst file found, open and chekc for blocked users
1897 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1898 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1899 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1900 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1901 }
1473 1902
1477 1906
1478 \@logins 1907 \@logins
1479} 1908}
1480 1909
1481=item $player->maps 1910=item $player->maps
1911
1912=item cf::player::maps $login
1482 1913
1483Returns an arrayref of map paths that are private for this 1914Returns an arrayref of map paths that are private for this
1484player. May block. 1915player. May block.
1485 1916
1486=cut 1917=cut
1504 } 1935 }
1505 1936
1506 \@paths 1937 \@paths
1507} 1938}
1508 1939
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1510 1941
1511Expand crossfire pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559
1560=item $player->ext_reply ($msgid, @msg)
1561
1562Sends an ext reply to the player.
1563
1564=cut
1565
1566sub ext_reply($$@) {
1567 my ($self, $id, @msg) = @_;
1568
1569 $self->ns->ext_reply ($id, @msg)
1570}
1571 1943
1572=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1573 1945
1574Sends an ext event to the client. 1946Sends an ext event to the client.
1575 1947
1595 1967
1596=cut 1968=cut
1597 1969
1598sub find_by_path($) { 1970sub find_by_path($) {
1599 my ($path) = @_; 1971 my ($path) = @_;
1972
1973 $path =~ s/^~[^\/]*//; # skip ~login
1600 1974
1601 my ($match, $specificity); 1975 my ($match, $specificity);
1602 1976
1603 for my $region (list) { 1977 for my $region (list) {
1604 if ($region->{match} && $path =~ $region->{match}) { 1978 if ($region->{match} && $path =~ $region->{match}) {
1630our $MAX_RESET = 3600; 2004our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 2005our $DEFAULT_RESET = 3000;
1632 2006
1633sub generate_random_map { 2007sub generate_random_map {
1634 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1635 # mit "rum" bekleckern, nicht 2009
2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
2011
1636 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1640 $rmp->{exit_on_final_map},
1641 $rmp->{xsize}, $rmp->{ysize},
1642 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1643 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1644 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1645 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1646 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1647 (cf::region::find $rmp->{region}), $rmp->{custom}
1648 )
1649} 2013}
1650 2014
1651=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1652 2016
1653Register 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
1658 2022
1659sub register { 2023sub register {
1660 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1661 my $pkg = caller; 2025 my $pkg = caller;
1662 2026
1663 no strict;
1664 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1665 2028
1666 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1667} 2030}
1668 2031
1669# also paths starting with '/' 2032# also paths starting with '/'
1670$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1671 2034
1672sub thawer_merge { 2035sub thawer_merge {
1673 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1674 2037
1675 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
1680} 2043}
1681 2044
1682sub normalise { 2045sub normalise {
1683 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1684 2047
1685 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1686 2049
1687 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1688 2051
1689 # map plan: 2052 # map plan:
1690 # 2053 #
1705 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1706 $path = "$base/$path"; 2069 $path = "$base/$path";
1707 } 2070 }
1708 2071
1709 for ($path) { 2072 for ($path) {
1710 redo if s{//}{/};
1711 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1712 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1713 } 2075 }
1714 2076
1715 $path 2077 $path
1729 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1730 return $self; 2092 return $self;
1731 } 2093 }
1732 } 2094 }
1733 2095
1734 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1735 () 2097 ()
1736} 2098}
1737 2099
2100# may re-bless or do other evil things
1738sub init { 2101sub init {
1739 my ($self) = @_; 2102 my ($self) = @_;
1740 2103
1741 $self 2104 $self
1742} 2105}
1761 2124
1762# the temporary/swap location 2125# the temporary/swap location
1763sub save_path { 2126sub save_path {
1764 my ($self) = @_; 2127 my ($self) = @_;
1765 2128
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2129 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 2130 "$TMPDIR/$path.map"
1768} 2131}
1769 2132
1770# the unique path, undef == no special unique path 2133# the unique path, undef == no special unique path
1771sub uniq_path { 2134sub uniq_path {
1772 my ($self) = @_; 2135 my ($self) = @_;
1773 2136
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2137 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 2138 "$UNIQUEDIR/$path"
1776}
1777
1778# and all this just because we cannot iterate over
1779# all maps in C++...
1780sub change_all_map_light {
1781 my ($change) = @_;
1782
1783 $_->change_map_light ($change)
1784 for grep $_->outdoor, values %cf::MAP;
1785} 2139}
1786 2140
1787sub decay_objects { 2141sub decay_objects {
1788 my ($self) = @_; 2142 my ($self) = @_;
1789 2143
1816 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1817 2171
1818 1 2172 1
1819} 2173}
1820 2174
2175# used to laod the header of an original map
1821sub load_header_orig { 2176sub load_header_orig {
1822 my ($self) = @_; 2177 my ($self) = @_;
1823 2178
1824 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1825} 2180}
1826 2181
2182# used to laod the header of an instantiated map
1827sub load_header_temp { 2183sub load_header_temp {
1828 my ($self) = @_; 2184 my ($self) = @_;
1829 2185
1830 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1831} 2187}
1832 2188
2189# called after loading the header from an instantiated map
1833sub prepare_temp { 2190sub prepare_temp {
1834 my ($self) = @_; 2191 my ($self) = @_;
1835 2192
1836 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
1837 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
1838 # safety 2195 # safety
1839 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
1840 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
1841} 2198}
1842 2199
2200# called after loading the header from an original map
1843sub prepare_orig { 2201sub prepare_orig {
1844 my ($self) = @_; 2202 my ($self) = @_;
1845 2203
1846 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
1847 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
1871 2229
1872sub find; 2230sub find;
1873sub find { 2231sub find {
1874 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
1875 2233
2234 cf::cede_to_tick;
2235
1876 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
1877 2237
1878 cf::lock_wait "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
1880 2240
1881 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1885 my $map = new_from_path cf::map $path 2242 my $map = new_from_path cf::map $path
1886 or return; 2243 or return;
1887 2244
1888 $map->{last_save} = $cf::RUNTIME; 2245 $map->{last_save} = $cf::RUNTIME;
1889 2246
1891 or return; 2248 or return;
1892 2249
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2250 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 2251 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 2252 #$cf::WAIT_FOR_TICK->wait;
2253 undef $guard2;
1896 undef $guard1; 2254 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 2255 $map->reset;
1899 return find $path; 2256 return find $path;
1900 } 2257 }
1901 2258
1902 $cf::MAP{$path} = $map 2259 $cf::MAP{$path} = $map
1903 } 2260 }
1904} 2261}
1905 2262
1906sub pre_load { } 2263sub pre_load { }
1907sub post_load { } 2264#sub post_load { } # XS
1908 2265
1909sub load { 2266sub load {
1910 my ($self) = @_; 2267 my ($self) = @_;
1911 2268
1912 local $self->{deny_reset} = 1; # loading can take a long time 2269 local $self->{deny_reset} = 1; # loading can take a long time
1915 2272
1916 { 2273 {
1917 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
1918 2275
1919 return unless $self->valid; 2276 return unless $self->valid;
1920 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
1921
1922 $self->in_memory (cf::MAP_LOADING);
1923 2278
1924 $self->alloc; 2279 $self->alloc;
1925 2280
1926 $self->pre_load; 2281 $self->pre_load;
1927 cf::cede_to_tick; 2282 cf::cede_to_tick;
1928 2283
2284 if (exists $self->{load_path}) {
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2286 $f->skip_block;
1931 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
1932 or return; 2288 or return;
1933 2289
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2290 $self->post_load_original
1935 if delete $self->{load_original}; 2291 if delete $self->{load_original};
1936 2292
1937 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2294 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
1941 $self->clear_unique_items; 2297 $self->clear_unique_items;
1942 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
1944 } 2301 }
1945 } 2302 }
1946 }
1947 2303
1948 $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);
1949 2311
1950 cf::cede_to_tick; 2312 cf::cede_to_tick;
1951 # now do the right thing for maps 2313 # now do the right thing for maps
1952 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
1953 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
1957 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
1958 $self->decay_objects; 2320 $self->decay_objects;
1959 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
1960 $self->update_buttons; 2322 $self->update_buttons;
1961 cf::cede_to_tick; 2323 cf::cede_to_tick;
1962 $self->set_darkness_map; 2324 #$self->activate; # no longer activate maps automatically
1963 cf::cede_to_tick;
1964 $self->activate;
1965 } 2325 }
1966 2326
1967 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
1969
1970 $self->in_memory (cf::MAP_IN_MEMORY);
1971 } 2329 }
1972 2330
1973 $self->post_load; 2331 $self->post_load;
1974}
1975 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
1976sub customise_for { 2339sub customise_for {
1977 my ($self, $ob) = @_; 2340 my ($self, $ob) = @_;
1978 2341
1979 return find "~" . $ob->name . "/" . $self->{path} 2342 return find "~" . $ob->name . "/" . $self->{path}
1980 if $self->per_player; 2343 if $self->per_player;
1983# if $self->per_party; 2346# if $self->per_party;
1984 2347
1985 $self 2348 $self
1986} 2349}
1987 2350
1988# find and load all maps in the 3x3 area around a map
1989sub load_neighbours {
1990 my ($map) = @_;
1991
1992 my @neigh; # diagonal neighbours
1993
1994 for (0 .. 3) {
1995 my $neigh = $map->tile_path ($_)
1996 or next;
1997 $neigh = find $neigh, $map
1998 or next;
1999 $neigh->load;
2000
2001 push @neigh,
2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2004 }
2005
2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
2008 my $neigh = find $path, $origin
2009 or next;
2010 $neigh->load;
2011 }
2012}
2013
2014sub find_sync { 2351sub find_sync {
2015 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2016 2353
2017 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
2018} 2359}
2019 2360
2020sub do_load_sync { 2361sub do_load_sync {
2021 my ($map) = @_; 2362 my ($map) = @_;
2022 2363
2364 # it's a bug to call this from the main context
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2025 2367
2026 cf::sync_job { $map->load }; 2368 $map->load;
2027} 2369}
2028 2370
2029our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2030our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2031 2373
2032sub find_async { 2374sub find_async {
2033 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2034 2376
2035 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2036 2378
2037 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2380 return $map if !$load || $map->linkable;
2039 } 2381 }
2040 2382
2041 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2042 2384
2043 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2057 $MAP_PREFETCHER->prio (6); 2399 $MAP_PREFETCHER->prio (6);
2058 2400
2059 () 2401 ()
2060} 2402}
2061 2403
2404# common code, used by both ->save and ->swapout
2062sub save { 2405sub _save {
2063 my ($self) = @_; 2406 my ($self) = @_;
2064
2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
2066 2407
2067 $self->{last_save} = $cf::RUNTIME; 2408 $self->{last_save} = $cf::RUNTIME;
2068 2409
2069 return unless $self->dirty; 2410 return unless $self->dirty;
2070 2411
2079 2420
2080 cf::async { 2421 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2422 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2423 $_->contr->save for $self->players;
2083 }; 2424 };
2425
2426 cf::get_slot 0.02;
2084 2427
2085 if ($uniq) { 2428 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2429 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2430 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2431 } else {
2089 $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);
2090 } 2433 }
2091} 2434}
2092 2435
2436sub save {
2437 my ($self) = @_;
2438
2439 my $lock = cf::lock_acquire "map_data:$self->{path}";
2440
2441 $self->_save;
2442}
2443
2093sub swap_out { 2444sub swap_out {
2094 my ($self) = @_; 2445 my ($self) = @_;
2095 2446
2096 # save first because save cedes
2097 $self->save;
2098
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2448
2449 return if !$self->linkable;
2450 return if $self->{deny_save};
2101 return if $self->players; 2451 return if $self->players;
2102 return if $self->in_memory != cf::MAP_IN_MEMORY; 2452
2453 # first deactivate the map and "unlink" it from the core
2454 $self->deactivate;
2455 $_->clear_links_to ($self) for values %cf::MAP;
2456 $self->state (cf::MAP_SWAPPED);
2457
2458 # then atomically save
2459 $self->_save;
2460
2461 # then free the map
2462 $self->clear;
2463}
2464
2465sub reset_at {
2466 my ($self) = @_;
2467
2468 # TODO: safety, remove and allow resettable per-player maps
2103 return if $self->{deny_save}; 2469 return 1e99 if $self->{deny_reset};
2104 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
2105 $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};
2106 2503
2107 $self->deactivate; 2504 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP; 2505 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2506 $self->clear;
2110}
2111
2112sub reset_at {
2113 my ($self) = @_;
2114
2115 # TODO: safety, remove and allow resettable per-player maps
2116 return 1e99 if $self->{deny_reset};
2117
2118 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2119 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2120
2121 $time + $to
2122}
2123
2124sub should_reset {
2125 my ($self) = @_;
2126
2127 $self->reset_at <= $cf::RUNTIME
2128}
2129
2130sub reset {
2131 my ($self) = @_;
2132
2133 my $lock = cf::lock_acquire "map_data:$self->{path}";
2134
2135 return if $self->players;
2136
2137 warn "resetting map ", $self->path;
2138
2139 $self->in_memory (cf::MAP_SWAPPED);
2140
2141 # need to save uniques path
2142 unless ($self->{deny_save}) {
2143 my $uniq = $self->uniq_path; utf8::encode $uniq;
2144
2145 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2146 if $uniq;
2147 }
2148
2149 delete $cf::MAP{$self->path};
2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2153 $self->clear;
2154 2507
2155 $self->unlink_save; 2508 $self->unlink_save;
2156 $self->destroy; 2509 $self->destroy;
2157} 2510}
2158 2511
2166 2519
2167 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2168 2521
2169 $self->unlink_save; 2522 $self->unlink_save;
2170 2523
2171 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2172 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2173 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2174 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2176 2529
2225 2578
2226sub unique_maps() { 2579sub unique_maps() {
2227 [ 2580 [
2228 map { 2581 map {
2229 utf8::decode $_; 2582 utf8::decode $_;
2230 /\.map$/ 2583 s/\.map$//; # TODO future compatibility hack
2584 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2585 ? ()
2231 ? normalise $_ 2586 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2587 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2588 ]
2235} 2589}
2236 2590
2237package cf; 2591=item cf::map::static_maps
2592
2593Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2594file in the shared directory excluding F</styles> and F</editor>). May
2595block.
2596
2597=cut
2598
2599sub static_maps() {
2600 my @dirs = "";
2601 my @maps;
2602
2603 while (@dirs) {
2604 my $dir = shift @dirs;
2605
2606 next if $dir eq "/styles" || $dir eq "/editor";
2607
2608 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2609 or return;
2610
2611 for (@$files) {
2612 s/\.map$// or next;
2613 utf8::decode $_;
2614 push @maps, "$dir/$_";
2615 }
2616
2617 push @dirs, map "$dir/$_", @$dirs;
2618 }
2619
2620 \@maps
2621}
2238 2622
2239=back 2623=back
2240 2624
2241=head3 cf::object 2625=head3 cf::object
2242 2626
2246 2630
2247=over 4 2631=over 4
2248 2632
2249=item $ob->inv_recursive 2633=item $ob->inv_recursive
2250 2634
2251Returns the inventory of the object _and_ their inventories, recursively. 2635Returns the inventory of the object I<and> their inventories, recursively,
2636but I<not> the object itself.
2252 2637
2253=cut 2638=cut
2254 2639
2255sub inv_recursive_; 2640sub inv_recursive_;
2256sub inv_recursive_ { 2641sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2646 inv_recursive_ inv $_[0]
2262} 2647}
2263 2648
2264=item $ref = $ob->ref 2649=item $ref = $ob->ref
2265 2650
2266creates and returns a persistent reference to an objetc that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2267 2652
2268=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2269 2654
2270returns 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,
2271even if the object actually exists. May block. 2656even if the object actually exists. May block.
2272 2657
2273=cut 2658=cut
2274 2659
2275sub deref { 2660sub deref {
2276 my ($ref) = @_; 2661 my ($ref) = @_;
2277 2662
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2663 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2664 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2665 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2666 or return;
2285 $pl->ob->uuid eq $uuid 2667 $pl->ob->uuid eq $uuid
2286 or return; 2668 or return;
2306can be C<undef>. Does the right thing when the player is currently in a 2688can be C<undef>. Does the right thing when the player is currently in a
2307dialogue with the given NPC character. 2689dialogue with the given NPC character.
2308 2690
2309=cut 2691=cut
2310 2692
2693our $SAY_CHANNEL = {
2694 id => "say",
2695 title => "Map",
2696 reply => "say ",
2697 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2698};
2699
2700our $CHAT_CHANNEL = {
2701 id => "chat",
2702 title => "Chat",
2703 reply => "chat ",
2704 tooltip => "Player chat and shouts, global to the server.",
2705};
2706
2311# rough implementation of a future "reply" method that works 2707# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2708# with dialog boxes.
2313#TODO: the first argument must go, split into a $npc->reply_to ( method 2709#TODO: the first argument must go, split into a $npc->reply_to ( method
2314sub cf::object::player::reply($$$;$) { 2710sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2711 my ($self, $npc, $msg, $flags) = @_;
2326 my $dialog = $pl->{npc_dialog}; 2722 my $dialog = $pl->{npc_dialog};
2327 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2723 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2328 2724
2329 } else { 2725 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2726 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2727 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2728 }
2333 } 2729 }
2334} 2730}
2335 2731
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2732=item $object->send_msg ($channel, $msg, $color, [extra...])
2346=item $player_object->may ("access") 2742=item $player_object->may ("access")
2347 2743
2348Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2349(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2350 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2351=cut 2772=cut
2352 2773
2353sub cf::object::player::may { 2774sub cf::object::player::may {
2354 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2355 2776
2356 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2357 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2358 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2359 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2360} 2781}
2361 2782
2362=item $player_object->enter_link 2783=item $player_object->enter_link
2363 2784
2364Freezes the player and moves him/her to a special map (C<{link}>). 2785Freezes the player and moves him/her to a special map (C<{link}>).
2365 2786
2366The player should be reasonably safe there for short amounts of time. You 2787The player should be reasonably safe there for short amounts of time (e.g.
2367I<MUST> call C<leave_link> as soon as possible, though. 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2789though, as the player cannot control the character while it is on the link
2790map.
2368 2791
2369Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2370 2799
2371=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2372 2801
2373Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2374map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
2392sub cf::object::player::enter_link { 2821sub cf::object::player::enter_link {
2393 my ($self) = @_; 2822 my ($self) = @_;
2394 2823
2395 $self->deactivate_recursive; 2824 $self->deactivate_recursive;
2396 2825
2826 ++$self->{_link_recursion};
2827
2397 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2828 return if UNIVERSAL::isa $self->map, "ext::map_link";
2398 2829
2399 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2830 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2400 if $self->map && $self->map->{path} ne "{link}"; 2831 if $self->map && $self->map->{path} ne "{link}";
2401 2832
2402 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2833 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2403} 2834}
2404 2835
2405sub cf::object::player::leave_link { 2836sub cf::object::player::leave_link {
2406 my ($self, $map, $x, $y) = @_; 2837 my ($self, $map, $x, $y) = @_;
2407 2838
2424 ($x, $y) = (-1, -1) 2855 ($x, $y) = (-1, -1)
2425 unless (defined $x) && (defined $y); 2856 unless (defined $x) && (defined $y);
2426 2857
2427 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2428 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2429 if $x <=0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2430 2861
2431 $map->load; 2862 $map->load;
2432 $map->load_neighbours;
2433 2863
2434 return unless $self->contr->active; 2864 return unless $self->contr->active;
2435 $self->activate_recursive;
2436 2865
2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2438 $self->enter_map ($map, $x, $y); 2867 if ($self->enter_map ($map, $x, $y)) {
2439} 2868 # entering was successful
2869 delete $self->{_link_recursion};
2870 # only activate afterwards, to support waiting in hooks
2871 $self->activate_recursive;
2872 }
2440 2873
2874}
2875
2441=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2876=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2442 2877
2443Moves the player to the given map-path and coordinates by first freezing 2878Moves the player to the given map-path and coordinates by first freezing
2444her, loading and preparing them map, calling the provided $check callback 2879her, loading and preparing them map, calling the provided $check callback
2445that has to return the map if sucecssful, and then unfreezes the player on 2880that has to return the map if sucecssful, and then unfreezes the player on
2446the new (success) or old (failed) map position. In either case, $done will 2881the new (success) or old (failed) map position. In either case, $done will
2447be called at the end of this process. 2882be called at the end of this process.
2448 2883
2884Note that $check will be called with a potentially non-loaded map, so if
2885it needs a loaded map it has to call C<< ->load >>.
2886
2449=cut 2887=cut
2450 2888
2451our $GOTOGEN; 2889our $GOTOGEN;
2452 2890
2453sub cf::object::player::goto { 2891sub cf::object::player::goto {
2454 my ($self, $path, $x, $y, $check, $done) = @_; 2892 my ($self, $path, $x, $y, $check, $done) = @_;
2893
2894 if ($self->{_link_recursion} >= $MAX_LINKS) {
2895 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2896 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2897 ($path, $x, $y) = @$EMERGENCY_POSITION;
2898 }
2455 2899
2456 # do generation counting so two concurrent goto's will be executed in-order 2900 # do generation counting so two concurrent goto's will be executed in-order
2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2901 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2458 2902
2459 $self->enter_link; 2903 $self->enter_link;
2479 ($path, $x, $y) = (undef, undef, undef); 2923 ($path, $x, $y) = (undef, undef, undef);
2480 } 2924 }
2481 } 2925 }
2482 2926
2483 my $map = eval { 2927 my $map = eval {
2484 my $map = defined $path ? cf::map::find $path : undef; 2928 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2485 2929
2486 if ($map) { 2930 if ($map) {
2487 $map = $map->customise_for ($self); 2931 $map = $map->customise_for ($self);
2488 $map = $check->($map) if $check && $map; 2932 $map = $check->($map, $x, $y, $self) if $check && $map;
2489 } else { 2933 } else {
2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2934 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2491 } 2935 }
2492 2936
2493 $map 2937 $map
2501 if ($gen == $self->{_goto_generation}) { 2945 if ($gen == $self->{_goto_generation}) {
2502 delete $self->{_goto_generation}; 2946 delete $self->{_goto_generation};
2503 $self->leave_link ($map, $x, $y); 2947 $self->leave_link ($map, $x, $y);
2504 } 2948 }
2505 2949
2506 $done->() if $done; 2950 $done->($self) if $done;
2507 })->prio (1); 2951 })->prio (1);
2508} 2952}
2509 2953
2510=item $player_object->enter_exit ($exit_object) 2954=item $player_object->enter_exit ($exit_object)
2511 2955
2531} 2975}
2532 2976
2533sub prepare_random_map { 2977sub prepare_random_map {
2534 my ($exit) = @_; 2978 my ($exit) = @_;
2535 2979
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2980 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2981 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2982 # that depends on the exit object
2541 2983
2542 my $rmp = parse_random_map_params $exit->msg; 2984 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2986 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2987 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2988 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2989 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2990 $rmp->{origin_y} = $exit->y;
2991
2992 $exit->map->touch;
2549 } 2993 }
2550 2994
2551 $rmp->{random_seed} ||= $exit->random_seed; 2995 $rmp->{random_seed} ||= $exit->random_seed;
2552 2996
2553 my $data = cf::to_json $rmp; 2997 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2998 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2999 my $meta = "$RANDOMDIR/$md5.meta";
2556 3000
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 3001 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 3002 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 3003 undef $fh;
2560 aio_rename "$meta~", $meta; 3004 aio_rename "$meta~", $meta;
2561 3005
3006 my $slaying = "?random/$md5";
3007
3008 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 3009 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 3010 $exit->msg (undef);
3011 }
2564 } 3012 }
2565} 3013}
2566 3014
2567sub cf::object::player::enter_exit { 3015sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 3016 my ($self, $exit) = @_;
2569 3017
2570 return unless $self->type == cf::PLAYER; 3018 return unless $self->type == cf::PLAYER;
2571 3019
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 3020 $self->enter_link;
2584 3021
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 3022 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 3023 $Coro::current->{desc} = "enter_exit";
2591 3024
2592 $self->deactivate_recursive; # just to be sure
2593 unless (eval { 3025 unless (eval {
3026 $self->deactivate_recursive; # just to be sure
3027
3028 my $map = cf::map::normalise $exit->slaying, $exit->map;
3029 my $x = $exit->stats->hp;
3030 my $y = $exit->stats->sp;
3031
3032 # special map handling
3033 my $slaying = $exit->slaying;
3034
3035 # special map handling
3036 if ($slaying eq "/!") {
3037 my $guard = cf::lock_acquire "exit_prepare:$exit";
3038
3039 prepare_random_map $exit
3040 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3041
3042 $map = $exit->slaying;
3043
3044 } elsif ($slaying eq '!up') {
3045 $map = $exit->map->tile_path (cf::TILE_UP);
3046 $x = $exit->x;
3047 $y = $exit->y;
3048
3049 } elsif ($slaying eq '!down') {
3050 $map = $exit->map->tile_path (cf::TILE_DOWN);
3051 $x = $exit->x;
3052 $y = $exit->y;
3053 }
3054
2594 $self->goto ($slaying, $hp, $sp); 3055 $self->goto ($map, $x, $y);
2595 3056
3057 # if exit is damned, update players death & WoR home-position
3058 $self->contr->savebed ($map, $x, $y)
3059 if $exit->flag (cf::FLAG_DAMNED);
3060
2596 1; 3061 1
2597 }) { 3062 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 3063 $self->message ("Something went wrong deep within the deliantra server. "
2599 . "I'll try to bring you back to the map you were before. " 3064 . "I'll try to bring you back to the map you were before. "
2600 . "Please report this to the dungeon master!", 3065 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 3066 cf::NDI_UNIQUE | cf::NDI_RED);
2602 3067
2603 warn "ERROR in enter_exit: $@"; 3068 error "ERROR in enter_exit: $@";
2604 $self->leave_link; 3069 $self->leave_link;
2605 } 3070 }
2606 })->prio (1); 3071 })->prio (1);
2607} 3072}
2608 3073
2609=head3 cf::client 3074=head3 cf::client
2610 3075
2611=over 4 3076=over 4
2612 3077
2613=item $client->send_drawinfo ($text, $flags) 3078=item $client->send_big_packet ($pkt)
2614 3079
2615Sends a drawinfo packet to the client. Circumvents output buffering so 3080Like C<send_packet>, but tries to compress large packets, and fragments
2616should not be used under normal circumstances. 3081them as required.
2617 3082
2618=cut 3083=cut
2619 3084
3085our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3086
2620sub cf::client::send_drawinfo { 3087sub cf::client::send_big_packet {
2621 my ($self, $text, $flags) = @_; 3088 my ($self, $pkt) = @_;
2622 3089
2623 utf8::encode $text; 3090 # try lzf for large packets
2624 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3091 $pkt = "lzf " . Compress::LZF::compress $pkt
3092 if 1024 <= length $pkt and $self->{can_lzf};
3093
3094 # split very large packets
3095 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3096 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3097 $pkt = "frag";
3098 }
3099
3100 $self->send_packet ($pkt);
2625} 3101}
2626 3102
2627=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
2628 3104
2629Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
2630client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
2631the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
2632the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
2633 3109
2634=cut 3110=cut
2635 3111
3112# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 3113our %CHANNEL = (
3114 "c/motd" => {
3115 id => "infobox",
3116 title => "MOTD",
3117 reply => undef,
3118 tooltip => "The message of the day",
3119 },
2637 "c/identify" => { 3120 "c/identify" => {
2638 id => "infobox", 3121 id => "infobox",
2639 title => "Identify", 3122 title => "Identify",
2640 reply => undef, 3123 reply => undef,
2641 tooltip => "Items recently identified", 3124 tooltip => "Items recently identified",
2644 id => "infobox", 3127 id => "infobox",
2645 title => "Examine", 3128 title => "Examine",
2646 reply => undef, 3129 reply => undef,
2647 tooltip => "Signs and other items you examined", 3130 tooltip => "Signs and other items you examined",
2648 }, 3131 },
3132 "c/shopinfo" => {
3133 id => "infobox",
3134 title => "Shop Info",
3135 reply => undef,
3136 tooltip => "What your bargaining skill tells you about the shop",
3137 },
3138 "c/book" => {
3139 id => "infobox",
3140 title => "Book",
3141 reply => undef,
3142 tooltip => "The contents of a note or book",
3143 },
2649 "c/lookat" => { 3144 "c/lookat" => {
2650 id => "infobox", 3145 id => "infobox",
2651 title => "Look", 3146 title => "Look",
2652 reply => undef, 3147 reply => undef,
2653 tooltip => "What you saw there", 3148 tooltip => "What you saw there",
2654 }, 3149 },
3150 "c/who" => {
3151 id => "infobox",
3152 title => "Players",
3153 reply => undef,
3154 tooltip => "Shows players who are currently online",
3155 },
3156 "c/body" => {
3157 id => "infobox",
3158 title => "Body Parts",
3159 reply => undef,
3160 tooltip => "Shows which body parts you posess and are available",
3161 },
3162 "c/statistics" => {
3163 id => "infobox",
3164 title => "Statistics",
3165 reply => undef,
3166 tooltip => "Shows your primary statistics",
3167 },
3168 "c/skills" => {
3169 id => "infobox",
3170 title => "Skills",
3171 reply => undef,
3172 tooltip => "Shows your experience per skill and item power",
3173 },
3174 "c/shopitems" => {
3175 id => "infobox",
3176 title => "Shop Items",
3177 reply => undef,
3178 tooltip => "Shows the items currently for sale in this shop",
3179 },
3180 "c/resistances" => {
3181 id => "infobox",
3182 title => "Resistances",
3183 reply => undef,
3184 tooltip => "Shows your resistances",
3185 },
3186 "c/pets" => {
3187 id => "infobox",
3188 title => "Pets",
3189 reply => undef,
3190 tooltip => "Shows information abotu your pets/a specific pet",
3191 },
3192 "c/perceiveself" => {
3193 id => "infobox",
3194 title => "Perceive Self",
3195 reply => undef,
3196 tooltip => "You gained detailed knowledge about yourself",
3197 },
3198 "c/uptime" => {
3199 id => "infobox",
3200 title => "Uptime",
3201 reply => undef,
3202 tooltip => "How long the server has been running since last restart",
3203 },
3204 "c/mapinfo" => {
3205 id => "infobox",
3206 title => "Map Info",
3207 reply => undef,
3208 tooltip => "Information related to the maps",
3209 },
3210 "c/party" => {
3211 id => "party",
3212 title => "Party",
3213 reply => "gsay ",
3214 tooltip => "Messages and chat related to your party",
3215 },
3216 "c/death" => {
3217 id => "death",
3218 title => "Death",
3219 reply => undef,
3220 tooltip => "Reason for and more info about your most recent death",
3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3228 "c/say" => $SAY_CHANNEL,
3229 "c/chat" => $CHAT_CHANNEL,
2655); 3230);
2656 3231
2657sub cf::client::send_msg { 3232sub cf::client::send_msg {
2658 my ($self, $channel, $msg, $color, @extra) = @_; 3233 my ($self, $channel, $msg, $color, @extra) = @_;
2659 3234
2660 $msg = $self->pl->expand_cfpod ($msg); 3235 $msg = $self->pl->expand_cfpod ($msg)
3236 unless $color & cf::NDI_VERBATIM;
2661 3237
2662 $color &= cf::NDI_CLIENT_MASK; # just in case... 3238 $color &= cf::NDI_CLIENT_MASK; # just in case...
2663 3239
2664 # check predefined channels, for the benefit of C 3240 # check predefined channels, for the benefit of C
2665 if ($CHANNEL{$channel}) { 3241 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel}; 3242 $channel = $CHANNEL{$channel};
2667 3243
2668 $self->ext_msg (channel_info => $channel) 3244 $self->ext_msg (channel_info => $channel);
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id}; 3245 $channel = $channel->{id};
2672 3246
2673 } elsif (ref $channel) { 3247 } elsif (ref $channel) {
2674 # send meta info to client, if not yet sent 3248 # send meta info to client, if not yet sent
2675 unless (exists $self->{channel}{$channel->{id}}) { 3249 unless (exists $self->{channel}{$channel->{id}}) {
2676 $self->{channel}{$channel->{id}} = $channel; 3250 $self->{channel}{$channel->{id}} = $channel;
2677 $self->ext_msg (channel_info => $channel) 3251 $self->ext_msg (channel_info => $channel);
2678 if $self->can_msg;
2679 } 3252 }
2680 3253
2681 $channel = $channel->{id}; 3254 $channel = $channel->{id};
2682 } 3255 }
2683 3256
2684 return unless @extra || length $msg; 3257 return unless @extra || length $msg;
2685 3258
2686 if ($self->can_msg) {
2687 # default colour, mask it out 3259 # default colour, mask it out
2688 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3260 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2689 if $color & cf::NDI_DEF; 3261 if $color & cf::NDI_DEF;
2690 3262
2691 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3263 my $pkt = "msg "
3264 . $self->{json_coder}->encode (
2692 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3265 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2693 } else { 3266 );
2694 if ($color >= 0) {
2695 # replace some tags by gcfclient-compatible ones
2696 for ($msg) {
2697 1 while
2698 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2699 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2700 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2701 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2702 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2703 }
2704 3267
2705 $color &= cf::NDI_COLOR_MASK; 3268 $self->send_big_packet ($pkt);
2706
2707 utf8::encode $msg;
2708
2709 if (0 && $msg =~ /\[/) {
2710 # COMMAND/INFO
2711 $self->send_packet ("drawextinfo $color 10 8 $msg")
2712 } else {
2713 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2714 $self->send_packet ("drawinfo $color $msg")
2715 }
2716 }
2717 }
2718} 3269}
2719 3270
2720=item $client->ext_msg ($type, @msg) 3271=item $client->ext_msg ($type, @msg)
2721 3272
2722Sends an ext event to the client. 3273Sends an ext event to the client.
2724=cut 3275=cut
2725 3276
2726sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
2727 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
2728 3279
2729 if ($self->extcmd == 2) {
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2731 } elsif ($self->extcmd == 1) { # TODO: remove
2732 push @msg, msgtype => "event_$type";
2733 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2734 }
2735}
2736
2737=item $client->ext_reply ($msgid, @msg)
2738
2739Sends an ext reply to the client.
2740
2741=cut
2742
2743sub cf::client::ext_reply($$@) {
2744 my ($self, $id, @msg) = @_;
2745
2746 if ($self->extcmd == 2) {
2747 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2748 } elsif ($self->extcmd == 1) {
2749 #TODO: version 1, remove
2750 unshift @msg, msgtype => "reply", msgid => $id;
2751 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2752 }
2753} 3281}
2754 3282
2755=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
2756 3284
2757Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
2777 3305
2778 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
2779 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
2780 3308
2781 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
2782} 3349}
2783 3350
2784cf::client->attach ( 3351cf::client->attach (
2785 on_connect => sub { 3352 on_connect => sub {
2786 my ($ns) = @_; 3353 my ($ns) = @_;
2812 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
2813 3380
2814 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2815 3382
2816 if (ref $msg) { 3383 if (ref $msg) {
2817 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2818 "ARRAY" eq ref $msg
2819 ? @$msg
2820 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2821 3385
2822 my @reply;
2823
2824 if (my $cb = $EXTICMD{$type}) { 3386 if (my $cb = $EXTIACMD{$type}) {
3387 $cb->(
3388 $ns,
3389 sub {
3390 $ns->ext_msg ("reply-$reply", @_)
3391 if $reply;
3392 },
3393 @payload
3394 );
3395 } else {
3396 my @reply;
3397
3398 if (my $cb = $EXTICMD{$type}) {
2825 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
2826 } 3404 }
2827
2828 $ns->ext_reply ($reply, @reply)
2829 if $reply;
2830
2831 } else { 3405 } else {
2832 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3406 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2833 } 3407 }
2834 3408
2835 cf::override; 3409 cf::override;
2836 }, 3410 },
2837); 3411);
2857 3431
2858 $coro 3432 $coro
2859} 3433}
2860 3434
2861cf::client->attach ( 3435cf::client->attach (
2862 on_destroy => sub { 3436 on_client_destroy => sub {
2863 my ($ns) = @_; 3437 my ($ns) = @_;
2864 3438
2865 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3439 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2866 }, 3440 },
2867); 3441);
2883our $safe_hole = new Safe::Hole; 3457our $safe_hole = new Safe::Hole;
2884 3458
2885$SIG{FPE} = 'IGNORE'; 3459$SIG{FPE} = 'IGNORE';
2886 3460
2887$safe->permit_only (Opcode::opset qw( 3461$safe->permit_only (Opcode::opset qw(
2888 :base_core :base_mem :base_orig :base_math 3462 :base_core :base_mem :base_orig :base_math :base_loop
2889 grepstart grepwhile mapstart mapwhile 3463 grepstart grepwhile mapstart mapwhile
2890 sort time 3464 sort time
2891)); 3465));
2892 3466
2893# here we export the classes and methods available to script code 3467# here we export the classes and methods available to script code
2895=pod 3469=pod
2896 3470
2897The following functions and methods are available within a safe environment: 3471The following functions and methods are available within a safe environment:
2898 3472
2899 cf::object 3473 cf::object
2900 contr pay_amount pay_player map x y force_find force_add 3474 contr pay_amount pay_player map x y force_find force_add destroy
2901 insert remove name archname title slaying race decrease_ob_nr 3475 insert remove name archname title slaying race decrease split
3476 value
2902 3477
2903 cf::object::player 3478 cf::object::player
2904 player 3479 player
2905 3480
2906 cf::player 3481 cf::player
2911 3486
2912=cut 3487=cut
2913 3488
2914for ( 3489for (
2915 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3490 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2916 insert remove inv name archname title slaying race 3491 insert remove inv nrof name archname title slaying race
2917 decrease_ob_nr)], 3492 decrease split destroy change_exp value msg lore send_msg)],
2918 ["cf::object::player" => qw(player)], 3493 ["cf::object::player" => qw(player)],
2919 ["cf::player" => qw(peaceful)], 3494 ["cf::player" => qw(peaceful send_msg)],
2920 ["cf::map" => qw(trigger)], 3495 ["cf::map" => qw(trigger)],
2921) { 3496) {
2922 no strict 'refs';
2923 my ($pkg, @funs) = @$_; 3497 my ($pkg, @funs) = @$_;
2924 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3498 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2925 for @funs; 3499 for @funs;
2926} 3500}
2927 3501
2942 3516
2943 my $qcode = $code; 3517 my $qcode = $code;
2944 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3518 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2945 $qcode =~ s/\n/\\n/g; 3519 $qcode =~ s/\n/\\n/g;
2946 3520
3521 %vars = (_dummy => 0) unless %vars;
3522
3523 my @res;
2947 local $_; 3524 local $_;
2948 local @safe::cf::_safe_eval_args = values %vars;
2949 3525
2950 my $eval = 3526 my $eval =
2951 "do {\n" 3527 "do {\n"
2952 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3528 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2953 . "#line 0 \"{$qcode}\"\n" 3529 . "#line 0 \"{$qcode}\"\n"
2954 . $code 3530 . $code
2955 . "\n}" 3531 . "\n}"
2956 ; 3532 ;
2957 3533
3534 if ($CFG{safe_eval}) {
2958 sub_generation_inc; 3535 sub_generation_inc;
3536 local @safe::cf::_safe_eval_args = values %vars;
2959 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3537 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2960 sub_generation_inc; 3538 sub_generation_inc;
3539 } else {
3540 local @cf::_safe_eval_args = values %vars;
3541 @res = wantarray ? eval eval : scalar eval $eval;
3542 }
2961 3543
2962 if ($@) { 3544 if ($@) {
2963 warn "$@"; 3545 warn "$@",
2964 warn "while executing safe code '$code'\n"; 3546 "while executing safe code '$code'\n",
2965 warn "with arguments " . (join " ", %vars) . "\n"; 3547 "with arguments " . (join " ", %vars) . "\n";
2966 } 3548 }
2967 3549
2968 wantarray ? @res : $res[0] 3550 wantarray ? @res : $res[0]
2969} 3551}
2970 3552
2984=cut 3566=cut
2985 3567
2986sub register_script_function { 3568sub register_script_function {
2987 my ($fun, $cb) = @_; 3569 my ($fun, $cb) = @_;
2988 3570
2989 no strict 'refs'; 3571 $fun = "safe::$fun" if $CFG{safe_eval};
2990 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3572 *$fun = $safe_hole->wrap ($cb);
2991} 3573}
2992 3574
2993=back 3575=back
2994 3576
2995=cut 3577=cut
2996 3578
2997############################################################################# 3579#############################################################################
2998# the server's init and main functions 3580# the server's init and main functions
2999 3581
3582{
3583 package cf::face;
3584
3585 our %HASH; # hash => idx
3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3592 # internal api, not finalised
3593 sub set {
3594 my ($name, $type, $data) = @_;
3595
3596 my $idx = cf::face::find $name;
3597
3598 if ($idx) {
3599 delete $HASH{cf::face::get_csum $idx};
3600 } else {
3601 $idx = cf::face::alloc $name;
3602 }
3603
3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3605
3606 cf::face::set_type $idx, $type;
3607 cf::face::set_csum $idx, 0, $hash;
3608
3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3616 $HASH{$hash} = $idx;#d#
3617
3618 $idx
3619 }
3620
3621 sub _get_data($$$) {
3622 my ($idx, $set, $cb) = @_;
3623
3624 if (defined $DATA[$set][$idx]) {
3625 $cb->($DATA[$set][$idx]);
3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3641
3642 # rather ineffient
3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3645
3646 _get_data $idx, $set, Coro::rouse_cb;
3647 Coro::rouse_wait
3648 }
3649
3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3652
3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3657}
3658
3000sub load_facedata($) { 3659sub load_facedata($) {
3001 my ($path) = @_; 3660 my ($path) = @_;
3002 3661
3003 # HACK to clear player env face cache, we need some signal framework
3004 # for this (global event?)
3005 %ext::player_env::MUSIC_FACE_CACHE = ();
3006
3007 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3008 3663
3009 warn "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3010 3665
3011 my $facedata; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3012 0 < aio_load $path, $facedata
3013 or die "$path: $!";
3014
3015 $facedata = Coro::Storable::thaw $facedata;
3016 3667
3017 $facedata->{version} == 2 3668 $facedata->{version} == 2
3018 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3019 3670
3020 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3021 $facedata->{resource}{"res/exp_table"} = { 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3022 type => FT_RSRC, 3673
3023 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3024 }; 3675
3025 cf::cede_to_tick; 3676 # BEGIN ATOMIC
3677 # from here on, everything must be atomic - no thread switch allowed
3678 my $t1 = EV::time;
3026 3679
3027 { 3680 {
3028 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3029 3682
3030 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3031 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3686
3032 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3033 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3034 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3035 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3036 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3037 cf::cede_to_tick; 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3693 delete $cf::face::META[$idx];
3038 } 3694 }
3039 3695
3040 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3041 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3698
3042 my $idx = cf::face::find $face 3699 my $idx = cf::face::find $face
3043 or next; 3700 or next;
3701
3044 if (my $smooth = cf::face::find $info->{smooth}) { 3702 if (my $smooth = cf::face::find $info->{smooth}) {
3045 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3046 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3047 } else { 3705 } else {
3048 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3049 } 3707 }
3050
3051 cf::cede_to_tick;
3052 } 3708 }
3053 } 3709 }
3054 3710
3055 { 3711 {
3056 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3057 3713
3058 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3059 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3060 cf::cede_to_tick;
3061 } 3716 }
3062 3717
3063 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3064 } 3719 }
3065 3720
3066 { 3721 {
3067 # TODO: for gcfclient pleasure, we should give resources
3068 # that gcfclient doesn't grok a >10000 face index.
3069 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3070 3723
3071 my $soundconf = delete $res->{"res/sound.conf"};
3072
3073 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3725 if (defined (my $type = $info->{type})) {
3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3074 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3075 my $data;
3076 3728
3077 if ($info->{type} & 1) { 3729 cf::face::set_type $idx, $type;
3078 # prepend meta info 3730 cf::face::set_csum $idx, 0, $info->{hash};
3079 3731 $cf::face::SIZE[0][$idx] = $info->{size};
3080 my $meta = $enc->encode ({ 3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3081 name => $name, 3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3082 %{ $info->{meta} || {} }, 3734 $cf::face::HASH{$info->{hash}} = $idx;
3083 });
3084
3085 $data = pack "(w/a*)*", $meta, $info->{data};
3086 } else { 3735 } else {
3087 $data = $info->{data}; 3736# $RESOURCE{$name} = $info; # unused
3088 } 3737 }
3089
3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3091 cf::face::set_type $idx, $info->{type};
3092
3093 cf::cede_to_tick;
3094 }
3095
3096 if ($soundconf) {
3097 $soundconf = $enc->decode (delete $soundconf->{data});
3098
3099 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3100 my $sound = $soundconf->{compat}[$_]
3101 or next;
3102
3103 my $face = cf::face::find "sound/$sound->[1]";
3104 cf::sound::set $sound->[0] => $face;
3105 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3106 } 3738 }
3107
3108 while (my ($k, $v) = each %{$soundconf->{event}}) {
3109 my $face = cf::face::find "sound/$v";
3110 cf::sound::set $k => $face;
3111 }
3112 }
3113 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3750
3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3752
3753 aio_close $fh if $fh; # close old facedata
3114 3754
3115 1 3755 1
3116} 3756}
3117 3757
3118register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3120 3760
3121 while (my ($k, $v) = each %$want) { 3761 while (my ($k, $v) = each %$want) {
3122 $ns->fx_want ($k, $v); 3762 $ns->fx_want ($k, $v);
3123 } 3763 }
3124}; 3764};
3765
3766sub load_resource_file($) {
3767 my $guard = lock_acquire "load_resource_file";
3768
3769 my $status = load_resource_file_ $_[0];
3770 get_slot 0.1, 100;
3771 cf::arch::commit_load;
3772
3773 $status
3774}
3775
3776sub reload_exp_table {
3777 _reload_exp_table;
3778
3779 cf::face::set
3780 "res/exp_table" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3783 );
3784}
3785
3786sub reload_materials {
3787 _reload_materials;
3788}
3125 3789
3126sub reload_regions { 3790sub reload_regions {
3127 # HACK to clear player env face cache, we need some signal framework 3791 # HACK to clear player env face cache, we need some signal framework
3128 # for this (global event?) 3792 # for this (global event?)
3129 %ext::player_env::MUSIC_FACE_CACHE = (); 3793 %ext::player_env::MUSIC_FACE_CACHE = ();
3136 if exists $_->{match}; 3800 if exists $_->{match};
3137 } 3801 }
3138} 3802}
3139 3803
3140sub reload_facedata { 3804sub reload_facedata {
3141 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3142 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3143} 3807}
3144 3808
3145sub reload_archetypes { 3809sub reload_archetypes {
3146 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3147 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3148 #d# NEED to laod twice to resolve forward references 3812
3149 # this really needs to be done in an extra post-pass 3813 cf::face::set
3150 # (which needs to be synchronous, so solve it differently) 3814 "res/skill_info" => FT_RSRC,
3151 load_resource_file "$DATADIR/archetypes" 3815 JSON::XS->new->utf8->canonical->encode (
3152 or die "unable to load archetypes\n"; 3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3817 );
3818
3819 cf::face::set
3820 "res/spell_paths" => FT_RSRC,
3821 JSON::XS->new->utf8->canonical->encode (
3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3153} 3838}
3154 3839
3155sub reload_treasures { 3840sub reload_treasures {
3156 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3157 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3158} 3843}
3159 3844
3845sub reload_sound {
3846 trace "loading sound config from $DATADIR/sound\n";
3847
3848 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3849
3850 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3851 my $sound = $soundconf->{compat}[$_]
3852 or next;
3853
3854 my $face = cf::face::find "sound/$sound->[1]";
3855 cf::sound::set $sound->[0] => $face;
3856 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3857 }
3858
3859 while (my ($k, $v) = each %{$soundconf->{event}}) {
3860 my $face = cf::face::find "sound/$v";
3861 cf::sound::set $k => $face;
3862 }
3863}
3864
3160sub reload_resources { 3865sub reload_resources {
3161 warn "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3162 3867
3868 reload_materials;
3869 reload_facedata;
3870 reload_exp_table;
3871 reload_sound;
3872 reload_archetypes;
3163 reload_regions; 3873 reload_regions;
3164 reload_facedata;
3165 #reload_archetypes;#d#
3166 reload_archetypes;
3167 reload_treasures; 3874 reload_treasures;
3168 3875
3169 warn "finished reloading resource files\n"; 3876 trace "finished reloading resource files\n";
3170}
3171
3172sub init {
3173 reload_resources;
3174} 3877}
3175 3878
3176sub reload_config { 3879sub reload_config {
3177 open my $fh, "<:utf8", "$CONFDIR/config" 3880 trace "reloading config file...\n";
3178 or return;
3179 3881
3180 local $/; 3882 my $config = load_file "$CONFDIR/config";
3181 *CFG = YAML::Syck::Load <$fh>; 3883 utf8::decode $config;
3884 *CFG = decode_yaml $config;
3182 3885
3183 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3886 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3184 3887
3185 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3888 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3186 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3889 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3187 3890
3188 if (exists $CFG{mlockall}) { 3891 if (exists $CFG{mlockall}) {
3192 }; 3895 };
3193 warn $@ if $@; 3896 warn $@ if $@;
3194 } 3897 }
3195} 3898}
3196 3899
3900sub pidfile() {
3901 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3902 or die "$PIDFILE: $!";
3903 flock $fh, &Fcntl::LOCK_EX
3904 or die "$PIDFILE: flock: $!";
3905 $fh
3906}
3907
3908# make sure only one server instance is running at any one time
3909sub atomic {
3910 my $fh = pidfile;
3911
3912 my $pid = <$fh>;
3913 kill 9, $pid if $pid > 0;
3914
3915 seek $fh, 0, 0;
3916 print $fh $$;
3917}
3918
3919sub main_loop {
3920 trace "EV::loop starting\n";
3921 if (1) {
3922 EV::loop;
3923 }
3924 trace "EV::loop returned\n";
3925 goto &main_loop unless $REALLY_UNLOOP;
3926}
3927
3197sub main { 3928sub main {
3929 cf::init_globals; # initialise logging
3930
3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3932 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3935
3936 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3937
3198 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3199 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3200 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3201 (async { 3941 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3203 Event::one_event; 3943 EV::loop EV::LOOP_ONESHOT;
3204 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3205 }; 3945 };
3206 3946
3947 evthread_start IO::AIO::poll_fileno;
3948
3949 cf::sync_job {
3950 cf::incloader::init ();
3951
3952 db_init;
3953
3954 cf::init_anim;
3955 cf::init_attackmess;
3956 cf::init_dynamic;
3957
3958 cf::load_settings;
3959
3960 reload_resources;
3207 reload_config; 3961 reload_config;
3208 db_init; 3962
3963 cf::init_uuid;
3964 cf::init_signals;
3965 cf::init_skills;
3966
3967 cf::init_beforeplay;
3968
3969 atomic;
3970
3209 load_extensions; 3971 load_extensions;
3210 3972
3211 $TICK_WATCHER->start; 3973 utime time, time, $RUNTIMEFILE;
3212 Event::loop; 3974
3975 # no (long-running) fork's whatsoever before this point(!)
3976 use POSIX ();
3977 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3978
3979 cf::_post_init 0;
3980 };
3981
3982 cf::object::thawer::errors_are_fatal 0;
3983 info "parse errors in files are no longer fatal from this point on.\n";
3984
3985 AE::postpone {
3986 undef &main; # free gobs of memory :)
3987 };
3988
3989 goto &main_loop;
3213} 3990}
3214 3991
3215############################################################################# 3992#############################################################################
3216# initialisation and cleanup 3993# initialisation and cleanup
3217 3994
3218# install some emergency cleanup handlers 3995# install some emergency cleanup handlers
3219BEGIN { 3996BEGIN {
3997 our %SIGWATCHER = ();
3220 for my $signal (qw(INT HUP TERM)) { 3998 for my $signal (qw(INT HUP TERM)) {
3221 Event->signal ( 3999 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3222 reentrant => 0,
3223 data => WF_AUTOCANCEL,
3224 signal => $signal,
3225 prio => 0,
3226 cb => sub {
3227 cf::cleanup "SIG$signal"; 4000 cf::cleanup "SIG$signal";
3228 },
3229 ); 4001 };
3230 } 4002 }
3231} 4003}
3232 4004
3233sub write_runtime { 4005sub write_runtime_sync {
3234 my $runtime = "$LOCALDIR/runtime"; 4006 my $t0 = AE::time;
3235 4007
3236 # first touch the runtime file to show we are still running: 4008 # first touch the runtime file to show we are still running:
3237 # the fsync below can take a very very long time. 4009 # the fsync below can take a very very long time.
3238 4010
3239 IO::AIO::aio_utime $runtime, undef, undef; 4011 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3240 4012
3241 my $guard = cf::lock_acquire "write_runtime"; 4013 my $guard = cf::lock_acquire "write_runtime";
3242 4014
3243 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4015 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3244 or return; 4016 or return;
3245 4017
3246 my $value = $cf::RUNTIME + 90 + 10; 4018 my $value = $cf::RUNTIME + 90 + 10;
3247 # 10 is the runtime save interval, for a monotonic clock 4019 # 10 is the runtime save interval, for a monotonic clock
3248 # 60 allows for the watchdog to kill the server. 4020 # 60 allows for the watchdog to kill the server.
3258 aio_utime $fh, undef, undef; 4030 aio_utime $fh, undef, undef;
3259 4031
3260 close $fh 4032 close $fh
3261 or return; 4033 or return;
3262 4034
3263 aio_rename "$runtime~", $runtime 4035 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3264 and return; 4036 and return;
3265 4037
3266 warn "runtime file written.\n"; 4038 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3267 4039
3268 1 4040 1
4041}
4042
4043our $uuid_lock;
4044our $uuid_skip;
4045
4046sub write_uuid_sync($) {
4047 $uuid_skip ||= $_[0];
4048
4049 return if $uuid_lock;
4050 local $uuid_lock = 1;
4051
4052 my $uuid = "$LOCALDIR/uuid";
4053
4054 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
4055 or return;
4056
4057 my $value = uuid_seq uuid_cur;
4058
4059 unless ($value) {
4060 info "cowardly refusing to write zero uuid value!\n";
4061 return;
4062 }
4063
4064 my $value = uuid_str $value + $uuid_skip;
4065 $uuid_skip = 0;
4066
4067 (aio_write $fh, 0, (length $value), $value, 0) <= 0
4068 and return;
4069
4070 # always fsync - this file is important
4071 aio_fsync $fh
4072 and return;
4073
4074 close $fh
4075 or return;
4076
4077 aio_rename "$uuid~", $uuid
4078 and return;
4079
4080 trace "uuid file written ($value).\n";
4081
4082 1
4083
4084}
4085
4086sub write_uuid($$) {
4087 my ($skip, $sync) = @_;
4088
4089 $sync ? write_uuid_sync $skip
4090 : async { write_uuid_sync $skip };
3269} 4091}
3270 4092
3271sub emergency_save() { 4093sub emergency_save() {
3272 my $freeze_guard = cf::freeze_mainloop; 4094 my $freeze_guard = cf::freeze_mainloop;
3273 4095
3274 warn "enter emergency perl save\n"; 4096 info "emergency_perl_save: enter\n";
4097
4098 # this is a trade-off: we want to be very quick here, so
4099 # save all maps without fsync, and later call a global sync
4100 # (which in turn might be very very slow)
4101 local $USE_FSYNC = 0;
3275 4102
3276 cf::sync_job { 4103 cf::sync_job {
4104 cf::write_runtime_sync; # external watchdog should not bark
4105
3277 # use a peculiar iteration method to avoid tripping on perl 4106 # use a peculiar iteration method to avoid tripping on perl
3278 # refcount bugs in for. also avoids problems with players 4107 # refcount bugs in for. also avoids problems with players
3279 # and maps saved/destroyed asynchronously. 4108 # and maps saved/destroyed asynchronously.
3280 warn "begin emergency player save\n"; 4109 info "emergency_perl_save: begin player save\n";
3281 for my $login (keys %cf::PLAYER) { 4110 for my $login (keys %cf::PLAYER) {
3282 my $pl = $cf::PLAYER{$login} or next; 4111 my $pl = $cf::PLAYER{$login} or next;
3283 $pl->valid or next; 4112 $pl->valid or next;
4113 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3284 $pl->save; 4114 $pl->save;
3285 } 4115 }
3286 warn "end emergency player save\n"; 4116 info "emergency_perl_save: end player save\n";
3287 4117
3288 warn "begin emergency map save\n"; 4118 cf::write_runtime_sync; # external watchdog should not bark
4119
4120 info "emergency_perl_save: begin map save\n";
3289 for my $path (keys %cf::MAP) { 4121 for my $path (keys %cf::MAP) {
3290 my $map = $cf::MAP{$path} or next; 4122 my $map = $cf::MAP{$path} or next;
3291 $map->valid or next; 4123 $map->valid or next;
3292 $map->save; 4124 $map->save;
3293 } 4125 }
3294 warn "end emergency map save\n"; 4126 info "emergency_perl_save: end map save\n";
3295 4127
3296 warn "begin emergency database checkpoint\n"; 4128 cf::write_runtime_sync; # external watchdog should not bark
4129
4130 info "emergency_perl_save: begin database checkpoint\n";
3297 BDB::db_env_txn_checkpoint $DB_ENV; 4131 BDB::db_env_txn_checkpoint $DB_ENV;
3298 warn "end emergency database checkpoint\n"; 4132 info "emergency_perl_save: end database checkpoint\n";
4133
4134 info "emergency_perl_save: begin write uuid\n";
4135 write_uuid_sync 1;
4136 info "emergency_perl_save: end write uuid\n";
4137
4138 cf::write_runtime_sync; # external watchdog should not bark
4139
4140 trace "emergency_perl_save: syncing database to disk";
4141 BDB::db_env_txn_checkpoint $DB_ENV;
4142
4143 info "emergency_perl_save: starting sync\n";
4144 IO::AIO::aio_sync sub {
4145 info "emergency_perl_save: finished sync\n";
4146 };
4147
4148 cf::write_runtime_sync; # external watchdog should not bark
4149
4150 trace "emergency_perl_save: flushing outstanding aio requests";
4151 while (IO::AIO::nreqs || BDB::nreqs) {
4152 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4153 }
4154
4155 cf::write_runtime_sync; # external watchdog should not bark
3299 }; 4156 };
3300 4157
3301 warn "leave emergency perl save\n"; 4158 info "emergency_perl_save: leave\n";
3302} 4159}
3303 4160
3304sub post_cleanup { 4161sub post_cleanup {
3305 my ($make_core) = @_; 4162 my ($make_core) = @_;
3306 4163
4164 IO::AIO::flush;
4165
3307 warn Carp::longmess "post_cleanup backtrace" 4166 error Carp::longmess "post_cleanup backtrace"
3308 if $make_core; 4167 if $make_core;
4168
4169 my $fh = pidfile;
4170 unlink $PIDFILE if <$fh> == $$;
4171}
4172
4173# a safer delete_package, copied from Symbol
4174sub clear_package($) {
4175 my $pkg = shift;
4176
4177 # expand to full symbol table name if needed
4178 unless ($pkg =~ /^main::.*::$/) {
4179 $pkg = "main$pkg" if $pkg =~ /^::/;
4180 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4181 $pkg .= '::' unless $pkg =~ /::$/;
4182 }
4183
4184 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4185 my $stem_symtab = *{$stem}{HASH};
4186
4187 defined $stem_symtab and exists $stem_symtab->{$leaf}
4188 or return;
4189
4190 # clear all symbols
4191 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4192 for my $name (keys %$leaf_symtab) {
4193 _gv_clear *{"$pkg$name"};
4194# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4195 }
3309} 4196}
3310 4197
3311sub do_reload_perl() { 4198sub do_reload_perl() {
3312 # can/must only be called in main 4199 # can/must only be called in main
3313 if ($Coro::current != $Coro::main) { 4200 unless (in_main) {
3314 warn "can only reload from main coroutine"; 4201 error "can only reload from main coroutine";
3315 return; 4202 return;
3316 } 4203 }
3317 4204
3318 warn "reloading..."; 4205 return if $RELOAD++;
3319 4206
3320 warn "entering sync_job"; 4207 my $t1 = AE::time;
3321 4208
4209 while ($RELOAD) {
4210 cf::get_slot 0.1, -1, "reload_perl";
4211 info "perl_reload: reloading...";
4212
4213 trace "perl_reload: entering sync_job";
4214
3322 cf::sync_job { 4215 cf::sync_job {
3323 cf::write_runtime; # external watchdog should not bark
3324 cf::emergency_save; 4216 #cf::emergency_save;
3325 cf::write_runtime; # external watchdog should not bark
3326 4217
3327 warn "syncing database to disk";
3328 BDB::db_env_txn_checkpoint $DB_ENV;
3329
3330 # if anything goes wrong in here, we should simply crash as we already saved
3331
3332 warn "cancelling all WF_AUTOCANCEL watchers";
3333 for (Event::all_watchers) {
3334 $_->cancel if $_->data & WF_AUTOCANCEL;
3335 }
3336
3337 warn "flushing outstanding aio requests";
3338 for (;;) {
3339 BDB::flush;
3340 IO::AIO::flush;
3341 Coro::cede;
3342 last unless IO::AIO::nreqs || BDB::nreqs;
3343 warn "iterate...";
3344 }
3345
3346 ++$RELOAD;
3347
3348 warn "cancelling all extension coros"; 4218 trace "perl_reload: cancelling all extension coros";
3349 $_->cancel for values %EXT_CORO; 4219 $_->cancel for values %EXT_CORO;
3350 %EXT_CORO = (); 4220 %EXT_CORO = ();
3351 4221
3352 warn "removing commands"; 4222 trace "perl_reload: removing commands";
3353 %COMMAND = (); 4223 %COMMAND = ();
3354 4224
3355 warn "removing ext/exti commands"; 4225 trace "perl_reload: removing ext/exti commands";
3356 %EXTCMD = (); 4226 %EXTCMD = ();
3357 %EXTICMD = (); 4227 %EXTICMD = ();
3358 4228
3359 warn "unloading/nuking all extensions"; 4229 trace "perl_reload: unloading/nuking all extensions";
3360 for my $pkg (@EXTS) { 4230 for my $pkg (@EXTS) {
3361 warn "... unloading $pkg"; 4231 trace "... unloading $pkg";
3362 4232
3363 if (my $cb = $pkg->can ("unload")) { 4233 if (my $cb = $pkg->can ("unload")) {
3364 eval { 4234 eval {
3365 $cb->($pkg); 4235 $cb->($pkg);
3366 1 4236 1
3367 } or warn "$pkg unloaded, but with errors: $@"; 4237 } or error "$pkg unloaded, but with errors: $@";
4238 }
4239
4240 trace "... clearing $pkg";
4241 clear_package $pkg;
3368 } 4242 }
3369 4243
3370 warn "... nuking $pkg";
3371 Symbol::delete_package $pkg;
3372 }
3373
3374 warn "unloading all perl modules loaded from $LIBDIR"; 4244 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3375 while (my ($k, $v) = each %INC) { 4245 while (my ($k, $v) = each %INC) {
3376 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3377 4247
3378 warn "... unloading $k"; 4248 trace "... unloading $k";
3379 delete $INC{$k}; 4249 delete $INC{$k};
3380 4250
3381 $k =~ s/\.pm$//; 4251 $k =~ s/\.pm$//;
3382 $k =~ s/\//::/g; 4252 $k =~ s/\//::/g;
3383 4253
3384 if (my $cb = $k->can ("unload_module")) { 4254 if (my $cb = $k->can ("unload_module")) {
3385 $cb->(); 4255 $cb->();
4256 }
4257
4258 clear_package $k;
3386 } 4259 }
3387 4260
3388 Symbol::delete_package $k;
3389 }
3390
3391 warn "getting rid of safe::, as good as possible"; 4261 trace "perl_reload: getting rid of safe::, as good as possible";
3392 Symbol::delete_package "safe::$_" 4262 clear_package "safe::$_"
3393 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4263 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3394 4264
3395 warn "unloading cf.pm \"a bit\""; 4265 trace "perl_reload: unloading cf.pm \"a bit\"";
3396 delete $INC{"cf.pm"}; 4266 delete $INC{"cf.pm"};
3397 delete $INC{"cf/pod.pm"}; 4267 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3398 4268
3399 # don't, removes xs symbols, too, 4269 # don't, removes xs symbols, too,
3400 # and global variables created in xs 4270 # and global variables created in xs
3401 #Symbol::delete_package __PACKAGE__; 4271 #clear_package __PACKAGE__;
3402 4272
3403 warn "unload completed, starting to reload now"; 4273 info "perl_reload: unload completed, starting to reload now";
3404 4274
3405 warn "reloading cf.pm"; 4275 trace "perl_reload: reloading cf.pm";
3406 require cf; 4276 require cf;
3407 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4277 cf::_connect_to_perl_1;
3408 4278
3409 warn "loading config and database again"; 4279 trace "perl_reload: loading config and database again";
3410 cf::reload_config; 4280 cf::reload_config;
3411 4281
3412 warn "loading extensions"; 4282 trace "perl_reload: loading extensions";
3413 cf::load_extensions; 4283 cf::load_extensions;
3414 4284
4285 if ($REATTACH_ON_RELOAD) {
3415 warn "reattaching attachments to objects/players"; 4286 trace "perl_reload: reattaching attachments to objects/players";
3416 _global_reattach; # objects, sockets 4287 _global_reattach; # objects, sockets
3417 warn "reattaching attachments to maps"; 4288 trace "perl_reload: reattaching attachments to maps";
3418 reattach $_ for values %MAP; 4289 reattach $_ for values %MAP;
3419 warn "reattaching attachments to players"; 4290 trace "perl_reload: reattaching attachments to players";
3420 reattach $_ for values %PLAYER; 4291 reattach $_ for values %PLAYER;
4292 }
3421 4293
3422 warn "leaving sync_job"; 4294 cf::_post_init 1;
3423 4295
4296 trace "perl_reload: leaving sync_job";
4297
3424 1 4298 1
3425 } or do { 4299 } or do {
3426 warn $@; 4300 error $@;
3427 warn "error while reloading, exiting."; 4301 cf::cleanup "perl_reload: error, exiting.";
3428 exit 1; 4302 };
4303
4304 --$RELOAD;
3429 }; 4305 }
3430 4306
3431 warn "reloaded"; 4307 $t1 = AE::time - $t1;
4308 info "perl_reload: completed in ${t1}s\n";
3432}; 4309};
3433 4310
3434our $RELOAD_WATCHER; # used only during reload 4311our $RELOAD_WATCHER; # used only during reload
3435 4312
3436sub reload_perl() { 4313sub reload_perl() {
3437 # doing reload synchronously and two reloads happen back-to-back, 4314 # doing reload synchronously and two reloads happen back-to-back,
3438 # coro crashes during coro_state_free->destroy here. 4315 # coro crashes during coro_state_free->destroy here.
3439 4316
3440 $RELOAD_WATCHER ||= Event->timer ( 4317 $RELOAD_WATCHER ||= cf::async {
3441 reentrant => 0, 4318 Coro::AIO::aio_wait cache_extensions;
3442 after => 0, 4319
3443 data => WF_AUTOCANCEL, 4320 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3444 cb => sub {
3445 do_reload_perl; 4321 do_reload_perl;
3446 undef $RELOAD_WATCHER; 4322 undef $RELOAD_WATCHER;
3447 }, 4323 };
3448 ); 4324 };
3449} 4325}
3450 4326
3451register_command "reload" => sub { 4327register_command "reload" => sub {
3452 my ($who, $arg) = @_; 4328 my ($who, $arg) = @_;
3453 4329
3458 reload_perl; 4334 reload_perl;
3459 }; 4335 };
3460 } 4336 }
3461}; 4337};
3462 4338
3463unshift @INC, $LIBDIR; 4339#############################################################################
3464 4340
3465my $bug_warning = 0; 4341my $bug_warning = 0;
3466 4342
3467our @WAIT_FOR_TICK;
3468our @WAIT_FOR_TICK_BEGIN;
3469
3470sub wait_for_tick { 4343sub wait_for_tick() {
3471 return unless $TICK_WATCHER->is_active; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3472 return if $Coro::current == $Coro::main;
3473 4345
3474 my $signal = new Coro::Signal; 4346 $WAIT_FOR_TICK->wait;
3475 push @WAIT_FOR_TICK, $signal;
3476 $signal->wait;
3477} 4347}
3478 4348
3479sub wait_for_tick_begin { 4349sub wait_for_tick_begin() {
3480 return unless $TICK_WATCHER->is_active; 4350 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3481 return if $Coro::current == $Coro::main;
3482 4351
3483 my $signal = new Coro::Signal; 4352 my $signal = new Coro::Signal;
3484 push @WAIT_FOR_TICK_BEGIN, $signal; 4353 push @WAIT_FOR_TICK_BEGIN, $signal;
3485 $signal->wait; 4354 $signal->wait;
3486} 4355}
3487 4356
3488$TICK_WATCHER = Event->timer ( 4357sub tick {
3489 reentrant => 0,
3490 parked => 1,
3491 prio => 0,
3492 at => $NEXT_TICK || $TICK,
3493 data => WF_AUTOCANCEL,
3494 cb => sub {
3495 if ($Coro::current != $Coro::main) { 4358 if ($Coro::current != $Coro::main) {
3496 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4359 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3497 unless ++$bug_warning > 10; 4360 unless ++$bug_warning > 10;
3498 return; 4361 return;
3499 } 4362 }
3500 4363
3501 $NOW = $tick_start = Event::time; 4364 cf::one_tick; # one server iteration
3502 4365
3503 cf::server_tick; # one server iteration 4366 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3504 4367
3505 $RUNTIME += $TICK;
3506 $NEXT_TICK += $TICK;
3507
3508 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4368 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3509 $NEXT_RUNTIME_WRITE = $NOW + 10; 4369 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3510 Coro::async_pool { 4370 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver"; 4371 $Coro::current->{desc} = "runtime saver";
3512 write_runtime 4372 write_runtime_sync
3513 or warn "ERROR: unable to write runtime file: $!"; 4373 or error "ERROR: unable to write runtime file: $!";
3514 };
3515 } 4374 };
4375 }
3516 4376
3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4377 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3518 $sig->send; 4378 $sig->send;
3519 } 4379 }
3520 while (my $sig = shift @WAIT_FOR_TICK) { 4380 $WAIT_FOR_TICK->broadcast;
3521 $sig->send;
3522 }
3523 4381
3524 $NOW = Event::time; 4382 $LOAD = ($NOW - $TICK_START) / $TICK;
3525
3526 # if we are delayed by four ticks or more, skip them all
3527 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3528
3529 $TICK_WATCHER->at ($NEXT_TICK);
3530 $TICK_WATCHER->start;
3531
3532 $LOAD = ($NOW - $tick_start) / $TICK;
3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3534 4384
3535 _post_tick; 4385 if (0) {
4386 if ($NEXT_TICK) {
4387 my $jitter = $TICK_START - $NEXT_TICK;
4388 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4389 debug "jitter $JITTER\n";#d#
4390 }
3536 }, 4391 }
3537); 4392}
3538 4393
3539{ 4394{
4395 # configure BDB
4396 info "initialising database";
4397
3540 BDB::min_parallel 8; 4398 BDB::min_parallel 16;
3541 BDB::max_poll_time $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
3542 $BDB_POLL_WATCHER = Event->io ( 4400 #$AnyEvent::BDB::WATCHER->priority (1);
3543 reentrant => 0,
3544 fd => BDB::poll_fileno,
3545 poll => 'r',
3546 prio => 0,
3547 data => WF_AUTOCANCEL,
3548 cb => \&BDB::poll_cb,
3549 );
3550
3551 BDB::set_sync_prepare {
3552 my $status;
3553 my $current = $Coro::current;
3554 (
3555 sub {
3556 $status = $!;
3557 $current->ready; undef $current;
3558 },
3559 sub {
3560 Coro::schedule while defined $current;
3561 $! = $status;
3562 },
3563 )
3564 };
3565 4401
3566 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
3567 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3569 | BDB::LOG_AUTOREMOVE, 1); 4405 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4406 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4407 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4408 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3572 4409
3573 cf::sync_job { 4410 cf::sync_job {
3574 eval { 4411 eval {
3584 4421
3585 cf::cleanup "db_env_open(db): $@" if $@; 4422 cf::cleanup "db_env_open(db): $@" if $@;
3586 }; 4423 };
3587 } 4424 }
3588 4425
3589 $BDB_DEADLOCK_WATCHER = Event->timer ( 4426 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4427 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3597 },
3598 ); 4428 };
3599 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4429 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 ); 4431 };
3609 $BDB_TRICKLE_WATCHER = Event->timer ( 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 ); 4434 };
4435
4436 info "database initialised";
3619} 4437}
3620 4438
3621{ 4439{
4440 # configure IO::AIO
4441
4442 info "initialising aio";
3622 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
3623
3624 undef $Coro::AIO::WATCHER;
3625 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
3626 $AIO_POLL_WATCHER = Event->io ( 4445 undef $AnyEvent::AIO::WATCHER;
3627 reentrant => 0, 4446 info "aio initialised";
3628 data => WF_AUTOCANCEL,
3629 fd => IO::AIO::poll_fileno,
3630 poll => 'r',
3631 prio => 0,
3632 cb => \&IO::AIO::poll_cb,
3633 );
3634} 4447}
3635 4448
3636my $_log_backtrace; 4449our $_log_backtrace;
4450our $_log_backtrace_last;
3637 4451
3638sub _log_backtrace { 4452sub _log_backtrace {
3639 my ($msg, @addr) = @_; 4453 my ($msg, @addr) = @_;
3640 4454
3641 $msg =~ s/\n//; 4455 $msg =~ s/\n$//;
3642 4456
4457 if ($_log_backtrace_last eq $msg) {
4458 LOG llevInfo, "[ABT] $msg\n";
4459 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3643 # limit the # of concurrent backtraces 4460 # limit the # of concurrent backtraces
3644 if ($_log_backtrace < 2) { 4461 } elsif ($_log_backtrace < 2) {
4462 $_log_backtrace_last = $msg;
3645 ++$_log_backtrace; 4463 ++$_log_backtrace;
4464 my $perl_bt = Carp::longmess $msg;
3646 async { 4465 async {
3647 $Coro::current->{desc} = "abt $msg"; 4466 $Coro::current->{desc} = "abt $msg";
3648 4467
3649 my @bt = fork_call { 4468 my @bt = fork_call {
3650 @addr = map { sprintf "%x", $_ } @addr; 4469 @addr = map { sprintf "%x", $_ } @addr;
3661 } 4480 }
3662 4481
3663 @funcs 4482 @funcs
3664 }; 4483 };
3665 4484
3666 LOG llevInfo, "[ABT] $msg\n"; 4485 LOG llevInfo, "[ABT] $perl_bt\n";
4486 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3667 LOG llevInfo, "[ABT] $_\n" for @bt; 4487 LOG llevInfo, "[ABT] $_\n" for @bt;
3668 --$_log_backtrace; 4488 --$_log_backtrace;
3669 }; 4489 };
3670 } else { 4490 } else {
3671 LOG llevInfo, "[ABT] $msg\n"; 4491 LOG llevInfo, "[ABT] $msg\n";
3672 LOG llevInfo, "[ABT] [suppressed]\n"; 4492 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3673 } 4493 }
3674} 4494}
3675 4495
3676# load additional modules 4496# load additional modules
3677use cf::pod; 4497require "cf/$_.pm" for @EXTRA_MODULES;
4498cf::_connect_to_perl_2;
3678 4499
3679END { cf::emergency_save } 4500END { cf::emergency_save }
3680 4501
36811 45021
3682 4503

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines