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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines