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.361 by root, Sun Sep 9 12:52:48 2007 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines