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.395 by root, Sat Nov 10 22:41:59 2007 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines