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.389 by root, Sat Oct 20 04:39:57 2007 UTC vs.
Revision 1.572 by root, Sun May 8 11:44:43 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
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1852
1598=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1599 1854
1600Sends an ext reply to the player. 1855Sends an ext reply to the player.
1601 1856
1633 1888
1634=cut 1889=cut
1635 1890
1636sub find_by_path($) { 1891sub find_by_path($) {
1637 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1638 1895
1639 my ($match, $specificity); 1896 my ($match, $specificity);
1640 1897
1641 for my $region (list) { 1898 for my $region (list) {
1642 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1668our $MAX_RESET = 3600; 1925our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1926our $DEFAULT_RESET = 3000;
1670 1927
1671sub generate_random_map { 1928sub generate_random_map {
1672 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1673 # mit "rum" bekleckern, nicht 1930
1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1932
1674 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1678 $rmp->{exit_on_final_map},
1679 $rmp->{xsize}, $rmp->{ysize},
1680 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1681 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1682 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1683 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1684 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1685 (cf::region::find $rmp->{region}), $rmp->{custom}
1686 )
1687} 1934}
1688 1935
1689=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1690 1937
1691Register 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
1696 1943
1697sub register { 1944sub register {
1698 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1699 my $pkg = caller; 1946 my $pkg = caller;
1700 1947
1701 no strict;
1702 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1703 1949
1704 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1705} 1951}
1706 1952
1707# also paths starting with '/' 1953# also paths starting with '/'
1708$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1709 1955
1710sub thawer_merge { 1956sub thawer_merge {
1711 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1712 1958
1713 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1718} 1964}
1719 1965
1720sub normalise { 1966sub normalise {
1721 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1722 1968
1723 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1724 1970
1725 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1726 1972
1727 # map plan: 1973 # map plan:
1728 # 1974 #
1743 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1744 $path = "$base/$path"; 1990 $path = "$base/$path";
1745 } 1991 }
1746 1992
1747 for ($path) { 1993 for ($path) {
1748 redo if s{//}{/};
1749 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1750 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1751 } 1996 }
1752 1997
1753 $path 1998 $path
1767 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1768 return $self; 2013 return $self;
1769 } 2014 }
1770 } 2015 }
1771 2016
1772 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1773 () 2018 ()
1774} 2019}
1775 2020
2021# may re-bless or do other evil things
1776sub init { 2022sub init {
1777 my ($self) = @_; 2023 my ($self) = @_;
1778 2024
1779 $self 2025 $self
1780} 2026}
1799 2045
1800# the temporary/swap location 2046# the temporary/swap location
1801sub save_path { 2047sub save_path {
1802 my ($self) = @_; 2048 my ($self) = @_;
1803 2049
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2050 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 2051 "$TMPDIR/$path.map"
1806} 2052}
1807 2053
1808# the unique path, undef == no special unique path 2054# the unique path, undef == no special unique path
1809sub uniq_path { 2055sub uniq_path {
1810 my ($self) = @_; 2056 my ($self) = @_;
1811 2057
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1814}
1815
1816# and all this just because we cannot iterate over
1817# all maps in C++...
1818sub change_all_map_light {
1819 my ($change) = @_;
1820
1821 $_->change_map_light ($change)
1822 for grep $_->outdoor, values %cf::MAP;
1823} 2060}
1824 2061
1825sub decay_objects { 2062sub decay_objects {
1826 my ($self) = @_; 2063 my ($self) = @_;
1827 2064
1854 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1855 2092
1856 1 2093 1
1857} 2094}
1858 2095
2096# used to laod the header of an original map
1859sub load_header_orig { 2097sub load_header_orig {
1860 my ($self) = @_; 2098 my ($self) = @_;
1861 2099
1862 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1863} 2101}
1864 2102
2103# used to laod the header of an instantiated map
1865sub load_header_temp { 2104sub load_header_temp {
1866 my ($self) = @_; 2105 my ($self) = @_;
1867 2106
1868 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1869} 2108}
1870 2109
2110# called after loading the header from an instantiated map
1871sub prepare_temp { 2111sub prepare_temp {
1872 my ($self) = @_; 2112 my ($self) = @_;
1873 2113
1874 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1875 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1876 # safety 2116 # safety
1877 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1878 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1879} 2119}
1880 2120
2121# called after loading the header from an original map
1881sub prepare_orig { 2122sub prepare_orig {
1882 my ($self) = @_; 2123 my ($self) = @_;
1883 2124
1884 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1885 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1909 2150
1910sub find; 2151sub find;
1911sub find { 2152sub find {
1912 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1913 2154
2155 cf::cede_to_tick;
2156
1914 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1915 2158
1916 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1918 2161
1919 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1922
1923 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
1924 or return; 2164 or return;
1925 2165
1926 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1927 2167
1929 or return; 2169 or return;
1930 2170
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
1934 undef $guard1; 2175 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 2176 $map->reset;
1937 return find $path; 2177 return find $path;
1938 } 2178 }
1939 2179
1940 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1941 } 2181 }
1942} 2182}
1943 2183
1944sub pre_load { } 2184sub pre_load { }
1945sub post_load { } 2185#sub post_load { } # XS
1946 2186
1947sub load { 2187sub load {
1948 my ($self) = @_; 2188 my ($self) = @_;
1949 2189
1950 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
1953 2193
1954 { 2194 {
1955 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
1956 2196
1957 return unless $self->valid; 2197 return unless $self->valid;
1958 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
1959
1960 $self->in_memory (cf::MAP_LOADING);
1961 2199
1962 $self->alloc; 2200 $self->alloc;
1963 2201
1964 $self->pre_load; 2202 $self->pre_load;
1965 cf::cede_to_tick; 2203 cf::cede_to_tick;
1966 2204
2205 if (exists $self->{load_path}) {
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2207 $f->skip_block;
1969 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
1970 or return; 2209 or return;
1971 2210
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
1973 if delete $self->{load_original}; 2212 if delete $self->{load_original};
1974 2213
1975 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2215 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
1978 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
1979 $self->clear_unique_items; 2218 $self->clear_unique_items;
1980 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
1981 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
1982 } 2222 }
1983 } 2223 }
1984 }
1985 2224
1986 $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);
1987 2232
1988 cf::cede_to_tick; 2233 cf::cede_to_tick;
1989 # now do the right thing for maps 2234 # now do the right thing for maps
1990 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
1991 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
1994 2239
1995 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
1996 $self->decay_objects; 2241 $self->decay_objects;
1997 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
1998 $self->update_buttons; 2243 $self->update_buttons;
2244 $self->post_load_physics;
1999 cf::cede_to_tick; 2245 cf::cede_to_tick;
2000 $self->set_darkness_map; 2246 #$self->activate; # no longer activate maps automatically
2001 cf::cede_to_tick;
2002 $self->activate;
2003 } 2247 }
2004 2248
2005 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2250 $self->last_access ($cf::RUNTIME);
2007
2008 $self->in_memory (cf::MAP_IN_MEMORY);
2009 } 2251 }
2010 2252
2011 $self->post_load; 2253 $self->post_load;
2012}
2013 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
2014sub customise_for { 2261sub customise_for {
2015 my ($self, $ob) = @_; 2262 my ($self, $ob) = @_;
2016 2263
2017 return find "~" . $ob->name . "/" . $self->{path} 2264 return find "~" . $ob->name . "/" . $self->{path}
2018 if $self->per_player; 2265 if $self->per_player;
2034 or next; 2281 or next;
2035 $neigh = find $neigh, $map 2282 $neigh = find $neigh, $map
2036 or next; 2283 or next;
2037 $neigh->load; 2284 $neigh->load;
2038 2285
2286 # now find the diagonal neighbours
2039 push @neigh, 2287 push @neigh,
2040 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2288 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2041 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2289 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2042 } 2290 }
2043 2291
2050} 2298}
2051 2299
2052sub find_sync { 2300sub find_sync {
2053 my ($path, $origin) = @_; 2301 my ($path, $origin) = @_;
2054 2302
2055 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
2056} 2308}
2057 2309
2058sub do_load_sync { 2310sub do_load_sync {
2059 my ($map) = @_; 2311 my ($map) = @_;
2060 2312
2313 # it's a bug to call this from the main context
2061 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2314 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2062 if $Coro::current == $Coro::main; 2315 if $Coro::current == $Coro::main;
2063 2316
2064 cf::sync_job { $map->load }; 2317 $map->load;
2065} 2318}
2066 2319
2067our %MAP_PREFETCH; 2320our %MAP_PREFETCH;
2068our $MAP_PREFETCHER = undef; 2321our $MAP_PREFETCHER = undef;
2069 2322
2070sub find_async { 2323sub find_async {
2071 my ($path, $origin, $load) = @_; 2324 my ($path, $origin, $load) = @_;
2072 2325
2073 $path = normalise $path, $origin && $origin->{path}; 2326 $path = normalise $path, $origin;
2074 2327
2328 print "find async $path (from $origin)\n";#d#
2329
2075 if (my $map = $cf::MAP{$path}) { 2330 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2331 return $map if !$load || $map->linkable;
2077 } 2332 }
2078 2333
2079 $MAP_PREFETCH{$path} |= $load; 2334 $MAP_PREFETCH{$path} |= $load;
2080 2335
2081 $MAP_PREFETCHER ||= cf::async { 2336 $MAP_PREFETCHER ||= cf::async {
2095 $MAP_PREFETCHER->prio (6); 2350 $MAP_PREFETCHER->prio (6);
2096 2351
2097 () 2352 ()
2098} 2353}
2099 2354
2355# common code, used by both ->save and ->swapout
2100sub save { 2356sub _save {
2101 my ($self) = @_; 2357 my ($self) = @_;
2102
2103 my $lock = cf::lock_acquire "map_data:$self->{path}";
2104 2358
2105 $self->{last_save} = $cf::RUNTIME; 2359 $self->{last_save} = $cf::RUNTIME;
2106 2360
2107 return unless $self->dirty; 2361 return unless $self->dirty;
2108 2362
2117 2371
2118 cf::async { 2372 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2373 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2374 $_->contr->save for $self->players;
2121 }; 2375 };
2376
2377 cf::get_slot 0.02;
2122 2378
2123 if ($uniq) { 2379 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2380 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2381 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2382 } else {
2127 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2383 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2128 } 2384 }
2129} 2385}
2130 2386
2387sub save {
2388 my ($self) = @_;
2389
2390 my $lock = cf::lock_acquire "map_data:$self->{path}";
2391
2392 $self->_save;
2393}
2394
2131sub swap_out { 2395sub swap_out {
2132 my ($self) = @_; 2396 my ($self) = @_;
2133 2397
2134 # save first because save cedes
2135 $self->save;
2136
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2398 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2399
2400 return if !$self->linkable;
2401 return if $self->{deny_save};
2139 return if $self->players; 2402 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY; 2403
2404 # first deactivate the map and "unlink" it from the core
2405 $self->deactivate;
2406 $_->clear_links_to ($self) for values %cf::MAP;
2407 $self->state (cf::MAP_SWAPPED);
2408
2409 # then atomically save
2410 $self->_save;
2411
2412 # then free the map
2413 $self->clear;
2414}
2415
2416sub reset_at {
2417 my ($self) = @_;
2418
2419 # TODO: safety, remove and allow resettable per-player maps
2141 return if $self->{deny_save}; 2420 return 1e99 if $self->{deny_reset};
2142 2421
2422 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2423 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2424
2425 $time + $to
2426}
2427
2428sub should_reset {
2429 my ($self) = @_;
2430
2431 $self->reset_at <= $cf::RUNTIME
2432}
2433
2434sub reset {
2435 my ($self) = @_;
2436
2437 my $lock = cf::lock_acquire "map_data:$self->{path}";
2438
2439 return if $self->players;
2440
2441 cf::trace "resetting map ", $self->path, "\n";
2442
2143 $self->in_memory (cf::MAP_SWAPPED); 2443 $self->state (cf::MAP_SWAPPED);
2444
2445 # need to save uniques path
2446 unless ($self->{deny_save}) {
2447 my $uniq = $self->uniq_path; utf8::encode $uniq;
2448
2449 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2450 if $uniq;
2451 }
2452
2453 delete $cf::MAP{$self->path};
2144 2454
2145 $self->deactivate; 2455 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP; 2456 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear; 2457 $self->clear;
2148}
2149
2150sub reset_at {
2151 my ($self) = @_;
2152
2153 # TODO: safety, remove and allow resettable per-player maps
2154 return 1e99 if $self->{deny_reset};
2155
2156 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2157 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2158
2159 $time + $to
2160}
2161
2162sub should_reset {
2163 my ($self) = @_;
2164
2165 $self->reset_at <= $cf::RUNTIME
2166}
2167
2168sub reset {
2169 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172
2173 return if $self->players;
2174
2175 warn "resetting map ", $self->path;
2176
2177 $self->in_memory (cf::MAP_SWAPPED);
2178
2179 # need to save uniques path
2180 unless ($self->{deny_save}) {
2181 my $uniq = $self->uniq_path; utf8::encode $uniq;
2182
2183 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2184 if $uniq;
2185 }
2186
2187 delete $cf::MAP{$self->path};
2188
2189 $self->deactivate;
2190 $_->clear_links_to ($self) for values %cf::MAP;
2191 $self->clear;
2192 2458
2193 $self->unlink_save; 2459 $self->unlink_save;
2194 $self->destroy; 2460 $self->destroy;
2195} 2461}
2196 2462
2204 2470
2205 delete $cf::MAP{$self->path}; 2471 delete $cf::MAP{$self->path};
2206 2472
2207 $self->unlink_save; 2473 $self->unlink_save;
2208 2474
2209 bless $self, "cf::map"; 2475 bless $self, "cf::map::wrap";
2210 delete $self->{deny_reset}; 2476 delete $self->{deny_reset};
2211 $self->{deny_save} = 1; 2477 $self->{deny_save} = 1;
2212 $self->reset_timeout (1); 2478 $self->reset_timeout (1);
2213 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2479 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2214 2480
2263 2529
2264sub unique_maps() { 2530sub unique_maps() {
2265 [ 2531 [
2266 map { 2532 map {
2267 utf8::decode $_; 2533 utf8::decode $_;
2268 /\.map$/ 2534 s/\.map$//; # TODO future compatibility hack
2535 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2536 ? ()
2269 ? normalise $_ 2537 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2538 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2539 ]
2273} 2540}
2274 2541
2275package cf; 2542=item cf::map::static_maps
2543
2544Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2545file in the shared directory excluding F</styles> and F</editor>). May
2546block.
2547
2548=cut
2549
2550sub static_maps() {
2551 my @dirs = "";
2552 my @maps;
2553
2554 while (@dirs) {
2555 my $dir = shift @dirs;
2556
2557 next if $dir eq "/styles" || $dir eq "/editor";
2558
2559 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2560 or return;
2561
2562 for (@$files) {
2563 s/\.map$// or next;
2564 utf8::decode $_;
2565 push @maps, "$dir/$_";
2566 }
2567
2568 push @dirs, map "$dir/$_", @$dirs;
2569 }
2570
2571 \@maps
2572}
2276 2573
2277=back 2574=back
2278 2575
2279=head3 cf::object 2576=head3 cf::object
2280 2577
2284 2581
2285=over 4 2582=over 4
2286 2583
2287=item $ob->inv_recursive 2584=item $ob->inv_recursive
2288 2585
2289Returns the inventory of the object _and_ their inventories, recursively. 2586Returns the inventory of the object I<and> their inventories, recursively,
2587but I<not> the object itself.
2290 2588
2291=cut 2589=cut
2292 2590
2293sub inv_recursive_; 2591sub inv_recursive_;
2294sub inv_recursive_ { 2592sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2597 inv_recursive_ inv $_[0]
2300} 2598}
2301 2599
2302=item $ref = $ob->ref 2600=item $ref = $ob->ref
2303 2601
2304creates and returns a persistent reference to an objetc that can be stored as a string. 2602Creates and returns a persistent reference to an object that can be stored as a string.
2305 2603
2306=item $ob = cf::object::deref ($refstring) 2604=item $ob = cf::object::deref ($refstring)
2307 2605
2308returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2606returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2309even if the object actually exists. May block. 2607even if the object actually exists. May block.
2341can be C<undef>. Does the right thing when the player is currently in a 2639can be C<undef>. Does the right thing when the player is currently in a
2342dialogue with the given NPC character. 2640dialogue with the given NPC character.
2343 2641
2344=cut 2642=cut
2345 2643
2644our $SAY_CHANNEL = {
2645 id => "say",
2646 title => "Map",
2647 reply => "say ",
2648 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2649};
2650
2651our $CHAT_CHANNEL = {
2652 id => "chat",
2653 title => "Chat",
2654 reply => "chat ",
2655 tooltip => "Player chat and shouts, global to the server.",
2656};
2657
2346# rough implementation of a future "reply" method that works 2658# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2659# with dialog boxes.
2348#TODO: the first argument must go, split into a $npc->reply_to ( method 2660#TODO: the first argument must go, split into a $npc->reply_to ( method
2349sub cf::object::player::reply($$$;$) { 2661sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2662 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2673 my $dialog = $pl->{npc_dialog};
2362 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2674 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2363 2675
2364 } else { 2676 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2677 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2678 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2679 }
2368 } 2680 }
2369} 2681}
2370 2682
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2683=item $object->send_msg ($channel, $msg, $color, [extra...])
2396 2708
2397=item $player_object->enter_link 2709=item $player_object->enter_link
2398 2710
2399Freezes the player and moves him/her to a special map (C<{link}>). 2711Freezes the player and moves him/her to a special map (C<{link}>).
2400 2712
2401The player should be reasonably safe there for short amounts of time. You 2713The player should be reasonably safe there for short amounts of time (e.g.
2402I<MUST> call C<leave_link> as soon as possible, though. 2714for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2715though, as the player cannot control the character while it is on the link
2716map.
2403 2717
2404Will never block. 2718Will never block.
2405 2719
2406=item $player_object->leave_link ($map, $x, $y) 2720=item $player_object->leave_link ($map, $x, $y)
2407 2721
2427sub cf::object::player::enter_link { 2741sub cf::object::player::enter_link {
2428 my ($self) = @_; 2742 my ($self) = @_;
2429 2743
2430 $self->deactivate_recursive; 2744 $self->deactivate_recursive;
2431 2745
2746 ++$self->{_link_recursion};
2747
2432 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2748 return if UNIVERSAL::isa $self->map, "ext::map_link";
2433 2749
2434 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2750 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2435 if $self->map && $self->map->{path} ne "{link}"; 2751 if $self->map && $self->map->{path} ne "{link}";
2436 2752
2437 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2753 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2438} 2754}
2439 2755
2440sub cf::object::player::leave_link { 2756sub cf::object::player::leave_link {
2441 my ($self, $map, $x, $y) = @_; 2757 my ($self, $map, $x, $y) = @_;
2442 2758
2459 ($x, $y) = (-1, -1) 2775 ($x, $y) = (-1, -1)
2460 unless (defined $x) && (defined $y); 2776 unless (defined $x) && (defined $y);
2461 2777
2462 # use -1 or undef as default coordinates, not 0, 0 2778 # use -1 or undef as default coordinates, not 0, 0
2463 ($x, $y) = ($map->enter_x, $map->enter_y) 2779 ($x, $y) = ($map->enter_x, $map->enter_y)
2464 if $x <=0 && $y <= 0; 2780 if $x <= 0 && $y <= 0;
2465 2781
2466 $map->load; 2782 $map->load;
2467 $map->load_neighbours; 2783 $map->load_neighbours;
2468 2784
2469 return unless $self->contr->active; 2785 return unless $self->contr->active;
2470 $self->activate_recursive;
2471 2786
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2787 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2788 if ($self->enter_map ($map, $x, $y)) {
2474} 2789 # entering was successful
2790 delete $self->{_link_recursion};
2791 # only activate afterwards, to support waiting in hooks
2792 $self->activate_recursive;
2793 }
2475 2794
2795}
2796
2476=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2797=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2477 2798
2478Moves the player to the given map-path and coordinates by first freezing 2799Moves the player to the given map-path and coordinates by first freezing
2479her, loading and preparing them map, calling the provided $check callback 2800her, loading and preparing them map, calling the provided $check callback
2480that has to return the map if sucecssful, and then unfreezes the player on 2801that has to return the map if sucecssful, and then unfreezes the player on
2481the new (success) or old (failed) map position. In either case, $done will 2802the new (success) or old (failed) map position. In either case, $done will
2482be called at the end of this process. 2803be called at the end of this process.
2483 2804
2805Note that $check will be called with a potentially non-loaded map, so if
2806it needs a loaded map it has to call C<< ->load >>.
2807
2484=cut 2808=cut
2485 2809
2486our $GOTOGEN; 2810our $GOTOGEN;
2487 2811
2488sub cf::object::player::goto { 2812sub cf::object::player::goto {
2489 my ($self, $path, $x, $y, $check, $done) = @_; 2813 my ($self, $path, $x, $y, $check, $done) = @_;
2814
2815 if ($self->{_link_recursion} >= $MAX_LINKS) {
2816 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2817 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2818 ($path, $x, $y) = @$EMERGENCY_POSITION;
2819 }
2490 2820
2491 # do generation counting so two concurrent goto's will be executed in-order 2821 # do generation counting so two concurrent goto's will be executed in-order
2492 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2822 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2493 2823
2494 $self->enter_link; 2824 $self->enter_link;
2514 ($path, $x, $y) = (undef, undef, undef); 2844 ($path, $x, $y) = (undef, undef, undef);
2515 } 2845 }
2516 } 2846 }
2517 2847
2518 my $map = eval { 2848 my $map = eval {
2519 my $map = defined $path ? cf::map::find $path : undef; 2849 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2520 2850
2521 if ($map) { 2851 if ($map) {
2522 $map = $map->customise_for ($self); 2852 $map = $map->customise_for ($self);
2523 $map = $check->($map) if $check && $map; 2853 $map = $check->($map, $x, $y, $self) if $check && $map;
2524 } else { 2854 } else {
2525 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2855 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2526 } 2856 }
2527 2857
2528 $map 2858 $map
2536 if ($gen == $self->{_goto_generation}) { 2866 if ($gen == $self->{_goto_generation}) {
2537 delete $self->{_goto_generation}; 2867 delete $self->{_goto_generation};
2538 $self->leave_link ($map, $x, $y); 2868 $self->leave_link ($map, $x, $y);
2539 } 2869 }
2540 2870
2541 $done->() if $done; 2871 $done->($self) if $done;
2542 })->prio (1); 2872 })->prio (1);
2543} 2873}
2544 2874
2545=item $player_object->enter_exit ($exit_object) 2875=item $player_object->enter_exit ($exit_object)
2546 2876
2566} 2896}
2567 2897
2568sub prepare_random_map { 2898sub prepare_random_map {
2569 my ($exit) = @_; 2899 my ($exit) = @_;
2570 2900
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2901 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2902 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2903 # that depends on the exit object
2576 2904
2577 my $rmp = parse_random_map_params $exit->msg; 2905 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2907 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2908 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2909 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2910 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2911 $rmp->{origin_y} = $exit->y;
2912
2913 $exit->map->touch;
2584 } 2914 }
2585 2915
2586 $rmp->{random_seed} ||= $exit->random_seed; 2916 $rmp->{random_seed} ||= $exit->random_seed;
2587 2917
2588 my $data = cf::to_json $rmp; 2918 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2919 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2920 my $meta = "$RANDOMDIR/$md5.meta";
2591 2921
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2922 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2923 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2924 undef $fh;
2595 aio_rename "$meta~", $meta; 2925 aio_rename "$meta~", $meta;
2596 2926
2927 my $slaying = "?random/$md5";
2928
2929 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2930 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2931 $exit->msg (undef);
2932 }
2599 } 2933 }
2600} 2934}
2601 2935
2602sub cf::object::player::enter_exit { 2936sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2937 my ($self, $exit) = @_;
2604 2938
2605 return unless $self->type == cf::PLAYER; 2939 return unless $self->type == cf::PLAYER;
2606 2940
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2941 $self->enter_link;
2619 2942
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2943 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2944 $Coro::current->{desc} = "enter_exit";
2626 2945
2627 $self->deactivate_recursive; # just to be sure
2628 unless (eval { 2946 unless (eval {
2947 $self->deactivate_recursive; # just to be sure
2948
2949 my $map = cf::map::normalise $exit->slaying, $exit->map;
2950 my $x = $exit->stats->hp;
2951 my $y = $exit->stats->sp;
2952
2953 # special map handling
2954 my $slaying = $exit->slaying;
2955
2956 # special map handling
2957 if ($slaying eq "/!") {
2958 my $guard = cf::lock_acquire "exit_prepare:$exit";
2959
2960 prepare_random_map $exit
2961 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2962
2963 $map = $exit->slaying;
2964
2965 } elsif ($slaying eq '!up') {
2966 $map = $exit->map->tile_path (cf::TILE_UP);
2967 $x = $exit->x;
2968 $y = $exit->y;
2969
2970 } elsif ($slaying eq '!down') {
2971 $map = $exit->map->tile_path (cf::TILE_DOWN);
2972 $x = $exit->x;
2973 $y = $exit->y;
2974 }
2975
2629 $self->goto ($slaying, $hp, $sp); 2976 $self->goto ($map, $x, $y);
2630 2977
2978 # if exit is damned, update players death & WoR home-position
2979 $self->contr->savebed ($map, $x, $y)
2980 if $exit->flag (cf::FLAG_DAMNED);
2981
2631 1; 2982 1
2632 }) { 2983 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2984 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "I'll try to bring you back to the map you were before. " 2985 . "I'll try to bring you back to the map you were before. "
2635 . "Please report this to the dungeon master!", 2986 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2987 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2988
2638 warn "ERROR in enter_exit: $@"; 2989 error "ERROR in enter_exit: $@";
2639 $self->leave_link; 2990 $self->leave_link;
2640 } 2991 }
2641 })->prio (1); 2992 })->prio (1);
2642} 2993}
2643 2994
2655sub cf::client::send_drawinfo { 3006sub cf::client::send_drawinfo {
2656 my ($self, $text, $flags) = @_; 3007 my ($self, $text, $flags) = @_;
2657 3008
2658 utf8::encode $text; 3009 utf8::encode $text;
2659 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3010 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3011}
3012
3013=item $client->send_big_packet ($pkt)
3014
3015Like C<send_packet>, but tries to compress large packets, and fragments
3016them as required.
3017
3018=cut
3019
3020our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3021
3022sub cf::client::send_big_packet {
3023 my ($self, $pkt) = @_;
3024
3025 # try lzf for large packets
3026 $pkt = "lzf " . Compress::LZF::compress $pkt
3027 if 1024 <= length $pkt and $self->{can_lzf};
3028
3029 # split very large packets
3030 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3031 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3032 $pkt = "frag";
3033 }
3034
3035 $self->send_packet ($pkt);
2660} 3036}
2661 3037
2662=item $client->send_msg ($channel, $msg, $color, [extra...]) 3038=item $client->send_msg ($channel, $msg, $color, [extra...])
2663 3039
2664Send a drawinfo or msg packet to the client, formatting the msg for the 3040Send a drawinfo or msg packet to the client, formatting the msg for the
2666the message, with C<log> being the default. If C<$color> is negative, suppress 3042the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 3043the message unless the client supports the msg packet.
2668 3044
2669=cut 3045=cut
2670 3046
3047# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 3048our %CHANNEL = (
3049 "c/motd" => {
3050 id => "infobox",
3051 title => "MOTD",
3052 reply => undef,
3053 tooltip => "The message of the day",
3054 },
2672 "c/identify" => { 3055 "c/identify" => {
2673 id => "infobox", 3056 id => "infobox",
2674 title => "Identify", 3057 title => "Identify",
2675 reply => undef, 3058 reply => undef,
2676 tooltip => "Items recently identified", 3059 tooltip => "Items recently identified",
2678 "c/examine" => { 3061 "c/examine" => {
2679 id => "infobox", 3062 id => "infobox",
2680 title => "Examine", 3063 title => "Examine",
2681 reply => undef, 3064 reply => undef,
2682 tooltip => "Signs and other items you examined", 3065 tooltip => "Signs and other items you examined",
3066 },
3067 "c/shopinfo" => {
3068 id => "infobox",
3069 title => "Shop Info",
3070 reply => undef,
3071 tooltip => "What your bargaining skill tells you about the shop",
2683 }, 3072 },
2684 "c/book" => { 3073 "c/book" => {
2685 id => "infobox", 3074 id => "infobox",
2686 title => "Book", 3075 title => "Book",
2687 reply => undef, 3076 reply => undef,
2691 id => "infobox", 3080 id => "infobox",
2692 title => "Look", 3081 title => "Look",
2693 reply => undef, 3082 reply => undef,
2694 tooltip => "What you saw there", 3083 tooltip => "What you saw there",
2695 }, 3084 },
3085 "c/who" => {
3086 id => "infobox",
3087 title => "Players",
3088 reply => undef,
3089 tooltip => "Shows players who are currently online",
3090 },
3091 "c/body" => {
3092 id => "infobox",
3093 title => "Body Parts",
3094 reply => undef,
3095 tooltip => "Shows which body parts you posess and are available",
3096 },
3097 "c/statistics" => {
3098 id => "infobox",
3099 title => "Statistics",
3100 reply => undef,
3101 tooltip => "Shows your primary statistics",
3102 },
3103 "c/skills" => {
3104 id => "infobox",
3105 title => "Skills",
3106 reply => undef,
3107 tooltip => "Shows your experience per skill and item power",
3108 },
3109 "c/shopitems" => {
3110 id => "infobox",
3111 title => "Shop Items",
3112 reply => undef,
3113 tooltip => "Shows the items currently for sale in this shop",
3114 },
3115 "c/resistances" => {
3116 id => "infobox",
3117 title => "Resistances",
3118 reply => undef,
3119 tooltip => "Shows your resistances",
3120 },
3121 "c/pets" => {
3122 id => "infobox",
3123 title => "Pets",
3124 reply => undef,
3125 tooltip => "Shows information abotu your pets/a specific pet",
3126 },
3127 "c/perceiveself" => {
3128 id => "infobox",
3129 title => "Perceive Self",
3130 reply => undef,
3131 tooltip => "You gained detailed knowledge about yourself",
3132 },
3133 "c/uptime" => {
3134 id => "infobox",
3135 title => "Uptime",
3136 reply => undef,
3137 tooltip => "How long the server has been running since last restart",
3138 },
3139 "c/mapinfo" => {
3140 id => "infobox",
3141 title => "Map Info",
3142 reply => undef,
3143 tooltip => "Information related to the maps",
3144 },
3145 "c/party" => {
3146 id => "party",
3147 title => "Party",
3148 reply => "gsay ",
3149 tooltip => "Messages and chat related to your party",
3150 },
3151 "c/death" => {
3152 id => "death",
3153 title => "Death",
3154 reply => undef,
3155 tooltip => "Reason for and more info about your most recent death",
3156 },
3157 "c/say" => $SAY_CHANNEL,
3158 "c/chat" => $CHAT_CHANNEL,
2696); 3159);
2697 3160
2698sub cf::client::send_msg { 3161sub cf::client::send_msg {
2699 my ($self, $channel, $msg, $color, @extra) = @_; 3162 my ($self, $channel, $msg, $color, @extra) = @_;
2700 3163
2701 $msg = $self->pl->expand_cfpod ($msg); 3164 $msg = $self->pl->expand_cfpod ($msg)
3165 unless $color & cf::NDI_VERBATIM;
2702 3166
2703 $color &= cf::NDI_CLIENT_MASK; # just in case... 3167 $color &= cf::NDI_CLIENT_MASK; # just in case...
2704 3168
2705 # check predefined channels, for the benefit of C 3169 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) { 3170 if ($CHANNEL{$channel}) {
2707 $channel = $CHANNEL{$channel}; 3171 $channel = $CHANNEL{$channel};
2708 3172
2709 $self->ext_msg (channel_info => $channel) 3173 $self->ext_msg (channel_info => $channel);
2710 if $self->can_msg;
2711
2712 $channel = $channel->{id}; 3174 $channel = $channel->{id};
2713 3175
2714 } elsif (ref $channel) { 3176 } elsif (ref $channel) {
2715 # send meta info to client, if not yet sent 3177 # send meta info to client, if not yet sent
2716 unless (exists $self->{channel}{$channel->{id}}) { 3178 unless (exists $self->{channel}{$channel->{id}}) {
2717 $self->{channel}{$channel->{id}} = $channel; 3179 $self->{channel}{$channel->{id}} = $channel;
2718 $self->ext_msg (channel_info => $channel) 3180 $self->ext_msg (channel_info => $channel);
2719 if $self->can_msg;
2720 } 3181 }
2721 3182
2722 $channel = $channel->{id}; 3183 $channel = $channel->{id};
2723 } 3184 }
2724 3185
2725 return unless @extra || length $msg; 3186 return unless @extra || length $msg;
2726 3187
2727 if ($self->can_msg) {
2728 # default colour, mask it out 3188 # default colour, mask it out
2729 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3189 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730 if $color & cf::NDI_DEF; 3190 if $color & cf::NDI_DEF;
2731 3191
2732 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3192 my $pkt = "msg "
3193 . $self->{json_coder}->encode (
2733 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3194 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2734 } else { 3195 );
2735 if ($color >= 0) {
2736 # replace some tags by gcfclient-compatible ones
2737 for ($msg) {
2738 1 while
2739 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2740 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2741 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2742 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2743 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2744 }
2745 3196
2746 $color &= cf::NDI_COLOR_MASK; 3197 $self->send_big_packet ($pkt);
2747
2748 utf8::encode $msg;
2749
2750 if (0 && $msg =~ /\[/) {
2751 # COMMAND/INFO
2752 $self->send_packet ("drawextinfo $color 10 8 $msg")
2753 } else {
2754 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2755 $self->send_packet ("drawinfo $color $msg")
2756 }
2757 }
2758 }
2759} 3198}
2760 3199
2761=item $client->ext_msg ($type, @msg) 3200=item $client->ext_msg ($type, @msg)
2762 3201
2763Sends an ext event to the client. 3202Sends an ext event to the client.
2766 3205
2767sub cf::client::ext_msg($$@) { 3206sub cf::client::ext_msg($$@) {
2768 my ($self, $type, @msg) = @_; 3207 my ($self, $type, @msg) = @_;
2769 3208
2770 if ($self->extcmd == 2) { 3209 if ($self->extcmd == 2) {
2771 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3210 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2772 } elsif ($self->extcmd == 1) { # TODO: remove 3211 } elsif ($self->extcmd == 1) { # TODO: remove
2773 push @msg, msgtype => "event_$type"; 3212 push @msg, msgtype => "event_$type";
2774 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3213 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2775 } 3214 }
2776} 3215}
2777 3216
2778=item $client->ext_reply ($msgid, @msg) 3217=item $client->ext_reply ($msgid, @msg)
2779 3218
2783 3222
2784sub cf::client::ext_reply($$@) { 3223sub cf::client::ext_reply($$@) {
2785 my ($self, $id, @msg) = @_; 3224 my ($self, $id, @msg) = @_;
2786 3225
2787 if ($self->extcmd == 2) { 3226 if ($self->extcmd == 2) {
2788 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3227 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2789 } elsif ($self->extcmd == 1) { 3228 } elsif ($self->extcmd == 1) {
2790 #TODO: version 1, remove 3229 #TODO: version 1, remove
2791 unshift @msg, msgtype => "reply", msgid => $id; 3230 unshift @msg, msgtype => "reply", msgid => $id;
2792 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3231 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2793 } 3232 }
2794} 3233}
2795 3234
2796=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2797 3236
2868 3307
2869 $ns->ext_reply ($reply, @reply) 3308 $ns->ext_reply ($reply, @reply)
2870 if $reply; 3309 if $reply;
2871 3310
2872 } else { 3311 } else {
2873 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3312 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2874 } 3313 }
2875 3314
2876 cf::override; 3315 cf::override;
2877 }, 3316 },
2878); 3317);
2898 3337
2899 $coro 3338 $coro
2900} 3339}
2901 3340
2902cf::client->attach ( 3341cf::client->attach (
2903 on_destroy => sub { 3342 on_client_destroy => sub {
2904 my ($ns) = @_; 3343 my ($ns) = @_;
2905 3344
2906 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3345 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2907 }, 3346 },
2908); 3347);
2924our $safe_hole = new Safe::Hole; 3363our $safe_hole = new Safe::Hole;
2925 3364
2926$SIG{FPE} = 'IGNORE'; 3365$SIG{FPE} = 'IGNORE';
2927 3366
2928$safe->permit_only (Opcode::opset qw( 3367$safe->permit_only (Opcode::opset qw(
2929 :base_core :base_mem :base_orig :base_math 3368 :base_core :base_mem :base_orig :base_math :base_loop
2930 grepstart grepwhile mapstart mapwhile 3369 grepstart grepwhile mapstart mapwhile
2931 sort time 3370 sort time
2932)); 3371));
2933 3372
2934# here we export the classes and methods available to script code 3373# here we export the classes and methods available to script code
2937 3376
2938The following functions and methods are available within a safe environment: 3377The following functions and methods are available within a safe environment:
2939 3378
2940 cf::object 3379 cf::object
2941 contr pay_amount pay_player map x y force_find force_add destroy 3380 contr pay_amount pay_player map x y force_find force_add destroy
2942 insert remove name archname title slaying race decrease_ob_nr 3381 insert remove name archname title slaying race decrease split
3382 value
2943 3383
2944 cf::object::player 3384 cf::object::player
2945 player 3385 player
2946 3386
2947 cf::player 3387 cf::player
2952 3392
2953=cut 3393=cut
2954 3394
2955for ( 3395for (
2956 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3396 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2957 insert remove inv name archname title slaying race 3397 insert remove inv nrof name archname title slaying race
2958 decrease_ob_nr destroy)], 3398 decrease split destroy change_exp value msg lore send_msg)],
2959 ["cf::object::player" => qw(player)], 3399 ["cf::object::player" => qw(player)],
2960 ["cf::player" => qw(peaceful)], 3400 ["cf::player" => qw(peaceful send_msg)],
2961 ["cf::map" => qw(trigger)], 3401 ["cf::map" => qw(trigger)],
2962) { 3402) {
2963 no strict 'refs';
2964 my ($pkg, @funs) = @$_; 3403 my ($pkg, @funs) = @$_;
2965 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3404 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2966 for @funs; 3405 for @funs;
2967} 3406}
2968 3407
2983 3422
2984 my $qcode = $code; 3423 my $qcode = $code;
2985 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3424 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2986 $qcode =~ s/\n/\\n/g; 3425 $qcode =~ s/\n/\\n/g;
2987 3426
3427 %vars = (_dummy => 0) unless %vars;
3428
3429 my @res;
2988 local $_; 3430 local $_;
2989 local @safe::cf::_safe_eval_args = values %vars;
2990 3431
2991 my $eval = 3432 my $eval =
2992 "do {\n" 3433 "do {\n"
2993 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3434 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2994 . "#line 0 \"{$qcode}\"\n" 3435 . "#line 0 \"{$qcode}\"\n"
2995 . $code 3436 . $code
2996 . "\n}" 3437 . "\n}"
2997 ; 3438 ;
2998 3439
3440 if ($CFG{safe_eval}) {
2999 sub_generation_inc; 3441 sub_generation_inc;
3442 local @safe::cf::_safe_eval_args = values %vars;
3000 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3443 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3001 sub_generation_inc; 3444 sub_generation_inc;
3445 } else {
3446 local @cf::_safe_eval_args = values %vars;
3447 @res = wantarray ? eval eval : scalar eval $eval;
3448 }
3002 3449
3003 if ($@) { 3450 if ($@) {
3004 warn "$@"; 3451 warn "$@",
3005 warn "while executing safe code '$code'\n"; 3452 "while executing safe code '$code'\n",
3006 warn "with arguments " . (join " ", %vars) . "\n"; 3453 "with arguments " . (join " ", %vars) . "\n";
3007 } 3454 }
3008 3455
3009 wantarray ? @res : $res[0] 3456 wantarray ? @res : $res[0]
3010} 3457}
3011 3458
3025=cut 3472=cut
3026 3473
3027sub register_script_function { 3474sub register_script_function {
3028 my ($fun, $cb) = @_; 3475 my ($fun, $cb) = @_;
3029 3476
3030 no strict 'refs'; 3477 $fun = "safe::$fun" if $CFG{safe_eval};
3031 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3478 *$fun = $safe_hole->wrap ($cb);
3032} 3479}
3033 3480
3034=back 3481=back
3035 3482
3036=cut 3483=cut
3045 # for this (global event?) 3492 # for this (global event?)
3046 %ext::player_env::MUSIC_FACE_CACHE = (); 3493 %ext::player_env::MUSIC_FACE_CACHE = ();
3047 3494
3048 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3495 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3049 3496
3050 warn "loading facedata from $path\n"; 3497 trace "loading facedata from $path\n";
3051 3498
3052 my $facedata; 3499 my $facedata = decode_storable load_file $path;
3053 0 < aio_load $path, $facedata
3054 or die "$path: $!";
3055
3056 $facedata = Coro::Storable::thaw $facedata;
3057 3500
3058 $facedata->{version} == 2 3501 $facedata->{version} == 2
3059 or cf::cleanup "$path: version mismatch, cannot proceed."; 3502 or cf::cleanup "$path: version mismatch, cannot proceed.";
3060 3503
3061 # patch in the exptable 3504 # patch in the exptable
3505 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3062 $facedata->{resource}{"res/exp_table"} = { 3506 $facedata->{resource}{"res/exp_table"} = {
3063 type => FT_RSRC, 3507 type => FT_RSRC,
3064 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3508 data => $exp_table,
3509 hash => (Digest::MD5::md5 $exp_table),
3065 }; 3510 };
3066 cf::cede_to_tick; 3511 cf::cede_to_tick;
3067 3512
3068 { 3513 {
3069 my $faces = $facedata->{faceinfo}; 3514 my $faces = $facedata->{faceinfo};
3070 3515
3071 while (my ($face, $info) = each %$faces) { 3516 while (my ($face, $info) = each %$faces) {
3072 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3517 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3518
3073 cf::face::set_visibility $idx, $info->{visibility}; 3519 cf::face::set_visibility $idx, $info->{visibility};
3074 cf::face::set_magicmap $idx, $info->{magicmap}; 3520 cf::face::set_magicmap $idx, $info->{magicmap};
3075 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3521 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3076 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3522 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3523 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3077 3524
3078 cf::cede_to_tick; 3525 cf::cede_to_tick;
3079 } 3526 }
3080 3527
3081 while (my ($face, $info) = each %$faces) { 3528 while (my ($face, $info) = each %$faces) {
3082 next unless $info->{smooth}; 3529 next unless $info->{smooth};
3530
3083 my $idx = cf::face::find $face 3531 my $idx = cf::face::find $face
3084 or next; 3532 or next;
3533
3085 if (my $smooth = cf::face::find $info->{smooth}) { 3534 if (my $smooth = cf::face::find $info->{smooth}) {
3086 cf::face::set_smooth $idx, $smooth; 3535 cf::face::set_smooth $idx, $smooth;
3087 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3536 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3088 } else { 3537 } else {
3089 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3538 error "smooth face '$info->{smooth}' not found for face '$face'";
3090 } 3539 }
3091 3540
3092 cf::cede_to_tick; 3541 cf::cede_to_tick;
3093 } 3542 }
3094 } 3543 }
3103 3552
3104 cf::anim::invalidate_all; # d'oh 3553 cf::anim::invalidate_all; # d'oh
3105 } 3554 }
3106 3555
3107 { 3556 {
3108 # TODO: for gcfclient pleasure, we should give resources
3109 # that gcfclient doesn't grok a >10000 face index.
3110 my $res = $facedata->{resource}; 3557 my $res = $facedata->{resource};
3111 3558
3112 my $soundconf = delete $res->{"res/sound.conf"};
3113
3114 while (my ($name, $info) = each %$res) { 3559 while (my ($name, $info) = each %$res) {
3560 if (defined $info->{type}) {
3115 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3561 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data;
3117 3562
3118 if ($info->{type} & 1) { 3563 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3119 # prepend meta info 3564 cf::face::set_type $idx, $info->{type};
3120
3121 my $meta = $enc->encode ({
3122 name => $name,
3123 %{ $info->{meta} || {} },
3124 });
3125
3126 $data = pack "(w/a*)*", $meta, $info->{data};
3127 } else { 3565 } else {
3128 $data = $info->{data}; 3566 $RESOURCE{$name} = $info; # unused
3129 } 3567 }
3130 3568
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
3134 cf::cede_to_tick; 3569 cf::cede_to_tick;
3135 } 3570 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
3154 } 3571 }
3572
3573 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3155 3574
3156 1 3575 1
3157} 3576}
3158 3577
3159register_exticmd fx_want => sub { 3578register_exticmd fx_want => sub {
3161 3580
3162 while (my ($k, $v) = each %$want) { 3581 while (my ($k, $v) = each %$want) {
3163 $ns->fx_want ($k, $v); 3582 $ns->fx_want ($k, $v);
3164 } 3583 }
3165}; 3584};
3585
3586sub load_resource_file($) {
3587 my $guard = lock_acquire "load_resource_file";
3588
3589 my $status = load_resource_file_ $_[0];
3590 get_slot 0.1, 100;
3591 cf::arch::commit_load;
3592
3593 $status
3594}
3166 3595
3167sub reload_regions { 3596sub reload_regions {
3168 # HACK to clear player env face cache, we need some signal framework 3597 # HACK to clear player env face cache, we need some signal framework
3169 # for this (global event?) 3598 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = (); 3599 %ext::player_env::MUSIC_FACE_CACHE = ();
3184} 3613}
3185 3614
3186sub reload_archetypes { 3615sub reload_archetypes {
3187 load_resource_file "$DATADIR/archetypes" 3616 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n"; 3617 or die "unable to load archetypes\n";
3189 #d# NEED to laod twice to resolve forward references
3190 # this really needs to be done in an extra post-pass
3191 # (which needs to be synchronous, so solve it differently)
3192 load_resource_file "$DATADIR/archetypes"
3193 or die "unable to load archetypes\n";
3194} 3618}
3195 3619
3196sub reload_treasures { 3620sub reload_treasures {
3197 load_resource_file "$DATADIR/treasures" 3621 load_resource_file "$DATADIR/treasures"
3198 or die "unable to load treasurelists\n"; 3622 or die "unable to load treasurelists\n";
3199} 3623}
3200 3624
3625sub reload_sound {
3626 trace "loading sound config from $DATADIR/sound\n";
3627
3628 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3629
3630 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3631 my $sound = $soundconf->{compat}[$_]
3632 or next;
3633
3634 my $face = cf::face::find "sound/$sound->[1]";
3635 cf::sound::set $sound->[0] => $face;
3636 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3637 }
3638
3639 while (my ($k, $v) = each %{$soundconf->{event}}) {
3640 my $face = cf::face::find "sound/$v";
3641 cf::sound::set $k => $face;
3642 }
3643}
3644
3201sub reload_resources { 3645sub reload_resources {
3202 warn "reloading resource files...\n"; 3646 trace "reloading resource files...\n";
3203 3647
3648 reload_exp_table;
3649 reload_materials;
3650 reload_facedata;
3651 reload_sound;
3652 reload_archetypes;
3204 reload_regions; 3653 reload_regions;
3205 reload_facedata;
3206 #reload_archetypes;#d#
3207 reload_archetypes;
3208 reload_treasures; 3654 reload_treasures;
3209 3655
3210 warn "finished reloading resource files\n"; 3656 trace "finished reloading resource files\n";
3211}
3212
3213sub init {
3214 reload_resources;
3215} 3657}
3216 3658
3217sub reload_config { 3659sub reload_config {
3218 open my $fh, "<:utf8", "$CONFDIR/config" 3660 trace "reloading config file...\n";
3219 or return;
3220 3661
3221 local $/; 3662 my $config = load_file "$CONFDIR/config";
3222 *CFG = YAML::Syck::Load <$fh>; 3663 utf8::decode $config;
3664 *CFG = decode_yaml $config;
3223 3665
3224 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3666 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3225 3667
3226 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3668 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3227 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3669 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3228 3670
3229 if (exists $CFG{mlockall}) { 3671 if (exists $CFG{mlockall}) {
3233 }; 3675 };
3234 warn $@ if $@; 3676 warn $@ if $@;
3235 } 3677 }
3236} 3678}
3237 3679
3680sub pidfile() {
3681 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3682 or die "$PIDFILE: $!";
3683 flock $fh, &Fcntl::LOCK_EX
3684 or die "$PIDFILE: flock: $!";
3685 $fh
3686}
3687
3688# make sure only one server instance is running at any one time
3689sub atomic {
3690 my $fh = pidfile;
3691
3692 my $pid = <$fh>;
3693 kill 9, $pid if $pid > 0;
3694
3695 seek $fh, 0, 0;
3696 print $fh $$;
3697}
3698
3699sub main_loop {
3700 trace "EV::loop starting\n";
3701 if (1) {
3702 EV::loop;
3703 }
3704 trace "EV::loop returned\n";
3705 goto &main_loop unless $REALLY_UNLOOP;
3706}
3707
3238sub main { 3708sub main {
3709 cf::init_globals; # initialise logging
3710
3711 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3712 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3713 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3714 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3715
3716 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3717
3239 # we must not ever block the main coroutine 3718 # we must not ever block the main coroutine
3240 local $Coro::idle = sub { 3719 local $Coro::idle = sub {
3241 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3720 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3242 (async { 3721 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3722 $Coro::current->{desc} = "IDLE BUG HANDLER";
3244 Event::one_event; 3723 EV::loop EV::LOOP_ONESHOT;
3245 })->prio (Coro::PRIO_MAX); 3724 })->prio (Coro::PRIO_MAX);
3246 }; 3725 };
3247 3726
3727 evthread_start IO::AIO::poll_fileno;
3728
3729 cf::sync_job {
3730 cf::incloader::init ();
3731
3732 cf::init_anim;
3733 cf::init_attackmess;
3734 cf::init_dynamic;
3735
3736 cf::load_settings;
3737
3738 reload_resources;
3248 reload_config; 3739 reload_config;
3249 db_init; 3740 db_init;
3741
3742 cf::init_uuid;
3743 cf::init_signals;
3744 cf::init_skills;
3745
3746 cf::init_beforeplay;
3747
3748 atomic;
3749
3250 load_extensions; 3750 load_extensions;
3251 3751
3252 $TICK_WATCHER->start; 3752 utime time, time, $RUNTIMEFILE;
3253 Event::loop; 3753
3754 # no (long-running) fork's whatsoever before this point(!)
3755 use POSIX ();
3756 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3757
3758 cf::_post_init 0;
3759 };
3760
3761 cf::object::thawer::errors_are_fatal 0;
3762 info "parse errors in files are no longer fatal from this point on.\n";
3763
3764 my $free_main; $free_main = EV::idle sub {
3765 undef $free_main;
3766 undef &main; # free gobs of memory :)
3767 };
3768
3769 goto &main_loop;
3254} 3770}
3255 3771
3256############################################################################# 3772#############################################################################
3257# initialisation and cleanup 3773# initialisation and cleanup
3258 3774
3259# install some emergency cleanup handlers 3775# install some emergency cleanup handlers
3260BEGIN { 3776BEGIN {
3777 our %SIGWATCHER = ();
3261 for my $signal (qw(INT HUP TERM)) { 3778 for my $signal (qw(INT HUP TERM)) {
3262 Event->signal ( 3779 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3263 reentrant => 0,
3264 data => WF_AUTOCANCEL,
3265 signal => $signal,
3266 prio => 0,
3267 cb => sub {
3268 cf::cleanup "SIG$signal"; 3780 cf::cleanup "SIG$signal";
3269 },
3270 ); 3781 };
3271 } 3782 }
3272} 3783}
3273 3784
3274sub write_runtime { 3785sub write_runtime_sync {
3275 my $runtime = "$LOCALDIR/runtime"; 3786 my $t0 = AE::time;
3276 3787
3277 # first touch the runtime file to show we are still running: 3788 # first touch the runtime file to show we are still running:
3278 # the fsync below can take a very very long time. 3789 # the fsync below can take a very very long time.
3279 3790
3280 IO::AIO::aio_utime $runtime, undef, undef; 3791 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3281 3792
3282 my $guard = cf::lock_acquire "write_runtime"; 3793 my $guard = cf::lock_acquire "write_runtime";
3283 3794
3284 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3795 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3285 or return; 3796 or return;
3286 3797
3287 my $value = $cf::RUNTIME + 90 + 10; 3798 my $value = $cf::RUNTIME + 90 + 10;
3288 # 10 is the runtime save interval, for a monotonic clock 3799 # 10 is the runtime save interval, for a monotonic clock
3289 # 60 allows for the watchdog to kill the server. 3800 # 60 allows for the watchdog to kill the server.
3299 aio_utime $fh, undef, undef; 3810 aio_utime $fh, undef, undef;
3300 3811
3301 close $fh 3812 close $fh
3302 or return; 3813 or return;
3303 3814
3304 aio_rename "$runtime~", $runtime 3815 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3305 and return; 3816 and return;
3306 3817
3307 warn "runtime file written.\n"; 3818 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3308 3819
3309 1 3820 1
3821}
3822
3823our $uuid_lock;
3824our $uuid_skip;
3825
3826sub write_uuid_sync($) {
3827 $uuid_skip ||= $_[0];
3828
3829 return if $uuid_lock;
3830 local $uuid_lock = 1;
3831
3832 my $uuid = "$LOCALDIR/uuid";
3833
3834 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3835 or return;
3836
3837 my $value = uuid_seq uuid_cur;
3838
3839 unless ($value) {
3840 info "cowardly refusing to write zero uuid value!\n";
3841 return;
3842 }
3843
3844 my $value = uuid_str $value + $uuid_skip;
3845 $uuid_skip = 0;
3846
3847 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3848 and return;
3849
3850 # always fsync - this file is important
3851 aio_fsync $fh
3852 and return;
3853
3854 close $fh
3855 or return;
3856
3857 aio_rename "$uuid~", $uuid
3858 and return;
3859
3860 trace "uuid file written ($value).\n";
3861
3862 1
3863
3864}
3865
3866sub write_uuid($$) {
3867 my ($skip, $sync) = @_;
3868
3869 $sync ? write_uuid_sync $skip
3870 : async { write_uuid_sync $skip };
3310} 3871}
3311 3872
3312sub emergency_save() { 3873sub emergency_save() {
3313 my $freeze_guard = cf::freeze_mainloop; 3874 my $freeze_guard = cf::freeze_mainloop;
3314 3875
3315 warn "enter emergency perl save\n"; 3876 info "emergency_perl_save: enter\n";
3877
3878 # this is a trade-off: we want to be very quick here, so
3879 # save all maps without fsync, and later call a global sync
3880 # (which in turn might be very very slow)
3881 local $USE_FSYNC = 0;
3316 3882
3317 cf::sync_job { 3883 cf::sync_job {
3884 cf::write_runtime_sync; # external watchdog should not bark
3885
3318 # use a peculiar iteration method to avoid tripping on perl 3886 # use a peculiar iteration method to avoid tripping on perl
3319 # refcount bugs in for. also avoids problems with players 3887 # refcount bugs in for. also avoids problems with players
3320 # and maps saved/destroyed asynchronously. 3888 # and maps saved/destroyed asynchronously.
3321 warn "begin emergency player save\n"; 3889 info "emergency_perl_save: begin player save\n";
3322 for my $login (keys %cf::PLAYER) { 3890 for my $login (keys %cf::PLAYER) {
3323 my $pl = $cf::PLAYER{$login} or next; 3891 my $pl = $cf::PLAYER{$login} or next;
3324 $pl->valid or next; 3892 $pl->valid or next;
3325 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3893 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3326 $pl->save; 3894 $pl->save;
3327 } 3895 }
3328 warn "end emergency player save\n"; 3896 info "emergency_perl_save: end player save\n";
3329 3897
3330 warn "begin emergency map save\n"; 3898 cf::write_runtime_sync; # external watchdog should not bark
3899
3900 info "emergency_perl_save: begin map save\n";
3331 for my $path (keys %cf::MAP) { 3901 for my $path (keys %cf::MAP) {
3332 my $map = $cf::MAP{$path} or next; 3902 my $map = $cf::MAP{$path} or next;
3333 $map->valid or next; 3903 $map->valid or next;
3334 $map->save; 3904 $map->save;
3335 } 3905 }
3336 warn "end emergency map save\n"; 3906 info "emergency_perl_save: end map save\n";
3337 3907
3338 warn "begin emergency database checkpoint\n"; 3908 cf::write_runtime_sync; # external watchdog should not bark
3909
3910 info "emergency_perl_save: begin database checkpoint\n";
3339 BDB::db_env_txn_checkpoint $DB_ENV; 3911 BDB::db_env_txn_checkpoint $DB_ENV;
3340 warn "end emergency database checkpoint\n"; 3912 info "emergency_perl_save: end database checkpoint\n";
3913
3914 info "emergency_perl_save: begin write uuid\n";
3915 write_uuid_sync 1;
3916 info "emergency_perl_save: end write uuid\n";
3917
3918 cf::write_runtime_sync; # external watchdog should not bark
3919
3920 trace "emergency_perl_save: syncing database to disk";
3921 BDB::db_env_txn_checkpoint $DB_ENV;
3922
3923 info "emergency_perl_save: starting sync\n";
3924 IO::AIO::aio_sync sub {
3925 info "emergency_perl_save: finished sync\n";
3926 };
3927
3928 cf::write_runtime_sync; # external watchdog should not bark
3929
3930 trace "emergency_perl_save: flushing outstanding aio requests";
3931 while (IO::AIO::nreqs || BDB::nreqs) {
3932 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3933 }
3934
3935 cf::write_runtime_sync; # external watchdog should not bark
3341 }; 3936 };
3342 3937
3343 warn "leave emergency perl save\n"; 3938 info "emergency_perl_save: leave\n";
3344} 3939}
3345 3940
3346sub post_cleanup { 3941sub post_cleanup {
3347 my ($make_core) = @_; 3942 my ($make_core) = @_;
3348 3943
3944 IO::AIO::flush;
3945
3349 warn Carp::longmess "post_cleanup backtrace" 3946 error Carp::longmess "post_cleanup backtrace"
3350 if $make_core; 3947 if $make_core;
3948
3949 my $fh = pidfile;
3950 unlink $PIDFILE if <$fh> == $$;
3951}
3952
3953# a safer delete_package, copied from Symbol
3954sub clear_package($) {
3955 my $pkg = shift;
3956
3957 # expand to full symbol table name if needed
3958 unless ($pkg =~ /^main::.*::$/) {
3959 $pkg = "main$pkg" if $pkg =~ /^::/;
3960 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3961 $pkg .= '::' unless $pkg =~ /::$/;
3962 }
3963
3964 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3965 my $stem_symtab = *{$stem}{HASH};
3966
3967 defined $stem_symtab and exists $stem_symtab->{$leaf}
3968 or return;
3969
3970 # clear all symbols
3971 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3972 for my $name (keys %$leaf_symtab) {
3973 _gv_clear *{"$pkg$name"};
3974# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3975 }
3351} 3976}
3352 3977
3353sub do_reload_perl() { 3978sub do_reload_perl() {
3354 # can/must only be called in main 3979 # can/must only be called in main
3355 if ($Coro::current != $Coro::main) { 3980 unless (in_main) {
3356 warn "can only reload from main coroutine"; 3981 error "can only reload from main coroutine";
3357 return; 3982 return;
3358 } 3983 }
3359 3984
3360 warn "reloading..."; 3985 return if $RELOAD++;
3361 3986
3362 warn "entering sync_job"; 3987 my $t1 = AE::time;
3363 3988
3989 while ($RELOAD) {
3990 cf::get_slot 0.1, -1, "reload_perl";
3991 info "perl_reload: reloading...";
3992
3993 trace "perl_reload: entering sync_job";
3994
3364 cf::sync_job { 3995 cf::sync_job {
3365 cf::write_runtime; # external watchdog should not bark
3366 cf::emergency_save; 3996 #cf::emergency_save;
3367 cf::write_runtime; # external watchdog should not bark
3368 3997
3369 warn "syncing database to disk";
3370 BDB::db_env_txn_checkpoint $DB_ENV;
3371
3372 # if anything goes wrong in here, we should simply crash as we already saved
3373
3374 warn "cancelling all WF_AUTOCANCEL watchers";
3375 for (Event::all_watchers) {
3376 $_->cancel if $_->data & WF_AUTOCANCEL;
3377 }
3378
3379 warn "flushing outstanding aio requests";
3380 for (;;) {
3381 BDB::flush;
3382 IO::AIO::flush;
3383 Coro::cede_notself;
3384 last unless IO::AIO::nreqs || BDB::nreqs;
3385 warn "iterate...";
3386 }
3387
3388 ++$RELOAD;
3389
3390 warn "cancelling all extension coros"; 3998 trace "perl_reload: cancelling all extension coros";
3391 $_->cancel for values %EXT_CORO; 3999 $_->cancel for values %EXT_CORO;
3392 %EXT_CORO = (); 4000 %EXT_CORO = ();
3393 4001
3394 warn "removing commands"; 4002 trace "perl_reload: removing commands";
3395 %COMMAND = (); 4003 %COMMAND = ();
3396 4004
3397 warn "removing ext/exti commands"; 4005 trace "perl_reload: removing ext/exti commands";
3398 %EXTCMD = (); 4006 %EXTCMD = ();
3399 %EXTICMD = (); 4007 %EXTICMD = ();
3400 4008
3401 warn "unloading/nuking all extensions"; 4009 trace "perl_reload: unloading/nuking all extensions";
3402 for my $pkg (@EXTS) { 4010 for my $pkg (@EXTS) {
3403 warn "... unloading $pkg"; 4011 trace "... unloading $pkg";
3404 4012
3405 if (my $cb = $pkg->can ("unload")) { 4013 if (my $cb = $pkg->can ("unload")) {
3406 eval { 4014 eval {
3407 $cb->($pkg); 4015 $cb->($pkg);
3408 1 4016 1
3409 } or warn "$pkg unloaded, but with errors: $@"; 4017 } or error "$pkg unloaded, but with errors: $@";
4018 }
4019
4020 trace "... clearing $pkg";
4021 clear_package $pkg;
3410 } 4022 }
3411 4023
3412 warn "... nuking $pkg";
3413 Symbol::delete_package $pkg;
3414 }
3415
3416 warn "unloading all perl modules loaded from $LIBDIR"; 4024 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3417 while (my ($k, $v) = each %INC) { 4025 while (my ($k, $v) = each %INC) {
3418 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4026 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3419 4027
3420 warn "... unloading $k"; 4028 trace "... unloading $k";
3421 delete $INC{$k}; 4029 delete $INC{$k};
3422 4030
3423 $k =~ s/\.pm$//; 4031 $k =~ s/\.pm$//;
3424 $k =~ s/\//::/g; 4032 $k =~ s/\//::/g;
3425 4033
3426 if (my $cb = $k->can ("unload_module")) { 4034 if (my $cb = $k->can ("unload_module")) {
3427 $cb->(); 4035 $cb->();
4036 }
4037
4038 clear_package $k;
3428 } 4039 }
3429 4040
3430 Symbol::delete_package $k;
3431 }
3432
3433 warn "getting rid of safe::, as good as possible"; 4041 trace "perl_reload: getting rid of safe::, as good as possible";
3434 Symbol::delete_package "safe::$_" 4042 clear_package "safe::$_"
3435 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4043 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3436 4044
3437 warn "unloading cf.pm \"a bit\""; 4045 trace "perl_reload: unloading cf.pm \"a bit\"";
3438 delete $INC{"cf.pm"}; 4046 delete $INC{"cf.pm"};
3439 delete $INC{"cf/pod.pm"}; 4047 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3440 4048
3441 # don't, removes xs symbols, too, 4049 # don't, removes xs symbols, too,
3442 # and global variables created in xs 4050 # and global variables created in xs
3443 #Symbol::delete_package __PACKAGE__; 4051 #clear_package __PACKAGE__;
3444 4052
3445 warn "unload completed, starting to reload now"; 4053 info "perl_reload: unload completed, starting to reload now";
3446 4054
3447 warn "reloading cf.pm"; 4055 trace "perl_reload: reloading cf.pm";
3448 require cf; 4056 require cf;
3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4057 cf::_connect_to_perl_1;
3450 4058
3451 warn "loading config and database again"; 4059 trace "perl_reload: loading config and database again";
3452 cf::reload_config; 4060 cf::reload_config;
3453 4061
3454 warn "loading extensions"; 4062 trace "perl_reload: loading extensions";
3455 cf::load_extensions; 4063 cf::load_extensions;
3456 4064
4065 if ($REATTACH_ON_RELOAD) {
3457 warn "reattaching attachments to objects/players"; 4066 trace "perl_reload: reattaching attachments to objects/players";
3458 _global_reattach; # objects, sockets 4067 _global_reattach; # objects, sockets
3459 warn "reattaching attachments to maps"; 4068 trace "perl_reload: reattaching attachments to maps";
3460 reattach $_ for values %MAP; 4069 reattach $_ for values %MAP;
3461 warn "reattaching attachments to players"; 4070 trace "perl_reload: reattaching attachments to players";
3462 reattach $_ for values %PLAYER; 4071 reattach $_ for values %PLAYER;
4072 }
3463 4073
3464 warn "leaving sync_job"; 4074 cf::_post_init 1;
3465 4075
4076 trace "perl_reload: leaving sync_job";
4077
3466 1 4078 1
3467 } or do { 4079 } or do {
3468 warn $@; 4080 error $@;
3469 warn "error while reloading, exiting."; 4081 cf::cleanup "perl_reload: error, exiting.";
3470 exit 1; 4082 };
4083
4084 --$RELOAD;
3471 }; 4085 }
3472 4086
3473 warn "reloaded"; 4087 $t1 = AE::time - $t1;
4088 info "perl_reload: completed in ${t1}s\n";
3474}; 4089};
3475 4090
3476our $RELOAD_WATCHER; # used only during reload 4091our $RELOAD_WATCHER; # used only during reload
3477 4092
3478sub reload_perl() { 4093sub reload_perl() {
3479 # doing reload synchronously and two reloads happen back-to-back, 4094 # doing reload synchronously and two reloads happen back-to-back,
3480 # coro crashes during coro_state_free->destroy here. 4095 # coro crashes during coro_state_free->destroy here.
3481 4096
3482 $RELOAD_WATCHER ||= Event->timer ( 4097 $RELOAD_WATCHER ||= cf::async {
3483 reentrant => 0, 4098 Coro::AIO::aio_wait cache_extensions;
3484 after => 0, 4099
3485 data => WF_AUTOCANCEL, 4100 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3486 cb => sub {
3487 do_reload_perl; 4101 do_reload_perl;
3488 undef $RELOAD_WATCHER; 4102 undef $RELOAD_WATCHER;
3489 }, 4103 };
3490 ); 4104 };
3491} 4105}
3492 4106
3493register_command "reload" => sub { 4107register_command "reload" => sub {
3494 my ($who, $arg) = @_; 4108 my ($who, $arg) = @_;
3495 4109
3500 reload_perl; 4114 reload_perl;
3501 }; 4115 };
3502 } 4116 }
3503}; 4117};
3504 4118
3505unshift @INC, $LIBDIR; 4119#############################################################################
3506 4120
3507my $bug_warning = 0; 4121my $bug_warning = 0;
3508 4122
3509our @WAIT_FOR_TICK;
3510our @WAIT_FOR_TICK_BEGIN;
3511
3512sub wait_for_tick { 4123sub wait_for_tick() {
3513 return unless $TICK_WATCHER->is_active; 4124 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3514 return if $Coro::current == $Coro::main;
3515 4125
3516 my $signal = new Coro::Signal; 4126 $WAIT_FOR_TICK->wait;
3517 push @WAIT_FOR_TICK, $signal;
3518 $signal->wait;
3519} 4127}
3520 4128
3521sub wait_for_tick_begin { 4129sub wait_for_tick_begin() {
3522 return unless $TICK_WATCHER->is_active; 4130 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3523 return if $Coro::current == $Coro::main;
3524 4131
3525 my $signal = new Coro::Signal; 4132 my $signal = new Coro::Signal;
3526 push @WAIT_FOR_TICK_BEGIN, $signal; 4133 push @WAIT_FOR_TICK_BEGIN, $signal;
3527 $signal->wait; 4134 $signal->wait;
3528} 4135}
3529 4136
3530$TICK_WATCHER = Event->timer ( 4137sub tick {
3531 reentrant => 0,
3532 parked => 1,
3533 prio => 0,
3534 at => $NEXT_TICK || $TICK,
3535 data => WF_AUTOCANCEL,
3536 cb => sub {
3537 if ($Coro::current != $Coro::main) { 4138 if ($Coro::current != $Coro::main) {
3538 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4139 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3539 unless ++$bug_warning > 10; 4140 unless ++$bug_warning > 10;
3540 return; 4141 return;
3541 } 4142 }
3542 4143
3543 $NOW = $tick_start = Event::time; 4144 cf::one_tick; # one server iteration
3544 4145
3545 cf::server_tick; # one server iteration 4146 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3546 4147
3547 $RUNTIME += $TICK;
3548 $NEXT_TICK += $TICK;
3549
3550 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4148 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3551 $NEXT_RUNTIME_WRITE = $NOW + 10; 4149 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3552 Coro::async_pool { 4150 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver"; 4151 $Coro::current->{desc} = "runtime saver";
3554 write_runtime 4152 write_runtime_sync
3555 or warn "ERROR: unable to write runtime file: $!"; 4153 or error "ERROR: unable to write runtime file: $!";
3556 };
3557 } 4154 };
4155 }
3558 4156
3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4157 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3560 $sig->send; 4158 $sig->send;
3561 } 4159 }
3562 while (my $sig = shift @WAIT_FOR_TICK) { 4160 $WAIT_FOR_TICK->broadcast;
3563 $sig->send;
3564 }
3565 4161
3566 $NOW = Event::time; 4162 $LOAD = ($NOW - $TICK_START) / $TICK;
3567
3568 # if we are delayed by four ticks or more, skip them all
3569 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3570
3571 $TICK_WATCHER->at ($NEXT_TICK);
3572 $TICK_WATCHER->start;
3573
3574 $LOAD = ($NOW - $tick_start) / $TICK;
3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4163 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3576 4164
3577 _post_tick; 4165 if (0) {
4166 if ($NEXT_TICK) {
4167 my $jitter = $TICK_START - $NEXT_TICK;
4168 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4169 debug "jitter $JITTER\n";#d#
4170 }
3578 }, 4171 }
3579); 4172}
3580 4173
3581{ 4174{
4175 # configure BDB
4176
3582 BDB::min_parallel 8; 4177 BDB::min_parallel 16;
3583 BDB::max_poll_time $TICK * 0.1; 4178 BDB::max_poll_reqs $TICK * 0.1;
3584 $BDB_POLL_WATCHER = Event->io ( 4179 $AnyEvent::BDB::WATCHER->priority (1);
3585 reentrant => 0,
3586 fd => BDB::poll_fileno,
3587 poll => 'r',
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => \&BDB::poll_cb,
3591 );
3592
3593 BDB::set_sync_prepare {
3594 my $status;
3595 my $current = $Coro::current;
3596 (
3597 sub {
3598 $status = $!;
3599 $current->ready; undef $current;
3600 },
3601 sub {
3602 Coro::schedule while defined $current;
3603 $! = $status;
3604 },
3605 )
3606 };
3607 4180
3608 unless ($DB_ENV) { 4181 unless ($DB_ENV) {
3609 $DB_ENV = BDB::db_env_create; 4182 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4183 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3611 | BDB::LOG_AUTOREMOVE, 1); 4184 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4185 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4186 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4187 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3614 4188
3615 cf::sync_job { 4189 cf::sync_job {
3616 eval { 4190 eval {
3626 4200
3627 cf::cleanup "db_env_open(db): $@" if $@; 4201 cf::cleanup "db_env_open(db): $@" if $@;
3628 }; 4202 };
3629 } 4203 }
3630 4204
3631 $BDB_DEADLOCK_WATCHER = Event->timer ( 4205 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4206 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 ); 4207 };
3641 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4208 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4209 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 ); 4210 };
3651 $BDB_TRICKLE_WATCHER = Event->timer ( 4211 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4212 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 ); 4213 };
3661} 4214}
3662 4215
3663{ 4216{
4217 # configure IO::AIO
4218
3664 IO::AIO::min_parallel 8; 4219 IO::AIO::min_parallel 8;
3665
3666 undef $Coro::AIO::WATCHER;
3667 IO::AIO::max_poll_time $TICK * 0.1; 4220 IO::AIO::max_poll_time $TICK * 0.1;
3668 $AIO_POLL_WATCHER = Event->io ( 4221 undef $AnyEvent::AIO::WATCHER;
3669 reentrant => 0,
3670 data => WF_AUTOCANCEL,
3671 fd => IO::AIO::poll_fileno,
3672 poll => 'r',
3673 prio => 0,
3674 cb => \&IO::AIO::poll_cb,
3675 );
3676} 4222}
3677 4223
3678my $_log_backtrace; 4224our $_log_backtrace;
4225our $_log_backtrace_last;
3679 4226
3680sub _log_backtrace { 4227sub _log_backtrace {
3681 my ($msg, @addr) = @_; 4228 my ($msg, @addr) = @_;
3682 4229
3683 $msg =~ s/\n//; 4230 $msg =~ s/\n$//;
3684 4231
4232 if ($_log_backtrace_last eq $msg) {
4233 LOG llevInfo, "[ABT] $msg\n";
4234 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3685 # limit the # of concurrent backtraces 4235 # limit the # of concurrent backtraces
3686 if ($_log_backtrace < 2) { 4236 } elsif ($_log_backtrace < 2) {
4237 $_log_backtrace_last = $msg;
3687 ++$_log_backtrace; 4238 ++$_log_backtrace;
4239 my $perl_bt = Carp::longmess $msg;
3688 async { 4240 async {
3689 $Coro::current->{desc} = "abt $msg"; 4241 $Coro::current->{desc} = "abt $msg";
3690 4242
3691 my @bt = fork_call { 4243 my @bt = fork_call {
3692 @addr = map { sprintf "%x", $_ } @addr; 4244 @addr = map { sprintf "%x", $_ } @addr;
3703 } 4255 }
3704 4256
3705 @funcs 4257 @funcs
3706 }; 4258 };
3707 4259
3708 LOG llevInfo, "[ABT] $msg\n"; 4260 LOG llevInfo, "[ABT] $perl_bt\n";
4261 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3709 LOG llevInfo, "[ABT] $_\n" for @bt; 4262 LOG llevInfo, "[ABT] $_\n" for @bt;
3710 --$_log_backtrace; 4263 --$_log_backtrace;
3711 }; 4264 };
3712 } else { 4265 } else {
3713 LOG llevInfo, "[ABT] $msg\n"; 4266 LOG llevInfo, "[ABT] $msg\n";
3714 LOG llevInfo, "[ABT] [suppressed]\n"; 4267 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3715 } 4268 }
3716} 4269}
3717 4270
3718# load additional modules 4271# load additional modules
3719use cf::pod; 4272require "cf/$_.pm" for @EXTRA_MODULES;
4273cf::_connect_to_perl_2;
3720 4274
3721END { cf::emergency_save } 4275END { cf::emergency_save }
3722 4276
37231 42771
3724 4278

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines