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.426 by root, Thu Apr 24 04:40:31 2008 UTC vs.
Revision 1.591 by root, Tue Nov 6 23:33:15 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV 3.2; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
35 36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
36use Coro 4.50 (); 41use Coro ();
37use Coro::State; 42use Coro::State;
38use Coro::Handle; 43use Coro::Handle;
39use Coro::EV; 44use Coro::EV;
45use Coro::AnyEvent;
40use Coro::Timer; 46use Coro::Timer;
41use Coro::Signal; 47use Coro::Signal;
42use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
50use Coro::AnyEvent;
43use Coro::AIO; 51use Coro::AIO;
44use Coro::BDB; 52use Coro::BDB 1.6;
45use Coro::Storable; 53use Coro::Storable;
46use Coro::Util (); 54use Coro::Util ();
47 55
56use Guard ();
48use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
49use BDB (); 58use BDB ();
50use Data::Dumper; 59use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 60use Fcntl;
53use YAML (); 61use YAML::XS ();
54use IO::AIO 2.51 (); 62use IO::AIO ();
55use Time::HiRes; 63use Time::HiRes;
56use Compress::LZF; 64use Compress::LZF;
57use Digest::MD5 (); 65use Digest::MD5 ();
66
67AnyEvent::detect;
58 68
59# configure various modules to our taste 69# configure various modules to our taste
60# 70#
61$Storable::canonical = 1; # reduce rsync transfers 71$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 72Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
73
74$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
75
76# make sure c-lzf reinitialises itself
77Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 78Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 79
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 82
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
68 86
69our %COMMAND = (); 87our %COMMAND = ();
70our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
71 89
72our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
73our %EXTCMD = (); 91our %EXTCMD = ();
74our %EXTICMD = (); 92our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
77 95
78our $RELOAD; # number of reloads so far 96our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
80 100
81our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
82our $DATADIR = datadir; 103our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
86our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
92our %RESOURCE; 114our $PIDFILE = "$LOCALDIR/pid";
115our $RUNTIMEFILE = "$LOCALDIR/runtime";
116
117#our %RESOURCE; # unused
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
93 124
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 127our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 128our $USE_FSYNC = 1; # use fsync to write maps - default on
99 129
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 133our $DB_ENV;
105 134
135our @EXTRA_MODULES = qw(pod match mapscript incloader);
136
106our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
107 139
108our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
110our $NOW; 143our $NOW;
111 144
112our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
113our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
114our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 152our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 153our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 154our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 155our $TICK_START; # for load detecting purposes
123 156
157our @POST_INIT;
158
159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
164
124binmode STDOUT; 165binmode STDOUT;
125binmode STDERR; 166binmode STDERR;
126 167
127# read virtual server time, if available 168# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 169unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 170 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
132} 173}
174
175eval "sub TICK() { $TICK } 1" or die;
133 176
134mkdir $_ 177mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 179
137our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
138 181
139sub cf::map::normalise; 182sub cf::map::normalise;
140 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
141############################################################################# 188#############################################################################
142 189
190%REFLECT = ();
191for (@REFLECT) {
192 my $reflect = JSON::XS::decode_json $_;
193 $REFLECT{$reflect->{class}} = $reflect;
194}
195
196# this is decidedly evil
197$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
198
199#############################################################################
200
143=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
144 202
145=over 4 203=over 4
146 204
147=item $cf::UPTIME 205=item $cf::UPTIME
148 206
149The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
150 223
151=item $cf::RUNTIME 224=item $cf::RUNTIME
152 225
153The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
154every server tick. 227every server tick.
155 228
156=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
157$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
158$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
159 232
160Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
161directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
162unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
163database environment. 236database environment.
164 237
165=item $cf::NOW
166
167The time of the last (current) server tick.
168
169=item $cf::TICK
170
171The interval between server ticks, in seconds.
172
173=item $cf::LOADAVG 238=item $cf::LOADAVG
174 239
175The current CPU load on the server (alpha-smoothed), as a value between 0 240The current CPU load on the server (alpha-smoothed), as a value between 0
176(none) and 1 (overloaded), indicating how much time is spent on processing 241(none) and 1 (overloaded), indicating how much time is spent on processing
177objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
186from wherever your confdir points to. 251from wherever your confdir points to.
187 252
188=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
189 254
190These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
191returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
275
194=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
195 277
196This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 280that call.
199 281
282=item %cf::REFLECT
283
284Contains, for each (C++) class name, a hash reference with information
285about object members (methods, scalars, arrays and flags) and other
286metadata, which is useful for introspection.
287
200=back 288=back
201 289
202=cut 290=cut
203 291
204BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
205 *CORE::GLOBAL::warn = sub { 293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
298$Coro::State::WARNHOOK = sub {
206 my $msg = join "", @_; 299 my $msg = join "", @_;
207 300
208 $msg .= "\n" 301 $msg .= "\n"
209 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
210 303
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 305
213 LOG llevError, $msg; 306 LOG llevWarn, $msg;
214 }; 307};
215}
216 308
217$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
219 311
220 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 316 return;#d#
223 }#d# 317 }#d#
224 318
225 # kill coroutine otherwise 319 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 320 Coro::terminate
228}; 321};
229
230$SIG{__DIE__} = sub { }; #d#?
231 322
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 333for my $pkg (qw(
243 cf::global cf::attachable 334 cf::global cf::attachable
244 cf::object cf::object::player 335 cf::object cf::object::player
245 cf::client cf::player 336 cf::client cf::player
246 cf::arch cf::living 337 cf::arch cf::living
338 cf::map cf::mapspace
247 cf::map cf::party cf::region 339 cf::party cf::region
248)) { 340)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 342}
252 343
253$EV::DIED = sub { 344$EV::DIED = sub {
254 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
255}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
256 352
257############################################################################# 353#############################################################################
258 354
259=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
260 356
281 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
282 $d 378 $d
283 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
284} 380}
285 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
286=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
287 435
288Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
289 437
290=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 445
298sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
300 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
480=item cf::post_init { BLOCK }
481
482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
483but I<before> the server starts ticking again.
484
485The codeblock will have a single boolean argument to indicate whether this
486is a reload or not.
487
488=cut
489
490sub post_init(&) {
491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
509}
510
301=item cf::lock_wait $string 511=item cf::lock_wait $string
302 512
303Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
304 514
305=item my $lock = cf::lock_acquire $string 515=item my $lock = cf::lock_acquire $string
306 516
307Wait until the given lock is available and then acquires it and returns 517Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 518a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 519for example when the coroutine gets canceled), the lock is automatically
310returned. 520returned.
311 521
312Locks are *not* recursive, locking from the same coro twice results in a 522Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 523deadlocked coro.
319 529
320Return true if the lock is currently active, i.e. somebody has locked it. 530Return true if the lock is currently active, i.e. somebody has locked it.
321 531
322=cut 532=cut
323 533
324our %LOCK; 534our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 535
327sub lock_wait($) { 536sub lock_wait($) {
328 my ($key) = @_; 537 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 538}
341 539
342sub lock_acquire($) { 540sub lock_acquire($) {
343 my ($key) = @_; 541 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 542}
357 543
358sub lock_active($) { 544sub lock_active($) {
359 my ($key) = @_; 545 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 546}
363 547
364sub freeze_mainloop { 548sub freeze_mainloop {
365 tick_inhibit_inc; 549 tick_inhibit_inc;
366 550
367 Coro::guard \&tick_inhibit_dec; 551 &Guard::guard (\&tick_inhibit_dec);
368} 552}
369 553
370=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
371 555
372Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
373get spread over timer. 557get spread over time.
374 558
375=cut 559=cut
376 560
377sub periodic($$) { 561sub periodic($$) {
378 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
382 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
383} 567}
384 568
385=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
386 570
387Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
388This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
389of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
390 578
391The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
392used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
393 581
394Useful for short background jobs. 582Useful for short background jobs.
395 583
396=cut 584=cut
397 585
398our @SLOT_QUEUE; 586our @SLOT_QUEUE;
399our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
400 589
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
404 593
405 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
406 596
407 while () { 597 while () {
408 next_job: 598 next_job:
599
409 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 601
411 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 606 $job->[2]->send;
415 Coro::cede; 607 Coro::cede;
416 goto next_job; 608 goto next_job;
417 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 611 }
419 } 612 }
420 613
421 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
424 $signal->wait;
425 } else { 617 } else {
618 $busy = 0;
426 Coro::schedule; 619 Coro::schedule;
427 } 620 }
428 } 621 }
429}; 622};
430 623
431sub get_slot($;$$) { 624sub get_slot($;$$) {
432 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
433 626
434 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
435 628
436 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
437 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
438 632
439 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
440 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
441 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
467=cut 661=cut
468 662
469sub sync_job(&) { 663sub sync_job(&) {
470 my ($job) = @_; 664 my ($job) = @_;
471 665
472 if ($Coro::current == $Coro::main) { 666 if (in_main) {
473 my $time = EV::time; 667 my $time = AE::time;
474 668
475 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
476 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
477 671
478 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
479 673
480 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
481 675
482 my $busy = 1; 676 my $busy = 1;
483 my @res; 677 my @res;
484 678
485 (async { 679 (async {
486 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
487 @res = eval { $job->() }; 681 @res = eval { $job->() };
488 warn $@ if $@; 682 error $@ if $@;
489 undef $busy; 683 undef $busy;
490 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
491 685
492 while ($busy) { 686 while ($busy) {
493 if (Coro::nready) { 687 if (Coro::nready) {
495 } else { 689 } else {
496 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
497 } 691 }
498 } 692 }
499 693
500 my $time = EV::time - $time; 694 my $time = AE::time - $time;
501 695
502 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
503 697
504 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
505 } else { 699 } else {
527 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
528 722
529 $coro 723 $coro
530} 724}
531 725
532=item fork_call { }, $args 726=item fork_call { }, @args
533 727
534Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
535process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
536Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
537never block itself or use any form of event handling. 731never block itself or use any form of event handling.
538 732
539=cut 733=cut
540 734
735sub post_fork {
736 reset_signals;
737}
738
541sub fork_call(&@) { 739sub fork_call(&@) {
542 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
543 741
544 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
545 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
546 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
547 745
548 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
549 reset_signals; 747 cf::post_fork;
550 &$cb 748 &$cb
551 }, @args; 749 } @args;
552 750
553 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
554} 763}
555 764
556=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
557 766
558=cut 767=cut
595within each server. 804within each server.
596 805
597=cut 806=cut
598 807
599sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
600 my ($name) = @_; 812 my ($name) = @_;
601 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
602 814
603 eval { 815 eval {
604 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
614} 826}
615 827
616our $DB; 828our $DB;
617 829
618sub db_init { 830sub db_init {
619 cf::sync_job {
620 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
621 };
622} 832}
623 833
624sub db_get($$) { 834sub db_get($$) {
625 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
626 836
627 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
628 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
629 841
630 $! ? () 842 $! ? ()
631 : $data 843 : $data
632 }
633} 844}
634 845
635sub db_put($$$) { 846sub db_put($$$) {
636 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
637 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
665 876
666 my @data; 877 my @data;
667 my $md5; 878 my $md5;
668 879
669 for (0 .. $#$src) { 880 for (0 .. $#$src) {
670 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
671 or Carp::croak "$src->[$_]: $!";
672 } 882 }
673 883
674 # if processing is expensive, check 884 # if processing is expensive, check
675 # checksum first 885 # checksum first
676 if (1) { 886 if (1) {
693 903
694 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
695 my $data = $process->(\@data); 905 my $data = $process->(\@data);
696 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
697 907
698 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
699 909
700 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
701 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
702 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
703 913
713 923
714=cut 924=cut
715 925
716sub datalog($@) { 926sub datalog($@) {
717 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
718 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
719} 929}
720 930
721=back 931=back
722 932
723=cut 933=cut
724 934
725############################################################################# 935#############################################################################
726 936
727=head2 ATTACHABLE OBJECTS 937=head2 ATTACHABLE OBJECTS
728 938
729Many objects in crossfire are so-called attachable objects. That means you can 939Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 940attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 941to it. All such attachable objects support the following methods.
732 942
733In the following description, CLASS can be any of C<global>, C<object> 943In the following description, CLASS can be any of C<global>, C<object>
734C<player>, C<client> or C<map> (i.e. the attachable objects in 944C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 994=item cf::CLASS::attachment $name, ...
785 995
786Register an attachment by C<$name> through which attachable objects of the 996Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 997given CLASS can refer to this attachment.
788 998
789Some classes such as crossfire maps and objects can specify attachments 999Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 1000that are attached at load/instantiate time, thus the need for a name.
791 1001
792These calls expect any number of the following handler/hook descriptions: 1002These calls expect any number of the following handler/hook descriptions:
793 1003
794=over 4 1004=over 4
918 1128
919 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
920 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
921 1131
922 } elsif (ref $type) { 1132 } elsif (ref $type) {
923 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
924 1134
925 } else { 1135 } else {
926 shift @arg; 1136 shift @arg;
927 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
928 } 1138 }
929 } 1139 }
930} 1140}
931 1141
932sub _object_attach { 1142sub _object_attach {
942 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
943 } 1153 }
944 1154
945 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
946 } else { 1156 } else {
947 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
948 } 1158 }
949 1159
950 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
951} 1161}
952 1162
1011 1221
1012 for (@$callbacks) { 1222 for (@$callbacks) {
1013 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1014 1224
1015 if ($@) { 1225 if ($@) {
1016 warn "$@";
1017 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1018 override; 1227 override;
1019 } 1228 }
1020 1229
1021 return 1 if $override; 1230 return 1 if $override;
1022 } 1231 }
1085 1294
1086sub reattach { 1295sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1296 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1297 my ($obj) = @_;
1089 1298
1299 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1300 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1301
1092 my $registry = $obj->registry; 1302 my $registry = $obj->registry;
1093 1303
1094 @$registry = (); 1304 @$registry = ();
1095 1305
1100 for (@$attach) { 1310 for (@$attach) {
1101 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1102 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1103 } 1313 }
1104 } else { 1314 } else {
1105 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1106 } 1316 }
1107 } 1317 }
1108} 1318}
1109 1319
1110cf::attachable->attach ( 1320cf::attachable->attach (
1137 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1138 1348
1139 sync_job { 1349 sync_job {
1140 if (length $$rdata) { 1350 if (length $$rdata) {
1141 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1144 1355
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1357 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1359 if ($cf::USE_FSYNC) {
1360 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;
1361 aio_fsync $fh;
1362 }
1149 close $fh; 1363 aio_close $fh;
1150 1364
1151 if (@$objs) { 1365 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1366 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1367 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1370 if ($cf::USE_FSYNC) {
1371 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;
1372 aio_fsync $fh;
1373 }
1157 close $fh; 1374 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1376 }
1160 } else { 1377 } else {
1161 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1162 } 1379 }
1163 1380
1164 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1382
1383 $filename =~ s%/[^/]+$%%;
1384 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1385 } else {
1166 warn "FATAL: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1167 } 1387 }
1168 } else { 1388 } else {
1169 aio_unlink $filename; 1389 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1171 } 1391 }
1195 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1196 $av = $st->{objs}; 1416 $av = $st->{objs};
1197 } 1417 }
1198 1418
1199 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1200 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1201 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1202 1423
1203 ($data, $av) 1424 ($data, $av)
1204} 1425}
1205 1426
1206=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1262 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1263 1484
1264 $EXTICMD{$name} = $cb; 1485 $EXTICMD{$name} = $cb;
1265} 1486}
1266 1487
1488use File::Glob ();
1489
1267cf::player->attach ( 1490cf::player->attach (
1268 on_command => sub { 1491 on_unknown_command => sub {
1269 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1270 1493
1271 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1272 or return; 1495 or return;
1273 1496
1281 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1282 1505
1283 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1284 1507
1285 if (ref $msg) { 1508 if (ref $msg) {
1286 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1287 "ARRAY" eq ref $msg
1288 ? @$msg
1289 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1290 1510
1291 my @reply; 1511 my @reply;
1292 1512
1293 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1294 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1296 1516
1297 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1298 if $reply; 1518 if $reply;
1299 1519
1300 } else { 1520 } else {
1301 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1302 } 1522 }
1303 1523
1304 cf::override; 1524 cf::override;
1305 }, 1525 },
1306); 1526);
1307 1527
1528# "readahead" all extensions
1529sub cache_extensions {
1530 my $grp = IO::AIO::aio_group;
1531
1532 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1533 for (grep /\.ext$/, @{$_[0]}) {
1534 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1535 }
1536 };
1537
1538 $grp
1539}
1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1308sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1309 cf::sync_job { 1557 cf::sync_job {
1310 my %todo; 1558 my %todo;
1311 1559
1312 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1313 next unless -r $path; 1561 next unless -r $path;
1331 1579
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1582
1335 $ext{source} = 1583 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1337 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1338 . $source 1586 . $source
1339 . "\n};\n1"; 1587 . "\n};\n1";
1340 1588
1341 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1342 } 1590 }
1343 1591
1592 my $pass = 0;
1344 my %done; 1593 my %done;
1345 while (%todo) { 1594 while (%todo) {
1346 my $progress; 1595 my $progress;
1347 1596
1597 ++$pass;
1598
1599 ext:
1348 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1349 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1350 goto skip 1602 next ext
1351 unless exists $done{$_}; 1603 unless exists $done{$_};
1352 } 1604 }
1353 1605
1354 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1355 1607
1356 unless (eval $v->{source}) { 1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1617 my $active = eval $source;
1618
1619 if (length $@) {
1357 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1358 : "$v->{base}: extension inactive.\n";
1359 1621
1360 if (exists $v->{meta}{mandatory}) {
1361 warn $msg;
1362 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1363 } 1623 if exists $v->{meta}{mandatory};
1364 1624
1365 warn $msg; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1627 } else {
1628 $done{$k} = delete $todo{$k};
1629 push @EXTS, $v->{pkg};
1630 $progress = 1;
1631
1632 info "$v->{base}: extension inactive.\n"
1633 unless $active;
1366 } 1634 }
1367
1368 $done{$k} = delete $todo{$k};
1369 push @EXTS, $v->{pkg};
1370 $progress = 1;
1371 } 1635 }
1372 1636
1373 skip: 1637 unless ($progress) {
1374 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1375 unless $progress; 1639
1640 while (my ($k, $v) = each %todo) {
1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1642 if exists $v->{meta}{mandatory};
1643 }
1644
1645 last;
1646 }
1376 } 1647 }
1377 }; 1648 };
1378} 1649}
1379 1650
1380############################################################################# 1651#############################################################################
1381 1652
1382=back 1653=back
1383 1654
1384=head2 CORE EXTENSIONS 1655=head2 CORE EXTENSIONS
1385 1656
1386Functions and methods that extend core crossfire objects. 1657Functions and methods that extend core deliantra objects.
1387 1658
1388=cut 1659=cut
1389 1660
1390package cf::player; 1661package cf::player;
1391 1662
1434 1705
1435sub exists($) { 1706sub exists($) {
1436 my ($login) = @_; 1707 my ($login) = @_;
1437 1708
1438 $cf::PLAYER{$login} 1709 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1710 or !aio_stat path $login
1440} 1711}
1441 1712
1442sub find($) { 1713sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1714 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1715 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1727 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1728 or return;
1458 1729
1459 my $pl = cf::player::load_pl $f 1730 my $pl = cf::player::load_pl $f
1460 or return; 1731 or return;
1732
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1733 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1734 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1464 } 1736 }
1465 } 1737 }
1466} 1738}
1467 1739
1740cf::player->attach (
1741 on_load => sub {
1742 my ($pl, $path) = @_;
1743
1744 # restore slots saved in save, below
1745 my $slots = delete $pl->{_slots};
1746
1747 $pl->ob->current_weapon ($slots->[0]);
1748 $pl->combat_ob ($slots->[1]);
1749 $pl->ranged_ob ($slots->[2]);
1750 },
1751);
1752
1468sub save($) { 1753sub save($) {
1469 my ($pl) = @_; 1754 my ($pl) = @_;
1470 1755
1471 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1472 1757
1477 1762
1478 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1479 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1480 1765
1481 cf::get_slot 0.01; 1766 cf::get_slot 0.01;
1767
1768 # save slots, to be restored later
1769 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1482 1770
1483 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1484 cf::cede_to_tick; 1772 cf::cede_to_tick;
1485} 1773}
1486 1774
1518 my ($pl) = @_; 1806 my ($pl) = @_;
1519 1807
1520 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1521 1809
1522 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1812
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1526 $pl->deactivate; 1814 $pl->deactivate;
1815
1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1528 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1529 1821
1530 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1532 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1570 1862
1571 for my $login (@$dirs) { 1863 for my $login (@$dirs) {
1572 my $path = path $login; 1864 my $path = path $login;
1573 1865
1574 # a .pst is a dead give-away for a valid player 1866 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1867 # if no pst file found, open and chekc for blocked users
1868 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1869 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1870 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1871 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1872 }
1580 1873
1584 1877
1585 \@logins 1878 \@logins
1586} 1879}
1587 1880
1588=item $player->maps 1881=item $player->maps
1882
1883=item cf::player::maps $login
1589 1884
1590Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1591player. May block. 1886player. May block.
1592 1887
1593=cut 1888=cut
1611 } 1906 }
1612 1907
1613 \@paths 1908 \@paths
1614} 1909}
1615 1910
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1912
1618Expand crossfire pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1914
1709=item $player->ext_reply ($msgid, @msg) 1915=item $player->ext_reply ($msgid, @msg)
1710 1916
1711Sends an ext reply to the player. 1917Sends an ext reply to the player.
1712 1918
1744 1950
1745=cut 1951=cut
1746 1952
1747sub find_by_path($) { 1953sub find_by_path($) {
1748 my ($path) = @_; 1954 my ($path) = @_;
1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1749 1957
1750 my ($match, $specificity); 1958 my ($match, $specificity);
1751 1959
1752 for my $region (list) { 1960 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1782sub generate_random_map { 1990sub generate_random_map {
1783 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1784 1992
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1994
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 1996}
1802 1997
1803=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1804 1999
1805Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
1810 2005
1811sub register { 2006sub register {
1812 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 2008 my $pkg = caller;
1814 2009
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 2011
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 2013}
1820 2014
1821# also paths starting with '/' 2015# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 2017
1824sub thawer_merge { 2018sub thawer_merge {
1825 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1826 2020
1827 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1832} 2026}
1833 2027
1834sub normalise { 2028sub normalise {
1835 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1836 2030
1837 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1838 2032
1839 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1840 2034
1841 # map plan: 2035 # map plan:
1842 # 2036 #
1857 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 2052 $path = "$base/$path";
1859 } 2053 }
1860 2054
1861 for ($path) { 2055 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1865 } 2058 }
1866 2059
1867 $path 2060 $path
1881 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1882 return $self; 2075 return $self;
1883 } 2076 }
1884 } 2077 }
1885 2078
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2080 ()
1888} 2081}
1889 2082
2083# may re-bless or do other evil things
1890sub init { 2084sub init {
1891 my ($self) = @_; 2085 my ($self) = @_;
1892 2086
1893 $self 2087 $self
1894} 2088}
1925 2119
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2120 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 2121 "$UNIQUEDIR/$path"
1928} 2122}
1929 2123
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 2124sub decay_objects {
1940 my ($self) = @_; 2125 my ($self) = @_;
1941 2126
1942 return if $self->{deny_reset}; 2127 return if $self->{deny_reset};
1943 2128
1968 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1969 2154
1970 1 2155 1
1971} 2156}
1972 2157
2158# used to laod the header of an original map
1973sub load_header_orig { 2159sub load_header_orig {
1974 my ($self) = @_; 2160 my ($self) = @_;
1975 2161
1976 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1977} 2163}
1978 2164
2165# used to laod the header of an instantiated map
1979sub load_header_temp { 2166sub load_header_temp {
1980 my ($self) = @_; 2167 my ($self) = @_;
1981 2168
1982 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1983} 2170}
1984 2171
2172# called after loading the header from an instantiated map
1985sub prepare_temp { 2173sub prepare_temp {
1986 my ($self) = @_; 2174 my ($self) = @_;
1987 2175
1988 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1989 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1990 # safety 2178 # safety
1991 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1992 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1993} 2181}
1994 2182
2183# called after loading the header from an original map
1995sub prepare_orig { 2184sub prepare_orig {
1996 my ($self) = @_; 2185 my ($self) = @_;
1997 2186
1998 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1999 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
2023 2212
2024sub find; 2213sub find;
2025sub find { 2214sub find {
2026 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2027 2216
2217 cf::cede_to_tick;
2218
2028 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2029 2220
2030 cf::lock_wait "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2032 2223
2033 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 2225 my $map = new_from_path cf::map $path
2038 or return; 2226 or return;
2039 2227
2040 $map->{last_save} = $cf::RUNTIME; 2228 $map->{last_save} = $cf::RUNTIME;
2041 2229
2043 or return; 2231 or return;
2044 2232
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2233 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 2234 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 2235 #$cf::WAIT_FOR_TICK->wait;
2236 undef $guard2;
2048 undef $guard1; 2237 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2238 $map->reset;
2051 return find $path; 2239 return find $path;
2052 } 2240 }
2053 2241
2054 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
2055 } 2243 }
2056} 2244}
2057 2245
2058sub pre_load { } 2246sub pre_load { }
2059sub post_load { } 2247#sub post_load { } # XS
2060 2248
2061sub load { 2249sub load {
2062 my ($self) = @_; 2250 my ($self) = @_;
2063 2251
2064 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
2067 2255
2068 { 2256 {
2069 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2070 2258
2071 return unless $self->valid; 2259 return unless $self->valid;
2072 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2073
2074 $self->in_memory (cf::MAP_LOADING);
2075 2261
2076 $self->alloc; 2262 $self->alloc;
2077 2263
2078 $self->pre_load; 2264 $self->pre_load;
2079 cf::cede_to_tick; 2265 cf::cede_to_tick;
2080 2266
2267 if (exists $self->{load_path}) {
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2269 $f->skip_block;
2083 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2084 or return; 2271 or return;
2085 2272
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2273 $self->post_load_original
2087 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2088 2275
2089 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2277 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2092 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2093 $self->clear_unique_items; 2280 $self->clear_unique_items;
2094 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2095 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2096 } 2284 }
2097 } 2285 }
2098 }
2099 2286
2100 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2101 2294
2102 cf::cede_to_tick; 2295 cf::cede_to_tick;
2103 # now do the right thing for maps 2296 # now do the right thing for maps
2104 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2105 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2109 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2303 $self->decay_objects;
2111 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2112 $self->update_buttons; 2305 $self->update_buttons;
2113 cf::cede_to_tick; 2306 cf::cede_to_tick;
2114 $self->set_darkness_map; 2307 #$self->activate; # no longer activate maps automatically
2115 cf::cede_to_tick;
2116 $self->activate;
2117 } 2308 }
2118 2309
2119 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2121
2122 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2312 }
2124 2313
2125 $self->post_load; 2314 $self->post_load;
2126}
2127 2315
2316 1
2317}
2318
2319# customize the map for a given player, i.e.
2320# return the _real_ map. used by e.g. per-player
2321# maps to change the path to ~playername/mappath
2128sub customise_for { 2322sub customise_for {
2129 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2130 2324
2131 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2132 if $self->per_player; 2326 if $self->per_player;
2135# if $self->per_party; 2329# if $self->per_party;
2136 2330
2137 $self 2331 $self
2138} 2332}
2139 2333
2140# find and load all maps in the 3x3 area around a map
2141sub load_neighbours {
2142 my ($map) = @_;
2143
2144 my @neigh; # diagonal neighbours
2145
2146 for (0 .. 3) {
2147 my $neigh = $map->tile_path ($_)
2148 or next;
2149 $neigh = find $neigh, $map
2150 or next;
2151 $neigh->load;
2152
2153 push @neigh,
2154 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2155 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2156 }
2157
2158 for (grep defined $_->[0], @neigh) {
2159 my ($path, $origin) = @$_;
2160 my $neigh = find $path, $origin
2161 or next;
2162 $neigh->load;
2163 }
2164}
2165
2166sub find_sync { 2334sub find_sync {
2167 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2168 2336
2169 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2170} 2342}
2171 2343
2172sub do_load_sync { 2344sub do_load_sync {
2173 my ($map) = @_; 2345 my ($map) = @_;
2174 2346
2347 # it's a bug to call this from the main context
2175 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2176 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2177 2350
2178 cf::sync_job { $map->load }; 2351 $map->load;
2179} 2352}
2180 2353
2181our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2182our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2183 2356
2184sub find_async { 2357sub find_async {
2185 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2186 2359
2187 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2188 2361
2189 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2190 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2191 } 2364 }
2192 2365
2193 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2194 2367
2195 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2209 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2210 2383
2211 () 2384 ()
2212} 2385}
2213 2386
2387# common code, used by both ->save and ->swapout
2214sub save { 2388sub _save {
2215 my ($self) = @_; 2389 my ($self) = @_;
2216
2217 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2390
2219 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2220 2392
2221 return unless $self->dirty; 2393 return unless $self->dirty;
2222 2394
2242 } else { 2414 } else {
2243 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2415 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2244 } 2416 }
2245} 2417}
2246 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2247sub swap_out { 2427sub swap_out {
2248 my ($self) = @_; 2428 my ($self) = @_;
2249 2429
2250 # save first because save cedes
2251 $self->save;
2252
2253 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2254 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2255 return if $self->players; 2434 return if $self->players;
2256 return if $self->in_memory != cf::MAP_ACTIVE; 2435
2436 # first deactivate the map and "unlink" it from the core
2437 $self->deactivate;
2438 $_->clear_links_to ($self) for values %cf::MAP;
2439 $self->state (cf::MAP_SWAPPED);
2440
2441 # then atomically save
2442 $self->_save;
2443
2444 # then free the map
2445 $self->clear;
2446}
2447
2448sub reset_at {
2449 my ($self) = @_;
2450
2451 # TODO: safety, remove and allow resettable per-player maps
2257 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2258 2453
2454 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2455 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2456
2457 $time + $to
2458}
2459
2460sub should_reset {
2461 my ($self) = @_;
2462
2463 $self->reset_at <= $cf::RUNTIME
2464}
2465
2466sub reset {
2467 my ($self) = @_;
2468
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
2471 return if $self->players;
2472
2473 cf::trace "resetting map ", $self->path, "\n";
2474
2259 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2476
2477 # need to save uniques path
2478 unless ($self->{deny_save}) {
2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2480
2481 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2482 if $uniq;
2483 }
2484
2485 delete $cf::MAP{$self->path};
2260 2486
2261 $self->deactivate; 2487 $self->deactivate;
2262 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2263 $self->clear; 2489 $self->clear;
2264}
2265
2266sub reset_at {
2267 my ($self) = @_;
2268
2269 # TODO: safety, remove and allow resettable per-player maps
2270 return 1e99 if $self->{deny_reset};
2271
2272 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2273 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2274
2275 $time + $to
2276}
2277
2278sub should_reset {
2279 my ($self) = @_;
2280
2281 $self->reset_at <= $cf::RUNTIME
2282}
2283
2284sub reset {
2285 my ($self) = @_;
2286
2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288
2289 return if $self->players;
2290
2291 warn "resetting map ", $self->path;
2292
2293 $self->in_memory (cf::MAP_SWAPPED);
2294
2295 # need to save uniques path
2296 unless ($self->{deny_save}) {
2297 my $uniq = $self->uniq_path; utf8::encode $uniq;
2298
2299 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2300 if $uniq;
2301 }
2302
2303 delete $cf::MAP{$self->path};
2304
2305 $self->deactivate;
2306 $_->clear_links_to ($self) for values %cf::MAP;
2307 $self->clear;
2308 2490
2309 $self->unlink_save; 2491 $self->unlink_save;
2310 $self->destroy; 2492 $self->destroy;
2311} 2493}
2312 2494
2320 2502
2321 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2322 2504
2323 $self->unlink_save; 2505 $self->unlink_save;
2324 2506
2325 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2326 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2327 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2328 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2329 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2330 2512
2387 : normalise $_ 2569 : normalise $_
2388 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2389 ] 2571 ]
2390} 2572}
2391 2573
2574=item cf::map::static_maps
2575
2576Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2577file in the shared directory excluding F</styles> and F</editor>). May
2578block.
2579
2580=cut
2581
2582sub static_maps() {
2583 my @dirs = "";
2584 my @maps;
2585
2586 while (@dirs) {
2587 my $dir = shift @dirs;
2588
2589 next if $dir eq "/styles" || $dir eq "/editor";
2590
2591 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2592 or return;
2593
2594 for (@$files) {
2595 s/\.map$// or next;
2596 utf8::decode $_;
2597 push @maps, "$dir/$_";
2598 }
2599
2600 push @dirs, map "$dir/$_", @$dirs;
2601 }
2602
2603 \@maps
2604}
2605
2392=back 2606=back
2393 2607
2394=head3 cf::object 2608=head3 cf::object
2395 2609
2396=cut 2610=cut
2457can be C<undef>. Does the right thing when the player is currently in a 2671can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2672dialogue with the given NPC character.
2459 2673
2460=cut 2674=cut
2461 2675
2676our $SAY_CHANNEL = {
2677 id => "say",
2678 title => "Map",
2679 reply => "say ",
2680 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2681};
2682
2683our $CHAT_CHANNEL = {
2684 id => "chat",
2685 title => "Chat",
2686 reply => "chat ",
2687 tooltip => "Player chat and shouts, global to the server.",
2688};
2689
2462# rough implementation of a future "reply" method that works 2690# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2691# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2692#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2693sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2694 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2705 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2706 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2707
2480 } else { 2708 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2709 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2710 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2711 }
2484 } 2712 }
2485} 2713}
2486 2714
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2715=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2740
2513=item $player_object->enter_link 2741=item $player_object->enter_link
2514 2742
2515Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2516 2744
2517The player should be reasonably safe there for short amounts of time. You 2745The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2746for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2747though, as the player cannot control the character while it is on the link
2748map.
2519 2749
2520Will never block. 2750Will never block.
2521 2751
2522=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2523 2753
2543sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2544 my ($self) = @_; 2774 my ($self) = @_;
2545 2775
2546 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2547 2777
2778 ++$self->{_link_recursion};
2779
2548 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2549 2781
2550 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2551 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2552 2784
2553 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2554} 2786}
2555 2787
2556sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2557 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2558 2790
2575 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2576 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2577 2809
2578 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2579 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2580 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2581 2813
2582 $map->load; 2814 $map->load;
2583 $map->load_neighbours;
2584 2815
2585 return unless $self->contr->active; 2816 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2817
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2590} 2820 # entering was successful
2821 delete $self->{_link_recursion};
2822 # only activate afterwards, to support waiting in hooks
2823 $self->activate_recursive;
2824 }
2591 2825
2826}
2827
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2593 2829
2594Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2597the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2834be called at the end of this process.
2599 2835
2836Note that $check will be called with a potentially non-loaded map, so if
2837it needs a loaded map it has to call C<< ->load >>.
2838
2600=cut 2839=cut
2601 2840
2602our $GOTOGEN; 2841our $GOTOGEN;
2603 2842
2604sub cf::object::player::goto { 2843sub cf::object::player::goto {
2605 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2606 2851
2607 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2608 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2609 2854
2610 $self->enter_link; 2855 $self->enter_link;
2630 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2631 } 2876 }
2632 } 2877 }
2633 2878
2634 my $map = eval { 2879 my $map = eval {
2635 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2636 2881
2637 if ($map) { 2882 if ($map) {
2638 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2639 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2640 } else { 2885 } else {
2641 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2642 } 2887 }
2643 2888
2644 $map 2889 $map
2652 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2653 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2654 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2655 } 2900 }
2656 2901
2657 $done->() if $done; 2902 $done->($self) if $done;
2658 })->prio (1); 2903 })->prio (1);
2659} 2904}
2660 2905
2661=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2662 2907
2682} 2927}
2683 2928
2684sub prepare_random_map { 2929sub prepare_random_map {
2685 my ($exit) = @_; 2930 my ($exit) = @_;
2686 2931
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2932 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2933 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2934 # that depends on the exit object
2692 2935
2693 my $rmp = parse_random_map_params $exit->msg; 2936 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2938 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2939 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2940 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2941 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2942 $rmp->{origin_y} = $exit->y;
2943
2944 $exit->map->touch;
2700 } 2945 }
2701 2946
2702 $rmp->{random_seed} ||= $exit->random_seed; 2947 $rmp->{random_seed} ||= $exit->random_seed;
2703 2948
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2949 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2953 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2954 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2955 undef $fh;
2711 aio_rename "$meta~", $meta; 2956 aio_rename "$meta~", $meta;
2712 2957
2958 my $slaying = "?random/$md5";
2959
2960 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2961 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2962 $exit->msg (undef);
2963 }
2715 } 2964 }
2716} 2965}
2717 2966
2718sub cf::object::player::enter_exit { 2967sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2968 my ($self, $exit) = @_;
2720 2969
2721 return unless $self->type == cf::PLAYER; 2970 return unless $self->type == cf::PLAYER;
2722 2971
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2972 $self->enter_link;
2735 2973
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2974 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2975 $Coro::current->{desc} = "enter_exit";
2742 2976
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2977 unless (eval {
2978 $self->deactivate_recursive; # just to be sure
2979
2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2981 my $x = $exit->stats->hp;
2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
3006
2745 $self->goto ($slaying, $hp, $sp); 3007 $self->goto ($map, $x, $y);
2746 3008
3009 # if exit is damned, update players death & WoR home-position
3010 $self->contr->savebed ($map, $x, $y)
3011 if $exit->flag (cf::FLAG_DAMNED);
3012
2747 1; 3013 1
2748 }) { 3014 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2753 3019
2754 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2755 $self->leave_link; 3021 $self->leave_link;
2756 } 3022 }
2757 })->prio (1); 3023 })->prio (1);
2758} 3024}
2759 3025
2771sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2772 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2773 3039
2774 utf8::encode $text; 3040 utf8::encode $text;
2775 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3041 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3042}
3043
3044=item $client->send_big_packet ($pkt)
3045
3046Like C<send_packet>, but tries to compress large packets, and fragments
3047them as required.
3048
3049=cut
3050
3051our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3052
3053sub cf::client::send_big_packet {
3054 my ($self, $pkt) = @_;
3055
3056 # try lzf for large packets
3057 $pkt = "lzf " . Compress::LZF::compress $pkt
3058 if 1024 <= length $pkt and $self->{can_lzf};
3059
3060 # split very large packets
3061 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3062 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3063 $pkt = "frag";
3064 }
3065
3066 $self->send_packet ($pkt);
2776} 3067}
2777 3068
2778=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2779 3070
2780Send a drawinfo or msg packet to the client, formatting the msg for the 3071Send a drawinfo or msg packet to the client, formatting the msg for the
2784 3075
2785=cut 3076=cut
2786 3077
2787# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2788our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2789 "c/identify" => { 3086 "c/identify" => {
2790 id => "infobox", 3087 id => "infobox",
2791 title => "Identify", 3088 title => "Identify",
2792 reply => undef, 3089 reply => undef,
2793 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2795 "c/examine" => { 3092 "c/examine" => {
2796 id => "infobox", 3093 id => "infobox",
2797 title => "Examine", 3094 title => "Examine",
2798 reply => undef, 3095 reply => undef,
2799 tooltip => "Signs and other items you examined", 3096 tooltip => "Signs and other items you examined",
3097 },
3098 "c/shopinfo" => {
3099 id => "infobox",
3100 title => "Shop Info",
3101 reply => undef,
3102 tooltip => "What your bargaining skill tells you about the shop",
2800 }, 3103 },
2801 "c/book" => { 3104 "c/book" => {
2802 id => "infobox", 3105 id => "infobox",
2803 title => "Book", 3106 title => "Book",
2804 reply => undef, 3107 reply => undef,
2820 id => "infobox", 3123 id => "infobox",
2821 title => "Body Parts", 3124 title => "Body Parts",
2822 reply => undef, 3125 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 3126 tooltip => "Shows which body parts you posess and are available",
2824 }, 3127 },
3128 "c/statistics" => {
3129 id => "infobox",
3130 title => "Statistics",
3131 reply => undef,
3132 tooltip => "Shows your primary statistics",
3133 },
3134 "c/skills" => {
3135 id => "infobox",
3136 title => "Skills",
3137 reply => undef,
3138 tooltip => "Shows your experience per skill and item power",
3139 },
3140 "c/shopitems" => {
3141 id => "infobox",
3142 title => "Shop Items",
3143 reply => undef,
3144 tooltip => "Shows the items currently for sale in this shop",
3145 },
3146 "c/resistances" => {
3147 id => "infobox",
3148 title => "Resistances",
3149 reply => undef,
3150 tooltip => "Shows your resistances",
3151 },
3152 "c/pets" => {
3153 id => "infobox",
3154 title => "Pets",
3155 reply => undef,
3156 tooltip => "Shows information abotu your pets/a specific pet",
3157 },
3158 "c/perceiveself" => {
3159 id => "infobox",
3160 title => "Perceive Self",
3161 reply => undef,
3162 tooltip => "You gained detailed knowledge about yourself",
3163 },
2825 "c/uptime" => { 3164 "c/uptime" => {
2826 id => "infobox", 3165 id => "infobox",
2827 title => "Uptime", 3166 title => "Uptime",
2828 reply => undef, 3167 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 3168 tooltip => "How long the server has been running since last restart",
2838 id => "party", 3177 id => "party",
2839 title => "Party", 3178 title => "Party",
2840 reply => "gsay ", 3179 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party", 3180 tooltip => "Messages and chat related to your party",
2842 }, 3181 },
3182 "c/death" => {
3183 id => "death",
3184 title => "Death",
3185 reply => undef,
3186 tooltip => "Reason for and more info about your most recent death",
3187 },
3188 "c/say" => $SAY_CHANNEL,
3189 "c/chat" => $CHAT_CHANNEL,
2843); 3190);
2844 3191
2845sub cf::client::send_msg { 3192sub cf::client::send_msg {
2846 my ($self, $channel, $msg, $color, @extra) = @_; 3193 my ($self, $channel, $msg, $color, @extra) = @_;
2847 3194
2848 $msg = $self->pl->expand_cfpod ($msg); 3195 $msg = $self->pl->expand_cfpod ($msg)
3196 unless $color & cf::NDI_VERBATIM;
2849 3197
2850 $color &= cf::NDI_CLIENT_MASK; # just in case... 3198 $color &= cf::NDI_CLIENT_MASK; # just in case...
2851 3199
2852 # check predefined channels, for the benefit of C 3200 # check predefined channels, for the benefit of C
2853 if ($CHANNEL{$channel}) { 3201 if ($CHANNEL{$channel}) {
2854 $channel = $CHANNEL{$channel}; 3202 $channel = $CHANNEL{$channel};
2855 3203
2856 $self->ext_msg (channel_info => $channel) 3204 $self->ext_msg (channel_info => $channel);
2857 if $self->can_msg;
2858
2859 $channel = $channel->{id}; 3205 $channel = $channel->{id};
2860 3206
2861 } elsif (ref $channel) { 3207 } elsif (ref $channel) {
2862 # send meta info to client, if not yet sent 3208 # send meta info to client, if not yet sent
2863 unless (exists $self->{channel}{$channel->{id}}) { 3209 unless (exists $self->{channel}{$channel->{id}}) {
2864 $self->{channel}{$channel->{id}} = $channel; 3210 $self->{channel}{$channel->{id}} = $channel;
2865 $self->ext_msg (channel_info => $channel) 3211 $self->ext_msg (channel_info => $channel);
2866 if $self->can_msg;
2867 } 3212 }
2868 3213
2869 $channel = $channel->{id}; 3214 $channel = $channel->{id};
2870 } 3215 }
2871 3216
2872 return unless @extra || length $msg; 3217 return unless @extra || length $msg;
2873 3218
2874 if ($self->can_msg) {
2875 # default colour, mask it out 3219 # default colour, mask it out
2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3220 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2877 if $color & cf::NDI_DEF; 3221 if $color & cf::NDI_DEF;
2878 3222
2879 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3223 my $pkt = "msg "
3224 . $self->{json_coder}->encode (
2880 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2881 } else { 3226 );
2882 if ($color >= 0) {
2883 # replace some tags by gcfclient-compatible ones
2884 for ($msg) {
2885 1 while
2886 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2887 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2888 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2889 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2890 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2891 }
2892 3227
2893 $color &= cf::NDI_COLOR_MASK; 3228 $self->send_big_packet ($pkt);
2894
2895 utf8::encode $msg;
2896
2897 if (0 && $msg =~ /\[/) {
2898 # COMMAND/INFO
2899 $self->send_packet ("drawextinfo $color 10 8 $msg")
2900 } else {
2901 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2902 $self->send_packet ("drawinfo $color $msg")
2903 }
2904 }
2905 }
2906} 3229}
2907 3230
2908=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2909 3232
2910Sends an ext event to the client. 3233Sends an ext event to the client.
2912=cut 3235=cut
2913 3236
2914sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2915 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2916 3239
2917 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2919 } elsif ($self->extcmd == 1) { # TODO: remove
2920 push @msg, msgtype => "event_$type";
2921 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2922 }
2923} 3241}
2924 3242
2925=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
2926 3244
2927Sends an ext reply to the client. 3245Sends an ext reply to the client.
2929=cut 3247=cut
2930 3248
2931sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
2932 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
2933 3251
2934 if ($self->extcmd == 2) {
2935 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2936 } elsif ($self->extcmd == 1) {
2937 #TODO: version 1, remove
2938 unshift @msg, msgtype => "reply", msgid => $id;
2939 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2940 }
2941} 3253}
2942 3254
2943=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
2944 3256
2945Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
3000 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3001 3313
3002 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3003 3315
3004 if (ref $msg) { 3316 if (ref $msg) {
3005 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3006 "ARRAY" eq ref $msg
3007 ? @$msg
3008 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3009 3318
3010 my @reply; 3319 my @reply;
3011 3320
3012 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3013 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
3015 3324
3016 $ns->ext_reply ($reply, @reply) 3325 $ns->ext_reply ($reply, @reply)
3017 if $reply; 3326 if $reply;
3018 3327
3019 } else { 3328 } else {
3020 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3329 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3021 } 3330 }
3022 3331
3023 cf::override; 3332 cf::override;
3024 }, 3333 },
3025); 3334);
3045 3354
3046 $coro 3355 $coro
3047} 3356}
3048 3357
3049cf::client->attach ( 3358cf::client->attach (
3050 on_destroy => sub { 3359 on_client_destroy => sub {
3051 my ($ns) = @_; 3360 my ($ns) = @_;
3052 3361
3053 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3362 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3054 }, 3363 },
3055); 3364);
3071our $safe_hole = new Safe::Hole; 3380our $safe_hole = new Safe::Hole;
3072 3381
3073$SIG{FPE} = 'IGNORE'; 3382$SIG{FPE} = 'IGNORE';
3074 3383
3075$safe->permit_only (Opcode::opset qw( 3384$safe->permit_only (Opcode::opset qw(
3076 :base_core :base_mem :base_orig :base_math 3385 :base_core :base_mem :base_orig :base_math :base_loop
3077 grepstart grepwhile mapstart mapwhile 3386 grepstart grepwhile mapstart mapwhile
3078 sort time 3387 sort time
3079)); 3388));
3080 3389
3081# here we export the classes and methods available to script code 3390# here we export the classes and methods available to script code
3085The following functions and methods are available within a safe environment: 3394The following functions and methods are available within a safe environment:
3086 3395
3087 cf::object 3396 cf::object
3088 contr pay_amount pay_player map x y force_find force_add destroy 3397 contr pay_amount pay_player map x y force_find force_add destroy
3089 insert remove name archname title slaying race decrease split 3398 insert remove name archname title slaying race decrease split
3399 value
3090 3400
3091 cf::object::player 3401 cf::object::player
3092 player 3402 player
3093 3403
3094 cf::player 3404 cf::player
3099 3409
3100=cut 3410=cut
3101 3411
3102for ( 3412for (
3103 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3413 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3104 insert remove inv name archname title slaying race 3414 insert remove inv nrof name archname title slaying race
3105 decrease split destroy)], 3415 decrease split destroy change_exp value msg lore send_msg)],
3106 ["cf::object::player" => qw(player)], 3416 ["cf::object::player" => qw(player)],
3107 ["cf::player" => qw(peaceful)], 3417 ["cf::player" => qw(peaceful send_msg)],
3108 ["cf::map" => qw(trigger)], 3418 ["cf::map" => qw(trigger)],
3109) { 3419) {
3110 no strict 'refs';
3111 my ($pkg, @funs) = @$_; 3420 my ($pkg, @funs) = @$_;
3112 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3421 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3113 for @funs; 3422 for @funs;
3114} 3423}
3115 3424
3130 3439
3131 my $qcode = $code; 3440 my $qcode = $code;
3132 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3441 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3133 $qcode =~ s/\n/\\n/g; 3442 $qcode =~ s/\n/\\n/g;
3134 3443
3444 %vars = (_dummy => 0) unless %vars;
3445
3446 my @res;
3135 local $_; 3447 local $_;
3136 local @safe::cf::_safe_eval_args = values %vars;
3137 3448
3138 my $eval = 3449 my $eval =
3139 "do {\n" 3450 "do {\n"
3140 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3451 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3141 . "#line 0 \"{$qcode}\"\n" 3452 . "#line 0 \"{$qcode}\"\n"
3142 . $code 3453 . $code
3143 . "\n}" 3454 . "\n}"
3144 ; 3455 ;
3145 3456
3457 if ($CFG{safe_eval}) {
3146 sub_generation_inc; 3458 sub_generation_inc;
3459 local @safe::cf::_safe_eval_args = values %vars;
3147 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3460 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3148 sub_generation_inc; 3461 sub_generation_inc;
3462 } else {
3463 local @cf::_safe_eval_args = values %vars;
3464 @res = wantarray ? eval eval : scalar eval $eval;
3465 }
3149 3466
3150 if ($@) { 3467 if ($@) {
3151 warn "$@"; 3468 warn "$@",
3152 warn "while executing safe code '$code'\n"; 3469 "while executing safe code '$code'\n",
3153 warn "with arguments " . (join " ", %vars) . "\n"; 3470 "with arguments " . (join " ", %vars) . "\n";
3154 } 3471 }
3155 3472
3156 wantarray ? @res : $res[0] 3473 wantarray ? @res : $res[0]
3157} 3474}
3158 3475
3172=cut 3489=cut
3173 3490
3174sub register_script_function { 3491sub register_script_function {
3175 my ($fun, $cb) = @_; 3492 my ($fun, $cb) = @_;
3176 3493
3177 no strict 'refs'; 3494 $fun = "safe::$fun" if $CFG{safe_eval};
3178 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3495 *$fun = $safe_hole->wrap ($cb);
3179} 3496}
3180 3497
3181=back 3498=back
3182 3499
3183=cut 3500=cut
3184 3501
3185############################################################################# 3502#############################################################################
3186# the server's init and main functions 3503# the server's init and main functions
3504
3505our %FACEHASH; # hash => idx, #d# HACK for http server
3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3187 3528
3188sub load_facedata($) { 3529sub load_facedata($) {
3189 my ($path) = @_; 3530 my ($path) = @_;
3190 3531
3191 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3192 # for this (global event?) 3533 # for this (global event?)
3193 %ext::player_env::MUSIC_FACE_CACHE = (); 3534 %ext::player_env::MUSIC_FACE_CACHE = ();
3194 3535
3195 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3196 3537
3197 warn "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3198 3539
3199 my $facedata; 3540 my $facedata = decode_storable load_file $path;
3200 0 < aio_load $path, $facedata
3201 or die "$path: $!";
3202
3203 $facedata = Coro::Storable::thaw $facedata;
3204 3541
3205 $facedata->{version} == 2 3542 $facedata->{version} == 2
3206 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3207 3544
3208 # patch in the exptable
3209 $facedata->{resource}{"res/exp_table"} = {
3210 type => FT_RSRC,
3211 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3212 };
3213 cf::cede_to_tick; 3545 cf::cede_to_tick;
3214 3546
3215 { 3547 {
3216 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3217 3549
3218 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3219 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3220 3553
3221 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3222 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3223 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3224 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3225 3560
3226 cf::cede_to_tick; 3561 cf::cede_to_tick;
3227 } 3562 }
3228 3563
3229 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
3234 3569
3235 if (my $smooth = cf::face::find $info->{smooth}) { 3570 if (my $smooth = cf::face::find $info->{smooth}) {
3236 cf::face::set_smooth $idx, $smooth; 3571 cf::face::set_smooth $idx, $smooth;
3237 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3572 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3238 } else { 3573 } else {
3239 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3574 error "smooth face '$info->{smooth}' not found for face '$face'";
3240 } 3575 }
3241 3576
3242 cf::cede_to_tick; 3577 cf::cede_to_tick;
3243 } 3578 }
3244 } 3579 }
3253 3588
3254 cf::anim::invalidate_all; # d'oh 3589 cf::anim::invalidate_all; # d'oh
3255 } 3590 }
3256 3591
3257 { 3592 {
3258 # TODO: for gcfclient pleasure, we should give resources
3259 # that gcfclient doesn't grok a >10000 face index.
3260 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3261 3594
3262 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3263 if (defined $info->{type}) { 3596 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue
3264 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3265 my $data;
3266 3599
3267 if ($info->{type} & 1) {
3268 # prepend meta info
3269
3270 my $meta = $enc->encode ({
3271 name => $name,
3272 %{ $info->{meta} || {} },
3273 });
3274
3275 $data = pack "(w/a*)*", $meta, $info->{data};
3276 } else {
3277 $data = $info->{data};
3278 }
3279
3280 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3281 cf::face::set_type $idx, $info->{type}; 3600 cf::face::set_type $idx, $type;
3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d#
3282 } else { 3604 } else {
3283 $RESOURCE{$name} = $info; 3605# $RESOURCE{$name} = $info; # unused
3284 } 3606 }
3285 3607
3286 cf::cede_to_tick; 3608 cf::cede_to_tick;
3287 } 3609 }
3288 } 3610 }
3289 3611
3290 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3612 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3291 3613
3292 1 3614 1
3293} 3615}
3294
3295cf::global->attach (on_resource_update => sub {
3296 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3297 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3298
3299 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3300 my $sound = $soundconf->{compat}[$_]
3301 or next;
3302
3303 my $face = cf::face::find "sound/$sound->[1]";
3304 cf::sound::set $sound->[0] => $face;
3305 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3306 }
3307
3308 while (my ($k, $v) = each %{$soundconf->{event}}) {
3309 my $face = cf::face::find "sound/$v";
3310 cf::sound::set $k => $face;
3311 }
3312 }
3313});
3314 3616
3315register_exticmd fx_want => sub { 3617register_exticmd fx_want => sub {
3316 my ($ns, $want) = @_; 3618 my ($ns, $want) = @_;
3317 3619
3318 while (my ($k, $v) = each %$want) { 3620 while (my ($k, $v) = each %$want) {
3326 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3327 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3328 cf::arch::commit_load; 3630 cf::arch::commit_load;
3329 3631
3330 $status 3632 $status
3633}
3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3331} 3646}
3332 3647
3333sub reload_regions { 3648sub reload_regions {
3334 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3335 # for this (global event?) 3650 # for this (global event?)
3350} 3665}
3351 3666
3352sub reload_archetypes { 3667sub reload_archetypes {
3353 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3354 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3355} 3679}
3356 3680
3357sub reload_treasures { 3681sub reload_treasures {
3358 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3359 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3360} 3684}
3361 3685
3686sub reload_sound {
3687 trace "loading sound config from $DATADIR/sound\n";
3688
3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3690
3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3692 my $sound = $soundconf->{compat}[$_]
3693 or next;
3694
3695 my $face = cf::face::find "sound/$sound->[1]";
3696 cf::sound::set $sound->[0] => $face;
3697 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3698 }
3699
3700 while (my ($k, $v) = each %{$soundconf->{event}}) {
3701 my $face = cf::face::find "sound/$v";
3702 cf::sound::set $k => $face;
3703 }
3704}
3705
3706sub reload_pod {
3707 trace "loading pods $PODDIR\n";
3708
3709 my @command_help;
3710
3711 for (
3712 [0, "command_help"],
3713 [1, "emote_help"],
3714 [2, "dmcommand_help"],
3715 ) {
3716 my ($type, $path) = @$_;
3717
3718 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3719 or die "unable to load $path";
3720
3721 my $level = 1e9;
3722
3723 for my $par (@$paragraphs) {
3724 if ($par->{type} eq "head2") {
3725 # this code taken almost verbatim from DC/Protocol.pm
3726
3727 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3728 my $cmd = $1;
3729 my @args = split /\|/, $2;
3730 @args = (".*") unless @args;
3731
3732 $_ = $_ eq ".*" ? "" : " $_"
3733 for @args;
3734
3735 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3736
3737 push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
3738 $level = $par->{level};
3739 } else {
3740 error "$par->{markup}: unparsable command heading";
3741 }
3742 } elsif ($par->{level} > $level) {
3743 $command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
3744 }
3745
3746 cf::cede_to_tick;
3747 }
3748 }
3749
3750 @command_help = sort {
3751 $a->[0] <=> $b->[0]
3752 or $a->[1] cmp $b->[1]
3753 } @command_help;
3754
3755 cf::cede_to_tick;
3756
3757 add_face "res/command_help" => FT_RSRC,
3758 JSON::XS->new->utf8->encode (\@command_help);
3759}
3760
3362sub reload_resources { 3761sub reload_resources {
3363 warn "reloading resource files...\n"; 3762 trace "reloading resource files...\n";
3364 3763
3764 reload_materials;
3365 reload_facedata; 3765 reload_facedata;
3766 reload_exp_table;
3767 reload_sound;
3366 reload_archetypes; 3768 reload_archetypes;
3367 reload_regions; 3769 reload_regions;
3368 reload_treasures; 3770 reload_treasures;
3771 reload_pod;
3369 3772
3370 warn "finished reloading resource files\n"; 3773 trace "finished reloading resource files\n";
3371}
3372
3373sub init {
3374 my $guard = freeze_mainloop;
3375
3376 reload_resources;
3377} 3774}
3378 3775
3379sub reload_config { 3776sub reload_config {
3380 open my $fh, "<:utf8", "$CONFDIR/config" 3777 trace "reloading config file...\n";
3381 or return;
3382 3778
3383 local $/; 3779 my $config = load_file "$CONFDIR/config";
3384 *CFG = YAML::Load <$fh>; 3780 utf8::decode $config;
3781 *CFG = decode_yaml $config;
3385 3782
3386 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3783 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3387 3784
3388 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3785 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3389 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3786 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3390 3787
3391 if (exists $CFG{mlockall}) { 3788 if (exists $CFG{mlockall}) {
3395 }; 3792 };
3396 warn $@ if $@; 3793 warn $@ if $@;
3397 } 3794 }
3398} 3795}
3399 3796
3797sub pidfile() {
3798 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3799 or die "$PIDFILE: $!";
3800 flock $fh, &Fcntl::LOCK_EX
3801 or die "$PIDFILE: flock: $!";
3802 $fh
3803}
3804
3805# make sure only one server instance is running at any one time
3806sub atomic {
3807 my $fh = pidfile;
3808
3809 my $pid = <$fh>;
3810 kill 9, $pid if $pid > 0;
3811
3812 seek $fh, 0, 0;
3813 print $fh $$;
3814}
3815
3816sub main_loop {
3817 trace "EV::loop starting\n";
3818 if (1) {
3819 EV::loop;
3820 }
3821 trace "EV::loop returned\n";
3822 goto &main_loop unless $REALLY_UNLOOP;
3823}
3824
3400sub main { 3825sub main {
3826 cf::init_globals; # initialise logging
3827
3828 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3829 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3830 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3831 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3832
3833 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3834
3401 # we must not ever block the main coroutine 3835 # we must not ever block the main coroutine
3402 local $Coro::idle = sub { 3836 $Coro::idle = sub {
3403 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3837 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3404 (async { 3838 (async {
3405 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3839 $Coro::current->{desc} = "IDLE BUG HANDLER";
3406 EV::loop EV::LOOP_ONESHOT; 3840 EV::loop EV::LOOP_ONESHOT;
3407 })->prio (Coro::PRIO_MAX); 3841 })->prio (Coro::PRIO_MAX);
3408 }; 3842 };
3409 3843
3410 { 3844 evthread_start IO::AIO::poll_fileno;
3411 my $guard = freeze_mainloop; 3845
3846 cf::sync_job {
3847 cf::incloader::init ();
3848
3849 db_init;
3850
3851 cf::init_anim;
3852 cf::init_attackmess;
3853 cf::init_dynamic;
3854
3855 cf::load_settings;
3856
3857 reload_resources;
3412 reload_config; 3858 reload_config;
3413 db_init; 3859
3860 cf::init_uuid;
3861 cf::init_signals;
3862 cf::init_skills;
3863
3864 cf::init_beforeplay;
3865
3866 atomic;
3867
3414 load_extensions; 3868 load_extensions;
3415 3869
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3870 utime time, time, $RUNTIMEFILE;
3417 evthread_start IO::AIO::poll_fileno; 3871
3872 # no (long-running) fork's whatsoever before this point(!)
3873 use POSIX ();
3874 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3875
3876 cf::_post_init 0;
3418 } 3877 };
3419 3878
3420 EV::loop; 3879 cf::object::thawer::errors_are_fatal 0;
3880 info "parse errors in files are no longer fatal from this point on.\n";
3881
3882 AE::postpone {
3883 undef &main; # free gobs of memory :)
3884 };
3885
3886 goto &main_loop;
3421} 3887}
3422 3888
3423############################################################################# 3889#############################################################################
3424# initialisation and cleanup 3890# initialisation and cleanup
3425 3891
3426# install some emergency cleanup handlers 3892# install some emergency cleanup handlers
3427BEGIN { 3893BEGIN {
3428 our %SIGWATCHER = (); 3894 our %SIGWATCHER = ();
3429 for my $signal (qw(INT HUP TERM)) { 3895 for my $signal (qw(INT HUP TERM)) {
3430 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3896 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3431 cf::cleanup "SIG$signal"; 3897 cf::cleanup "SIG$signal";
3432 }; 3898 };
3433 } 3899 }
3434} 3900}
3435 3901
3436sub write_runtime_sync { 3902sub write_runtime_sync {
3437 my $runtime = "$LOCALDIR/runtime"; 3903 my $t0 = AE::time;
3438 3904
3439 # first touch the runtime file to show we are still running: 3905 # first touch the runtime file to show we are still running:
3440 # the fsync below can take a very very long time. 3906 # the fsync below can take a very very long time.
3441 3907
3442 IO::AIO::aio_utime $runtime, undef, undef; 3908 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3443 3909
3444 my $guard = cf::lock_acquire "write_runtime"; 3910 my $guard = cf::lock_acquire "write_runtime";
3445 3911
3446 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3912 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3447 or return; 3913 or return;
3448 3914
3449 my $value = $cf::RUNTIME + 90 + 10; 3915 my $value = $cf::RUNTIME + 90 + 10;
3450 # 10 is the runtime save interval, for a monotonic clock 3916 # 10 is the runtime save interval, for a monotonic clock
3451 # 60 allows for the watchdog to kill the server. 3917 # 60 allows for the watchdog to kill the server.
3461 aio_utime $fh, undef, undef; 3927 aio_utime $fh, undef, undef;
3462 3928
3463 close $fh 3929 close $fh
3464 or return; 3930 or return;
3465 3931
3466 aio_rename "$runtime~", $runtime 3932 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3467 and return; 3933 and return;
3468 3934
3469 warn "runtime file written.\n"; 3935 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3470 3936
3471 1 3937 1
3472} 3938}
3473 3939
3474our $uuid_lock; 3940our $uuid_lock;
3483 my $uuid = "$LOCALDIR/uuid"; 3949 my $uuid = "$LOCALDIR/uuid";
3484 3950
3485 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3951 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3486 or return; 3952 or return;
3487 3953
3488 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3954 my $value = uuid_seq uuid_cur;
3955
3956 unless ($value) {
3957 info "cowardly refusing to write zero uuid value!\n";
3958 return;
3959 }
3960
3961 my $value = uuid_str $value + $uuid_skip;
3489 $uuid_skip = 0; 3962 $uuid_skip = 0;
3490 3963
3491 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3964 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3492 and return; 3965 and return;
3493 3966
3499 or return; 3972 or return;
3500 3973
3501 aio_rename "$uuid~", $uuid 3974 aio_rename "$uuid~", $uuid
3502 and return; 3975 and return;
3503 3976
3504 warn "uuid file written ($value).\n"; 3977 trace "uuid file written ($value).\n";
3505 3978
3506 1 3979 1
3507 3980
3508} 3981}
3509 3982
3515} 3988}
3516 3989
3517sub emergency_save() { 3990sub emergency_save() {
3518 my $freeze_guard = cf::freeze_mainloop; 3991 my $freeze_guard = cf::freeze_mainloop;
3519 3992
3520 warn "enter emergency perl save\n"; 3993 info "emergency_perl_save: enter\n";
3994
3995 # this is a trade-off: we want to be very quick here, so
3996 # save all maps without fsync, and later call a global sync
3997 # (which in turn might be very very slow)
3998 local $USE_FSYNC = 0;
3521 3999
3522 cf::sync_job { 4000 cf::sync_job {
4001 cf::write_runtime_sync; # external watchdog should not bark
4002
3523 # use a peculiar iteration method to avoid tripping on perl 4003 # use a peculiar iteration method to avoid tripping on perl
3524 # refcount bugs in for. also avoids problems with players 4004 # refcount bugs in for. also avoids problems with players
3525 # and maps saved/destroyed asynchronously. 4005 # and maps saved/destroyed asynchronously.
3526 warn "begin emergency player save\n"; 4006 info "emergency_perl_save: begin player save\n";
3527 for my $login (keys %cf::PLAYER) { 4007 for my $login (keys %cf::PLAYER) {
3528 my $pl = $cf::PLAYER{$login} or next; 4008 my $pl = $cf::PLAYER{$login} or next;
3529 $pl->valid or next; 4009 $pl->valid or next;
3530 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4010 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3531 $pl->save; 4011 $pl->save;
3532 } 4012 }
3533 warn "end emergency player save\n"; 4013 info "emergency_perl_save: end player save\n";
3534 4014
3535 warn "begin emergency map save\n"; 4015 cf::write_runtime_sync; # external watchdog should not bark
4016
4017 info "emergency_perl_save: begin map save\n";
3536 for my $path (keys %cf::MAP) { 4018 for my $path (keys %cf::MAP) {
3537 my $map = $cf::MAP{$path} or next; 4019 my $map = $cf::MAP{$path} or next;
3538 $map->valid or next; 4020 $map->valid or next;
3539 $map->save; 4021 $map->save;
3540 } 4022 }
3541 warn "end emergency map save\n"; 4023 info "emergency_perl_save: end map save\n";
3542 4024
3543 warn "begin emergency database checkpoint\n"; 4025 cf::write_runtime_sync; # external watchdog should not bark
4026
4027 info "emergency_perl_save: begin database checkpoint\n";
3544 BDB::db_env_txn_checkpoint $DB_ENV; 4028 BDB::db_env_txn_checkpoint $DB_ENV;
3545 warn "end emergency database checkpoint\n"; 4029 info "emergency_perl_save: end database checkpoint\n";
3546 4030
3547 warn "begin write uuid\n"; 4031 info "emergency_perl_save: begin write uuid\n";
3548 write_uuid_sync 1; 4032 write_uuid_sync 1;
3549 warn "end write uuid\n"; 4033 info "emergency_perl_save: end write uuid\n";
4034
4035 cf::write_runtime_sync; # external watchdog should not bark
4036
4037 trace "emergency_perl_save: syncing database to disk";
4038 BDB::db_env_txn_checkpoint $DB_ENV;
4039
4040 info "emergency_perl_save: starting sync\n";
4041 IO::AIO::aio_sync sub {
4042 info "emergency_perl_save: finished sync\n";
4043 };
4044
4045 cf::write_runtime_sync; # external watchdog should not bark
4046
4047 trace "emergency_perl_save: flushing outstanding aio requests";
4048 while (IO::AIO::nreqs || BDB::nreqs) {
4049 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4050 }
4051
4052 cf::write_runtime_sync; # external watchdog should not bark
3550 }; 4053 };
3551 4054
3552 warn "leave emergency perl save\n"; 4055 info "emergency_perl_save: leave\n";
3553} 4056}
3554 4057
3555sub post_cleanup { 4058sub post_cleanup {
3556 my ($make_core) = @_; 4059 my ($make_core) = @_;
3557 4060
4061 IO::AIO::flush;
4062
3558 warn Carp::longmess "post_cleanup backtrace" 4063 error Carp::longmess "post_cleanup backtrace"
3559 if $make_core; 4064 if $make_core;
4065
4066 my $fh = pidfile;
4067 unlink $PIDFILE if <$fh> == $$;
4068}
4069
4070# a safer delete_package, copied from Symbol
4071sub clear_package($) {
4072 my $pkg = shift;
4073
4074 # expand to full symbol table name if needed
4075 unless ($pkg =~ /^main::.*::$/) {
4076 $pkg = "main$pkg" if $pkg =~ /^::/;
4077 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4078 $pkg .= '::' unless $pkg =~ /::$/;
4079 }
4080
4081 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4082 my $stem_symtab = *{$stem}{HASH};
4083
4084 defined $stem_symtab and exists $stem_symtab->{$leaf}
4085 or return;
4086
4087 # clear all symbols
4088 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4089 for my $name (keys %$leaf_symtab) {
4090 _gv_clear *{"$pkg$name"};
4091# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4092 }
3560} 4093}
3561 4094
3562sub do_reload_perl() { 4095sub do_reload_perl() {
3563 # can/must only be called in main 4096 # can/must only be called in main
3564 if ($Coro::current != $Coro::main) { 4097 unless (in_main) {
3565 warn "can only reload from main coroutine"; 4098 error "can only reload from main coroutine";
3566 return; 4099 return;
3567 } 4100 }
3568 4101
3569 warn "reloading..."; 4102 return if $RELOAD++;
3570 4103
3571 warn "entering sync_job"; 4104 my $t1 = AE::time;
3572 4105
4106 while ($RELOAD) {
4107 cf::get_slot 0.1, -1, "reload_perl";
4108 info "perl_reload: reloading...";
4109
4110 trace "perl_reload: entering sync_job";
4111
3573 cf::sync_job { 4112 cf::sync_job {
3574 cf::write_runtime_sync; # external watchdog should not bark
3575 cf::emergency_save; 4113 #cf::emergency_save;
3576 cf::write_runtime_sync; # external watchdog should not bark
3577 4114
3578 warn "syncing database to disk";
3579 BDB::db_env_txn_checkpoint $DB_ENV;
3580
3581 # if anything goes wrong in here, we should simply crash as we already saved
3582
3583 warn "flushing outstanding aio requests";
3584 for (;;) {
3585 BDB::flush;
3586 IO::AIO::flush;
3587 Coro::cede_notself;
3588 last unless IO::AIO::nreqs || BDB::nreqs;
3589 warn "iterate...";
3590 }
3591
3592 ++$RELOAD;
3593
3594 warn "cancelling all extension coros"; 4115 trace "perl_reload: cancelling all extension coros";
3595 $_->cancel for values %EXT_CORO; 4116 $_->cancel for values %EXT_CORO;
3596 %EXT_CORO = (); 4117 %EXT_CORO = ();
3597 4118
3598 warn "removing commands"; 4119 trace "perl_reload: removing commands";
3599 %COMMAND = (); 4120 %COMMAND = ();
3600 4121
3601 warn "removing ext/exti commands"; 4122 trace "perl_reload: removing ext/exti commands";
3602 %EXTCMD = (); 4123 %EXTCMD = ();
3603 %EXTICMD = (); 4124 %EXTICMD = ();
3604 4125
3605 warn "unloading/nuking all extensions"; 4126 trace "perl_reload: unloading/nuking all extensions";
3606 for my $pkg (@EXTS) { 4127 for my $pkg (@EXTS) {
3607 warn "... unloading $pkg"; 4128 trace "... unloading $pkg";
3608 4129
3609 if (my $cb = $pkg->can ("unload")) { 4130 if (my $cb = $pkg->can ("unload")) {
3610 eval { 4131 eval {
3611 $cb->($pkg); 4132 $cb->($pkg);
3612 1 4133 1
3613 } or warn "$pkg unloaded, but with errors: $@"; 4134 } or error "$pkg unloaded, but with errors: $@";
4135 }
4136
4137 trace "... clearing $pkg";
4138 clear_package $pkg;
3614 } 4139 }
3615 4140
3616 warn "... nuking $pkg";
3617 Symbol::delete_package $pkg;
3618 }
3619
3620 warn "unloading all perl modules loaded from $LIBDIR"; 4141 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3621 while (my ($k, $v) = each %INC) { 4142 while (my ($k, $v) = each %INC) {
3622 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4143 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3623 4144
3624 warn "... unloading $k"; 4145 trace "... unloading $k";
3625 delete $INC{$k}; 4146 delete $INC{$k};
3626 4147
3627 $k =~ s/\.pm$//; 4148 $k =~ s/\.pm$//;
3628 $k =~ s/\//::/g; 4149 $k =~ s/\//::/g;
3629 4150
3630 if (my $cb = $k->can ("unload_module")) { 4151 if (my $cb = $k->can ("unload_module")) {
3631 $cb->(); 4152 $cb->();
4153 }
4154
4155 clear_package $k;
3632 } 4156 }
3633 4157
3634 Symbol::delete_package $k;
3635 }
3636
3637 warn "getting rid of safe::, as good as possible"; 4158 trace "perl_reload: getting rid of safe::, as good as possible";
3638 Symbol::delete_package "safe::$_" 4159 clear_package "safe::$_"
3639 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4160 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3640 4161
3641 warn "unloading cf.pm \"a bit\""; 4162 trace "perl_reload: unloading cf.pm \"a bit\"";
3642 delete $INC{"cf.pm"}; 4163 delete $INC{"cf.pm"};
3643 delete $INC{"cf/pod.pm"}; 4164 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3644 4165
3645 # don't, removes xs symbols, too, 4166 # don't, removes xs symbols, too,
3646 # and global variables created in xs 4167 # and global variables created in xs
3647 #Symbol::delete_package __PACKAGE__; 4168 #clear_package __PACKAGE__;
3648 4169
3649 warn "unload completed, starting to reload now"; 4170 info "perl_reload: unload completed, starting to reload now";
3650 4171
3651 warn "reloading cf.pm"; 4172 trace "perl_reload: reloading cf.pm";
3652 require cf; 4173 require cf;
3653 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4174 cf::_connect_to_perl_1;
3654 4175
3655 warn "loading config and database again"; 4176 trace "perl_reload: loading config and database again";
3656 cf::reload_config; 4177 cf::reload_config;
3657 4178
3658 warn "loading extensions"; 4179 trace "perl_reload: loading extensions";
3659 cf::load_extensions; 4180 cf::load_extensions;
3660 4181
4182 if ($REATTACH_ON_RELOAD) {
3661 warn "reattaching attachments to objects/players"; 4183 trace "perl_reload: reattaching attachments to objects/players";
3662 _global_reattach; # objects, sockets 4184 _global_reattach; # objects, sockets
3663 warn "reattaching attachments to maps"; 4185 trace "perl_reload: reattaching attachments to maps";
3664 reattach $_ for values %MAP; 4186 reattach $_ for values %MAP;
3665 warn "reattaching attachments to players"; 4187 trace "perl_reload: reattaching attachments to players";
3666 reattach $_ for values %PLAYER; 4188 reattach $_ for values %PLAYER;
4189 }
3667 4190
3668 warn "leaving sync_job"; 4191 cf::_post_init 1;
3669 4192
4193 trace "perl_reload: leaving sync_job";
4194
3670 1 4195 1
3671 } or do { 4196 } or do {
3672 warn $@; 4197 error $@;
3673 cf::cleanup "error while reloading, exiting."; 4198 cf::cleanup "perl_reload: error, exiting.";
4199 };
4200
4201 --$RELOAD;
3674 }; 4202 }
3675 4203
3676 warn "reloaded"; 4204 $t1 = AE::time - $t1;
4205 info "perl_reload: completed in ${t1}s\n";
3677}; 4206};
3678 4207
3679our $RELOAD_WATCHER; # used only during reload 4208our $RELOAD_WATCHER; # used only during reload
3680 4209
3681sub reload_perl() { 4210sub reload_perl() {
3682 # doing reload synchronously and two reloads happen back-to-back, 4211 # doing reload synchronously and two reloads happen back-to-back,
3683 # coro crashes during coro_state_free->destroy here. 4212 # coro crashes during coro_state_free->destroy here.
3684 4213
4214 $RELOAD_WATCHER ||= cf::async {
4215 Coro::AIO::aio_wait cache_extensions;
4216
3685 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4217 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3686 do_reload_perl; 4218 do_reload_perl;
3687 undef $RELOAD_WATCHER; 4219 undef $RELOAD_WATCHER;
4220 };
3688 }; 4221 };
3689} 4222}
3690 4223
3691register_command "reload" => sub { 4224register_command "reload" => sub {
3692 my ($who, $arg) = @_; 4225 my ($who, $arg) = @_;
3698 reload_perl; 4231 reload_perl;
3699 }; 4232 };
3700 } 4233 }
3701}; 4234};
3702 4235
3703unshift @INC, $LIBDIR; 4236#############################################################################
3704 4237
3705my $bug_warning = 0; 4238my $bug_warning = 0;
3706 4239
3707our @WAIT_FOR_TICK;
3708our @WAIT_FOR_TICK_BEGIN;
3709
3710sub wait_for_tick { 4240sub wait_for_tick() {
3711 return if tick_inhibit || $Coro::current == $Coro::main; 4241 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3712 4242
3713 my $signal = new Coro::Signal; 4243 $WAIT_FOR_TICK->wait;
3714 push @WAIT_FOR_TICK, $signal;
3715 $signal->wait;
3716} 4244}
3717 4245
3718sub wait_for_tick_begin { 4246sub wait_for_tick_begin() {
3719 return if tick_inhibit || $Coro::current == $Coro::main; 4247 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3720 4248
3721 my $signal = new Coro::Signal; 4249 my $signal = new Coro::Signal;
3722 push @WAIT_FOR_TICK_BEGIN, $signal; 4250 push @WAIT_FOR_TICK_BEGIN, $signal;
3723 $signal->wait; 4251 $signal->wait;
3724} 4252}
3728 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4256 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3729 unless ++$bug_warning > 10; 4257 unless ++$bug_warning > 10;
3730 return; 4258 return;
3731 } 4259 }
3732 4260
3733 cf::server_tick; # one server iteration 4261 cf::one_tick; # one server iteration
4262
4263 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3734 4264
3735 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4265 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3736 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4266 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3737 Coro::async_pool { 4267 Coro::async_pool {
3738 $Coro::current->{desc} = "runtime saver"; 4268 $Coro::current->{desc} = "runtime saver";
3739 write_runtime_sync 4269 write_runtime_sync
3740 or warn "ERROR: unable to write runtime file: $!"; 4270 or error "ERROR: unable to write runtime file: $!";
3741 }; 4271 };
3742 } 4272 }
3743 4273
3744 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4274 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3745 $sig->send; 4275 $sig->send;
3746 } 4276 }
3747 while (my $sig = shift @WAIT_FOR_TICK) { 4277 $WAIT_FOR_TICK->broadcast;
3748 $sig->send;
3749 }
3750 4278
3751 $LOAD = ($NOW - $TICK_START) / $TICK; 4279 $LOAD = ($NOW - $TICK_START) / $TICK;
3752 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4280 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3753 4281
3754 if (0) { 4282 if (0) {
3755 if ($NEXT_TICK) { 4283 if ($NEXT_TICK) {
3756 my $jitter = $TICK_START - $NEXT_TICK; 4284 my $jitter = $TICK_START - $NEXT_TICK;
3757 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4285 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3758 warn "jitter $JITTER\n";#d# 4286 debug "jitter $JITTER\n";#d#
3759 } 4287 }
3760 } 4288 }
3761} 4289}
3762 4290
3763{ 4291{
3764 # configure BDB 4292 # configure BDB
4293 info "initialising database";
3765 4294
3766 BDB::min_parallel 8; 4295 BDB::min_parallel 16;
3767 BDB::max_poll_reqs $TICK * 0.1; 4296 BDB::max_poll_reqs $TICK * 0.1;
3768 $Coro::BDB::WATCHER->priority (1); 4297 #$AnyEvent::BDB::WATCHER->priority (1);
3769 4298
3770 unless ($DB_ENV) { 4299 unless ($DB_ENV) {
3771 $DB_ENV = BDB::db_env_create; 4300 $DB_ENV = BDB::db_env_create;
3772 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3773 | BDB::LOG_AUTOREMOVE, 1); 4302 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4303 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3774 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4304 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3775 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4305 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3776 4306
3777 cf::sync_job { 4307 cf::sync_job {
3778 eval { 4308 eval {
3797 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4327 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3798 }; 4328 };
3799 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4329 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3800 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4330 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3801 }; 4331 };
4332
4333 info "database initialised";
3802} 4334}
3803 4335
3804{ 4336{
3805 # configure IO::AIO 4337 # configure IO::AIO
3806 4338
4339 info "initialising aio";
3807 IO::AIO::min_parallel 8; 4340 IO::AIO::min_parallel 8;
3808 IO::AIO::max_poll_time $TICK * 0.1; 4341 IO::AIO::max_poll_time $TICK * 0.1;
3809 $Coro::AIO::WATCHER->priority (1); 4342 undef $AnyEvent::AIO::WATCHER;
4343 info "aio initialised";
3810} 4344}
3811 4345
3812my $_log_backtrace; 4346our $_log_backtrace;
4347our $_log_backtrace_last;
3813 4348
3814sub _log_backtrace { 4349sub _log_backtrace {
3815 my ($msg, @addr) = @_; 4350 my ($msg, @addr) = @_;
3816 4351
3817 $msg =~ s/\n//; 4352 $msg =~ s/\n$//;
3818 4353
4354 if ($_log_backtrace_last eq $msg) {
4355 LOG llevInfo, "[ABT] $msg\n";
4356 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3819 # limit the # of concurrent backtraces 4357 # limit the # of concurrent backtraces
3820 if ($_log_backtrace < 2) { 4358 } elsif ($_log_backtrace < 2) {
4359 $_log_backtrace_last = $msg;
3821 ++$_log_backtrace; 4360 ++$_log_backtrace;
4361 my $perl_bt = Carp::longmess $msg;
3822 async { 4362 async {
3823 $Coro::current->{desc} = "abt $msg"; 4363 $Coro::current->{desc} = "abt $msg";
3824 4364
3825 my @bt = fork_call { 4365 my @bt = fork_call {
3826 @addr = map { sprintf "%x", $_ } @addr; 4366 @addr = map { sprintf "%x", $_ } @addr;
3837 } 4377 }
3838 4378
3839 @funcs 4379 @funcs
3840 }; 4380 };
3841 4381
3842 LOG llevInfo, "[ABT] $msg\n"; 4382 LOG llevInfo, "[ABT] $perl_bt\n";
4383 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3843 LOG llevInfo, "[ABT] $_\n" for @bt; 4384 LOG llevInfo, "[ABT] $_\n" for @bt;
3844 --$_log_backtrace; 4385 --$_log_backtrace;
3845 }; 4386 };
3846 } else { 4387 } else {
3847 LOG llevInfo, "[ABT] $msg\n"; 4388 LOG llevInfo, "[ABT] $msg\n";
3848 LOG llevInfo, "[ABT] [suppressed]\n"; 4389 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3849 } 4390 }
3850} 4391}
3851 4392
3852# load additional modules 4393# load additional modules
3853use cf::pod; 4394require "cf/$_.pm" for @EXTRA_MODULES;
4395cf::_connect_to_perl_2;
3854 4396
3855END { cf::emergency_save } 4397END { cf::emergency_save }
3856 4398
38571 43991
3858 4400

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines