ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines