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.386 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.576 by root, Tue Jan 3 02:08:49 2012 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 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
113our %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.
162 240
163The raw value load value from the last tick. 241The raw value load value from the last tick.
164 242
165=item %cf::CFG 243=item %cf::CFG
166 244
167Configuration for the server, loaded from C</etc/crossfire/config>, or 245Configuration for the server, loaded from C</etc/deliantra-server/config>, or
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 = 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
253=item $ref = cf::from_json $json 391=item $ref = cf::decode_json $json
254 392
255Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
256 394
257=item $json = cf::to_json $ref 395=item $json = cf::encode_json $ref
258 396
259Converts a perl data structure into its JSON representation. 397Converts a perl data structure into its JSON representation.
260 398
261=cut 399=cut
262 400
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 401our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 402
265sub to_json ($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
405
406=item $ref = cf::decode_storable $scalar
407
408Same as Coro::Storable::thaw, so blocks.
409
410=cut
411
412BEGIN { *decode_storable = \&Coro::Storable::thaw }
413
414=item $ref = cf::decode_yaml $scalar
415
416Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
417
418=cut
419
420sub decode_yaml($) {
421 fork_call { YAML::XS::Load $_[0] } @_
422}
423
424=item $scalar = cf::unlzf $scalar
425
426Same as Compress::LZF::compress, but takes server ticks into account, so
427blocks.
428
429=cut
430
431sub unlzf($) {
432 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
433 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
434 Compress::LZF::decompress $_[0]
435}
436
437=item cf::post_init { BLOCK }
438
439Execute the given codeblock, I<after> all extensions have been (re-)loaded,
440but I<before> the server starts ticking again.
441
442The codeblock will have a single boolean argument to indicate whether this
443is a reload or not.
444
445=cut
446
447sub post_init(&) {
448 push @POST_INIT, shift;
449}
450
451sub _post_init {
452 trace "running post_init jobs";
453
454 # run them in parallel...
455
456 my @join;
457
458 while () {
459 push @join, map &Coro::async ($_, 0), @POST_INIT;
460 @POST_INIT = ();
461
462 @join or last;
463
464 (pop @join)->join;
465 }
466}
267 467
268=item cf::lock_wait $string 468=item cf::lock_wait $string
269 469
270Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
271 471
272=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
273 473
274Wait until the given lock is available and then acquires it and returns 474Wait 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, 475a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
277returned. 477returned.
278 478
279Locks are *not* recursive, locking from the same coro twice results in a 479Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 480deadlocked coro.
286 486
287Return true if the lock is currently active, i.e. somebody has locked it. 487Return true if the lock is currently active, i.e. somebody has locked it.
288 488
289=cut 489=cut
290 490
291our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 492
294sub lock_wait($) { 493sub lock_wait($) {
295 my ($key) = @_; 494 $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} 495}
308 496
309sub lock_acquire($) { 497sub lock_acquire($) {
310 my ($key) = @_; 498 $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} 499}
324 500
325sub lock_active($) { 501sub lock_active($) {
326 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 503}
330 504
331sub freeze_mainloop { 505sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 506 tick_inhibit_inc;
333 507
334 my $guard = Coro::guard { 508 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 509}
336 }; 510
337 $TICK_WATCHER->stop; 511=item cf::periodic $interval, $cb
338 $guard 512
513Like EV::periodic, but randomly selects a starting point so that the actions
514get spread over time.
515
516=cut
517
518sub periodic($$) {
519 my ($interval, $cb) = @_;
520
521 my $start = rand List::Util::min 180, $interval;
522
523 EV::periodic $start, $interval, 0, $cb
339} 524}
340 525
341=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
342 527
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
344This call blocks and returns only when you have at least C<$time> seconds 529(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. 530C<$time> seconds of cpu time till the next tick. The slot is only valid
531till the next cede.
532
533Background jobs should use a priority les than zero, interactive jobs
534should use 100 or more.
346 535
347The optional C<$name> can be used to identify the job to run. It might be 536The 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. 537used for statistical purposes and should identify the same time-class.
349 538
350Useful for short background jobs. 539Useful for short background jobs.
351 540
352=cut 541=cut
353 542
354our @SLOT_QUEUE; 543our @SLOT_QUEUE;
355our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
356 546
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
360 550
361 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
362 553
363 while () { 554 while () {
364 next_job: 555 next_job:
556
365 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
366 if ($avail > 0.01) { 558
367 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
369 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send; 563 $job->[2]->send;
371 Coro::cede; 564 Coro::cede;
372 goto next_job; 565 goto next_job;
373 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
374 } 568 }
375 } 569 }
376 570
377 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive 572 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
380 $signal->wait;
381 } else { 574 } else {
575 $busy = 0;
382 Coro::schedule; 576 Coro::schedule;
383 } 577 }
384 } 578 }
385}; 579};
386 580
387sub get_slot($;$$) { 581sub get_slot($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
388 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
389 585
390 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
391 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
392 589
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
406 603
407BEGIN { *async = \&Coro::async_pool } 604BEGIN { *async = \&Coro::async_pool }
408 605
409=item cf::sync_job { BLOCK } 606=item cf::sync_job { BLOCK }
410 607
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 608The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 609is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 610partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 611acceptable.
415 612
416If it must be done, put the blocking parts into C<sync_job>. This will run 613If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 614the given BLOCK in another coroutine while waiting for the result. The
421=cut 618=cut
422 619
423sub sync_job(&) { 620sub sync_job(&) {
424 my ($job) = @_; 621 my ($job) = @_;
425 622
426 if ($Coro::current == $Coro::main) { 623 if (in_main) {
427 my $time = Event::time; 624 my $time = AE::time;
428 625
429 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
431 628
432 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
433 630
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
437 632
438 my $busy = 1; 633 my $busy = 1;
439 my @res; 634 my @res;
440 635
441 (async { 636 (async {
442 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
443 @res = eval { $job->() }; 638 @res = eval { $job->() };
444 warn $@ if $@; 639 error $@ if $@;
445 undef $busy; 640 undef $busy;
446 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
447 642
448 while ($busy) { 643 while ($busy) {
449 Coro::cede or Event::one_event; 644 if (Coro::nready) {
645 Coro::cede_notself;
646 } else {
647 EV::loop EV::LOOP_ONESHOT;
450 } 648 }
649 }
451 650
452 $time = Event::time - $time; 651 my $time = AE::time - $time;
453 652
454 LOG llevError | logBacktrace, Carp::longmess "long sync job"
455 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
456
457 $tick_start += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
458 654
459 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
460 } else { 656 } else {
461 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
462 658
482 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
483 679
484 $coro 680 $coro
485} 681}
486 682
487=item fork_call { }, $args 683=item fork_call { }, @args
488 684
489Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
490process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
491Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
492never block itself or use any form of Event handling. 688never block itself or use any form of event handling.
493 689
494=cut 690=cut
691
692sub post_fork {
693 reset_signals;
694}
495 695
496sub fork_call(&@) { 696sub fork_call(&@) {
497 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
498 698
499 # we seemingly have to make a local copy of the whole thing, 699 # we seemingly have to make a local copy of the whole thing,
500 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
501 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
502 702
503 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
504 reset_signals; 704 cf::post_fork;
505 &$cb 705 &$cb
506 }, @args; 706 } @args;
507 707
508 wantarray ? @res : $res[-1] 708 wantarray ? @res : $res[-1]
709}
710
711sub objinfo {
712 (
713 "counter value" => cf::object::object_count,
714 "objects created" => cf::object::create_count,
715 "objects destroyed" => cf::object::destroy_count,
716 "freelist size" => cf::object::free_count,
717 "allocated objects" => cf::object::objects_size,
718 "active objects" => cf::object::actives_size,
719 )
720}
721
722=item $coin = coin_from_name $name
723
724=cut
725
726our %coin_alias = (
727 "silver" => "silvercoin",
728 "silvercoin" => "silvercoin",
729 "silvercoins" => "silvercoin",
730 "gold" => "goldcoin",
731 "goldcoin" => "goldcoin",
732 "goldcoins" => "goldcoin",
733 "platinum" => "platinacoin",
734 "platinumcoin" => "platinacoin",
735 "platinumcoins" => "platinacoin",
736 "platina" => "platinacoin",
737 "platinacoin" => "platinacoin",
738 "platinacoins" => "platinacoin",
739 "royalty" => "royalty",
740 "royalties" => "royalty",
741);
742
743sub coin_from_name($) {
744 $coin_alias{$_[0]}
745 ? cf::arch::find $coin_alias{$_[0]}
746 : undef
509} 747}
510 748
511=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
512 750
513Returns a single value from the environment database. 751Returns a single value from the environment database.
523within each server. 761within each server.
524 762
525=cut 763=cut
526 764
527sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
528 my ($name) = @_; 769 my ($name) = @_;
529 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
530 771
531 eval { 772 eval {
532 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
542} 783}
543 784
544our $DB; 785our $DB;
545 786
546sub db_init { 787sub db_init {
547 cf::sync_job {
548 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
549 };
550} 789}
551 790
552sub db_get($$) { 791sub db_get($$) {
553 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
554 793
555 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
556 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
557 798
558 $! ? () 799 $! ? ()
559 : $data 800 : $data
560 }
561} 801}
562 802
563sub db_put($$$) { 803sub db_put($$$) {
564 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
565 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
593 833
594 my @data; 834 my @data;
595 my $md5; 835 my $md5;
596 836
597 for (0 .. $#$src) { 837 for (0 .. $#$src) {
598 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
599 or Carp::croak "$src->[$_]: $!";
600 } 839 }
601 840
602 # if processing is expensive, check 841 # if processing is expensive, check
603 # checksum first 842 # checksum first
604 if (1) { 843 if (1) {
621 860
622 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
623 my $data = $process->(\@data); 862 my $data = $process->(\@data);
624 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
625 864
626 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
627 866
628 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
629 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
630 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
631 870
641 880
642=cut 881=cut
643 882
644sub datalog($@) { 883sub datalog($@) {
645 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
646 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
647} 886}
648 887
649=back 888=back
650 889
651=cut 890=cut
652 891
653############################################################################# 892#############################################################################
654 893
655=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
656 895
657Many objects in crossfire are so-called attachable objects. That means you can 896Many objects in deliantra are so-called attachable objects. That means you can
658attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
659to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
660 899
661In the following description, CLASS can be any of C<global>, C<object> 900In the following description, CLASS can be any of C<global>, C<object>
662C<player>, C<client> or C<map> (i.e. the attachable objects in 901C<player>, C<client> or C<map> (i.e. the attachable objects in
663Crossfire TRT). 902Deliantra).
664 903
665=over 4 904=over 4
666 905
667=item $attachable->attach ($attachment, key => $value...) 906=item $attachable->attach ($attachment, key => $value...)
668 907
712=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
713 952
714Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
715given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
716 955
717Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
718that are attached at load/instantiate time, thus the need for a name. 957that are attached at load/instantiate time, thus the need for a name.
719 958
720These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
721 960
722=over 4 961=over 4
846 1085
847 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
848 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
849 1088
850 } elsif (ref $type) { 1089 } elsif (ref $type) {
851 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
852 1091
853 } else { 1092 } else {
854 shift @arg; 1093 shift @arg;
855 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
856 } 1095 }
857 } 1096 }
858} 1097}
859 1098
860sub _object_attach { 1099sub _object_attach {
870 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
871 } 1110 }
872 1111
873 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
874 } else { 1113 } else {
875 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
876 } 1115 }
877 1116
878 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
879} 1118}
880 1119
939 1178
940 for (@$callbacks) { 1179 for (@$callbacks) {
941 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
942 1181
943 if ($@) { 1182 if ($@) {
944 warn "$@";
945 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
946 override; 1184 override;
947 } 1185 }
948 1186
949 return 1 if $override; 1187 return 1 if $override;
950 } 1188 }
951 1189
952 0 1190 0
953} 1191}
954 1192
955=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1193=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
956 1194
957=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1195=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
958 1196
959Generate an object-specific event with the given arguments. 1197Generate an object-specific event with the given arguments.
960 1198
1013 1251
1014sub reattach { 1252sub reattach {
1015 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1016 my ($obj) = @_; 1254 my ($obj) = @_;
1017 1255
1256 # no longer needed after getting rid of delete_package?
1018 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1257 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1019 1258
1020 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1021 1260
1022 @$registry = (); 1261 @$registry = ();
1023 1262
1028 for (@$attach) { 1267 for (@$attach) {
1029 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1030 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1031 } 1270 }
1032 } else { 1271 } else {
1033 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1034 } 1273 }
1035 } 1274 }
1036} 1275}
1037 1276
1038cf::attachable->attach ( 1277cf::attachable->attach (
1039 prio => -1000000, 1278 prio => -1000000,
1040 on_instantiate => sub { 1279 on_instantiate => sub {
1041 my ($obj, $data) = @_; 1280 my ($obj, $data) = @_;
1042 1281
1043 $data = from_json $data; 1282 $data = decode_json $data;
1044 1283
1045 for (@$data) { 1284 for (@$data) {
1046 my ($name, $args) = @$_; 1285 my ($name, $args) = @$_;
1047 1286
1048 $obj->attach ($name, %{$args || {} }); 1287 $obj->attach ($name, %{$args || {} });
1065 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1066 1305
1067 sync_job { 1306 sync_job {
1068 if (length $$rdata) { 1307 if (length $$rdata) {
1069 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1070 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1071 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1072 1312
1073 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1074 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1075 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1076 aio_fsync $fh if $cf::USE_FSYNC; 1316 if ($cf::USE_FSYNC) {
1317 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;
1318 aio_fsync $fh;
1319 }
1077 close $fh; 1320 aio_close $fh;
1078 1321
1079 if (@$objs) { 1322 if (@$objs) {
1080 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1323 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1081 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1082 my $data = Coro::Storable::blocking_nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1083 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1084 aio_fsync $fh if $cf::USE_FSYNC; 1327 if ($cf::USE_FSYNC) {
1328 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;
1329 aio_fsync $fh;
1330 }
1085 close $fh; 1331 aio_close $fh;
1086 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1087 } 1333 }
1088 } else { 1334 } else {
1089 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1090 } 1336 }
1091 1337
1092 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1093 } else { 1342 } else {
1094 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1095 } 1344 }
1096 } else { 1345 } else {
1097 aio_unlink $filename; 1346 aio_unlink $filename;
1098 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1099 } 1348 }
1118 1367
1119 unless (aio_stat "$filename.pst") { 1368 unless (aio_stat "$filename.pst") {
1120 (aio_load "$filename.pst", $av) >= 0 1369 (aio_load "$filename.pst", $av) >= 0
1121 or return; 1370 or return;
1122 1371
1123 my $st = eval { Coro::Storable::thaw $av } 1372 my $st = eval { Coro::Storable::thaw $av };
1124 || eval { my $guard = Coro::Storable::guard; Storable::thaw $av }; #d# compatibility, remove
1125 $av = $st->{objs}; 1373 $av = $st->{objs};
1126 } 1374 }
1127 1375
1128 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1129 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1130 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1131 1380
1132 ($data, $av) 1381 ($data, $av)
1133} 1382}
1134 1383
1135=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1191 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1192 1441
1193 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1194} 1443}
1195 1444
1445use File::Glob ();
1446
1196cf::player->attach ( 1447cf::player->attach (
1197 on_command => sub { 1448 on_unknown_command => sub {
1198 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1199 1450
1200 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1201 or return; 1452 or return;
1202 1453
1210 my ($pl, $buf) = @_; 1461 my ($pl, $buf) = @_;
1211 1462
1212 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1463 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1213 1464
1214 if (ref $msg) { 1465 if (ref $msg) {
1215 my ($type, $reply, @payload) = 1466 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1216 "ARRAY" eq ref $msg
1217 ? @$msg
1218 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1219 1467
1220 my @reply; 1468 my @reply;
1221 1469
1222 if (my $cb = $EXTCMD{$type}) { 1470 if (my $cb = $EXTCMD{$type}) {
1223 @reply = $cb->($pl, @payload); 1471 @reply = $cb->($pl, @payload);
1225 1473
1226 $pl->ext_reply ($reply, @reply) 1474 $pl->ext_reply ($reply, @reply)
1227 if $reply; 1475 if $reply;
1228 1476
1229 } else { 1477 } else {
1230 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1478 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1231 } 1479 }
1232 1480
1233 cf::override; 1481 cf::override;
1234 }, 1482 },
1235); 1483);
1236 1484
1485# "readahead" all extensions
1486sub cache_extensions {
1487 my $grp = IO::AIO::aio_group;
1488
1489 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1490 for (grep /\.ext$/, @{$_[0]}) {
1491 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1492 }
1493 };
1494
1495 $grp
1496}
1497
1237sub load_extensions { 1498sub load_extensions {
1499 info "loading extensions...";
1500
1238 cf::sync_job { 1501 cf::sync_job {
1239 my %todo; 1502 my %todo;
1240 1503
1241 for my $path (<$LIBDIR/*.ext>) { 1504 for my $path (<$LIBDIR/*.ext>) {
1242 next unless -r $path; 1505 next unless -r $path;
1260 1523
1261 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1524 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1262 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1525 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1263 1526
1264 $ext{source} = 1527 $ext{source} =
1265 "package $pkg; use strict; use utf8;\n" 1528 "package $pkg; use common::sense;\n"
1266 . "#line 1 \"$path\"\n{\n" 1529 . "#line 1 \"$path\"\n{\n"
1267 . $source 1530 . $source
1268 . "\n};\n1"; 1531 . "\n};\n1";
1269 1532
1270 $todo{$base} = \%ext; 1533 $todo{$base} = \%ext;
1271 } 1534 }
1272 1535
1536 my $pass = 0;
1273 my %done; 1537 my %done;
1274 while (%todo) { 1538 while (%todo) {
1275 my $progress; 1539 my $progress;
1276 1540
1541 ++$pass;
1542
1543 ext:
1277 while (my ($k, $v) = each %todo) { 1544 while (my ($k, $v) = each %todo) {
1278 for (split /,\s*/, $v->{meta}{depends}) { 1545 for (split /,\s*/, $v->{meta}{depends}) {
1279 goto skip 1546 next ext
1280 unless exists $done{$_}; 1547 unless exists $done{$_};
1281 } 1548 }
1282 1549
1283 warn "... loading '$k' into '$v->{pkg}'\n"; 1550 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1284 1551
1285 unless (eval $v->{source}) { 1552 my $active = eval $v->{source};
1553
1554 if (length $@) {
1286 my $msg = $@ ? "$v->{path}: $@\n" 1555 error "$v->{path}: $@\n";
1287 : "$v->{base}: extension inactive.\n";
1288 1556
1557 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1289 if (exists $v->{meta}{mandatory}) { 1558 if exists $v->{meta}{mandatory};
1290 warn $msg; 1559
1291 warn "mandatory extension failed to load, exiting.\n"; 1560 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1292 exit 1; 1561 delete $todo{$k};
1293 } 1562 } else {
1294 1563 $done{$k} = delete $todo{$k};
1295 warn $msg; 1564 push @EXTS, $v->{pkg};
1565 $progress = 1;
1566
1567 info "$v->{base}: extension inactive.\n"
1568 unless $active;
1296 } 1569 }
1297
1298 $done{$k} = delete $todo{$k};
1299 push @EXTS, $v->{pkg};
1300 $progress = 1;
1301 } 1570 }
1302 1571
1303 skip: 1572 unless ($progress) {
1304 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1573 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1305 unless $progress; 1574
1575 while (my ($k, $v) = each %todo) {
1576 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1577 if exists $v->{meta}{mandatory};
1578 }
1579
1580 last;
1581 }
1306 } 1582 }
1307 }; 1583 };
1308} 1584}
1309 1585
1310############################################################################# 1586#############################################################################
1311 1587
1312=back 1588=back
1313 1589
1314=head2 CORE EXTENSIONS 1590=head2 CORE EXTENSIONS
1315 1591
1316Functions and methods that extend core crossfire objects. 1592Functions and methods that extend core deliantra objects.
1317 1593
1318=cut 1594=cut
1319 1595
1320package cf::player; 1596package cf::player;
1321 1597
1364 1640
1365sub exists($) { 1641sub exists($) {
1366 my ($login) = @_; 1642 my ($login) = @_;
1367 1643
1368 $cf::PLAYER{$login} 1644 $cf::PLAYER{$login}
1369 or cf::sync_job { !aio_stat path $login } 1645 or !aio_stat path $login
1370} 1646}
1371 1647
1372sub find($) { 1648sub find($) {
1373 return $cf::PLAYER{$_[0]} || do { 1649 return $cf::PLAYER{$_[0]} || do {
1374 my $login = $_[0]; 1650 my $login = $_[0];
1386 my $f = new_from_file cf::object::thawer path $login 1662 my $f = new_from_file cf::object::thawer path $login
1387 or return; 1663 or return;
1388 1664
1389 my $pl = cf::player::load_pl $f 1665 my $pl = cf::player::load_pl $f
1390 or return; 1666 or return;
1667
1391 local $cf::PLAYER_LOADING{$login} = $pl; 1668 local $cf::PLAYER_LOADING{$login} = $pl;
1392 $f->resolve_delayed_derefs; 1669 $f->resolve_delayed_derefs;
1393 $cf::PLAYER{$login} = $pl 1670 $cf::PLAYER{$login} = $pl
1394 } 1671 }
1395 } 1672 }
1396} 1673}
1397 1674
1675cf::player->attach (
1676 on_load => sub {
1677 my ($pl, $path) = @_;
1678
1679 # restore slots saved in save, below
1680 my $slots = delete $pl->{_slots};
1681
1682 $pl->ob->current_weapon ($slots->[0]);
1683 $pl->combat_ob ($slots->[1]);
1684 $pl->ranged_ob ($slots->[2]);
1685 },
1686);
1687
1398sub save($) { 1688sub save($) {
1399 my ($pl) = @_; 1689 my ($pl) = @_;
1400 1690
1401 return if $pl->{deny_save}; 1691 return if $pl->{deny_save};
1402 1692
1405 1695
1406 return if $pl->{deny_save}; 1696 return if $pl->{deny_save};
1407 1697
1408 aio_mkdir playerdir $pl, 0770; 1698 aio_mkdir playerdir $pl, 0770;
1409 $pl->{last_save} = $cf::RUNTIME; 1699 $pl->{last_save} = $cf::RUNTIME;
1700
1701 cf::get_slot 0.01;
1702
1703 # save slots, to be restored later
1704 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1410 1705
1411 $pl->save_pl ($path); 1706 $pl->save_pl ($path);
1412 cf::cede_to_tick; 1707 cf::cede_to_tick;
1413} 1708}
1414 1709
1446 my ($pl) = @_; 1741 my ($pl) = @_;
1447 1742
1448 my $name = $pl->ob->name; 1743 my $name = $pl->ob->name;
1449 1744
1450 $pl->{deny_save} = 1; 1745 $pl->{deny_save} = 1;
1451 $pl->password ("*"); # this should lock out the player until we nuked the dir 1746 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1452 1747
1453 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1748 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1454 $pl->deactivate; 1749 $pl->deactivate;
1750
1751 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1455 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1752 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1753 ext::highscore::check ($pl->ob);
1754
1456 $pl->ns->destroy if $pl->ns; 1755 $pl->ns->destroy if $pl->ns;
1457 1756
1458 my $path = playerdir $pl; 1757 my $path = playerdir $pl;
1459 my $temp = "$path~$cf::RUNTIME~deleting~"; 1758 my $temp = "$path~$cf::RUNTIME~deleting~";
1460 aio_rename $path, $temp; 1759 aio_rename $path, $temp;
1498 1797
1499 for my $login (@$dirs) { 1798 for my $login (@$dirs) {
1500 my $path = path $login; 1799 my $path = path $login;
1501 1800
1502 # a .pst is a dead give-away for a valid player 1801 # a .pst is a dead give-away for a valid player
1503 unless (-e "$path.pst") { 1802 # if no pst file found, open and chekc for blocked users
1803 if (aio_stat "$path.pst") {
1504 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1804 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1505 aio_read $fh, 0, 512, my $buf, 0 or next; 1805 aio_read $fh, 0, 512, my $buf, 0 or next;
1506 $buf !~ /^password -------------$/m or next; # official not-valid tag 1806 $buf !~ /^password -------------$/m or next; # official not-valid tag
1507 } 1807 }
1508 1808
1512 1812
1513 \@logins 1813 \@logins
1514} 1814}
1515 1815
1516=item $player->maps 1816=item $player->maps
1817
1818=item cf::player::maps $login
1517 1819
1518Returns an arrayref of map paths that are private for this 1820Returns an arrayref of map paths that are private for this
1519player. May block. 1821player. May block.
1520 1822
1521=cut 1823=cut
1539 } 1841 }
1540 1842
1541 \@paths 1843 \@paths
1542} 1844}
1543 1845
1544=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1846=item $protocol_xml = $player->expand_cfpod ($cfpod)
1545 1847
1546Expand crossfire pod fragments into protocol xml. 1848Expand deliantra pod fragments into protocol xml.
1547
1548=cut
1549
1550sub expand_cfpod {
1551 ((my $self), (local $_)) = @_;
1552
1553 # escape & and <
1554 s/&/&amp;/g;
1555 s/(?<![BIUGHT])</&lt;/g;
1556
1557 # this is buggy, it needs to properly take care of nested <'s
1558
1559 1 while
1560 # replace B<>, I<>, U<> etc.
1561 s/B<([^\>]*)>/<b>$1<\/b>/
1562 || s/I<([^\>]*)>/<i>$1<\/i>/
1563 || s/U<([^\>]*)>/<u>$1<\/u>/
1564 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1565 # replace G<male|female> tags
1566 || s{G<([^>|]*)\|([^>]*)>}{
1567 $self->gender ? $2 : $1
1568 }ge
1569 # replace H<hint text>
1570 || s{H<([^\>]*)>}
1571 {
1572 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1573 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1574 "")
1575 [$self->{hintmode}]
1576 }ge;
1577
1578 # create single paragraphs (very hackish)
1579 s/(?<=\S)\n(?=\w)/ /g;
1580
1581 # compress some whitespace
1582 s/\s+\n/\n/g; # ws line-ends
1583 s/\n\n+/\n/g; # double lines
1584 s/^\n+//; # beginning lines
1585 s/\n+$//; # ending lines
1586
1587 $_
1588}
1589
1590sub hintmode {
1591 $_[0]{hintmode} = $_[1] if @_ > 1;
1592 $_[0]{hintmode}
1593}
1594 1849
1595=item $player->ext_reply ($msgid, @msg) 1850=item $player->ext_reply ($msgid, @msg)
1596 1851
1597Sends an ext reply to the player. 1852Sends an ext reply to the player.
1598 1853
1630 1885
1631=cut 1886=cut
1632 1887
1633sub find_by_path($) { 1888sub find_by_path($) {
1634 my ($path) = @_; 1889 my ($path) = @_;
1890
1891 $path =~ s/^~[^\/]*//; # skip ~login
1635 1892
1636 my ($match, $specificity); 1893 my ($match, $specificity);
1637 1894
1638 for my $region (list) { 1895 for my $region (list) {
1639 if ($region->{match} && $path =~ $region->{match}) { 1896 if ($region->{match} && $path =~ $region->{match}) {
1665our $MAX_RESET = 3600; 1922our $MAX_RESET = 3600;
1666our $DEFAULT_RESET = 3000; 1923our $DEFAULT_RESET = 3000;
1667 1924
1668sub generate_random_map { 1925sub generate_random_map {
1669 my ($self, $rmp) = @_; 1926 my ($self, $rmp) = @_;
1670 # mit "rum" bekleckern, nicht 1927
1928 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1929
1671 $self->_create_random_map ( 1930 $self->_create_random_map ($rmp);
1672 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1673 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1674 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1675 $rmp->{exit_on_final_map},
1676 $rmp->{xsize}, $rmp->{ysize},
1677 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1678 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1679 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1680 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1681 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1682 (cf::region::find $rmp->{region}), $rmp->{custom}
1683 )
1684} 1931}
1685 1932
1686=item cf::map->register ($regex, $prio) 1933=item cf::map->register ($regex, $prio)
1687 1934
1688Register a handler for the map path matching the given regex at the 1935Register a handler for the map path matching the given regex at the
1693 1940
1694sub register { 1941sub register {
1695 my (undef, $regex, $prio) = @_; 1942 my (undef, $regex, $prio) = @_;
1696 my $pkg = caller; 1943 my $pkg = caller;
1697 1944
1698 no strict;
1699 push @{"$pkg\::ISA"}, __PACKAGE__; 1945 push @{"$pkg\::ISA"}, __PACKAGE__;
1700 1946
1701 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1947 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1702} 1948}
1703 1949
1704# also paths starting with '/' 1950# also paths starting with '/'
1705$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1951$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1706 1952
1707sub thawer_merge { 1953sub thawer_merge {
1708 my ($self, $merge) = @_; 1954 my ($self, $merge) = @_;
1709 1955
1710 # we have to keep some variables in memory intact 1956 # we have to keep some variables in memory intact
1715} 1961}
1716 1962
1717sub normalise { 1963sub normalise {
1718 my ($path, $base) = @_; 1964 my ($path, $base) = @_;
1719 1965
1720 $path = "$path"; # make sure its a string 1966 $path = "$path"; # make sure it's a string
1721 1967
1722 $path =~ s/\.map$//; 1968 $path =~ s/\.map$//;
1723 1969
1724 # map plan: 1970 # map plan:
1725 # 1971 #
1740 $base =~ s{[^/]+/?$}{}; 1986 $base =~ s{[^/]+/?$}{};
1741 $path = "$base/$path"; 1987 $path = "$base/$path";
1742 } 1988 }
1743 1989
1744 for ($path) { 1990 for ($path) {
1745 redo if s{//}{/};
1746 redo if s{/\.?/}{/}; 1991 redo if s{/\.?/}{/};
1747 redo if s{/[^/]+/\.\./}{/}; 1992 redo if s{/[^/]+/\.\./}{/};
1748 } 1993 }
1749 1994
1750 $path 1995 $path
1764 $self->init; # pass $1 etc. 2009 $self->init; # pass $1 etc.
1765 return $self; 2010 return $self;
1766 } 2011 }
1767 } 2012 }
1768 2013
1769 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2014 Carp::cluck "unable to resolve path '$path' (base '$base')";
1770 () 2015 ()
1771} 2016}
1772 2017
2018# may re-bless or do other evil things
1773sub init { 2019sub init {
1774 my ($self) = @_; 2020 my ($self) = @_;
1775 2021
1776 $self 2022 $self
1777} 2023}
1796 2042
1797# the temporary/swap location 2043# the temporary/swap location
1798sub save_path { 2044sub save_path {
1799 my ($self) = @_; 2045 my ($self) = @_;
1800 2046
1801 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2047 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1802 "$TMPDIR/$path.map" 2048 "$TMPDIR/$path.map"
1803} 2049}
1804 2050
1805# the unique path, undef == no special unique path 2051# the unique path, undef == no special unique path
1806sub uniq_path { 2052sub uniq_path {
1807 my ($self) = @_; 2053 my ($self) = @_;
1808 2054
1809 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2055 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1810 "$UNIQUEDIR/$path" 2056 "$UNIQUEDIR/$path"
1811}
1812
1813# and all this just because we cannot iterate over
1814# all maps in C++...
1815sub change_all_map_light {
1816 my ($change) = @_;
1817
1818 $_->change_map_light ($change)
1819 for grep $_->outdoor, values %cf::MAP;
1820} 2057}
1821 2058
1822sub decay_objects { 2059sub decay_objects {
1823 my ($self) = @_; 2060 my ($self) = @_;
1824 2061
1851 $self->{load_path} = $path; 2088 $self->{load_path} = $path;
1852 2089
1853 1 2090 1
1854} 2091}
1855 2092
2093# used to laod the header of an original map
1856sub load_header_orig { 2094sub load_header_orig {
1857 my ($self) = @_; 2095 my ($self) = @_;
1858 2096
1859 $self->load_header_from ($self->load_path) 2097 $self->load_header_from ($self->load_path)
1860} 2098}
1861 2099
2100# used to laod the header of an instantiated map
1862sub load_header_temp { 2101sub load_header_temp {
1863 my ($self) = @_; 2102 my ($self) = @_;
1864 2103
1865 $self->load_header_from ($self->save_path) 2104 $self->load_header_from ($self->save_path)
1866} 2105}
1867 2106
2107# called after loading the header from an instantiated map
1868sub prepare_temp { 2108sub prepare_temp {
1869 my ($self) = @_; 2109 my ($self) = @_;
1870 2110
1871 $self->last_access ((delete $self->{last_access}) 2111 $self->last_access ((delete $self->{last_access})
1872 || $cf::RUNTIME); #d# 2112 || $cf::RUNTIME); #d#
1873 # safety 2113 # safety
1874 $self->{instantiate_time} = $cf::RUNTIME 2114 $self->{instantiate_time} = $cf::RUNTIME
1875 if $self->{instantiate_time} > $cf::RUNTIME; 2115 if $self->{instantiate_time} > $cf::RUNTIME;
1876} 2116}
1877 2117
2118# called after loading the header from an original map
1878sub prepare_orig { 2119sub prepare_orig {
1879 my ($self) = @_; 2120 my ($self) = @_;
1880 2121
1881 $self->{load_original} = 1; 2122 $self->{load_original} = 1;
1882 $self->{instantiate_time} = $cf::RUNTIME; 2123 $self->{instantiate_time} = $cf::RUNTIME;
1906 2147
1907sub find; 2148sub find;
1908sub find { 2149sub find {
1909 my ($path, $origin) = @_; 2150 my ($path, $origin) = @_;
1910 2151
2152 cf::cede_to_tick;
2153
1911 $path = normalise $path, $origin && $origin->path; 2154 $path = normalise $path, $origin;
1912 2155
1913 cf::lock_wait "map_data:$path";#d#remove 2156 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1914 cf::lock_wait "map_find:$path"; 2157 my $guard2 = cf::lock_acquire "map_find:$path";
1915 2158
1916 $cf::MAP{$path} || do { 2159 $cf::MAP{$path} || do {
1917 my $guard1 = cf::lock_acquire "map_find:$path";
1918 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1919
1920 my $map = new_from_path cf::map $path 2160 my $map = new_from_path cf::map $path
1921 or return; 2161 or return;
1922 2162
1923 $map->{last_save} = $cf::RUNTIME; 2163 $map->{last_save} = $cf::RUNTIME;
1924 2164
1926 or return; 2166 or return;
1927 2167
1928 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2168 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1929 # doing this can freeze the server in a sync job, obviously 2169 # doing this can freeze the server in a sync job, obviously
1930 #$cf::WAIT_FOR_TICK->wait; 2170 #$cf::WAIT_FOR_TICK->wait;
2171 undef $guard2;
1931 undef $guard1; 2172 undef $guard1;
1932 undef $guard2;
1933 $map->reset; 2173 $map->reset;
1934 return find $path; 2174 return find $path;
1935 } 2175 }
1936 2176
1937 $cf::MAP{$path} = $map 2177 $cf::MAP{$path} = $map
1938 } 2178 }
1939} 2179}
1940 2180
1941sub pre_load { } 2181sub pre_load { }
1942sub post_load { } 2182#sub post_load { } # XS
1943 2183
1944sub load { 2184sub load {
1945 my ($self) = @_; 2185 my ($self) = @_;
1946 2186
1947 local $self->{deny_reset} = 1; # loading can take a long time 2187 local $self->{deny_reset} = 1; # loading can take a long time
1950 2190
1951 { 2191 {
1952 my $guard = cf::lock_acquire "map_data:$path"; 2192 my $guard = cf::lock_acquire "map_data:$path";
1953 2193
1954 return unless $self->valid; 2194 return unless $self->valid;
1955 return unless $self->in_memory == cf::MAP_SWAPPED; 2195 return unless $self->state == cf::MAP_SWAPPED;
1956
1957 $self->in_memory (cf::MAP_LOADING);
1958 2196
1959 $self->alloc; 2197 $self->alloc;
1960 2198
1961 $self->pre_load; 2199 $self->pre_load;
1962 cf::cede_to_tick; 2200 cf::cede_to_tick;
1963 2201
2202 if (exists $self->{load_path}) {
1964 my $f = new_from_file cf::object::thawer $self->{load_path}; 2203 my $f = new_from_file cf::object::thawer $self->{load_path};
1965 $f->skip_block; 2204 $f->skip_block;
1966 $self->_load_objects ($f) 2205 $self->_load_objects ($f)
1967 or return; 2206 or return;
1968 2207
1969 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2208 $self->post_load_original
1970 if delete $self->{load_original}; 2209 if delete $self->{load_original};
1971 2210
1972 if (my $uniq = $self->uniq_path) { 2211 if (my $uniq = $self->uniq_path) {
1973 utf8::encode $uniq; 2212 utf8::encode $uniq;
1974 unless (aio_stat $uniq) { 2213 unless (aio_stat $uniq) {
1975 if (my $f = new_from_file cf::object::thawer $uniq) { 2214 if (my $f = new_from_file cf::object::thawer $uniq) {
1976 $self->clear_unique_items; 2215 $self->clear_unique_items;
1977 $self->_load_objects ($f); 2216 $self->_load_objects ($f);
1978 $f->resolve_delayed_derefs; 2217 $f->resolve_delayed_derefs;
2218 }
1979 } 2219 }
1980 } 2220 }
1981 }
1982 2221
1983 $f->resolve_delayed_derefs; 2222 $f->resolve_delayed_derefs;
2223 } else {
2224 $self->post_load_original
2225 if delete $self->{load_original};
2226 }
2227
2228 $self->state (cf::MAP_INACTIVE);
1984 2229
1985 cf::cede_to_tick; 2230 cf::cede_to_tick;
1986 # now do the right thing for maps 2231 # now do the right thing for maps
1987 $self->link_multipart_objects; 2232 $self->link_multipart_objects;
1988 $self->difficulty ($self->estimate_difficulty) 2233 $self->difficulty ($self->estimate_difficulty)
1992 unless ($self->{deny_activate}) { 2237 unless ($self->{deny_activate}) {
1993 $self->decay_objects; 2238 $self->decay_objects;
1994 $self->fix_auto_apply; 2239 $self->fix_auto_apply;
1995 $self->update_buttons; 2240 $self->update_buttons;
1996 cf::cede_to_tick; 2241 cf::cede_to_tick;
1997 $self->set_darkness_map; 2242 #$self->activate; # no longer activate maps automatically
1998 cf::cede_to_tick;
1999 $self->activate;
2000 } 2243 }
2001 2244
2002 $self->{last_save} = $cf::RUNTIME; 2245 $self->{last_save} = $cf::RUNTIME;
2003 $self->last_access ($cf::RUNTIME); 2246 $self->last_access ($cf::RUNTIME);
2004
2005 $self->in_memory (cf::MAP_IN_MEMORY);
2006 } 2247 }
2007 2248
2008 $self->post_load; 2249 $self->post_load;
2009}
2010 2250
2251 1
2252}
2253
2254# customize the map for a given player, i.e.
2255# return the _real_ map. used by e.g. per-player
2256# maps to change the path to ~playername/mappath
2011sub customise_for { 2257sub customise_for {
2012 my ($self, $ob) = @_; 2258 my ($self, $ob) = @_;
2013 2259
2014 return find "~" . $ob->name . "/" . $self->{path} 2260 return find "~" . $ob->name . "/" . $self->{path}
2015 if $self->per_player; 2261 if $self->per_player;
2018# if $self->per_party; 2264# if $self->per_party;
2019 2265
2020 $self 2266 $self
2021} 2267}
2022 2268
2023# find and load all maps in the 3x3 area around a map
2024sub load_neighbours {
2025 my ($map) = @_;
2026
2027 my @neigh; # diagonal neighbours
2028
2029 for (0 .. 3) {
2030 my $neigh = $map->tile_path ($_)
2031 or next;
2032 $neigh = find $neigh, $map
2033 or next;
2034 $neigh->load;
2035
2036 push @neigh,
2037 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2038 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2039 }
2040
2041 for (grep defined $_->[0], @neigh) {
2042 my ($path, $origin) = @$_;
2043 my $neigh = find $path, $origin
2044 or next;
2045 $neigh->load;
2046 }
2047}
2048
2049sub find_sync { 2269sub find_sync {
2050 my ($path, $origin) = @_; 2270 my ($path, $origin) = @_;
2051 2271
2052 cf::sync_job { find $path, $origin } 2272 # it's a bug to call this from the main context
2273 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2274 if $Coro::current == $Coro::main;
2275
2276 find $path, $origin
2053} 2277}
2054 2278
2055sub do_load_sync { 2279sub do_load_sync {
2056 my ($map) = @_; 2280 my ($map) = @_;
2057 2281
2282 # it's a bug to call this from the main context
2058 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2283 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2059 if $Coro::current == $Coro::main; 2284 if $Coro::current == $Coro::main;
2060 2285
2061 cf::sync_job { $map->load }; 2286 $map->load;
2062} 2287}
2063 2288
2064our %MAP_PREFETCH; 2289our %MAP_PREFETCH;
2065our $MAP_PREFETCHER = undef; 2290our $MAP_PREFETCHER = undef;
2066 2291
2067sub find_async { 2292sub find_async {
2068 my ($path, $origin, $load) = @_; 2293 my ($path, $origin, $load) = @_;
2069 2294
2070 $path = normalise $path, $origin && $origin->{path}; 2295 $path = normalise $path, $origin;
2071 2296
2072 if (my $map = $cf::MAP{$path}) { 2297 if (my $map = $cf::MAP{$path}) {
2073 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2298 return $map if !$load || $map->linkable;
2074 } 2299 }
2075 2300
2076 $MAP_PREFETCH{$path} |= $load; 2301 $MAP_PREFETCH{$path} |= $load;
2077 2302
2078 $MAP_PREFETCHER ||= cf::async { 2303 $MAP_PREFETCHER ||= cf::async {
2092 $MAP_PREFETCHER->prio (6); 2317 $MAP_PREFETCHER->prio (6);
2093 2318
2094 () 2319 ()
2095} 2320}
2096 2321
2322# common code, used by both ->save and ->swapout
2097sub save { 2323sub _save {
2098 my ($self) = @_; 2324 my ($self) = @_;
2099
2100 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2325
2102 $self->{last_save} = $cf::RUNTIME; 2326 $self->{last_save} = $cf::RUNTIME;
2103 2327
2104 return unless $self->dirty; 2328 return unless $self->dirty;
2105 2329
2114 2338
2115 cf::async { 2339 cf::async {
2116 $Coro::current->{desc} = "map player save"; 2340 $Coro::current->{desc} = "map player save";
2117 $_->contr->save for $self->players; 2341 $_->contr->save for $self->players;
2118 }; 2342 };
2343
2344 cf::get_slot 0.02;
2119 2345
2120 if ($uniq) { 2346 if ($uniq) {
2121 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2347 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2122 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2348 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2123 } else { 2349 } else {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2125 } 2351 }
2126} 2352}
2127 2353
2354sub save {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 $self->_save;
2360}
2361
2128sub swap_out { 2362sub swap_out {
2129 my ($self) = @_; 2363 my ($self) = @_;
2130 2364
2131 # save first because save cedes
2132 $self->save;
2133
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2366
2367 return if !$self->linkable;
2368 return if $self->{deny_save};
2136 return if $self->players; 2369 return if $self->players;
2137 return if $self->in_memory != cf::MAP_IN_MEMORY; 2370
2371 # first deactivate the map and "unlink" it from the core
2372 $self->deactivate;
2373 $_->clear_links_to ($self) for values %cf::MAP;
2374 $self->state (cf::MAP_SWAPPED);
2375
2376 # then atomically save
2377 $self->_save;
2378
2379 # then free the map
2380 $self->clear;
2381}
2382
2383sub reset_at {
2384 my ($self) = @_;
2385
2386 # TODO: safety, remove and allow resettable per-player maps
2138 return if $self->{deny_save}; 2387 return 1e99 if $self->{deny_reset};
2139 2388
2389 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2390 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2391
2392 $time + $to
2393}
2394
2395sub should_reset {
2396 my ($self) = @_;
2397
2398 $self->reset_at <= $cf::RUNTIME
2399}
2400
2401sub reset {
2402 my ($self) = @_;
2403
2404 my $lock = cf::lock_acquire "map_data:$self->{path}";
2405
2406 return if $self->players;
2407
2408 cf::trace "resetting map ", $self->path, "\n";
2409
2140 $self->in_memory (cf::MAP_SWAPPED); 2410 $self->state (cf::MAP_SWAPPED);
2411
2412 # need to save uniques path
2413 unless ($self->{deny_save}) {
2414 my $uniq = $self->uniq_path; utf8::encode $uniq;
2415
2416 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2417 if $uniq;
2418 }
2419
2420 delete $cf::MAP{$self->path};
2141 2421
2142 $self->deactivate; 2422 $self->deactivate;
2143 $_->clear_links_to ($self) for values %cf::MAP; 2423 $_->clear_links_to ($self) for values %cf::MAP;
2144 $self->clear; 2424 $self->clear;
2145}
2146
2147sub reset_at {
2148 my ($self) = @_;
2149
2150 # TODO: safety, remove and allow resettable per-player maps
2151 return 1e99 if $self->{deny_reset};
2152
2153 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2154 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2155
2156 $time + $to
2157}
2158
2159sub should_reset {
2160 my ($self) = @_;
2161
2162 $self->reset_at <= $cf::RUNTIME
2163}
2164
2165sub reset {
2166 my ($self) = @_;
2167
2168 my $lock = cf::lock_acquire "map_data:$self->{path}";
2169
2170 return if $self->players;
2171
2172 warn "resetting map ", $self->path;
2173
2174 $self->in_memory (cf::MAP_SWAPPED);
2175
2176 # need to save uniques path
2177 unless ($self->{deny_save}) {
2178 my $uniq = $self->uniq_path; utf8::encode $uniq;
2179
2180 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2181 if $uniq;
2182 }
2183
2184 delete $cf::MAP{$self->path};
2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
2188 $self->clear;
2189 2425
2190 $self->unlink_save; 2426 $self->unlink_save;
2191 $self->destroy; 2427 $self->destroy;
2192} 2428}
2193 2429
2201 2437
2202 delete $cf::MAP{$self->path}; 2438 delete $cf::MAP{$self->path};
2203 2439
2204 $self->unlink_save; 2440 $self->unlink_save;
2205 2441
2206 bless $self, "cf::map"; 2442 bless $self, "cf::map::wrap";
2207 delete $self->{deny_reset}; 2443 delete $self->{deny_reset};
2208 $self->{deny_save} = 1; 2444 $self->{deny_save} = 1;
2209 $self->reset_timeout (1); 2445 $self->reset_timeout (1);
2210 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2446 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2211 2447
2260 2496
2261sub unique_maps() { 2497sub unique_maps() {
2262 [ 2498 [
2263 map { 2499 map {
2264 utf8::decode $_; 2500 utf8::decode $_;
2265 /\.map$/ 2501 s/\.map$//; # TODO future compatibility hack
2502 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2503 ? ()
2266 ? normalise $_ 2504 : normalise $_
2267 : ()
2268 } @{ aio_readdir $UNIQUEDIR or [] } 2505 } @{ aio_readdir $UNIQUEDIR or [] }
2269 ] 2506 ]
2270} 2507}
2271 2508
2272package cf; 2509=item cf::map::static_maps
2510
2511Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2512file in the shared directory excluding F</styles> and F</editor>). May
2513block.
2514
2515=cut
2516
2517sub static_maps() {
2518 my @dirs = "";
2519 my @maps;
2520
2521 while (@dirs) {
2522 my $dir = shift @dirs;
2523
2524 next if $dir eq "/styles" || $dir eq "/editor";
2525
2526 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2527 or return;
2528
2529 for (@$files) {
2530 s/\.map$// or next;
2531 utf8::decode $_;
2532 push @maps, "$dir/$_";
2533 }
2534
2535 push @dirs, map "$dir/$_", @$dirs;
2536 }
2537
2538 \@maps
2539}
2273 2540
2274=back 2541=back
2275 2542
2276=head3 cf::object 2543=head3 cf::object
2277 2544
2281 2548
2282=over 4 2549=over 4
2283 2550
2284=item $ob->inv_recursive 2551=item $ob->inv_recursive
2285 2552
2286Returns the inventory of the object _and_ their inventories, recursively. 2553Returns the inventory of the object I<and> their inventories, recursively,
2554but I<not> the object itself.
2287 2555
2288=cut 2556=cut
2289 2557
2290sub inv_recursive_; 2558sub inv_recursive_;
2291sub inv_recursive_ { 2559sub inv_recursive_ {
2296 inv_recursive_ inv $_[0] 2564 inv_recursive_ inv $_[0]
2297} 2565}
2298 2566
2299=item $ref = $ob->ref 2567=item $ref = $ob->ref
2300 2568
2301creates and returns a persistent reference to an objetc that can be stored as a string. 2569Creates and returns a persistent reference to an object that can be stored as a string.
2302 2570
2303=item $ob = cf::object::deref ($refstring) 2571=item $ob = cf::object::deref ($refstring)
2304 2572
2305returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2573returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2306even if the object actually exists. May block. 2574even if the object actually exists. May block.
2338can be C<undef>. Does the right thing when the player is currently in a 2606can be C<undef>. Does the right thing when the player is currently in a
2339dialogue with the given NPC character. 2607dialogue with the given NPC character.
2340 2608
2341=cut 2609=cut
2342 2610
2611our $SAY_CHANNEL = {
2612 id => "say",
2613 title => "Map",
2614 reply => "say ",
2615 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2616};
2617
2618our $CHAT_CHANNEL = {
2619 id => "chat",
2620 title => "Chat",
2621 reply => "chat ",
2622 tooltip => "Player chat and shouts, global to the server.",
2623};
2624
2343# rough implementation of a future "reply" method that works 2625# rough implementation of a future "reply" method that works
2344# with dialog boxes. 2626# with dialog boxes.
2345#TODO: the first argument must go, split into a $npc->reply_to ( method 2627#TODO: the first argument must go, split into a $npc->reply_to ( method
2346sub cf::object::player::reply($$$;$) { 2628sub cf::object::player::reply($$$;$) {
2347 my ($self, $npc, $msg, $flags) = @_; 2629 my ($self, $npc, $msg, $flags) = @_;
2358 my $dialog = $pl->{npc_dialog}; 2640 my $dialog = $pl->{npc_dialog};
2359 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2641 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2360 2642
2361 } else { 2643 } else {
2362 $msg = $npc->name . " says: $msg" if $npc; 2644 $msg = $npc->name . " says: $msg" if $npc;
2363 $self->message ($msg, $flags); 2645 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2364 } 2646 }
2365 } 2647 }
2366} 2648}
2367 2649
2368=item $object->send_msg ($channel, $msg, $color, [extra...]) 2650=item $object->send_msg ($channel, $msg, $color, [extra...])
2393 2675
2394=item $player_object->enter_link 2676=item $player_object->enter_link
2395 2677
2396Freezes the player and moves him/her to a special map (C<{link}>). 2678Freezes the player and moves him/her to a special map (C<{link}>).
2397 2679
2398The player should be reasonably safe there for short amounts of time. You 2680The player should be reasonably safe there for short amounts of time (e.g.
2399I<MUST> call C<leave_link> as soon as possible, though. 2681for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2682though, as the player cannot control the character while it is on the link
2683map.
2400 2684
2401Will never block. 2685Will never block.
2402 2686
2403=item $player_object->leave_link ($map, $x, $y) 2687=item $player_object->leave_link ($map, $x, $y)
2404 2688
2424sub cf::object::player::enter_link { 2708sub cf::object::player::enter_link {
2425 my ($self) = @_; 2709 my ($self) = @_;
2426 2710
2427 $self->deactivate_recursive; 2711 $self->deactivate_recursive;
2428 2712
2713 ++$self->{_link_recursion};
2714
2429 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2715 return if UNIVERSAL::isa $self->map, "ext::map_link";
2430 2716
2431 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2717 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2432 if $self->map && $self->map->{path} ne "{link}"; 2718 if $self->map && $self->map->{path} ne "{link}";
2433 2719
2434 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2720 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2435} 2721}
2436 2722
2437sub cf::object::player::leave_link { 2723sub cf::object::player::leave_link {
2438 my ($self, $map, $x, $y) = @_; 2724 my ($self, $map, $x, $y) = @_;
2439 2725
2456 ($x, $y) = (-1, -1) 2742 ($x, $y) = (-1, -1)
2457 unless (defined $x) && (defined $y); 2743 unless (defined $x) && (defined $y);
2458 2744
2459 # use -1 or undef as default coordinates, not 0, 0 2745 # use -1 or undef as default coordinates, not 0, 0
2460 ($x, $y) = ($map->enter_x, $map->enter_y) 2746 ($x, $y) = ($map->enter_x, $map->enter_y)
2461 if $x <=0 && $y <= 0; 2747 if $x <= 0 && $y <= 0;
2462 2748
2463 $map->load; 2749 $map->load;
2464 $map->load_neighbours;
2465 2750
2466 return unless $self->contr->active; 2751 return unless $self->contr->active;
2467 $self->activate_recursive;
2468 2752
2469 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2753 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2470 $self->enter_map ($map, $x, $y); 2754 if ($self->enter_map ($map, $x, $y)) {
2471} 2755 # entering was successful
2756 delete $self->{_link_recursion};
2757 # only activate afterwards, to support waiting in hooks
2758 $self->activate_recursive;
2759 }
2472 2760
2761}
2762
2473=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2763=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2474 2764
2475Moves the player to the given map-path and coordinates by first freezing 2765Moves the player to the given map-path and coordinates by first freezing
2476her, loading and preparing them map, calling the provided $check callback 2766her, loading and preparing them map, calling the provided $check callback
2477that has to return the map if sucecssful, and then unfreezes the player on 2767that has to return the map if sucecssful, and then unfreezes the player on
2478the new (success) or old (failed) map position. In either case, $done will 2768the new (success) or old (failed) map position. In either case, $done will
2479be called at the end of this process. 2769be called at the end of this process.
2480 2770
2771Note that $check will be called with a potentially non-loaded map, so if
2772it needs a loaded map it has to call C<< ->load >>.
2773
2481=cut 2774=cut
2482 2775
2483our $GOTOGEN; 2776our $GOTOGEN;
2484 2777
2485sub cf::object::player::goto { 2778sub cf::object::player::goto {
2486 my ($self, $path, $x, $y, $check, $done) = @_; 2779 my ($self, $path, $x, $y, $check, $done) = @_;
2780
2781 if ($self->{_link_recursion} >= $MAX_LINKS) {
2782 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2783 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2784 ($path, $x, $y) = @$EMERGENCY_POSITION;
2785 }
2487 2786
2488 # do generation counting so two concurrent goto's will be executed in-order 2787 # do generation counting so two concurrent goto's will be executed in-order
2489 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2788 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2490 2789
2491 $self->enter_link; 2790 $self->enter_link;
2511 ($path, $x, $y) = (undef, undef, undef); 2810 ($path, $x, $y) = (undef, undef, undef);
2512 } 2811 }
2513 } 2812 }
2514 2813
2515 my $map = eval { 2814 my $map = eval {
2516 my $map = defined $path ? cf::map::find $path : undef; 2815 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2517 2816
2518 if ($map) { 2817 if ($map) {
2519 $map = $map->customise_for ($self); 2818 $map = $map->customise_for ($self);
2520 $map = $check->($map) if $check && $map; 2819 $map = $check->($map, $x, $y, $self) if $check && $map;
2521 } else { 2820 } else {
2522 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2821 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2523 } 2822 }
2524 2823
2525 $map 2824 $map
2533 if ($gen == $self->{_goto_generation}) { 2832 if ($gen == $self->{_goto_generation}) {
2534 delete $self->{_goto_generation}; 2833 delete $self->{_goto_generation};
2535 $self->leave_link ($map, $x, $y); 2834 $self->leave_link ($map, $x, $y);
2536 } 2835 }
2537 2836
2538 $done->() if $done; 2837 $done->($self) if $done;
2539 })->prio (1); 2838 })->prio (1);
2540} 2839}
2541 2840
2542=item $player_object->enter_exit ($exit_object) 2841=item $player_object->enter_exit ($exit_object)
2543 2842
2563} 2862}
2564 2863
2565sub prepare_random_map { 2864sub prepare_random_map {
2566 my ($exit) = @_; 2865 my ($exit) = @_;
2567 2866
2568 my $guard = cf::lock_acquire "exit_prepare:$exit";
2569
2570 # all this does is basically replace the /! path by 2867 # all this does is basically replace the /! path by
2571 # a new random map path (?random/...) with a seed 2868 # a new random map path (?random/...) with a seed
2572 # that depends on the exit object 2869 # that depends on the exit object
2573 2870
2574 my $rmp = parse_random_map_params $exit->msg; 2871 my $rmp = parse_random_map_params $exit->msg;
2576 if ($exit->map) { 2873 if ($exit->map) {
2577 $rmp->{region} = $exit->region->name; 2874 $rmp->{region} = $exit->region->name;
2578 $rmp->{origin_map} = $exit->map->path; 2875 $rmp->{origin_map} = $exit->map->path;
2579 $rmp->{origin_x} = $exit->x; 2876 $rmp->{origin_x} = $exit->x;
2580 $rmp->{origin_y} = $exit->y; 2877 $rmp->{origin_y} = $exit->y;
2878
2879 $exit->map->touch;
2581 } 2880 }
2582 2881
2583 $rmp->{random_seed} ||= $exit->random_seed; 2882 $rmp->{random_seed} ||= $exit->random_seed;
2584 2883
2585 my $data = cf::to_json $rmp; 2884 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2586 my $md5 = Digest::MD5::md5_hex $data; 2885 my $md5 = Digest::MD5::md5_hex $data;
2587 my $meta = "$RANDOMDIR/$md5.meta"; 2886 my $meta = "$RANDOMDIR/$md5.meta";
2588 2887
2589 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2888 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2590 aio_write $fh, 0, (length $data), $data, 0; 2889 aio_write $fh, 0, (length $data), $data, 0;
2591 undef $fh; 2890 undef $fh;
2592 aio_rename "$meta~", $meta; 2891 aio_rename "$meta~", $meta;
2593 2892
2893 my $slaying = "?random/$md5";
2894
2895 if ($exit->valid) {
2594 $exit->slaying ("?random/$md5"); 2896 $exit->slaying ("?random/$md5");
2595 $exit->msg (undef); 2897 $exit->msg (undef);
2898 }
2596 } 2899 }
2597} 2900}
2598 2901
2599sub cf::object::player::enter_exit { 2902sub cf::object::player::enter_exit {
2600 my ($self, $exit) = @_; 2903 my ($self, $exit) = @_;
2601 2904
2602 return unless $self->type == cf::PLAYER; 2905 return unless $self->type == cf::PLAYER;
2603 2906
2604 if ($exit->slaying eq "/!") {
2605 #TODO: this should de-fi-ni-te-ly not be a sync-job
2606 # the problem is that $exit might not survive long enough
2607 # so it needs to be done right now, right here
2608 cf::sync_job { prepare_random_map $exit };
2609 }
2610
2611 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2612 my $hp = $exit->stats->hp;
2613 my $sp = $exit->stats->sp;
2614
2615 $self->enter_link; 2907 $self->enter_link;
2616 2908
2617 # if exit is damned, update players death & WoR home-position
2618 $self->contr->savebed ($slaying, $hp, $sp)
2619 if $exit->flag (FLAG_DAMNED);
2620
2621 (async { 2909 (async {
2622 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2910 $Coro::current->{desc} = "enter_exit";
2623 2911
2624 $self->deactivate_recursive; # just to be sure
2625 unless (eval { 2912 unless (eval {
2913 $self->deactivate_recursive; # just to be sure
2914
2915 my $map = cf::map::normalise $exit->slaying, $exit->map;
2916 my $x = $exit->stats->hp;
2917 my $y = $exit->stats->sp;
2918
2919 # special map handling
2920 my $slaying = $exit->slaying;
2921
2922 # special map handling
2923 if ($slaying eq "/!") {
2924 my $guard = cf::lock_acquire "exit_prepare:$exit";
2925
2926 prepare_random_map $exit
2927 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2928
2929 $map = $exit->slaying;
2930
2931 } elsif ($slaying eq '!up') {
2932 $map = $exit->map->tile_path (cf::TILE_UP);
2933 $x = $exit->x;
2934 $y = $exit->y;
2935
2936 } elsif ($slaying eq '!down') {
2937 $map = $exit->map->tile_path (cf::TILE_DOWN);
2938 $x = $exit->x;
2939 $y = $exit->y;
2940 }
2941
2626 $self->goto ($slaying, $hp, $sp); 2942 $self->goto ($map, $x, $y);
2627 2943
2944 # if exit is damned, update players death & WoR home-position
2945 $self->contr->savebed ($map, $x, $y)
2946 if $exit->flag (cf::FLAG_DAMNED);
2947
2628 1; 2948 1
2629 }) { 2949 }) {
2630 $self->message ("Something went wrong deep within the crossfire server. " 2950 $self->message ("Something went wrong deep within the deliantra server. "
2631 . "I'll try to bring you back to the map you were before. " 2951 . "I'll try to bring you back to the map you were before. "
2632 . "Please report this to the dungeon master!", 2952 . "Please report this to the dungeon master!",
2633 cf::NDI_UNIQUE | cf::NDI_RED); 2953 cf::NDI_UNIQUE | cf::NDI_RED);
2634 2954
2635 warn "ERROR in enter_exit: $@"; 2955 error "ERROR in enter_exit: $@";
2636 $self->leave_link; 2956 $self->leave_link;
2637 } 2957 }
2638 })->prio (1); 2958 })->prio (1);
2639} 2959}
2640 2960
2652sub cf::client::send_drawinfo { 2972sub cf::client::send_drawinfo {
2653 my ($self, $text, $flags) = @_; 2973 my ($self, $text, $flags) = @_;
2654 2974
2655 utf8::encode $text; 2975 utf8::encode $text;
2656 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2976 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2977}
2978
2979=item $client->send_big_packet ($pkt)
2980
2981Like C<send_packet>, but tries to compress large packets, and fragments
2982them as required.
2983
2984=cut
2985
2986our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2987
2988sub cf::client::send_big_packet {
2989 my ($self, $pkt) = @_;
2990
2991 # try lzf for large packets
2992 $pkt = "lzf " . Compress::LZF::compress $pkt
2993 if 1024 <= length $pkt and $self->{can_lzf};
2994
2995 # split very large packets
2996 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2997 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2998 $pkt = "frag";
2999 }
3000
3001 $self->send_packet ($pkt);
2657} 3002}
2658 3003
2659=item $client->send_msg ($channel, $msg, $color, [extra...]) 3004=item $client->send_msg ($channel, $msg, $color, [extra...])
2660 3005
2661Send a drawinfo or msg packet to the client, formatting the msg for the 3006Send a drawinfo or msg packet to the client, formatting the msg for the
2663the message, with C<log> being the default. If C<$color> is negative, suppress 3008the message, with C<log> being the default. If C<$color> is negative, suppress
2664the message unless the client supports the msg packet. 3009the message unless the client supports the msg packet.
2665 3010
2666=cut 3011=cut
2667 3012
3013# non-persistent channels (usually the info channel)
2668our %CHANNEL = ( 3014our %CHANNEL = (
3015 "c/motd" => {
3016 id => "infobox",
3017 title => "MOTD",
3018 reply => undef,
3019 tooltip => "The message of the day",
3020 },
2669 "c/identify" => { 3021 "c/identify" => {
2670 id => "infobox", 3022 id => "infobox",
2671 title => "Identify", 3023 title => "Identify",
2672 reply => undef, 3024 reply => undef,
2673 tooltip => "Items recently identified", 3025 tooltip => "Items recently identified",
2676 id => "infobox", 3028 id => "infobox",
2677 title => "Examine", 3029 title => "Examine",
2678 reply => undef, 3030 reply => undef,
2679 tooltip => "Signs and other items you examined", 3031 tooltip => "Signs and other items you examined",
2680 }, 3032 },
3033 "c/shopinfo" => {
3034 id => "infobox",
3035 title => "Shop Info",
3036 reply => undef,
3037 tooltip => "What your bargaining skill tells you about the shop",
3038 },
3039 "c/book" => {
3040 id => "infobox",
3041 title => "Book",
3042 reply => undef,
3043 tooltip => "The contents of a note or book",
3044 },
2681 "c/lookat" => { 3045 "c/lookat" => {
2682 id => "infobox", 3046 id => "infobox",
2683 title => "Look", 3047 title => "Look",
2684 reply => undef, 3048 reply => undef,
2685 tooltip => "What you saw there", 3049 tooltip => "What you saw there",
2686 }, 3050 },
3051 "c/who" => {
3052 id => "infobox",
3053 title => "Players",
3054 reply => undef,
3055 tooltip => "Shows players who are currently online",
3056 },
3057 "c/body" => {
3058 id => "infobox",
3059 title => "Body Parts",
3060 reply => undef,
3061 tooltip => "Shows which body parts you posess and are available",
3062 },
3063 "c/statistics" => {
3064 id => "infobox",
3065 title => "Statistics",
3066 reply => undef,
3067 tooltip => "Shows your primary statistics",
3068 },
3069 "c/skills" => {
3070 id => "infobox",
3071 title => "Skills",
3072 reply => undef,
3073 tooltip => "Shows your experience per skill and item power",
3074 },
3075 "c/shopitems" => {
3076 id => "infobox",
3077 title => "Shop Items",
3078 reply => undef,
3079 tooltip => "Shows the items currently for sale in this shop",
3080 },
3081 "c/resistances" => {
3082 id => "infobox",
3083 title => "Resistances",
3084 reply => undef,
3085 tooltip => "Shows your resistances",
3086 },
3087 "c/pets" => {
3088 id => "infobox",
3089 title => "Pets",
3090 reply => undef,
3091 tooltip => "Shows information abotu your pets/a specific pet",
3092 },
3093 "c/perceiveself" => {
3094 id => "infobox",
3095 title => "Perceive Self",
3096 reply => undef,
3097 tooltip => "You gained detailed knowledge about yourself",
3098 },
3099 "c/uptime" => {
3100 id => "infobox",
3101 title => "Uptime",
3102 reply => undef,
3103 tooltip => "How long the server has been running since last restart",
3104 },
3105 "c/mapinfo" => {
3106 id => "infobox",
3107 title => "Map Info",
3108 reply => undef,
3109 tooltip => "Information related to the maps",
3110 },
3111 "c/party" => {
3112 id => "party",
3113 title => "Party",
3114 reply => "gsay ",
3115 tooltip => "Messages and chat related to your party",
3116 },
3117 "c/death" => {
3118 id => "death",
3119 title => "Death",
3120 reply => undef,
3121 tooltip => "Reason for and more info about your most recent death",
3122 },
3123 "c/say" => $SAY_CHANNEL,
3124 "c/chat" => $CHAT_CHANNEL,
2687); 3125);
2688 3126
2689sub cf::client::send_msg { 3127sub cf::client::send_msg {
2690 my ($self, $channel, $msg, $color, @extra) = @_; 3128 my ($self, $channel, $msg, $color, @extra) = @_;
2691 3129
2692 $msg = $self->pl->expand_cfpod ($msg); 3130 $msg = $self->pl->expand_cfpod ($msg)
3131 unless $color & cf::NDI_VERBATIM;
2693 3132
2694 $color &= cf::NDI_CLIENT_MASK; # just in case... 3133 $color &= cf::NDI_CLIENT_MASK; # just in case...
2695 3134
2696 # check predefined channels, for the benefit of C 3135 # check predefined channels, for the benefit of C
2697 if ($CHANNEL{$channel}) { 3136 if ($CHANNEL{$channel}) {
2698 $channel = $CHANNEL{$channel}; 3137 $channel = $CHANNEL{$channel};
2699 3138
2700 $self->ext_msg (channel_info => $channel) 3139 $self->ext_msg (channel_info => $channel);
2701 if $self->can_msg;
2702
2703 $channel = $channel->{id}; 3140 $channel = $channel->{id};
2704 3141
2705 } elsif (ref $channel) { 3142 } elsif (ref $channel) {
2706 # send meta info to client, if not yet sent 3143 # send meta info to client, if not yet sent
2707 unless (exists $self->{channel}{$channel->{id}}) { 3144 unless (exists $self->{channel}{$channel->{id}}) {
2708 $self->{channel}{$channel->{id}} = $channel; 3145 $self->{channel}{$channel->{id}} = $channel;
2709 $self->ext_msg (channel_info => $channel) 3146 $self->ext_msg (channel_info => $channel);
2710 if $self->can_msg;
2711 } 3147 }
2712 3148
2713 $channel = $channel->{id}; 3149 $channel = $channel->{id};
2714 } 3150 }
2715 3151
2716 return unless @extra || length $msg; 3152 return unless @extra || length $msg;
2717 3153
2718 if ($self->can_msg) {
2719 # default colour, mask it out 3154 # default colour, mask it out
2720 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3155 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2721 if $color & cf::NDI_DEF; 3156 if $color & cf::NDI_DEF;
2722 3157
2723 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3158 my $pkt = "msg "
3159 . $self->{json_coder}->encode (
2724 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3160 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2725 } else { 3161 );
2726 if ($color >= 0) {
2727 # replace some tags by gcfclient-compatible ones
2728 for ($msg) {
2729 1 while
2730 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2731 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2732 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2733 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2734 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2735 }
2736 3162
2737 $color &= cf::NDI_COLOR_MASK; 3163 $self->send_big_packet ($pkt);
2738
2739 utf8::encode $msg;
2740
2741 if (0 && $msg =~ /\[/) {
2742 # COMMAND/INFO
2743 $self->send_packet ("drawextinfo $color 10 8 $msg")
2744 } else {
2745 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2746 $self->send_packet ("drawinfo $color $msg")
2747 }
2748 }
2749 }
2750} 3164}
2751 3165
2752=item $client->ext_msg ($type, @msg) 3166=item $client->ext_msg ($type, @msg)
2753 3167
2754Sends an ext event to the client. 3168Sends an ext event to the client.
2757 3171
2758sub cf::client::ext_msg($$@) { 3172sub cf::client::ext_msg($$@) {
2759 my ($self, $type, @msg) = @_; 3173 my ($self, $type, @msg) = @_;
2760 3174
2761 if ($self->extcmd == 2) { 3175 if ($self->extcmd == 2) {
2762 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3176 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2763 } elsif ($self->extcmd == 1) { # TODO: remove 3177 } elsif ($self->extcmd == 1) { # TODO: remove
2764 push @msg, msgtype => "event_$type"; 3178 push @msg, msgtype => "event_$type";
2765 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2766 } 3180 }
2767} 3181}
2768 3182
2769=item $client->ext_reply ($msgid, @msg) 3183=item $client->ext_reply ($msgid, @msg)
2770 3184
2773=cut 3187=cut
2774 3188
2775sub cf::client::ext_reply($$@) { 3189sub cf::client::ext_reply($$@) {
2776 my ($self, $id, @msg) = @_; 3190 my ($self, $id, @msg) = @_;
2777 3191
2778 if ($self->extcmd == 2) { 3192 return unless $self->extcmd == 2;
3193
2779 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3194 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2780 } elsif ($self->extcmd == 1) {
2781 #TODO: version 1, remove
2782 unshift @msg, msgtype => "reply", msgid => $id;
2783 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2784 }
2785} 3195}
2786 3196
2787=item $success = $client->query ($flags, "text", \&cb) 3197=item $success = $client->query ($flags, "text", \&cb)
2788 3198
2789Queues a query to the client, calling the given callback with 3199Queues a query to the client, calling the given callback with
2844 my ($ns, $buf) = @_; 3254 my ($ns, $buf) = @_;
2845 3255
2846 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3256 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2847 3257
2848 if (ref $msg) { 3258 if (ref $msg) {
2849 my ($type, $reply, @payload) = 3259 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2850 "ARRAY" eq ref $msg
2851 ? @$msg
2852 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2853 3260
2854 my @reply; 3261 my @reply;
2855 3262
2856 if (my $cb = $EXTICMD{$type}) { 3263 if (my $cb = $EXTICMD{$type}) {
2857 @reply = $cb->($ns, @payload); 3264 @reply = $cb->($ns, @payload);
2859 3266
2860 $ns->ext_reply ($reply, @reply) 3267 $ns->ext_reply ($reply, @reply)
2861 if $reply; 3268 if $reply;
2862 3269
2863 } else { 3270 } else {
2864 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3271 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2865 } 3272 }
2866 3273
2867 cf::override; 3274 cf::override;
2868 }, 3275 },
2869); 3276);
2889 3296
2890 $coro 3297 $coro
2891} 3298}
2892 3299
2893cf::client->attach ( 3300cf::client->attach (
2894 on_destroy => sub { 3301 on_client_destroy => sub {
2895 my ($ns) = @_; 3302 my ($ns) = @_;
2896 3303
2897 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3304 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2898 }, 3305 },
2899); 3306);
2915our $safe_hole = new Safe::Hole; 3322our $safe_hole = new Safe::Hole;
2916 3323
2917$SIG{FPE} = 'IGNORE'; 3324$SIG{FPE} = 'IGNORE';
2918 3325
2919$safe->permit_only (Opcode::opset qw( 3326$safe->permit_only (Opcode::opset qw(
2920 :base_core :base_mem :base_orig :base_math 3327 :base_core :base_mem :base_orig :base_math :base_loop
2921 grepstart grepwhile mapstart mapwhile 3328 grepstart grepwhile mapstart mapwhile
2922 sort time 3329 sort time
2923)); 3330));
2924 3331
2925# here we export the classes and methods available to script code 3332# here we export the classes and methods available to script code
2928 3335
2929The following functions and methods are available within a safe environment: 3336The following functions and methods are available within a safe environment:
2930 3337
2931 cf::object 3338 cf::object
2932 contr pay_amount pay_player map x y force_find force_add destroy 3339 contr pay_amount pay_player map x y force_find force_add destroy
2933 insert remove name archname title slaying race decrease_ob_nr 3340 insert remove name archname title slaying race decrease split
3341 value
2934 3342
2935 cf::object::player 3343 cf::object::player
2936 player 3344 player
2937 3345
2938 cf::player 3346 cf::player
2943 3351
2944=cut 3352=cut
2945 3353
2946for ( 3354for (
2947 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3355 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2948 insert remove inv name archname title slaying race 3356 insert remove inv nrof name archname title slaying race
2949 decrease_ob_nr destroy)], 3357 decrease split destroy change_exp value msg lore send_msg)],
2950 ["cf::object::player" => qw(player)], 3358 ["cf::object::player" => qw(player)],
2951 ["cf::player" => qw(peaceful)], 3359 ["cf::player" => qw(peaceful send_msg)],
2952 ["cf::map" => qw(trigger)], 3360 ["cf::map" => qw(trigger)],
2953) { 3361) {
2954 no strict 'refs';
2955 my ($pkg, @funs) = @$_; 3362 my ($pkg, @funs) = @$_;
2956 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3363 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2957 for @funs; 3364 for @funs;
2958} 3365}
2959 3366
2974 3381
2975 my $qcode = $code; 3382 my $qcode = $code;
2976 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3383 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2977 $qcode =~ s/\n/\\n/g; 3384 $qcode =~ s/\n/\\n/g;
2978 3385
3386 %vars = (_dummy => 0) unless %vars;
3387
3388 my @res;
2979 local $_; 3389 local $_;
2980 local @safe::cf::_safe_eval_args = values %vars;
2981 3390
2982 my $eval = 3391 my $eval =
2983 "do {\n" 3392 "do {\n"
2984 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3393 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2985 . "#line 0 \"{$qcode}\"\n" 3394 . "#line 0 \"{$qcode}\"\n"
2986 . $code 3395 . $code
2987 . "\n}" 3396 . "\n}"
2988 ; 3397 ;
2989 3398
3399 if ($CFG{safe_eval}) {
2990 sub_generation_inc; 3400 sub_generation_inc;
3401 local @safe::cf::_safe_eval_args = values %vars;
2991 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3402 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2992 sub_generation_inc; 3403 sub_generation_inc;
3404 } else {
3405 local @cf::_safe_eval_args = values %vars;
3406 @res = wantarray ? eval eval : scalar eval $eval;
3407 }
2993 3408
2994 if ($@) { 3409 if ($@) {
2995 warn "$@"; 3410 warn "$@",
2996 warn "while executing safe code '$code'\n"; 3411 "while executing safe code '$code'\n",
2997 warn "with arguments " . (join " ", %vars) . "\n"; 3412 "with arguments " . (join " ", %vars) . "\n";
2998 } 3413 }
2999 3414
3000 wantarray ? @res : $res[0] 3415 wantarray ? @res : $res[0]
3001} 3416}
3002 3417
3016=cut 3431=cut
3017 3432
3018sub register_script_function { 3433sub register_script_function {
3019 my ($fun, $cb) = @_; 3434 my ($fun, $cb) = @_;
3020 3435
3021 no strict 'refs'; 3436 $fun = "safe::$fun" if $CFG{safe_eval};
3022 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3437 *$fun = $safe_hole->wrap ($cb);
3023} 3438}
3024 3439
3025=back 3440=back
3026 3441
3027=cut 3442=cut
3036 # for this (global event?) 3451 # for this (global event?)
3037 %ext::player_env::MUSIC_FACE_CACHE = (); 3452 %ext::player_env::MUSIC_FACE_CACHE = ();
3038 3453
3039 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3454 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3040 3455
3041 warn "loading facedata from $path\n"; 3456 trace "loading facedata from $path\n";
3042 3457
3043 my $facedata; 3458 my $facedata = decode_storable load_file $path;
3044 0 < aio_load $path, $facedata
3045 or die "$path: $!";
3046
3047 $facedata = Coro::Storable::thaw $facedata;
3048 3459
3049 $facedata->{version} == 2 3460 $facedata->{version} == 2
3050 or cf::cleanup "$path: version mismatch, cannot proceed."; 3461 or cf::cleanup "$path: version mismatch, cannot proceed.";
3051 3462
3052 # patch in the exptable 3463 # patch in the exptable
3464 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3053 $facedata->{resource}{"res/exp_table"} = { 3465 $facedata->{resource}{"res/exp_table"} = {
3054 type => FT_RSRC, 3466 type => FT_RSRC,
3055 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3467 data => $exp_table,
3468 hash => (Digest::MD5::md5 $exp_table),
3056 }; 3469 };
3057 cf::cede_to_tick; 3470 cf::cede_to_tick;
3058 3471
3059 { 3472 {
3060 my $faces = $facedata->{faceinfo}; 3473 my $faces = $facedata->{faceinfo};
3061 3474
3062 while (my ($face, $info) = each %$faces) { 3475 while (my ($face, $info) = each %$faces) {
3063 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3476 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3477
3064 cf::face::set_visibility $idx, $info->{visibility}; 3478 cf::face::set_visibility $idx, $info->{visibility};
3065 cf::face::set_magicmap $idx, $info->{magicmap}; 3479 cf::face::set_magicmap $idx, $info->{magicmap};
3066 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3480 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3067 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3481 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3482 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3068 3483
3069 cf::cede_to_tick; 3484 cf::cede_to_tick;
3070 } 3485 }
3071 3486
3072 while (my ($face, $info) = each %$faces) { 3487 while (my ($face, $info) = each %$faces) {
3073 next unless $info->{smooth}; 3488 next unless $info->{smooth};
3489
3074 my $idx = cf::face::find $face 3490 my $idx = cf::face::find $face
3075 or next; 3491 or next;
3492
3076 if (my $smooth = cf::face::find $info->{smooth}) { 3493 if (my $smooth = cf::face::find $info->{smooth}) {
3077 cf::face::set_smooth $idx, $smooth; 3494 cf::face::set_smooth $idx, $smooth;
3078 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3495 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3079 } else { 3496 } else {
3080 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3497 error "smooth face '$info->{smooth}' not found for face '$face'";
3081 } 3498 }
3082 3499
3083 cf::cede_to_tick; 3500 cf::cede_to_tick;
3084 } 3501 }
3085 } 3502 }
3094 3511
3095 cf::anim::invalidate_all; # d'oh 3512 cf::anim::invalidate_all; # d'oh
3096 } 3513 }
3097 3514
3098 { 3515 {
3099 # TODO: for gcfclient pleasure, we should give resources
3100 # that gcfclient doesn't grok a >10000 face index.
3101 my $res = $facedata->{resource}; 3516 my $res = $facedata->{resource};
3102 3517
3103 my $soundconf = delete $res->{"res/sound.conf"};
3104
3105 while (my ($name, $info) = each %$res) { 3518 while (my ($name, $info) = each %$res) {
3519 if (defined $info->{type}) {
3106 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3520 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3107 my $data;
3108 3521
3109 if ($info->{type} & 1) { 3522 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3110 # prepend meta info 3523 cf::face::set_type $idx, $info->{type};
3111
3112 my $meta = $enc->encode ({
3113 name => $name,
3114 %{ $info->{meta} || {} },
3115 });
3116
3117 $data = pack "(w/a*)*", $meta, $info->{data};
3118 } else { 3524 } else {
3119 $data = $info->{data}; 3525 $RESOURCE{$name} = $info; # unused
3120 } 3526 }
3121 3527
3122 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3123 cf::face::set_type $idx, $info->{type};
3124
3125 cf::cede_to_tick; 3528 cf::cede_to_tick;
3126 } 3529 }
3127
3128 if ($soundconf) {
3129 $soundconf = $enc->decode (delete $soundconf->{data});
3130
3131 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3132 my $sound = $soundconf->{compat}[$_]
3133 or next;
3134
3135 my $face = cf::face::find "sound/$sound->[1]";
3136 cf::sound::set $sound->[0] => $face;
3137 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3138 }
3139
3140 while (my ($k, $v) = each %{$soundconf->{event}}) {
3141 my $face = cf::face::find "sound/$v";
3142 cf::sound::set $k => $face;
3143 }
3144 }
3145 } 3530 }
3531
3532 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3146 3533
3147 1 3534 1
3148} 3535}
3149 3536
3150register_exticmd fx_want => sub { 3537register_exticmd fx_want => sub {
3152 3539
3153 while (my ($k, $v) = each %$want) { 3540 while (my ($k, $v) = each %$want) {
3154 $ns->fx_want ($k, $v); 3541 $ns->fx_want ($k, $v);
3155 } 3542 }
3156}; 3543};
3544
3545sub load_resource_file($) {
3546 my $guard = lock_acquire "load_resource_file";
3547
3548 my $status = load_resource_file_ $_[0];
3549 get_slot 0.1, 100;
3550 cf::arch::commit_load;
3551
3552 $status
3553}
3157 3554
3158sub reload_regions { 3555sub reload_regions {
3159 # HACK to clear player env face cache, we need some signal framework 3556 # HACK to clear player env face cache, we need some signal framework
3160 # for this (global event?) 3557 # for this (global event?)
3161 %ext::player_env::MUSIC_FACE_CACHE = (); 3558 %ext::player_env::MUSIC_FACE_CACHE = ();
3175} 3572}
3176 3573
3177sub reload_archetypes { 3574sub reload_archetypes {
3178 load_resource_file "$DATADIR/archetypes" 3575 load_resource_file "$DATADIR/archetypes"
3179 or die "unable to load archetypes\n"; 3576 or die "unable to load archetypes\n";
3180 #d# NEED to laod twice to resolve forward references
3181 # this really needs to be done in an extra post-pass
3182 # (which needs to be synchronous, so solve it differently)
3183 load_resource_file "$DATADIR/archetypes"
3184 or die "unable to load archetypes\n";
3185} 3577}
3186 3578
3187sub reload_treasures { 3579sub reload_treasures {
3188 load_resource_file "$DATADIR/treasures" 3580 load_resource_file "$DATADIR/treasures"
3189 or die "unable to load treasurelists\n"; 3581 or die "unable to load treasurelists\n";
3190} 3582}
3191 3583
3584sub reload_sound {
3585 trace "loading sound config from $DATADIR/sound\n";
3586
3587 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3588
3589 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3590 my $sound = $soundconf->{compat}[$_]
3591 or next;
3592
3593 my $face = cf::face::find "sound/$sound->[1]";
3594 cf::sound::set $sound->[0] => $face;
3595 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3596 }
3597
3598 while (my ($k, $v) = each %{$soundconf->{event}}) {
3599 my $face = cf::face::find "sound/$v";
3600 cf::sound::set $k => $face;
3601 }
3602}
3603
3192sub reload_resources { 3604sub reload_resources {
3193 warn "reloading resource files...\n"; 3605 trace "reloading resource files...\n";
3194 3606
3607 reload_exp_table;
3608 reload_materials;
3609 reload_facedata;
3610 reload_sound;
3611 reload_archetypes;
3195 reload_regions; 3612 reload_regions;
3196 reload_facedata;
3197 #reload_archetypes;#d#
3198 reload_archetypes;
3199 reload_treasures; 3613 reload_treasures;
3200 3614
3201 warn "finished reloading resource files\n"; 3615 trace "finished reloading resource files\n";
3202}
3203
3204sub init {
3205 reload_resources;
3206} 3616}
3207 3617
3208sub reload_config { 3618sub reload_config {
3209 open my $fh, "<:utf8", "$CONFDIR/config" 3619 trace "reloading config file...\n";
3210 or return;
3211 3620
3212 local $/; 3621 my $config = load_file "$CONFDIR/config";
3213 *CFG = YAML::Syck::Load <$fh>; 3622 utf8::decode $config;
3623 *CFG = decode_yaml $config;
3214 3624
3215 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3625 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3216 3626
3217 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3627 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3218 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3628 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3219 3629
3220 if (exists $CFG{mlockall}) { 3630 if (exists $CFG{mlockall}) {
3224 }; 3634 };
3225 warn $@ if $@; 3635 warn $@ if $@;
3226 } 3636 }
3227} 3637}
3228 3638
3639sub pidfile() {
3640 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3641 or die "$PIDFILE: $!";
3642 flock $fh, &Fcntl::LOCK_EX
3643 or die "$PIDFILE: flock: $!";
3644 $fh
3645}
3646
3647# make sure only one server instance is running at any one time
3648sub atomic {
3649 my $fh = pidfile;
3650
3651 my $pid = <$fh>;
3652 kill 9, $pid if $pid > 0;
3653
3654 seek $fh, 0, 0;
3655 print $fh $$;
3656}
3657
3658sub main_loop {
3659 trace "EV::loop starting\n";
3660 if (1) {
3661 EV::loop;
3662 }
3663 trace "EV::loop returned\n";
3664 goto &main_loop unless $REALLY_UNLOOP;
3665}
3666
3229sub main { 3667sub main {
3668 cf::init_globals; # initialise logging
3669
3670 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3671 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3672 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3673 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3674
3675 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3676
3230 # we must not ever block the main coroutine 3677 # we must not ever block the main coroutine
3231 local $Coro::idle = sub { 3678 local $Coro::idle = sub {
3232 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3679 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3233 (async { 3680 (async {
3234 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3681 $Coro::current->{desc} = "IDLE BUG HANDLER";
3235 Event::one_event; 3682 EV::loop EV::LOOP_ONESHOT;
3236 })->prio (Coro::PRIO_MAX); 3683 })->prio (Coro::PRIO_MAX);
3237 }; 3684 };
3238 3685
3686 evthread_start IO::AIO::poll_fileno;
3687
3688 cf::sync_job {
3689 cf::incloader::init ();
3690
3691 cf::init_anim;
3692 cf::init_attackmess;
3693 cf::init_dynamic;
3694
3695 cf::load_settings;
3696
3697 reload_resources;
3239 reload_config; 3698 reload_config;
3240 db_init; 3699 db_init;
3700
3701 cf::init_uuid;
3702 cf::init_signals;
3703 cf::init_skills;
3704
3705 cf::init_beforeplay;
3706
3707 atomic;
3708
3241 load_extensions; 3709 load_extensions;
3242 3710
3243 $TICK_WATCHER->start; 3711 utime time, time, $RUNTIMEFILE;
3244 Event::loop; 3712
3713 # no (long-running) fork's whatsoever before this point(!)
3714 use POSIX ();
3715 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3716
3717 cf::_post_init 0;
3718 };
3719
3720 cf::object::thawer::errors_are_fatal 0;
3721 info "parse errors in files are no longer fatal from this point on.\n";
3722
3723 AE::postpone {
3724 undef &main; # free gobs of memory :)
3725 };
3726
3727 goto &main_loop;
3245} 3728}
3246 3729
3247############################################################################# 3730#############################################################################
3248# initialisation and cleanup 3731# initialisation and cleanup
3249 3732
3250# install some emergency cleanup handlers 3733# install some emergency cleanup handlers
3251BEGIN { 3734BEGIN {
3735 our %SIGWATCHER = ();
3252 for my $signal (qw(INT HUP TERM)) { 3736 for my $signal (qw(INT HUP TERM)) {
3253 Event->signal ( 3737 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3254 reentrant => 0,
3255 data => WF_AUTOCANCEL,
3256 signal => $signal,
3257 prio => 0,
3258 cb => sub {
3259 cf::cleanup "SIG$signal"; 3738 cf::cleanup "SIG$signal";
3260 },
3261 ); 3739 };
3262 } 3740 }
3263} 3741}
3264 3742
3265sub write_runtime { 3743sub write_runtime_sync {
3266 my $runtime = "$LOCALDIR/runtime"; 3744 my $t0 = AE::time;
3267 3745
3268 # first touch the runtime file to show we are still running: 3746 # first touch the runtime file to show we are still running:
3269 # the fsync below can take a very very long time. 3747 # the fsync below can take a very very long time.
3270 3748
3271 IO::AIO::aio_utime $runtime, undef, undef; 3749 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3272 3750
3273 my $guard = cf::lock_acquire "write_runtime"; 3751 my $guard = cf::lock_acquire "write_runtime";
3274 3752
3275 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3753 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3276 or return; 3754 or return;
3277 3755
3278 my $value = $cf::RUNTIME + 90 + 10; 3756 my $value = $cf::RUNTIME + 90 + 10;
3279 # 10 is the runtime save interval, for a monotonic clock 3757 # 10 is the runtime save interval, for a monotonic clock
3280 # 60 allows for the watchdog to kill the server. 3758 # 60 allows for the watchdog to kill the server.
3290 aio_utime $fh, undef, undef; 3768 aio_utime $fh, undef, undef;
3291 3769
3292 close $fh 3770 close $fh
3293 or return; 3771 or return;
3294 3772
3295 aio_rename "$runtime~", $runtime 3773 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3296 and return; 3774 and return;
3297 3775
3298 warn "runtime file written.\n"; 3776 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3299 3777
3300 1 3778 1
3779}
3780
3781our $uuid_lock;
3782our $uuid_skip;
3783
3784sub write_uuid_sync($) {
3785 $uuid_skip ||= $_[0];
3786
3787 return if $uuid_lock;
3788 local $uuid_lock = 1;
3789
3790 my $uuid = "$LOCALDIR/uuid";
3791
3792 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3793 or return;
3794
3795 my $value = uuid_seq uuid_cur;
3796
3797 unless ($value) {
3798 info "cowardly refusing to write zero uuid value!\n";
3799 return;
3800 }
3801
3802 my $value = uuid_str $value + $uuid_skip;
3803 $uuid_skip = 0;
3804
3805 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3806 and return;
3807
3808 # always fsync - this file is important
3809 aio_fsync $fh
3810 and return;
3811
3812 close $fh
3813 or return;
3814
3815 aio_rename "$uuid~", $uuid
3816 and return;
3817
3818 trace "uuid file written ($value).\n";
3819
3820 1
3821
3822}
3823
3824sub write_uuid($$) {
3825 my ($skip, $sync) = @_;
3826
3827 $sync ? write_uuid_sync $skip
3828 : async { write_uuid_sync $skip };
3301} 3829}
3302 3830
3303sub emergency_save() { 3831sub emergency_save() {
3304 my $freeze_guard = cf::freeze_mainloop; 3832 my $freeze_guard = cf::freeze_mainloop;
3305 3833
3306 warn "enter emergency perl save\n"; 3834 info "emergency_perl_save: enter\n";
3835
3836 # this is a trade-off: we want to be very quick here, so
3837 # save all maps without fsync, and later call a global sync
3838 # (which in turn might be very very slow)
3839 local $USE_FSYNC = 0;
3307 3840
3308 cf::sync_job { 3841 cf::sync_job {
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3309 # use a peculiar iteration method to avoid tripping on perl 3844 # use a peculiar iteration method to avoid tripping on perl
3310 # refcount bugs in for. also avoids problems with players 3845 # refcount bugs in for. also avoids problems with players
3311 # and maps saved/destroyed asynchronously. 3846 # and maps saved/destroyed asynchronously.
3312 warn "begin emergency player save\n"; 3847 info "emergency_perl_save: begin player save\n";
3313 for my $login (keys %cf::PLAYER) { 3848 for my $login (keys %cf::PLAYER) {
3314 my $pl = $cf::PLAYER{$login} or next; 3849 my $pl = $cf::PLAYER{$login} or next;
3315 $pl->valid or next; 3850 $pl->valid or next;
3316 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3851 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3317 $pl->save; 3852 $pl->save;
3318 } 3853 }
3319 warn "end emergency player save\n"; 3854 info "emergency_perl_save: end player save\n";
3320 3855
3321 warn "begin emergency map save\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin map save\n";
3322 for my $path (keys %cf::MAP) { 3859 for my $path (keys %cf::MAP) {
3323 my $map = $cf::MAP{$path} or next; 3860 my $map = $cf::MAP{$path} or next;
3324 $map->valid or next; 3861 $map->valid or next;
3325 $map->save; 3862 $map->save;
3326 } 3863 }
3327 warn "end emergency map save\n"; 3864 info "emergency_perl_save: end map save\n";
3328 3865
3329 warn "begin emergency database checkpoint\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin database checkpoint\n";
3330 BDB::db_env_txn_checkpoint $DB_ENV; 3869 BDB::db_env_txn_checkpoint $DB_ENV;
3331 warn "end emergency database checkpoint\n"; 3870 info "emergency_perl_save: end database checkpoint\n";
3871
3872 info "emergency_perl_save: begin write uuid\n";
3873 write_uuid_sync 1;
3874 info "emergency_perl_save: end write uuid\n";
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: syncing database to disk";
3879 BDB::db_env_txn_checkpoint $DB_ENV;
3880
3881 info "emergency_perl_save: starting sync\n";
3882 IO::AIO::aio_sync sub {
3883 info "emergency_perl_save: finished sync\n";
3884 };
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: flushing outstanding aio requests";
3889 while (IO::AIO::nreqs || BDB::nreqs) {
3890 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3891 }
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3332 }; 3894 };
3333 3895
3334 warn "leave emergency perl save\n"; 3896 info "emergency_perl_save: leave\n";
3335} 3897}
3336 3898
3337sub post_cleanup { 3899sub post_cleanup {
3338 my ($make_core) = @_; 3900 my ($make_core) = @_;
3339 3901
3902 IO::AIO::flush;
3903
3340 warn Carp::longmess "post_cleanup backtrace" 3904 error Carp::longmess "post_cleanup backtrace"
3341 if $make_core; 3905 if $make_core;
3906
3907 my $fh = pidfile;
3908 unlink $PIDFILE if <$fh> == $$;
3909}
3910
3911# a safer delete_package, copied from Symbol
3912sub clear_package($) {
3913 my $pkg = shift;
3914
3915 # expand to full symbol table name if needed
3916 unless ($pkg =~ /^main::.*::$/) {
3917 $pkg = "main$pkg" if $pkg =~ /^::/;
3918 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3919 $pkg .= '::' unless $pkg =~ /::$/;
3920 }
3921
3922 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3923 my $stem_symtab = *{$stem}{HASH};
3924
3925 defined $stem_symtab and exists $stem_symtab->{$leaf}
3926 or return;
3927
3928 # clear all symbols
3929 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3930 for my $name (keys %$leaf_symtab) {
3931 _gv_clear *{"$pkg$name"};
3932# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3933 }
3342} 3934}
3343 3935
3344sub do_reload_perl() { 3936sub do_reload_perl() {
3345 # can/must only be called in main 3937 # can/must only be called in main
3346 if ($Coro::current != $Coro::main) { 3938 unless (in_main) {
3347 warn "can only reload from main coroutine"; 3939 error "can only reload from main coroutine";
3348 return; 3940 return;
3349 } 3941 }
3350 3942
3351 warn "reloading..."; 3943 return if $RELOAD++;
3352 3944
3353 warn "entering sync_job"; 3945 my $t1 = AE::time;
3354 3946
3947 while ($RELOAD) {
3948 cf::get_slot 0.1, -1, "reload_perl";
3949 info "perl_reload: reloading...";
3950
3951 trace "perl_reload: entering sync_job";
3952
3355 cf::sync_job { 3953 cf::sync_job {
3356 cf::write_runtime; # external watchdog should not bark
3357 cf::emergency_save; 3954 #cf::emergency_save;
3358 cf::write_runtime; # external watchdog should not bark
3359 3955
3360 warn "syncing database to disk";
3361 BDB::db_env_txn_checkpoint $DB_ENV;
3362
3363 # if anything goes wrong in here, we should simply crash as we already saved
3364
3365 warn "cancelling all WF_AUTOCANCEL watchers";
3366 for (Event::all_watchers) {
3367 $_->cancel if $_->data & WF_AUTOCANCEL;
3368 }
3369
3370 warn "flushing outstanding aio requests";
3371 for (;;) {
3372 BDB::flush;
3373 IO::AIO::flush;
3374 Coro::cede;
3375 last unless IO::AIO::nreqs || BDB::nreqs;
3376 warn "iterate...";
3377 }
3378
3379 ++$RELOAD;
3380
3381 warn "cancelling all extension coros"; 3956 trace "perl_reload: cancelling all extension coros";
3382 $_->cancel for values %EXT_CORO; 3957 $_->cancel for values %EXT_CORO;
3383 %EXT_CORO = (); 3958 %EXT_CORO = ();
3384 3959
3385 warn "removing commands"; 3960 trace "perl_reload: removing commands";
3386 %COMMAND = (); 3961 %COMMAND = ();
3387 3962
3388 warn "removing ext/exti commands"; 3963 trace "perl_reload: removing ext/exti commands";
3389 %EXTCMD = (); 3964 %EXTCMD = ();
3390 %EXTICMD = (); 3965 %EXTICMD = ();
3391 3966
3392 warn "unloading/nuking all extensions"; 3967 trace "perl_reload: unloading/nuking all extensions";
3393 for my $pkg (@EXTS) { 3968 for my $pkg (@EXTS) {
3394 warn "... unloading $pkg"; 3969 trace "... unloading $pkg";
3395 3970
3396 if (my $cb = $pkg->can ("unload")) { 3971 if (my $cb = $pkg->can ("unload")) {
3397 eval { 3972 eval {
3398 $cb->($pkg); 3973 $cb->($pkg);
3399 1 3974 1
3400 } or warn "$pkg unloaded, but with errors: $@"; 3975 } or error "$pkg unloaded, but with errors: $@";
3976 }
3977
3978 trace "... clearing $pkg";
3979 clear_package $pkg;
3401 } 3980 }
3402 3981
3403 warn "... nuking $pkg";
3404 Symbol::delete_package $pkg;
3405 }
3406
3407 warn "unloading all perl modules loaded from $LIBDIR"; 3982 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3408 while (my ($k, $v) = each %INC) { 3983 while (my ($k, $v) = each %INC) {
3409 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3984 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3410 3985
3411 warn "... unloading $k"; 3986 trace "... unloading $k";
3412 delete $INC{$k}; 3987 delete $INC{$k};
3413 3988
3414 $k =~ s/\.pm$//; 3989 $k =~ s/\.pm$//;
3415 $k =~ s/\//::/g; 3990 $k =~ s/\//::/g;
3416 3991
3417 if (my $cb = $k->can ("unload_module")) { 3992 if (my $cb = $k->can ("unload_module")) {
3418 $cb->(); 3993 $cb->();
3994 }
3995
3996 clear_package $k;
3419 } 3997 }
3420 3998
3421 Symbol::delete_package $k;
3422 }
3423
3424 warn "getting rid of safe::, as good as possible"; 3999 trace "perl_reload: getting rid of safe::, as good as possible";
3425 Symbol::delete_package "safe::$_" 4000 clear_package "safe::$_"
3426 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4001 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3427 4002
3428 warn "unloading cf.pm \"a bit\""; 4003 trace "perl_reload: unloading cf.pm \"a bit\"";
3429 delete $INC{"cf.pm"}; 4004 delete $INC{"cf.pm"};
3430 delete $INC{"cf/pod.pm"}; 4005 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3431 4006
3432 # don't, removes xs symbols, too, 4007 # don't, removes xs symbols, too,
3433 # and global variables created in xs 4008 # and global variables created in xs
3434 #Symbol::delete_package __PACKAGE__; 4009 #clear_package __PACKAGE__;
3435 4010
3436 warn "unload completed, starting to reload now"; 4011 info "perl_reload: unload completed, starting to reload now";
3437 4012
3438 warn "reloading cf.pm"; 4013 trace "perl_reload: reloading cf.pm";
3439 require cf; 4014 require cf;
3440 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4015 cf::_connect_to_perl_1;
3441 4016
3442 warn "loading config and database again"; 4017 trace "perl_reload: loading config and database again";
3443 cf::reload_config; 4018 cf::reload_config;
3444 4019
3445 warn "loading extensions"; 4020 trace "perl_reload: loading extensions";
3446 cf::load_extensions; 4021 cf::load_extensions;
3447 4022
4023 if ($REATTACH_ON_RELOAD) {
3448 warn "reattaching attachments to objects/players"; 4024 trace "perl_reload: reattaching attachments to objects/players";
3449 _global_reattach; # objects, sockets 4025 _global_reattach; # objects, sockets
3450 warn "reattaching attachments to maps"; 4026 trace "perl_reload: reattaching attachments to maps";
3451 reattach $_ for values %MAP; 4027 reattach $_ for values %MAP;
3452 warn "reattaching attachments to players"; 4028 trace "perl_reload: reattaching attachments to players";
3453 reattach $_ for values %PLAYER; 4029 reattach $_ for values %PLAYER;
4030 }
3454 4031
3455 warn "leaving sync_job"; 4032 cf::_post_init 1;
3456 4033
4034 trace "perl_reload: leaving sync_job";
4035
3457 1 4036 1
3458 } or do { 4037 } or do {
3459 warn $@; 4038 error $@;
3460 warn "error while reloading, exiting."; 4039 cf::cleanup "perl_reload: error, exiting.";
3461 exit 1; 4040 };
4041
4042 --$RELOAD;
3462 }; 4043 }
3463 4044
3464 warn "reloaded"; 4045 $t1 = AE::time - $t1;
4046 info "perl_reload: completed in ${t1}s\n";
3465}; 4047};
3466 4048
3467our $RELOAD_WATCHER; # used only during reload 4049our $RELOAD_WATCHER; # used only during reload
3468 4050
3469sub reload_perl() { 4051sub reload_perl() {
3470 # doing reload synchronously and two reloads happen back-to-back, 4052 # doing reload synchronously and two reloads happen back-to-back,
3471 # coro crashes during coro_state_free->destroy here. 4053 # coro crashes during coro_state_free->destroy here.
3472 4054
3473 $RELOAD_WATCHER ||= Event->timer ( 4055 $RELOAD_WATCHER ||= cf::async {
3474 reentrant => 0, 4056 Coro::AIO::aio_wait cache_extensions;
3475 after => 0, 4057
3476 data => WF_AUTOCANCEL, 4058 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3477 cb => sub {
3478 do_reload_perl; 4059 do_reload_perl;
3479 undef $RELOAD_WATCHER; 4060 undef $RELOAD_WATCHER;
3480 }, 4061 };
3481 ); 4062 };
3482} 4063}
3483 4064
3484register_command "reload" => sub { 4065register_command "reload" => sub {
3485 my ($who, $arg) = @_; 4066 my ($who, $arg) = @_;
3486 4067
3491 reload_perl; 4072 reload_perl;
3492 }; 4073 };
3493 } 4074 }
3494}; 4075};
3495 4076
3496unshift @INC, $LIBDIR; 4077#############################################################################
3497 4078
3498my $bug_warning = 0; 4079my $bug_warning = 0;
3499 4080
3500our @WAIT_FOR_TICK;
3501our @WAIT_FOR_TICK_BEGIN;
3502
3503sub wait_for_tick { 4081sub wait_for_tick() {
3504 return unless $TICK_WATCHER->is_active; 4082 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3505 return if $Coro::current == $Coro::main;
3506 4083
3507 my $signal = new Coro::Signal; 4084 $WAIT_FOR_TICK->wait;
3508 push @WAIT_FOR_TICK, $signal;
3509 $signal->wait;
3510} 4085}
3511 4086
3512sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3513 return unless $TICK_WATCHER->is_active; 4088 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3514 return if $Coro::current == $Coro::main;
3515 4089
3516 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3518 $signal->wait; 4092 $signal->wait;
3519} 4093}
3520 4094
3521$TICK_WATCHER = Event->timer ( 4095sub tick {
3522 reentrant => 0,
3523 parked => 1,
3524 prio => 0,
3525 at => $NEXT_TICK || $TICK,
3526 data => WF_AUTOCANCEL,
3527 cb => sub {
3528 if ($Coro::current != $Coro::main) { 4096 if ($Coro::current != $Coro::main) {
3529 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4097 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3530 unless ++$bug_warning > 10; 4098 unless ++$bug_warning > 10;
3531 return; 4099 return;
3532 } 4100 }
3533 4101
3534 $NOW = $tick_start = Event::time; 4102 cf::one_tick; # one server iteration
3535 4103
3536 cf::server_tick; # one server iteration 4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3537 4105
3538 $RUNTIME += $TICK;
3539 $NEXT_TICK += $TICK;
3540
3541 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3542 $NEXT_RUNTIME_WRITE = $NOW + 10; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3543 Coro::async_pool { 4108 Coro::async_pool {
3544 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3545 write_runtime 4110 write_runtime_sync
3546 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3547 };
3548 } 4112 };
4113 }
3549 4114
3550 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3551 $sig->send; 4116 $sig->send;
3552 } 4117 }
3553 while (my $sig = shift @WAIT_FOR_TICK) { 4118 $WAIT_FOR_TICK->broadcast;
3554 $sig->send;
3555 }
3556 4119
3557 $NOW = Event::time; 4120 $LOAD = ($NOW - $TICK_START) / $TICK;
3558
3559 # if we are delayed by four ticks or more, skip them all
3560 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3561
3562 $TICK_WATCHER->at ($NEXT_TICK);
3563 $TICK_WATCHER->start;
3564
3565 $LOAD = ($NOW - $tick_start) / $TICK;
3566 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4121 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3567 4122
3568 _post_tick; 4123 if (0) {
4124 if ($NEXT_TICK) {
4125 my $jitter = $TICK_START - $NEXT_TICK;
4126 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4127 debug "jitter $JITTER\n";#d#
4128 }
3569 }, 4129 }
3570); 4130}
3571 4131
3572{ 4132{
4133 # configure BDB
4134
3573 BDB::min_parallel 8; 4135 BDB::min_parallel 16;
3574 BDB::max_poll_time $TICK * 0.1; 4136 BDB::max_poll_reqs $TICK * 0.1;
3575 $BDB_POLL_WATCHER = Event->io ( 4137 #$AnyEvent::BDB::WATCHER->priority (1);
3576 reentrant => 0,
3577 fd => BDB::poll_fileno,
3578 poll => 'r',
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => \&BDB::poll_cb,
3582 );
3583
3584 BDB::set_sync_prepare {
3585 my $status;
3586 my $current = $Coro::current;
3587 (
3588 sub {
3589 $status = $!;
3590 $current->ready; undef $current;
3591 },
3592 sub {
3593 Coro::schedule while defined $current;
3594 $! = $status;
3595 },
3596 )
3597 };
3598 4138
3599 unless ($DB_ENV) { 4139 unless ($DB_ENV) {
3600 $DB_ENV = BDB::db_env_create; 4140 $DB_ENV = BDB::db_env_create;
3601 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4141 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3602 | BDB::LOG_AUTOREMOVE, 1); 4142 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4143 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3603 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4144 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3604 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4145 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3605 4146
3606 cf::sync_job { 4147 cf::sync_job {
3607 eval { 4148 eval {
3617 4158
3618 cf::cleanup "db_env_open(db): $@" if $@; 4159 cf::cleanup "db_env_open(db): $@" if $@;
3619 }; 4160 };
3620 } 4161 }
3621 4162
3622 $BDB_DEADLOCK_WATCHER = Event->timer ( 4163 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3623 after => 3,
3624 interval => 1,
3625 hard => 1,
3626 prio => 0,
3627 data => WF_AUTOCANCEL,
3628 cb => sub {
3629 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4164 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3630 },
3631 ); 4165 };
3632 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4166 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3633 after => 11,
3634 interval => 60,
3635 hard => 1,
3636 prio => 0,
3637 data => WF_AUTOCANCEL,
3638 cb => sub {
3639 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4167 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3640 },
3641 ); 4168 };
3642 $BDB_TRICKLE_WATCHER = Event->timer ( 4169 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3643 after => 5,
3644 interval => 10,
3645 hard => 1,
3646 prio => 0,
3647 data => WF_AUTOCANCEL,
3648 cb => sub {
3649 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4170 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3650 },
3651 ); 4171 };
3652} 4172}
3653 4173
3654{ 4174{
4175 # configure IO::AIO
4176
3655 IO::AIO::min_parallel 8; 4177 IO::AIO::min_parallel 8;
3656
3657 undef $Coro::AIO::WATCHER;
3658 IO::AIO::max_poll_time $TICK * 0.1; 4178 IO::AIO::max_poll_time $TICK * 0.1;
3659 $AIO_POLL_WATCHER = Event->io ( 4179 undef $AnyEvent::AIO::WATCHER;
3660 reentrant => 0,
3661 data => WF_AUTOCANCEL,
3662 fd => IO::AIO::poll_fileno,
3663 poll => 'r',
3664 prio => 0,
3665 cb => \&IO::AIO::poll_cb,
3666 );
3667} 4180}
3668 4181
3669my $_log_backtrace; 4182our $_log_backtrace;
4183our $_log_backtrace_last;
3670 4184
3671sub _log_backtrace { 4185sub _log_backtrace {
3672 my ($msg, @addr) = @_; 4186 my ($msg, @addr) = @_;
3673 4187
3674 $msg =~ s/\n//; 4188 $msg =~ s/\n$//;
3675 4189
4190 if ($_log_backtrace_last eq $msg) {
4191 LOG llevInfo, "[ABT] $msg\n";
4192 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3676 # limit the # of concurrent backtraces 4193 # limit the # of concurrent backtraces
3677 if ($_log_backtrace < 2) { 4194 } elsif ($_log_backtrace < 2) {
4195 $_log_backtrace_last = $msg;
3678 ++$_log_backtrace; 4196 ++$_log_backtrace;
4197 my $perl_bt = Carp::longmess $msg;
3679 async { 4198 async {
3680 $Coro::current->{desc} = "abt $msg"; 4199 $Coro::current->{desc} = "abt $msg";
3681 4200
3682 my @bt = fork_call { 4201 my @bt = fork_call {
3683 @addr = map { sprintf "%x", $_ } @addr; 4202 @addr = map { sprintf "%x", $_ } @addr;
3694 } 4213 }
3695 4214
3696 @funcs 4215 @funcs
3697 }; 4216 };
3698 4217
3699 LOG llevInfo, "[ABT] $msg\n"; 4218 LOG llevInfo, "[ABT] $perl_bt\n";
4219 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3700 LOG llevInfo, "[ABT] $_\n" for @bt; 4220 LOG llevInfo, "[ABT] $_\n" for @bt;
3701 --$_log_backtrace; 4221 --$_log_backtrace;
3702 }; 4222 };
3703 } else { 4223 } else {
3704 LOG llevInfo, "[ABT] $msg\n"; 4224 LOG llevInfo, "[ABT] $msg\n";
3705 LOG llevInfo, "[ABT] [suppressed]\n"; 4225 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3706 } 4226 }
3707} 4227}
3708 4228
3709# load additional modules 4229# load additional modules
3710use cf::pod; 4230require "cf/$_.pm" for @EXTRA_MODULES;
4231cf::_connect_to_perl_2;
3711 4232
3712END { cf::emergency_save } 4233END { cf::emergency_save }
3713 4234
37141 42351
3715 4236

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines