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.400 by root, Mon Dec 17 06:36:34 2007 UTC vs.
Revision 1.575 by root, Sat Aug 13 20:20:30 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 EV; 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.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
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;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 56use Fcntl;
32use YAML::Syck (); 57use YAML::XS ();
33use IO::AIO 2.51 (); 58use IO::AIO ();
34use Time::HiRes; 59use Time::HiRes;
35use Compress::LZF; 60use Compress::LZF;
36use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
37 64
38# configure various modules to our taste 65# configure various modules to our taste
39# 66#
40$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 75
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 76# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
64our $DATADIR = datadir; 99our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
68our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
73our $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;
74 120
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 123our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
81 125
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 129our $DB_ENV;
87 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
88our %CFG; 133our %CFG;
89 134
90our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
92our $NOW; 138our $NOW;
93 139
94our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 145our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 146
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 147our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 148our $LOADAVG; # same thing, but with alpha-smoothing
149our $JITTER; # average jitter
103our $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;
104 159
105binmode STDOUT; 160binmode STDOUT;
106binmode STDERR; 161binmode STDERR;
107 162
108# read virtual server time, if available 163# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 164unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 165 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 166 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 167 $RUNTIME = <$fh> + 0.;
113} 168}
169
170eval "sub TICK() { $TICK } 1" or die;
114 171
115mkdir $_ 172mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 173 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 174
118our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
119 176
120sub cf::map::normalise; 177sub cf::map::normalise;
121 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
122############################################################################# 183#############################################################################
123 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
124=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
125 197
126=over 4 198=over 4
127 199
128=item $cf::UPTIME 200=item $cf::UPTIME
129 201
130The 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.
131 218
132=item $cf::RUNTIME 219=item $cf::RUNTIME
133 220
134The 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
135every server tick. 222every server tick.
141Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
142directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
143unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
144database environment. 231database environment.
145 232
146=item $cf::NOW
147
148The time of the last (current) server tick.
149
150=item $cf::TICK
151
152The interval between server ticks, in seconds.
153
154=item $cf::LOADAVG 233=item $cf::LOADAVG
155 234
156The 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
157(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
158objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
167from wherever your confdir points to. 246from wherever your confdir points to.
168 247
169=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
170 249
171These 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
172returns 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
173per 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.
174 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
175=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
176 272
177This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
178C<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
179that call. 275that call.
180 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
181=back 283=back
182 284
183=cut 285=cut
184 286
185BEGIN { 287sub error(@) { LOG llevError, join "", @_ }
186 *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 {
187 my $msg = join "", @_; 294 my $msg = join "", @_;
188 295
189 $msg .= "\n" 296 $msg .= "\n"
190 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
191 298
192 $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;
193 300
194 LOG llevError, $msg; 301 LOG llevWarn, $msg;
195 }; 302};
196} 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};
197 317
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 318@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 319@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 320@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 321@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 328for my $pkg (qw(
209 cf::global cf::attachable 329 cf::global cf::attachable
210 cf::object cf::object::player 330 cf::object cf::object::player
211 cf::client cf::player 331 cf::client cf::player
212 cf::arch cf::living 332 cf::arch cf::living
333 cf::map cf::mapspace
213 cf::map cf::party cf::region 334 cf::party cf::region
214)) { 335)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 337}
218 338
219$EV::DIED = sub { 339$EV::DIED = sub {
220 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
221}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
222 347
223############################################################################# 348#############################################################################
224 349
225=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
226 351
247 $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;
248 $d 373 $d
249 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
250} 375}
251 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
252=item $ref = cf::decode_json $json 391=item $ref = cf::decode_json $json
253 392
254Converts a JSON string into the corresponding perl data structure. 393Converts a JSON string into the corresponding perl data structure.
255 394
256=item $json = cf::encode_json $ref 395=item $json = cf::encode_json $ref
262our $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
263 402
264sub encode_json($) { $json_coder->encode ($_[0]) } 403sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 404sub decode_json($) { $json_coder->decode ($_[0]) }
266 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}
467
267=item cf::lock_wait $string 468=item cf::lock_wait $string
268 469
269Wait until the given lock is available. See cf::lock_acquire. 470Wait until the given lock is available. See cf::lock_acquire.
270 471
271=item my $lock = cf::lock_acquire $string 472=item my $lock = cf::lock_acquire $string
272 473
273Wait 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
274a 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,
275for example when the coroutine gets canceled), the lock is automatically 476for example when the coroutine gets canceled), the lock is automatically
276returned. 477returned.
277 478
278Locks 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
279deadlocked coro. 480deadlocked coro.
285 486
286Return 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.
287 488
288=cut 489=cut
289 490
290our %LOCK; 491our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 492
293sub lock_wait($) { 493sub lock_wait($) {
294 my ($key) = @_; 494 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 495}
307 496
308sub lock_acquire($) { 497sub lock_acquire($) {
309 my ($key) = @_; 498 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 499}
323 500
324sub lock_active($) { 501sub lock_active($) {
325 my ($key) = @_; 502 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 503}
329 504
330sub freeze_mainloop { 505sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 506 tick_inhibit_inc;
332 507
333 my $guard = Coro::guard { 508 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 509}
339 510
340=item cf::periodic $interval, $cb 511=item cf::periodic $interval, $cb
341 512
342Like EV::periodic, but randomly selects a starting point so that the actions 513Like EV::periodic, but randomly selects a starting point so that the actions
343get spread over timer. 514get spread over time.
344 515
345=cut 516=cut
346 517
347sub periodic($$) { 518sub periodic($$) {
348 my ($interval, $cb) = @_; 519 my ($interval, $cb) = @_;
352 EV::periodic $start, $interval, 0, $cb 523 EV::periodic $start, $interval, 0, $cb
353} 524}
354 525
355=item cf::get_slot $time[, $priority[, $name]] 526=item cf::get_slot $time[, $priority[, $name]]
356 527
357Allocate $time seconds of blocking CPU time at priority C<$priority>: 528Allocate $time seconds of blocking CPU time at priority C<$priority>
358This 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
359of 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.
360 535
361The 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
362used for statistical purposes and should identify the same time-class. 537used for statistical purposes and should identify the same time-class.
363 538
364Useful for short background jobs. 539Useful for short background jobs.
365 540
366=cut 541=cut
367 542
368our @SLOT_QUEUE; 543our @SLOT_QUEUE;
369our $SLOT_QUEUE; 544our $SLOT_QUEUE;
545our $SLOT_DECAY = 0.9;
370 546
371$SLOT_QUEUE->cancel if $SLOT_QUEUE; 547$SLOT_QUEUE->cancel if $SLOT_QUEUE;
372$SLOT_QUEUE = Coro::async { 548$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager"); 549 $Coro::current->desc ("timeslot manager");
374 550
375 my $signal = new Coro::Signal; 551 my $signal = new Coro::Signal;
552 my $busy;
376 553
377 while () { 554 while () {
378 next_job: 555 next_job:
556
379 my $avail = cf::till_tick; 557 my $avail = cf::till_tick;
380 if ($avail > 0.01) { 558
381 for (0 .. $#SLOT_QUEUE) { 559 for (0 .. $#SLOT_QUEUE) {
382 if ($SLOT_QUEUE[$_][0] < $avail) { 560 if ($SLOT_QUEUE[$_][0] <= $avail) {
561 $busy = 0;
383 my $job = splice @SLOT_QUEUE, $_, 1, (); 562 my $job = splice @SLOT_QUEUE, $_, 1, ();
384 $job->[2]->send; 563 $job->[2]->send;
385 Coro::cede; 564 Coro::cede;
386 goto next_job; 565 goto next_job;
387 } 566 } else {
567 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
388 } 568 }
389 } 569 }
390 570
391 if (@SLOT_QUEUE) { 571 if (@SLOT_QUEUE) {
392 # 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
393 push @cf::WAIT_FOR_TICK, $signal; 573 $WAIT_FOR_TICK->wait;
394 $signal->wait;
395 } else { 574 } else {
575 $busy = 0;
396 Coro::schedule; 576 Coro::schedule;
397 } 577 }
398 } 578 }
399}; 579};
400 580
401sub get_slot($;$$) { 581sub get_slot($;$$) {
582 return if tick_inhibit || $Coro::current == $Coro::main;
583
402 my ($time, $pri, $name) = @_; 584 my ($time, $pri, $name) = @_;
403 585
404 $time = $TICK * .6 if $time > $TICK * .6; 586 $time = clamp $time, 0.01, $TICK * .6;
587
405 my $sig = new Coro::Signal; 588 my $sig = new Coro::Signal;
406 589
407 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 590 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
408 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 591 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
409 $SLOT_QUEUE->ready; 592 $SLOT_QUEUE->ready;
435=cut 618=cut
436 619
437sub sync_job(&) { 620sub sync_job(&) {
438 my ($job) = @_; 621 my ($job) = @_;
439 622
440 if ($Coro::current == $Coro::main) { 623 if (in_main) {
441 my $time = EV::time; 624 my $time = AE::time;
442 625
443 # this is the main coro, too bad, we have to block 626 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 627 # till the operation succeeds, freezing the server :/
445 628
446 LOG llevError, Carp::longmess "sync job";#d# 629 #LOG llevError, Carp::longmess "sync job";#d#
447 630
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 631 my $freeze_guard = freeze_mainloop;
451 632
452 my $busy = 1; 633 my $busy = 1;
453 my @res; 634 my @res;
454 635
455 (async { 636 (async {
456 $Coro::current->desc ("sync job coro"); 637 $Coro::current->desc ("sync job coro");
457 @res = eval { $job->() }; 638 @res = eval { $job->() };
458 warn $@ if $@; 639 error $@ if $@;
459 undef $busy; 640 undef $busy;
460 })->prio (Coro::PRIO_MAX); 641 })->prio (Coro::PRIO_MAX);
461 642
462 while ($busy) { 643 while ($busy) {
463 if (Coro::nready) { 644 if (Coro::nready) {
465 } else { 646 } else {
466 EV::loop EV::LOOP_ONESHOT; 647 EV::loop EV::LOOP_ONESHOT;
467 } 648 }
468 } 649 }
469 650
470 $time = EV::time - $time; 651 my $time = AE::time - $time;
471 652
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 653 $TICK_START += $time; # do not account sync jobs to server load
476 654
477 wantarray ? @res : $res[0] 655 wantarray ? @res : $res[0]
478 } else { 656 } else {
479 # we are in another coroutine, how wonderful, everything just works 657 # we are in another coroutine, how wonderful, everything just works
480 658
500 $EXT_CORO{$coro+0} = $coro; 678 $EXT_CORO{$coro+0} = $coro;
501 679
502 $coro 680 $coro
503} 681}
504 682
505=item fork_call { }, $args 683=item fork_call { }, @args
506 684
507Executes the given code block with the given arguments in a seperate 685Executes the given code block with the given arguments in a seperate
508process, returning the results. Everything must be serialisable with 686process, returning the results. Everything must be serialisable with
509Coro::Storable. May, of course, block. Note that the executed sub may 687Coro::Storable. May, of course, block. Note that the executed sub may
510never block itself or use any form of event handling. 688never block itself or use any form of event handling.
511 689
512=cut 690=cut
513 691
692sub post_fork {
693 reset_signals;
694}
695
514sub fork_call(&@) { 696sub fork_call(&@) {
515 my ($cb, @args) = @_; 697 my ($cb, @args) = @_;
516 698
517 # 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,
518 # otherwise perl prematurely frees the stuff :/ 700 # otherwise perl prematurely frees the stuff :/
519 # TODO: investigate and fix (likely this will be rather laborious) 701 # TODO: investigate and fix (likely this will be rather laborious)
520 702
521 my @res = Coro::Util::fork_eval { 703 my @res = Coro::Util::fork_eval {
522 reset_signals; 704 cf::post_fork;
523 &$cb 705 &$cb
524 }, @args; 706 } @args;
525 707
526 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
527} 747}
528 748
529=item $value = cf::db_get $family => $key 749=item $value = cf::db_get $family => $key
530 750
531Returns a single value from the environment database. 751Returns a single value from the environment database.
541within each server. 761within each server.
542 762
543=cut 763=cut
544 764
545sub db_table($) { 765sub db_table($) {
766 cf::error "db_get called from main context"
767 if $Coro::current == $Coro::main;
768
546 my ($name) = @_; 769 my ($name) = @_;
547 my $db = BDB::db_create $DB_ENV; 770 my $db = BDB::db_create $DB_ENV;
548 771
549 eval { 772 eval {
550 $db->set_flags (BDB::CHKSUM); 773 $db->set_flags (BDB::CHKSUM);
560} 783}
561 784
562our $DB; 785our $DB;
563 786
564sub db_init { 787sub db_init {
565 cf::sync_job {
566 $DB ||= db_table "db"; 788 $DB ||= db_table "db";
567 };
568} 789}
569 790
570sub db_get($$) { 791sub db_get($$) {
571 my $key = "$_[0]/$_[1]"; 792 my $key = "$_[0]/$_[1]";
572 793
573 cf::sync_job { 794 cf::error "db_get called from main context"
795 if $Coro::current == $Coro::main;
796
574 BDB::db_get $DB, undef, $key, my $data; 797 BDB::db_get $DB, undef, $key, my $data;
575 798
576 $! ? () 799 $! ? ()
577 : $data 800 : $data
578 }
579} 801}
580 802
581sub db_put($$$) { 803sub db_put($$$) {
582 BDB::dbreq_pri 4; 804 BDB::dbreq_pri 4;
583 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 805 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
611 833
612 my @data; 834 my @data;
613 my $md5; 835 my $md5;
614 836
615 for (0 .. $#$src) { 837 for (0 .. $#$src) {
616 0 <= aio_load $src->[$_], $data[$_] 838 $data[$_] = load_file $src->[$_];
617 or Carp::croak "$src->[$_]: $!";
618 } 839 }
619 840
620 # if processing is expensive, check 841 # if processing is expensive, check
621 # checksum first 842 # checksum first
622 if (1) { 843 if (1) {
639 860
640 my $t1 = Time::HiRes::time; 861 my $t1 = Time::HiRes::time;
641 my $data = $process->(\@data); 862 my $data = $process->(\@data);
642 my $t2 = Time::HiRes::time; 863 my $t2 = Time::HiRes::time;
643 864
644 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 865 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
645 866
646 db_put cache => "$id/data", $data; 867 db_put cache => "$id/data", $data;
647 db_put cache => "$id/md5" , $md5; 868 db_put cache => "$id/md5" , $md5;
648 db_put cache => "$id/meta", $meta; 869 db_put cache => "$id/meta", $meta;
649 870
659 880
660=cut 881=cut
661 882
662sub datalog($@) { 883sub datalog($@) {
663 my ($type, %kv) = @_; 884 my ($type, %kv) = @_;
664 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 885 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
665} 886}
666 887
667=back 888=back
668 889
669=cut 890=cut
670 891
671############################################################################# 892#############################################################################
672 893
673=head2 ATTACHABLE OBJECTS 894=head2 ATTACHABLE OBJECTS
674 895
675Many 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
676attach callbacks/event handlers (a collection of which is called an "attachment") 897attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 898to it. All such attachable objects support the following methods.
678 899
679In 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>
680C<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
730=item cf::CLASS::attachment $name, ... 951=item cf::CLASS::attachment $name, ...
731 952
732Register an attachment by C<$name> through which attachable objects of the 953Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 954given CLASS can refer to this attachment.
734 955
735Some classes such as crossfire maps and objects can specify attachments 956Some classes such as deliantra maps and objects can specify attachments
736that 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.
737 958
738These calls expect any number of the following handler/hook descriptions: 959These calls expect any number of the following handler/hook descriptions:
739 960
740=over 4 961=over 4
864 1085
865 } elsif (exists $cb_id{$type}) { 1086 } elsif (exists $cb_id{$type}) {
866 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1087 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
867 1088
868 } elsif (ref $type) { 1089 } elsif (ref $type) {
869 warn "attaching objects not supported, ignoring.\n"; 1090 error "attaching objects not supported, ignoring.\n";
870 1091
871 } else { 1092 } else {
872 shift @arg; 1093 shift @arg;
873 warn "attach argument '$type' not supported, ignoring.\n"; 1094 error "attach argument '$type' not supported, ignoring.\n";
874 } 1095 }
875 } 1096 }
876} 1097}
877 1098
878sub _object_attach { 1099sub _object_attach {
888 _attach $registry, $klass, @attach; 1109 _attach $registry, $klass, @attach;
889 } 1110 }
890 1111
891 $obj->{$name} = \%arg; 1112 $obj->{$name} = \%arg;
892 } else { 1113 } else {
893 warn "object uses attachment '$name' which is not available, postponing.\n"; 1114 info "object uses attachment '$name' which is not available, postponing.\n";
894 } 1115 }
895 1116
896 $obj->{_attachment}{$name} = undef; 1117 $obj->{_attachment}{$name} = undef;
897} 1118}
898 1119
957 1178
958 for (@$callbacks) { 1179 for (@$callbacks) {
959 eval { &{$_->[1]} }; 1180 eval { &{$_->[1]} };
960 1181
961 if ($@) { 1182 if ($@) {
962 warn "$@";
963 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1183 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
964 override; 1184 override;
965 } 1185 }
966 1186
967 return 1 if $override; 1187 return 1 if $override;
968 } 1188 }
969 1189
970 0 1190 0
971} 1191}
972 1192
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1193=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1194
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1195=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1196
977Generate an object-specific event with the given arguments. 1197Generate an object-specific event with the given arguments.
978 1198
1031 1251
1032sub reattach { 1252sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1253 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1254 my ($obj) = @_;
1035 1255
1256 # no longer needed after getting rid of delete_package?
1036 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
1037 1258
1038 my $registry = $obj->registry; 1259 my $registry = $obj->registry;
1039 1260
1040 @$registry = (); 1261 @$registry = ();
1041 1262
1046 for (@$attach) { 1267 for (@$attach) {
1047 my ($klass, @attach) = @$_; 1268 my ($klass, @attach) = @$_;
1048 _attach $registry, $klass, @attach; 1269 _attach $registry, $klass, @attach;
1049 } 1270 }
1050 } else { 1271 } else {
1051 warn "object uses attachment '$name' that is not available, postponing.\n"; 1272 info "object uses attachment '$name' that is not available, postponing.\n";
1052 } 1273 }
1053 } 1274 }
1054} 1275}
1055 1276
1056cf::attachable->attach ( 1277cf::attachable->attach (
1083 my ($filename, $rdata, $objs) = @_; 1304 my ($filename, $rdata, $objs) = @_;
1084 1305
1085 sync_job { 1306 sync_job {
1086 if (length $$rdata) { 1307 if (length $$rdata) {
1087 utf8::decode (my $decname = $filename); 1308 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1309 trace sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1310 $decname, length $$rdata, scalar @$objs
1311 if $VERBOSE_IO;
1090 1312
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1313 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1314 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1315 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 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 }
1095 close $fh; 1320 aio_close $fh;
1096 1321
1097 if (@$objs) { 1322 if (@$objs) {
1098 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) {
1099 chmod SAVE_MODE, $fh; 1324 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1325 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1326 aio_write $fh, 0, (length $data), $data, 0;
1102 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 }
1103 close $fh; 1331 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1332 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1333 }
1106 } else { 1334 } else {
1107 aio_unlink "$filename.pst"; 1335 aio_unlink "$filename.pst";
1108 } 1336 }
1109 1337
1110 aio_rename "$filename~", $filename; 1338 aio_rename "$filename~", $filename;
1339
1340 $filename =~ s%/[^/]+$%%;
1341 aio_pathsync $filename if $cf::USE_FSYNC;
1111 } else { 1342 } else {
1112 warn "FATAL: $filename~: $!\n"; 1343 error "unable to save objects: $filename~: $!\n";
1113 } 1344 }
1114 } else { 1345 } else {
1115 aio_unlink $filename; 1346 aio_unlink $filename;
1116 aio_unlink "$filename.pst"; 1347 aio_unlink "$filename.pst";
1117 } 1348 }
1141 my $st = eval { Coro::Storable::thaw $av }; 1372 my $st = eval { Coro::Storable::thaw $av };
1142 $av = $st->{objs}; 1373 $av = $st->{objs};
1143 } 1374 }
1144 1375
1145 utf8::decode (my $decname = $filename); 1376 utf8::decode (my $decname = $filename);
1146 warn sprintf "loading %s (%d,%d)\n", 1377 trace sprintf "loading %s (%d,%d)\n",
1147 $decname, length $data, scalar @{$av || []}; 1378 $decname, length $data, scalar @{$av || []}
1379 if $VERBOSE_IO;
1148 1380
1149 ($data, $av) 1381 ($data, $av)
1150} 1382}
1151 1383
1152=head2 COMMAND CALLBACKS 1384=head2 COMMAND CALLBACKS
1208 my ($name, $cb) = @_; 1440 my ($name, $cb) = @_;
1209 1441
1210 $EXTICMD{$name} = $cb; 1442 $EXTICMD{$name} = $cb;
1211} 1443}
1212 1444
1445use File::Glob ();
1446
1213cf::player->attach ( 1447cf::player->attach (
1214 on_command => sub { 1448 on_unknown_command => sub {
1215 my ($pl, $name, $params) = @_; 1449 my ($pl, $name, $params) = @_;
1216 1450
1217 my $cb = $COMMAND{$name} 1451 my $cb = $COMMAND{$name}
1218 or return; 1452 or return;
1219 1453
1242 1476
1243 $pl->ext_reply ($reply, @reply) 1477 $pl->ext_reply ($reply, @reply)
1244 if $reply; 1478 if $reply;
1245 1479
1246 } else { 1480 } else {
1247 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1481 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1248 } 1482 }
1249 1483
1250 cf::override; 1484 cf::override;
1251 }, 1485 },
1252); 1486);
1253 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
1254sub load_extensions { 1501sub load_extensions {
1502 info "loading extensions...";
1503
1255 cf::sync_job { 1504 cf::sync_job {
1256 my %todo; 1505 my %todo;
1257 1506
1258 for my $path (<$LIBDIR/*.ext>) { 1507 for my $path (<$LIBDIR/*.ext>) {
1259 next unless -r $path; 1508 next unless -r $path;
1277 1526
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1527 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1528 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1529
1281 $ext{source} = 1530 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1531 "package $pkg; use common::sense;\n"
1283 . "#line 1 \"$path\"\n{\n" 1532 . "#line 1 \"$path\"\n{\n"
1284 . $source 1533 . $source
1285 . "\n};\n1"; 1534 . "\n};\n1";
1286 1535
1287 $todo{$base} = \%ext; 1536 $todo{$base} = \%ext;
1288 } 1537 }
1289 1538
1539 my $pass = 0;
1290 my %done; 1540 my %done;
1291 while (%todo) { 1541 while (%todo) {
1292 my $progress; 1542 my $progress;
1293 1543
1544 ++$pass;
1545
1546 ext:
1294 while (my ($k, $v) = each %todo) { 1547 while (my ($k, $v) = each %todo) {
1295 for (split /,\s*/, $v->{meta}{depends}) { 1548 for (split /,\s*/, $v->{meta}{depends}) {
1296 goto skip 1549 next ext
1297 unless exists $done{$_}; 1550 unless exists $done{$_};
1298 } 1551 }
1299 1552
1300 warn "... loading '$k' into '$v->{pkg}'\n"; 1553 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1301 1554
1302 unless (eval $v->{source}) { 1555 my $active = eval $v->{source};
1556
1557 if (length $@) {
1303 my $msg = $@ ? "$v->{path}: $@\n" 1558 error "$v->{path}: $@\n";
1304 : "$v->{base}: extension inactive.\n";
1305 1559
1560 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1306 if (exists $v->{meta}{mandatory}) { 1561 if exists $v->{meta}{mandatory};
1307 warn $msg; 1562
1308 warn "mandatory extension failed to load, exiting.\n"; 1563 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1309 exit 1; 1564 delete $todo{$k};
1310 } 1565 } else {
1311 1566 $done{$k} = delete $todo{$k};
1312 warn $msg; 1567 push @EXTS, $v->{pkg};
1568 $progress = 1;
1569
1570 info "$v->{base}: extension inactive.\n"
1571 unless $active;
1313 } 1572 }
1314
1315 $done{$k} = delete $todo{$k};
1316 push @EXTS, $v->{pkg};
1317 $progress = 1;
1318 } 1573 }
1319 1574
1320 skip: 1575 unless ($progress) {
1321 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1576 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1322 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 }
1323 } 1585 }
1324 }; 1586 };
1325} 1587}
1326 1588
1327############################################################################# 1589#############################################################################
1328 1590
1329=back 1591=back
1330 1592
1331=head2 CORE EXTENSIONS 1593=head2 CORE EXTENSIONS
1332 1594
1333Functions and methods that extend core crossfire objects. 1595Functions and methods that extend core deliantra objects.
1334 1596
1335=cut 1597=cut
1336 1598
1337package cf::player; 1599package cf::player;
1338 1600
1381 1643
1382sub exists($) { 1644sub exists($) {
1383 my ($login) = @_; 1645 my ($login) = @_;
1384 1646
1385 $cf::PLAYER{$login} 1647 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1648 or !aio_stat path $login
1387} 1649}
1388 1650
1389sub find($) { 1651sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1652 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1653 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1665 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1666 or return;
1405 1667
1406 my $pl = cf::player::load_pl $f 1668 my $pl = cf::player::load_pl $f
1407 or return; 1669 or return;
1670
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1671 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1672 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1673 $cf::PLAYER{$login} = $pl
1411 } 1674 }
1412 } 1675 }
1413} 1676}
1414 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
1415sub save($) { 1691sub save($) {
1416 my ($pl) = @_; 1692 my ($pl) = @_;
1417 1693
1418 return if $pl->{deny_save}; 1694 return if $pl->{deny_save};
1419 1695
1422 1698
1423 return if $pl->{deny_save}; 1699 return if $pl->{deny_save};
1424 1700
1425 aio_mkdir playerdir $pl, 0770; 1701 aio_mkdir playerdir $pl, 0770;
1426 $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];
1427 1708
1428 $pl->save_pl ($path); 1709 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1710 cf::cede_to_tick;
1430} 1711}
1431 1712
1463 my ($pl) = @_; 1744 my ($pl) = @_;
1464 1745
1465 my $name = $pl->ob->name; 1746 my $name = $pl->ob->name;
1466 1747
1467 $pl->{deny_save} = 1; 1748 $pl->{deny_save} = 1;
1468 $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
1469 1750
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1751 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1471 $pl->deactivate; 1752 $pl->deactivate;
1753
1754 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1755 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1756 ext::highscore::check ($pl->ob);
1757
1473 $pl->ns->destroy if $pl->ns; 1758 $pl->ns->destroy if $pl->ns;
1474 1759
1475 my $path = playerdir $pl; 1760 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1761 my $temp = "$path~$cf::RUNTIME~deleting~";
1477 aio_rename $path, $temp; 1762 aio_rename $path, $temp;
1515 1800
1516 for my $login (@$dirs) { 1801 for my $login (@$dirs) {
1517 my $path = path $login; 1802 my $path = path $login;
1518 1803
1519 # a .pst is a dead give-away for a valid player 1804 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1805 # if no pst file found, open and chekc for blocked users
1806 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1807 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1808 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1809 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1810 }
1525 1811
1529 1815
1530 \@logins 1816 \@logins
1531} 1817}
1532 1818
1533=item $player->maps 1819=item $player->maps
1820
1821=item cf::player::maps $login
1534 1822
1535Returns an arrayref of map paths that are private for this 1823Returns an arrayref of map paths that are private for this
1536player. May block. 1824player. May block.
1537 1825
1538=cut 1826=cut
1556 } 1844 }
1557 1845
1558 \@paths 1846 \@paths
1559} 1847}
1560 1848
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1849=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1850
1563Expand crossfire pod fragments into protocol xml. 1851Expand deliantra pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653 1852
1654=item $player->ext_reply ($msgid, @msg) 1853=item $player->ext_reply ($msgid, @msg)
1655 1854
1656Sends an ext reply to the player. 1855Sends an ext reply to the player.
1657 1856
1689 1888
1690=cut 1889=cut
1691 1890
1692sub find_by_path($) { 1891sub find_by_path($) {
1693 my ($path) = @_; 1892 my ($path) = @_;
1893
1894 $path =~ s/^~[^\/]*//; # skip ~login
1694 1895
1695 my ($match, $specificity); 1896 my ($match, $specificity);
1696 1897
1697 for my $region (list) { 1898 for my $region (list) {
1698 if ($region->{match} && $path =~ $region->{match}) { 1899 if ($region->{match} && $path =~ $region->{match}) {
1724our $MAX_RESET = 3600; 1925our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1926our $DEFAULT_RESET = 3000;
1726 1927
1727sub generate_random_map { 1928sub generate_random_map {
1728 my ($self, $rmp) = @_; 1929 my ($self, $rmp) = @_;
1729 # mit "rum" bekleckern, nicht 1930
1931 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1932
1730 $self->_create_random_map ( 1933 $self->_create_random_map ($rmp);
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1738 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1739 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1740 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1741 (cf::region::find $rmp->{region}), $rmp->{custom}
1742 )
1743} 1934}
1744 1935
1745=item cf::map->register ($regex, $prio) 1936=item cf::map->register ($regex, $prio)
1746 1937
1747Register 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
1752 1943
1753sub register { 1944sub register {
1754 my (undef, $regex, $prio) = @_; 1945 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 1946 my $pkg = caller;
1756 1947
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 1948 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 1949
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1950 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1951}
1762 1952
1763# also paths starting with '/' 1953# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1954$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1955
1766sub thawer_merge { 1956sub thawer_merge {
1767 my ($self, $merge) = @_; 1957 my ($self, $merge) = @_;
1768 1958
1769 # we have to keep some variables in memory intact 1959 # we have to keep some variables in memory intact
1774} 1964}
1775 1965
1776sub normalise { 1966sub normalise {
1777 my ($path, $base) = @_; 1967 my ($path, $base) = @_;
1778 1968
1779 $path = "$path"; # make sure its a string 1969 $path = "$path"; # make sure it's a string
1780 1970
1781 $path =~ s/\.map$//; 1971 $path =~ s/\.map$//;
1782 1972
1783 # map plan: 1973 # map plan:
1784 # 1974 #
1799 $base =~ s{[^/]+/?$}{}; 1989 $base =~ s{[^/]+/?$}{};
1800 $path = "$base/$path"; 1990 $path = "$base/$path";
1801 } 1991 }
1802 1992
1803 for ($path) { 1993 for ($path) {
1804 redo if s{//}{/};
1805 redo if s{/\.?/}{/}; 1994 redo if s{/\.?/}{/};
1806 redo if s{/[^/]+/\.\./}{/}; 1995 redo if s{/[^/]+/\.\./}{/};
1807 } 1996 }
1808 1997
1809 $path 1998 $path
1823 $self->init; # pass $1 etc. 2012 $self->init; # pass $1 etc.
1824 return $self; 2013 return $self;
1825 } 2014 }
1826 } 2015 }
1827 2016
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2017 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 2018 ()
1830} 2019}
1831 2020
2021# may re-bless or do other evil things
1832sub init { 2022sub init {
1833 my ($self) = @_; 2023 my ($self) = @_;
1834 2024
1835 $self 2025 $self
1836} 2026}
1855 2045
1856# the temporary/swap location 2046# the temporary/swap location
1857sub save_path { 2047sub save_path {
1858 my ($self) = @_; 2048 my ($self) = @_;
1859 2049
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2050 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 2051 "$TMPDIR/$path.map"
1862} 2052}
1863 2053
1864# the unique path, undef == no special unique path 2054# the unique path, undef == no special unique path
1865sub uniq_path { 2055sub uniq_path {
1866 my ($self) = @_; 2056 my ($self) = @_;
1867 2057
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2058 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 2059 "$UNIQUEDIR/$path"
1870}
1871
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879} 2060}
1880 2061
1881sub decay_objects { 2062sub decay_objects {
1882 my ($self) = @_; 2063 my ($self) = @_;
1883 2064
1910 $self->{load_path} = $path; 2091 $self->{load_path} = $path;
1911 2092
1912 1 2093 1
1913} 2094}
1914 2095
2096# used to laod the header of an original map
1915sub load_header_orig { 2097sub load_header_orig {
1916 my ($self) = @_; 2098 my ($self) = @_;
1917 2099
1918 $self->load_header_from ($self->load_path) 2100 $self->load_header_from ($self->load_path)
1919} 2101}
1920 2102
2103# used to laod the header of an instantiated map
1921sub load_header_temp { 2104sub load_header_temp {
1922 my ($self) = @_; 2105 my ($self) = @_;
1923 2106
1924 $self->load_header_from ($self->save_path) 2107 $self->load_header_from ($self->save_path)
1925} 2108}
1926 2109
2110# called after loading the header from an instantiated map
1927sub prepare_temp { 2111sub prepare_temp {
1928 my ($self) = @_; 2112 my ($self) = @_;
1929 2113
1930 $self->last_access ((delete $self->{last_access}) 2114 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2115 || $cf::RUNTIME); #d#
1932 # safety 2116 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2117 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2118 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2119}
1936 2120
2121# called after loading the header from an original map
1937sub prepare_orig { 2122sub prepare_orig {
1938 my ($self) = @_; 2123 my ($self) = @_;
1939 2124
1940 $self->{load_original} = 1; 2125 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2126 $self->{instantiate_time} = $cf::RUNTIME;
1965 2150
1966sub find; 2151sub find;
1967sub find { 2152sub find {
1968 my ($path, $origin) = @_; 2153 my ($path, $origin) = @_;
1969 2154
2155 cf::cede_to_tick;
2156
1970 $path = normalise $path, $origin && $origin->path; 2157 $path = normalise $path, $origin;
1971 2158
1972 cf::lock_wait "map_data:$path";#d#remove 2159 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2160 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2161
1975 $cf::MAP{$path} || do { 2162 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1979 my $map = new_from_path cf::map $path 2163 my $map = new_from_path cf::map $path
1980 or return; 2164 or return;
1981 2165
1982 $map->{last_save} = $cf::RUNTIME; 2166 $map->{last_save} = $cf::RUNTIME;
1983 2167
1985 or return; 2169 or return;
1986 2170
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2171 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 2172 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 2173 #$cf::WAIT_FOR_TICK->wait;
2174 undef $guard2;
1990 undef $guard1; 2175 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 2176 $map->reset;
1993 return find $path; 2177 return find $path;
1994 } 2178 }
1995 2179
1996 $cf::MAP{$path} = $map 2180 $cf::MAP{$path} = $map
1997 } 2181 }
1998} 2182}
1999 2183
2000sub pre_load { } 2184sub pre_load { }
2001sub post_load { } 2185#sub post_load { } # XS
2002 2186
2003sub load { 2187sub load {
2004 my ($self) = @_; 2188 my ($self) = @_;
2005 2189
2006 local $self->{deny_reset} = 1; # loading can take a long time 2190 local $self->{deny_reset} = 1; # loading can take a long time
2009 2193
2010 { 2194 {
2011 my $guard = cf::lock_acquire "map_data:$path"; 2195 my $guard = cf::lock_acquire "map_data:$path";
2012 2196
2013 return unless $self->valid; 2197 return unless $self->valid;
2014 return unless $self->in_memory == cf::MAP_SWAPPED; 2198 return unless $self->state == cf::MAP_SWAPPED;
2015
2016 $self->in_memory (cf::MAP_LOADING);
2017 2199
2018 $self->alloc; 2200 $self->alloc;
2019 2201
2020 $self->pre_load; 2202 $self->pre_load;
2021 cf::cede_to_tick; 2203 cf::cede_to_tick;
2022 2204
2205 if (exists $self->{load_path}) {
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2206 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2207 $f->skip_block;
2025 $self->_load_objects ($f) 2208 $self->_load_objects ($f)
2026 or return; 2209 or return;
2027 2210
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2211 $self->post_load_original
2029 if delete $self->{load_original}; 2212 if delete $self->{load_original};
2030 2213
2031 if (my $uniq = $self->uniq_path) { 2214 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2215 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2216 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) { 2217 if (my $f = new_from_file cf::object::thawer $uniq) {
2035 $self->clear_unique_items; 2218 $self->clear_unique_items;
2036 $self->_load_objects ($f); 2219 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 }
2038 } 2222 }
2039 } 2223 }
2040 }
2041 2224
2042 $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);
2043 2232
2044 cf::cede_to_tick; 2233 cf::cede_to_tick;
2045 # now do the right thing for maps 2234 # now do the right thing for maps
2046 $self->link_multipart_objects; 2235 $self->link_multipart_objects;
2047 $self->difficulty ($self->estimate_difficulty) 2236 $self->difficulty ($self->estimate_difficulty)
2051 unless ($self->{deny_activate}) { 2240 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2241 $self->decay_objects;
2053 $self->fix_auto_apply; 2242 $self->fix_auto_apply;
2054 $self->update_buttons; 2243 $self->update_buttons;
2055 cf::cede_to_tick; 2244 cf::cede_to_tick;
2056 $self->set_darkness_map; 2245 #$self->activate; # no longer activate maps automatically
2057 cf::cede_to_tick;
2058 $self->activate;
2059 } 2246 }
2060 2247
2061 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2249 $self->last_access ($cf::RUNTIME);
2063
2064 $self->in_memory (cf::MAP_IN_MEMORY);
2065 } 2250 }
2066 2251
2067 $self->post_load; 2252 $self->post_load;
2068}
2069 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
2070sub customise_for { 2260sub customise_for {
2071 my ($self, $ob) = @_; 2261 my ($self, $ob) = @_;
2072 2262
2073 return find "~" . $ob->name . "/" . $self->{path} 2263 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2264 if $self->per_player;
2077# if $self->per_party; 2267# if $self->per_party;
2078 2268
2079 $self 2269 $self
2080} 2270}
2081 2271
2082# find and load all maps in the 3x3 area around a map
2083sub load_neighbours {
2084 my ($map) = @_;
2085
2086 my @neigh; # diagonal neighbours
2087
2088 for (0 .. 3) {
2089 my $neigh = $map->tile_path ($_)
2090 or next;
2091 $neigh = find $neigh, $map
2092 or next;
2093 $neigh->load;
2094
2095 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 }
2099
2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
2102 my $neigh = find $path, $origin
2103 or next;
2104 $neigh->load;
2105 }
2106}
2107
2108sub find_sync { 2272sub find_sync {
2109 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2110 2274
2111 cf::sync_job { find $path, $origin } 2275 # it's a bug to call this from the main context
2276 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2277 if $Coro::current == $Coro::main;
2278
2279 find $path, $origin
2112} 2280}
2113 2281
2114sub do_load_sync { 2282sub do_load_sync {
2115 my ($map) = @_; 2283 my ($map) = @_;
2116 2284
2285 # it's a bug to call this from the main context
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2286 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2287 if $Coro::current == $Coro::main;
2119 2288
2120 cf::sync_job { $map->load }; 2289 $map->load;
2121} 2290}
2122 2291
2123our %MAP_PREFETCH; 2292our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2293our $MAP_PREFETCHER = undef;
2125 2294
2126sub find_async { 2295sub find_async {
2127 my ($path, $origin, $load) = @_; 2296 my ($path, $origin, $load) = @_;
2128 2297
2129 $path = normalise $path, $origin && $origin->{path}; 2298 $path = normalise $path, $origin;
2130 2299
2131 if (my $map = $cf::MAP{$path}) { 2300 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2301 return $map if !$load || $map->linkable;
2133 } 2302 }
2134 2303
2135 $MAP_PREFETCH{$path} |= $load; 2304 $MAP_PREFETCH{$path} |= $load;
2136 2305
2137 $MAP_PREFETCHER ||= cf::async { 2306 $MAP_PREFETCHER ||= cf::async {
2151 $MAP_PREFETCHER->prio (6); 2320 $MAP_PREFETCHER->prio (6);
2152 2321
2153 () 2322 ()
2154} 2323}
2155 2324
2325# common code, used by both ->save and ->swapout
2156sub save { 2326sub _save {
2157 my ($self) = @_; 2327 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2328
2161 $self->{last_save} = $cf::RUNTIME; 2329 $self->{last_save} = $cf::RUNTIME;
2162 2330
2163 return unless $self->dirty; 2331 return unless $self->dirty;
2164 2332
2173 2341
2174 cf::async { 2342 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2343 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2344 $_->contr->save for $self->players;
2177 }; 2345 };
2346
2347 cf::get_slot 0.02;
2178 2348
2179 if ($uniq) { 2349 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2350 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2351 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2352 } else {
2183 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2353 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2184 } 2354 }
2185} 2355}
2186 2356
2357sub save {
2358 my ($self) = @_;
2359
2360 my $lock = cf::lock_acquire "map_data:$self->{path}";
2361
2362 $self->_save;
2363}
2364
2187sub swap_out { 2365sub swap_out {
2188 my ($self) = @_; 2366 my ($self) = @_;
2189 2367
2190 # save first because save cedes
2191 $self->save;
2192
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2369
2370 return if !$self->linkable;
2371 return if $self->{deny_save};
2195 return if $self->players; 2372 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2373
2374 # first deactivate the map and "unlink" it from the core
2375 $self->deactivate;
2376 $_->clear_links_to ($self) for values %cf::MAP;
2377 $self->state (cf::MAP_SWAPPED);
2378
2379 # then atomically save
2380 $self->_save;
2381
2382 # then free the map
2383 $self->clear;
2384}
2385
2386sub reset_at {
2387 my ($self) = @_;
2388
2389 # TODO: safety, remove and allow resettable per-player maps
2197 return if $self->{deny_save}; 2390 return 1e99 if $self->{deny_reset};
2198 2391
2392 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2393 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2394
2395 $time + $to
2396}
2397
2398sub should_reset {
2399 my ($self) = @_;
2400
2401 $self->reset_at <= $cf::RUNTIME
2402}
2403
2404sub reset {
2405 my ($self) = @_;
2406
2407 my $lock = cf::lock_acquire "map_data:$self->{path}";
2408
2409 return if $self->players;
2410
2411 cf::trace "resetting map ", $self->path, "\n";
2412
2199 $self->in_memory (cf::MAP_SWAPPED); 2413 $self->state (cf::MAP_SWAPPED);
2414
2415 # need to save uniques path
2416 unless ($self->{deny_save}) {
2417 my $uniq = $self->uniq_path; utf8::encode $uniq;
2418
2419 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2420 if $uniq;
2421 }
2422
2423 delete $cf::MAP{$self->path};
2200 2424
2201 $self->deactivate; 2425 $self->deactivate;
2202 $_->clear_links_to ($self) for values %cf::MAP; 2426 $_->clear_links_to ($self) for values %cf::MAP;
2203 $self->clear; 2427 $self->clear;
2204}
2205
2206sub reset_at {
2207 my ($self) = @_;
2208
2209 # TODO: safety, remove and allow resettable per-player maps
2210 return 1e99 if $self->{deny_reset};
2211
2212 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2213 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2214
2215 $time + $to
2216}
2217
2218sub should_reset {
2219 my ($self) = @_;
2220
2221 $self->reset_at <= $cf::RUNTIME
2222}
2223
2224sub reset {
2225 my ($self) = @_;
2226
2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228
2229 return if $self->players;
2230
2231 warn "resetting map ", $self->path;
2232
2233 $self->in_memory (cf::MAP_SWAPPED);
2234
2235 # need to save uniques path
2236 unless ($self->{deny_save}) {
2237 my $uniq = $self->uniq_path; utf8::encode $uniq;
2238
2239 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2240 if $uniq;
2241 }
2242
2243 delete $cf::MAP{$self->path};
2244
2245 $self->deactivate;
2246 $_->clear_links_to ($self) for values %cf::MAP;
2247 $self->clear;
2248 2428
2249 $self->unlink_save; 2429 $self->unlink_save;
2250 $self->destroy; 2430 $self->destroy;
2251} 2431}
2252 2432
2260 2440
2261 delete $cf::MAP{$self->path}; 2441 delete $cf::MAP{$self->path};
2262 2442
2263 $self->unlink_save; 2443 $self->unlink_save;
2264 2444
2265 bless $self, "cf::map"; 2445 bless $self, "cf::map::wrap";
2266 delete $self->{deny_reset}; 2446 delete $self->{deny_reset};
2267 $self->{deny_save} = 1; 2447 $self->{deny_save} = 1;
2268 $self->reset_timeout (1); 2448 $self->reset_timeout (1);
2269 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2449 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2270 2450
2319 2499
2320sub unique_maps() { 2500sub unique_maps() {
2321 [ 2501 [
2322 map { 2502 map {
2323 utf8::decode $_; 2503 utf8::decode $_;
2324 /\.map$/ 2504 s/\.map$//; # TODO future compatibility hack
2505 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2506 ? ()
2325 ? normalise $_ 2507 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2508 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2509 ]
2329} 2510}
2330 2511
2331package cf; 2512=item cf::map::static_maps
2513
2514Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2515file in the shared directory excluding F</styles> and F</editor>). May
2516block.
2517
2518=cut
2519
2520sub static_maps() {
2521 my @dirs = "";
2522 my @maps;
2523
2524 while (@dirs) {
2525 my $dir = shift @dirs;
2526
2527 next if $dir eq "/styles" || $dir eq "/editor";
2528
2529 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2530 or return;
2531
2532 for (@$files) {
2533 s/\.map$// or next;
2534 utf8::decode $_;
2535 push @maps, "$dir/$_";
2536 }
2537
2538 push @dirs, map "$dir/$_", @$dirs;
2539 }
2540
2541 \@maps
2542}
2332 2543
2333=back 2544=back
2334 2545
2335=head3 cf::object 2546=head3 cf::object
2336 2547
2340 2551
2341=over 4 2552=over 4
2342 2553
2343=item $ob->inv_recursive 2554=item $ob->inv_recursive
2344 2555
2345Returns the inventory of the object _and_ their inventories, recursively. 2556Returns the inventory of the object I<and> their inventories, recursively,
2557but I<not> the object itself.
2346 2558
2347=cut 2559=cut
2348 2560
2349sub inv_recursive_; 2561sub inv_recursive_;
2350sub inv_recursive_ { 2562sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2567 inv_recursive_ inv $_[0]
2356} 2568}
2357 2569
2358=item $ref = $ob->ref 2570=item $ref = $ob->ref
2359 2571
2360creates and returns a persistent reference to an objetc that can be stored as a string. 2572Creates and returns a persistent reference to an object that can be stored as a string.
2361 2573
2362=item $ob = cf::object::deref ($refstring) 2574=item $ob = cf::object::deref ($refstring)
2363 2575
2364returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2576returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2365even if the object actually exists. May block. 2577even if the object actually exists. May block.
2397can be C<undef>. Does the right thing when the player is currently in a 2609can be C<undef>. Does the right thing when the player is currently in a
2398dialogue with the given NPC character. 2610dialogue with the given NPC character.
2399 2611
2400=cut 2612=cut
2401 2613
2614our $SAY_CHANNEL = {
2615 id => "say",
2616 title => "Map",
2617 reply => "say ",
2618 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2619};
2620
2621our $CHAT_CHANNEL = {
2622 id => "chat",
2623 title => "Chat",
2624 reply => "chat ",
2625 tooltip => "Player chat and shouts, global to the server.",
2626};
2627
2402# rough implementation of a future "reply" method that works 2628# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2629# with dialog boxes.
2404#TODO: the first argument must go, split into a $npc->reply_to ( method 2630#TODO: the first argument must go, split into a $npc->reply_to ( method
2405sub cf::object::player::reply($$$;$) { 2631sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2632 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2643 my $dialog = $pl->{npc_dialog};
2418 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2644 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2419 2645
2420 } else { 2646 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2647 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2648 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2649 }
2424 } 2650 }
2425} 2651}
2426 2652
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2653=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2678
2453=item $player_object->enter_link 2679=item $player_object->enter_link
2454 2680
2455Freezes the player and moves him/her to a special map (C<{link}>). 2681Freezes the player and moves him/her to a special map (C<{link}>).
2456 2682
2457The player should be reasonably safe there for short amounts of time. You 2683The player should be reasonably safe there for short amounts of time (e.g.
2458I<MUST> call C<leave_link> as soon as possible, though. 2684for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2685though, as the player cannot control the character while it is on the link
2686map.
2459 2687
2460Will never block. 2688Will never block.
2461 2689
2462=item $player_object->leave_link ($map, $x, $y) 2690=item $player_object->leave_link ($map, $x, $y)
2463 2691
2483sub cf::object::player::enter_link { 2711sub cf::object::player::enter_link {
2484 my ($self) = @_; 2712 my ($self) = @_;
2485 2713
2486 $self->deactivate_recursive; 2714 $self->deactivate_recursive;
2487 2715
2716 ++$self->{_link_recursion};
2717
2488 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2718 return if UNIVERSAL::isa $self->map, "ext::map_link";
2489 2719
2490 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2720 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2491 if $self->map && $self->map->{path} ne "{link}"; 2721 if $self->map && $self->map->{path} ne "{link}";
2492 2722
2493 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2723 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2494} 2724}
2495 2725
2496sub cf::object::player::leave_link { 2726sub cf::object::player::leave_link {
2497 my ($self, $map, $x, $y) = @_; 2727 my ($self, $map, $x, $y) = @_;
2498 2728
2515 ($x, $y) = (-1, -1) 2745 ($x, $y) = (-1, -1)
2516 unless (defined $x) && (defined $y); 2746 unless (defined $x) && (defined $y);
2517 2747
2518 # use -1 or undef as default coordinates, not 0, 0 2748 # use -1 or undef as default coordinates, not 0, 0
2519 ($x, $y) = ($map->enter_x, $map->enter_y) 2749 ($x, $y) = ($map->enter_x, $map->enter_y)
2520 if $x <=0 && $y <= 0; 2750 if $x <= 0 && $y <= 0;
2521 2751
2522 $map->load; 2752 $map->load;
2523 $map->load_neighbours;
2524 2753
2525 return unless $self->contr->active; 2754 return unless $self->contr->active;
2526 $self->activate_recursive;
2527 2755
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2756 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2757 if ($self->enter_map ($map, $x, $y)) {
2530} 2758 # entering was successful
2759 delete $self->{_link_recursion};
2760 # only activate afterwards, to support waiting in hooks
2761 $self->activate_recursive;
2762 }
2531 2763
2764}
2765
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2766=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2533 2767
2534Moves the player to the given map-path and coordinates by first freezing 2768Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2769her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2770that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2771the new (success) or old (failed) map position. In either case, $done will
2538be called at the end of this process. 2772be called at the end of this process.
2539 2773
2774Note that $check will be called with a potentially non-loaded map, so if
2775it needs a loaded map it has to call C<< ->load >>.
2776
2540=cut 2777=cut
2541 2778
2542our $GOTOGEN; 2779our $GOTOGEN;
2543 2780
2544sub cf::object::player::goto { 2781sub cf::object::player::goto {
2545 my ($self, $path, $x, $y, $check, $done) = @_; 2782 my ($self, $path, $x, $y, $check, $done) = @_;
2783
2784 if ($self->{_link_recursion} >= $MAX_LINKS) {
2785 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2786 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2787 ($path, $x, $y) = @$EMERGENCY_POSITION;
2788 }
2546 2789
2547 # do generation counting so two concurrent goto's will be executed in-order 2790 # do generation counting so two concurrent goto's will be executed in-order
2548 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2791 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2549 2792
2550 $self->enter_link; 2793 $self->enter_link;
2570 ($path, $x, $y) = (undef, undef, undef); 2813 ($path, $x, $y) = (undef, undef, undef);
2571 } 2814 }
2572 } 2815 }
2573 2816
2574 my $map = eval { 2817 my $map = eval {
2575 my $map = defined $path ? cf::map::find $path : undef; 2818 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2576 2819
2577 if ($map) { 2820 if ($map) {
2578 $map = $map->customise_for ($self); 2821 $map = $map->customise_for ($self);
2579 $map = $check->($map) if $check && $map; 2822 $map = $check->($map, $x, $y, $self) if $check && $map;
2580 } else { 2823 } else {
2581 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2824 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2582 } 2825 }
2583 2826
2584 $map 2827 $map
2592 if ($gen == $self->{_goto_generation}) { 2835 if ($gen == $self->{_goto_generation}) {
2593 delete $self->{_goto_generation}; 2836 delete $self->{_goto_generation};
2594 $self->leave_link ($map, $x, $y); 2837 $self->leave_link ($map, $x, $y);
2595 } 2838 }
2596 2839
2597 $done->() if $done; 2840 $done->($self) if $done;
2598 })->prio (1); 2841 })->prio (1);
2599} 2842}
2600 2843
2601=item $player_object->enter_exit ($exit_object) 2844=item $player_object->enter_exit ($exit_object)
2602 2845
2622} 2865}
2623 2866
2624sub prepare_random_map { 2867sub prepare_random_map {
2625 my ($exit) = @_; 2868 my ($exit) = @_;
2626 2869
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2870 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2871 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2872 # that depends on the exit object
2632 2873
2633 my $rmp = parse_random_map_params $exit->msg; 2874 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2876 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2877 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2878 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2879 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2880 $rmp->{origin_y} = $exit->y;
2881
2882 $exit->map->touch;
2640 } 2883 }
2641 2884
2642 $rmp->{random_seed} ||= $exit->random_seed; 2885 $rmp->{random_seed} ||= $exit->random_seed;
2643 2886
2644 my $data = cf::encode_json $rmp; 2887 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2888 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2889 my $meta = "$RANDOMDIR/$md5.meta";
2647 2890
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2891 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2892 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2893 undef $fh;
2651 aio_rename "$meta~", $meta; 2894 aio_rename "$meta~", $meta;
2652 2895
2896 my $slaying = "?random/$md5";
2897
2898 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2899 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2900 $exit->msg (undef);
2901 }
2655 } 2902 }
2656} 2903}
2657 2904
2658sub cf::object::player::enter_exit { 2905sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2906 my ($self, $exit) = @_;
2660 2907
2661 return unless $self->type == cf::PLAYER; 2908 return unless $self->type == cf::PLAYER;
2662 2909
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2910 $self->enter_link;
2675 2911
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2912 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2913 $Coro::current->{desc} = "enter_exit";
2682 2914
2683 $self->deactivate_recursive; # just to be sure
2684 unless (eval { 2915 unless (eval {
2916 $self->deactivate_recursive; # just to be sure
2917
2918 my $map = cf::map::normalise $exit->slaying, $exit->map;
2919 my $x = $exit->stats->hp;
2920 my $y = $exit->stats->sp;
2921
2922 # special map handling
2923 my $slaying = $exit->slaying;
2924
2925 # special map handling
2926 if ($slaying eq "/!") {
2927 my $guard = cf::lock_acquire "exit_prepare:$exit";
2928
2929 prepare_random_map $exit
2930 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2931
2932 $map = $exit->slaying;
2933
2934 } elsif ($slaying eq '!up') {
2935 $map = $exit->map->tile_path (cf::TILE_UP);
2936 $x = $exit->x;
2937 $y = $exit->y;
2938
2939 } elsif ($slaying eq '!down') {
2940 $map = $exit->map->tile_path (cf::TILE_DOWN);
2941 $x = $exit->x;
2942 $y = $exit->y;
2943 }
2944
2685 $self->goto ($slaying, $hp, $sp); 2945 $self->goto ($map, $x, $y);
2686 2946
2947 # if exit is damned, update players death & WoR home-position
2948 $self->contr->savebed ($map, $x, $y)
2949 if $exit->flag (cf::FLAG_DAMNED);
2950
2687 1; 2951 1
2688 }) { 2952 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2953 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "I'll try to bring you back to the map you were before. " 2954 . "I'll try to bring you back to the map you were before. "
2691 . "Please report this to the dungeon master!", 2955 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2956 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2957
2694 warn "ERROR in enter_exit: $@"; 2958 error "ERROR in enter_exit: $@";
2695 $self->leave_link; 2959 $self->leave_link;
2696 } 2960 }
2697 })->prio (1); 2961 })->prio (1);
2698} 2962}
2699 2963
2711sub cf::client::send_drawinfo { 2975sub cf::client::send_drawinfo {
2712 my ($self, $text, $flags) = @_; 2976 my ($self, $text, $flags) = @_;
2713 2977
2714 utf8::encode $text; 2978 utf8::encode $text;
2715 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2979 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2980}
2981
2982=item $client->send_big_packet ($pkt)
2983
2984Like C<send_packet>, but tries to compress large packets, and fragments
2985them as required.
2986
2987=cut
2988
2989our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2990
2991sub cf::client::send_big_packet {
2992 my ($self, $pkt) = @_;
2993
2994 # try lzf for large packets
2995 $pkt = "lzf " . Compress::LZF::compress $pkt
2996 if 1024 <= length $pkt and $self->{can_lzf};
2997
2998 # split very large packets
2999 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3000 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3001 $pkt = "frag";
3002 }
3003
3004 $self->send_packet ($pkt);
2716} 3005}
2717 3006
2718=item $client->send_msg ($channel, $msg, $color, [extra...]) 3007=item $client->send_msg ($channel, $msg, $color, [extra...])
2719 3008
2720Send a drawinfo or msg packet to the client, formatting the msg for the 3009Send a drawinfo or msg packet to the client, formatting the msg for the
2724 3013
2725=cut 3014=cut
2726 3015
2727# non-persistent channels (usually the info channel) 3016# non-persistent channels (usually the info channel)
2728our %CHANNEL = ( 3017our %CHANNEL = (
3018 "c/motd" => {
3019 id => "infobox",
3020 title => "MOTD",
3021 reply => undef,
3022 tooltip => "The message of the day",
3023 },
2729 "c/identify" => { 3024 "c/identify" => {
2730 id => "infobox", 3025 id => "infobox",
2731 title => "Identify", 3026 title => "Identify",
2732 reply => undef, 3027 reply => undef,
2733 tooltip => "Items recently identified", 3028 tooltip => "Items recently identified",
2735 "c/examine" => { 3030 "c/examine" => {
2736 id => "infobox", 3031 id => "infobox",
2737 title => "Examine", 3032 title => "Examine",
2738 reply => undef, 3033 reply => undef,
2739 tooltip => "Signs and other items you examined", 3034 tooltip => "Signs and other items you examined",
3035 },
3036 "c/shopinfo" => {
3037 id => "infobox",
3038 title => "Shop Info",
3039 reply => undef,
3040 tooltip => "What your bargaining skill tells you about the shop",
2740 }, 3041 },
2741 "c/book" => { 3042 "c/book" => {
2742 id => "infobox", 3043 id => "infobox",
2743 title => "Book", 3044 title => "Book",
2744 reply => undef, 3045 reply => undef,
2760 id => "infobox", 3061 id => "infobox",
2761 title => "Body Parts", 3062 title => "Body Parts",
2762 reply => undef, 3063 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 3064 tooltip => "Shows which body parts you posess and are available",
2764 }, 3065 },
3066 "c/statistics" => {
3067 id => "infobox",
3068 title => "Statistics",
3069 reply => undef,
3070 tooltip => "Shows your primary statistics",
3071 },
3072 "c/skills" => {
3073 id => "infobox",
3074 title => "Skills",
3075 reply => undef,
3076 tooltip => "Shows your experience per skill and item power",
3077 },
3078 "c/shopitems" => {
3079 id => "infobox",
3080 title => "Shop Items",
3081 reply => undef,
3082 tooltip => "Shows the items currently for sale in this shop",
3083 },
3084 "c/resistances" => {
3085 id => "infobox",
3086 title => "Resistances",
3087 reply => undef,
3088 tooltip => "Shows your resistances",
3089 },
3090 "c/pets" => {
3091 id => "infobox",
3092 title => "Pets",
3093 reply => undef,
3094 tooltip => "Shows information abotu your pets/a specific pet",
3095 },
3096 "c/perceiveself" => {
3097 id => "infobox",
3098 title => "Perceive Self",
3099 reply => undef,
3100 tooltip => "You gained detailed knowledge about yourself",
3101 },
2765 "c/uptime" => { 3102 "c/uptime" => {
2766 id => "infobox", 3103 id => "infobox",
2767 title => "Uptime", 3104 title => "Uptime",
2768 reply => undef, 3105 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 3106 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 3109 id => "infobox",
2773 title => "Map Info", 3110 title => "Map Info",
2774 reply => undef, 3111 reply => undef,
2775 tooltip => "Information related to the maps", 3112 tooltip => "Information related to the maps",
2776 }, 3113 },
3114 "c/party" => {
3115 id => "party",
3116 title => "Party",
3117 reply => "gsay ",
3118 tooltip => "Messages and chat related to your party",
3119 },
3120 "c/death" => {
3121 id => "death",
3122 title => "Death",
3123 reply => undef,
3124 tooltip => "Reason for and more info about your most recent death",
3125 },
3126 "c/say" => $SAY_CHANNEL,
3127 "c/chat" => $CHAT_CHANNEL,
2777); 3128);
2778 3129
2779sub cf::client::send_msg { 3130sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 3131 my ($self, $channel, $msg, $color, @extra) = @_;
2781 3132
2782 $msg = $self->pl->expand_cfpod ($msg); 3133 $msg = $self->pl->expand_cfpod ($msg)
3134 unless $color & cf::NDI_VERBATIM;
2783 3135
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 3136 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 3137
2786 # check predefined channels, for the benefit of C 3138 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 3139 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 3140 $channel = $CHANNEL{$channel};
2789 3141
2790 $self->ext_msg (channel_info => $channel) 3142 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 3143 $channel = $channel->{id};
2794 3144
2795 } elsif (ref $channel) { 3145 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 3146 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 3147 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 3148 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 3149 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 3150 }
2802 3151
2803 $channel = $channel->{id}; 3152 $channel = $channel->{id};
2804 } 3153 }
2805 3154
2806 return unless @extra || length $msg; 3155 return unless @extra || length $msg;
2807 3156
2808 if ($self->can_msg) {
2809 # default colour, mask it out 3157 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3158 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 3159 if $color & cf::NDI_DEF;
2812 3160
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3161 my $pkt = "msg "
3162 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3163 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 3164 );
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826 3165
2827 $color &= cf::NDI_COLOR_MASK; 3166 $self->send_big_packet ($pkt);
2828
2829 utf8::encode $msg;
2830
2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 }
2840} 3167}
2841 3168
2842=item $client->ext_msg ($type, @msg) 3169=item $client->ext_msg ($type, @msg)
2843 3170
2844Sends an ext event to the client. 3171Sends an ext event to the client.
2847 3174
2848sub cf::client::ext_msg($$@) { 3175sub cf::client::ext_msg($$@) {
2849 my ($self, $type, @msg) = @_; 3176 my ($self, $type, @msg) = @_;
2850 3177
2851 if ($self->extcmd == 2) { 3178 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove 3180 } elsif ($self->extcmd == 1) { # TODO: remove
2854 push @msg, msgtype => "event_$type"; 3181 push @msg, msgtype => "event_$type";
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3182 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 } 3183 }
2857} 3184}
2858 3185
2859=item $client->ext_reply ($msgid, @msg) 3186=item $client->ext_reply ($msgid, @msg)
2860 3187
2864 3191
2865sub cf::client::ext_reply($$@) { 3192sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_; 3193 my ($self, $id, @msg) = @_;
2867 3194
2868 if ($self->extcmd == 2) { 3195 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3196 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) { 3197 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove 3198 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id; 3199 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 } 3201 }
2875} 3202}
2876 3203
2877=item $success = $client->query ($flags, "text", \&cb) 3204=item $success = $client->query ($flags, "text", \&cb)
2878 3205
2949 3276
2950 $ns->ext_reply ($reply, @reply) 3277 $ns->ext_reply ($reply, @reply)
2951 if $reply; 3278 if $reply;
2952 3279
2953 } else { 3280 } else {
2954 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3281 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2955 } 3282 }
2956 3283
2957 cf::override; 3284 cf::override;
2958 }, 3285 },
2959); 3286);
2979 3306
2980 $coro 3307 $coro
2981} 3308}
2982 3309
2983cf::client->attach ( 3310cf::client->attach (
2984 on_destroy => sub { 3311 on_client_destroy => sub {
2985 my ($ns) = @_; 3312 my ($ns) = @_;
2986 3313
2987 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3314 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2988 }, 3315 },
2989); 3316);
3005our $safe_hole = new Safe::Hole; 3332our $safe_hole = new Safe::Hole;
3006 3333
3007$SIG{FPE} = 'IGNORE'; 3334$SIG{FPE} = 'IGNORE';
3008 3335
3009$safe->permit_only (Opcode::opset qw( 3336$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math 3337 :base_core :base_mem :base_orig :base_math :base_loop
3011 grepstart grepwhile mapstart mapwhile 3338 grepstart grepwhile mapstart mapwhile
3012 sort time 3339 sort time
3013)); 3340));
3014 3341
3015# here we export the classes and methods available to script code 3342# here we export the classes and methods available to script code
3018 3345
3019The following functions and methods are available within a safe environment: 3346The following functions and methods are available within a safe environment:
3020 3347
3021 cf::object 3348 cf::object
3022 contr pay_amount pay_player map x y force_find force_add destroy 3349 contr pay_amount pay_player map x y force_find force_add destroy
3023 insert remove name archname title slaying race decrease_ob_nr 3350 insert remove name archname title slaying race decrease split
3351 value
3024 3352
3025 cf::object::player 3353 cf::object::player
3026 player 3354 player
3027 3355
3028 cf::player 3356 cf::player
3033 3361
3034=cut 3362=cut
3035 3363
3036for ( 3364for (
3037 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3365 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3038 insert remove inv name archname title slaying race 3366 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3367 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3368 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3369 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3370 ["cf::map" => qw(trigger)],
3043) { 3371) {
3044 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3372 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3373 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3047 for @funs; 3374 for @funs;
3048} 3375}
3049 3376
3064 3391
3065 my $qcode = $code; 3392 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3393 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3394 $qcode =~ s/\n/\\n/g;
3068 3395
3396 %vars = (_dummy => 0) unless %vars;
3397
3398 my @res;
3069 local $_; 3399 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars;
3071 3400
3072 my $eval = 3401 my $eval =
3073 "do {\n" 3402 "do {\n"
3074 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3403 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3075 . "#line 0 \"{$qcode}\"\n" 3404 . "#line 0 \"{$qcode}\"\n"
3076 . $code 3405 . $code
3077 . "\n}" 3406 . "\n}"
3078 ; 3407 ;
3079 3408
3409 if ($CFG{safe_eval}) {
3080 sub_generation_inc; 3410 sub_generation_inc;
3411 local @safe::cf::_safe_eval_args = values %vars;
3081 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3412 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3082 sub_generation_inc; 3413 sub_generation_inc;
3414 } else {
3415 local @cf::_safe_eval_args = values %vars;
3416 @res = wantarray ? eval eval : scalar eval $eval;
3417 }
3083 3418
3084 if ($@) { 3419 if ($@) {
3085 warn "$@"; 3420 warn "$@",
3086 warn "while executing safe code '$code'\n"; 3421 "while executing safe code '$code'\n",
3087 warn "with arguments " . (join " ", %vars) . "\n"; 3422 "with arguments " . (join " ", %vars) . "\n";
3088 } 3423 }
3089 3424
3090 wantarray ? @res : $res[0] 3425 wantarray ? @res : $res[0]
3091} 3426}
3092 3427
3106=cut 3441=cut
3107 3442
3108sub register_script_function { 3443sub register_script_function {
3109 my ($fun, $cb) = @_; 3444 my ($fun, $cb) = @_;
3110 3445
3111 no strict 'refs'; 3446 $fun = "safe::$fun" if $CFG{safe_eval};
3112 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3447 *$fun = $safe_hole->wrap ($cb);
3113} 3448}
3114 3449
3115=back 3450=back
3116 3451
3117=cut 3452=cut
3126 # for this (global event?) 3461 # for this (global event?)
3127 %ext::player_env::MUSIC_FACE_CACHE = (); 3462 %ext::player_env::MUSIC_FACE_CACHE = ();
3128 3463
3129 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3464 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3130 3465
3131 warn "loading facedata from $path\n"; 3466 trace "loading facedata from $path\n";
3132 3467
3133 my $facedata; 3468 my $facedata = decode_storable load_file $path;
3134 0 < aio_load $path, $facedata
3135 or die "$path: $!";
3136
3137 $facedata = Coro::Storable::thaw $facedata;
3138 3469
3139 $facedata->{version} == 2 3470 $facedata->{version} == 2
3140 or cf::cleanup "$path: version mismatch, cannot proceed."; 3471 or cf::cleanup "$path: version mismatch, cannot proceed.";
3141 3472
3142 # patch in the exptable 3473 # patch in the exptable
3474 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3143 $facedata->{resource}{"res/exp_table"} = { 3475 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC, 3476 type => FT_RSRC,
3145 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3477 data => $exp_table,
3478 hash => (Digest::MD5::md5 $exp_table),
3146 }; 3479 };
3147 cf::cede_to_tick; 3480 cf::cede_to_tick;
3148 3481
3149 { 3482 {
3150 my $faces = $facedata->{faceinfo}; 3483 my $faces = $facedata->{faceinfo};
3151 3484
3152 while (my ($face, $info) = each %$faces) { 3485 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3486 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3487
3154 cf::face::set_visibility $idx, $info->{visibility}; 3488 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3489 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3490 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3491 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3492 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3158 3493
3159 cf::cede_to_tick; 3494 cf::cede_to_tick;
3160 } 3495 }
3161 3496
3162 while (my ($face, $info) = each %$faces) { 3497 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3498 next unless $info->{smooth};
3499
3164 my $idx = cf::face::find $face 3500 my $idx = cf::face::find $face
3165 or next; 3501 or next;
3502
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3503 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3504 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3505 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3506 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3507 error "smooth face '$info->{smooth}' not found for face '$face'";
3171 } 3508 }
3172 3509
3173 cf::cede_to_tick; 3510 cf::cede_to_tick;
3174 } 3511 }
3175 } 3512 }
3184 3521
3185 cf::anim::invalidate_all; # d'oh 3522 cf::anim::invalidate_all; # d'oh
3186 } 3523 }
3187 3524
3188 { 3525 {
3189 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3526 my $res = $facedata->{resource};
3192 3527
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3528 while (my ($name, $info) = each %$res) {
3529 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3530 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
3198 3531
3199 if ($info->{type} & 1) { 3532 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3200 # prepend meta info 3533 cf::face::set_type $idx, $info->{type};
3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
3207 $data = pack "(w/a*)*", $meta, $info->{data};
3208 } else { 3534 } else {
3209 $data = $info->{data}; 3535 $RESOURCE{$name} = $info; # unused
3210 } 3536 }
3211 3537
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3538 cf::cede_to_tick;
3216 } 3539 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3540 }
3541
3542 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3543
3237 1 3544 1
3238} 3545}
3239 3546
3240register_exticmd fx_want => sub { 3547register_exticmd fx_want => sub {
3242 3549
3243 while (my ($k, $v) = each %$want) { 3550 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3551 $ns->fx_want ($k, $v);
3245 } 3552 }
3246}; 3553};
3554
3555sub load_resource_file($) {
3556 my $guard = lock_acquire "load_resource_file";
3557
3558 my $status = load_resource_file_ $_[0];
3559 get_slot 0.1, 100;
3560 cf::arch::commit_load;
3561
3562 $status
3563}
3247 3564
3248sub reload_regions { 3565sub reload_regions {
3249 # HACK to clear player env face cache, we need some signal framework 3566 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?) 3567 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3568 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3582}
3266 3583
3267sub reload_archetypes { 3584sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3585 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3586 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3587}
3276 3588
3277sub reload_treasures { 3589sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3590 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3591 or die "unable to load treasurelists\n";
3280} 3592}
3281 3593
3594sub reload_sound {
3595 trace "loading sound config from $DATADIR/sound\n";
3596
3597 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3598
3599 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3600 my $sound = $soundconf->{compat}[$_]
3601 or next;
3602
3603 my $face = cf::face::find "sound/$sound->[1]";
3604 cf::sound::set $sound->[0] => $face;
3605 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3606 }
3607
3608 while (my ($k, $v) = each %{$soundconf->{event}}) {
3609 my $face = cf::face::find "sound/$v";
3610 cf::sound::set $k => $face;
3611 }
3612}
3613
3282sub reload_resources { 3614sub reload_resources {
3283 warn "reloading resource files...\n"; 3615 trace "reloading resource files...\n";
3284 3616
3617 reload_exp_table;
3618 reload_materials;
3619 reload_facedata;
3620 reload_sound;
3621 reload_archetypes;
3285 reload_regions; 3622 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3623 reload_treasures;
3290 3624
3291 warn "finished reloading resource files\n"; 3625 trace "finished reloading resource files\n";
3292}
3293
3294sub init {
3295 reload_resources;
3296} 3626}
3297 3627
3298sub reload_config { 3628sub reload_config {
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3629 trace "reloading config file...\n";
3300 or return;
3301 3630
3302 local $/; 3631 my $config = load_file "$CONFDIR/config";
3303 *CFG = YAML::Syck::Load <$fh>; 3632 utf8::decode $config;
3633 *CFG = decode_yaml $config;
3304 3634
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3635 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3306 3636
3307 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3637 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3308 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3638 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3309 3639
3310 if (exists $CFG{mlockall}) { 3640 if (exists $CFG{mlockall}) {
3314 }; 3644 };
3315 warn $@ if $@; 3645 warn $@ if $@;
3316 } 3646 }
3317} 3647}
3318 3648
3649sub pidfile() {
3650 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3651 or die "$PIDFILE: $!";
3652 flock $fh, &Fcntl::LOCK_EX
3653 or die "$PIDFILE: flock: $!";
3654 $fh
3655}
3656
3657# make sure only one server instance is running at any one time
3658sub atomic {
3659 my $fh = pidfile;
3660
3661 my $pid = <$fh>;
3662 kill 9, $pid if $pid > 0;
3663
3664 seek $fh, 0, 0;
3665 print $fh $$;
3666}
3667
3668sub main_loop {
3669 trace "EV::loop starting\n";
3670 if (1) {
3671 EV::loop;
3672 }
3673 trace "EV::loop returned\n";
3674 goto &main_loop unless $REALLY_UNLOOP;
3675}
3676
3319sub main { 3677sub main {
3678 cf::init_globals; # initialise logging
3679
3680 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3681 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3682 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3683 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3684
3685 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3686
3320 # we must not ever block the main coroutine 3687 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3688 local $Coro::idle = sub {
3322 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3689 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3323 (async { 3690 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3691 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3692 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3693 })->prio (Coro::PRIO_MAX);
3327 }; 3694 };
3328 3695
3696 evthread_start IO::AIO::poll_fileno;
3697
3698 cf::sync_job {
3699 cf::incloader::init ();
3700
3701 cf::init_anim;
3702 cf::init_attackmess;
3703 cf::init_dynamic;
3704
3705 cf::load_settings;
3706
3707 reload_resources;
3329 reload_config; 3708 reload_config;
3330 db_init; 3709 db_init;
3710
3711 cf::init_uuid;
3712 cf::init_signals;
3713 cf::init_skills;
3714
3715 cf::init_beforeplay;
3716
3717 atomic;
3718
3331 load_extensions; 3719 load_extensions;
3332 3720
3333 $TICK_WATCHER->start; 3721 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3722
3335 EV::loop; 3723 # no (long-running) fork's whatsoever before this point(!)
3724 use POSIX ();
3725 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3726
3727 cf::_post_init 0;
3728 };
3729
3730 cf::object::thawer::errors_are_fatal 0;
3731 info "parse errors in files are no longer fatal from this point on.\n";
3732
3733 AE::postpone {
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3336} 3738}
3337 3739
3338############################################################################# 3740#############################################################################
3339# initialisation and cleanup 3741# initialisation and cleanup
3340 3742
3341# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3342BEGIN { 3744BEGIN {
3343 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3344 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3345 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3346 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3347 }; 3749 };
3348 } 3750 }
3349} 3751}
3350 3752
3351sub write_runtime { 3753sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3353 3755
3354 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3356 3758
3357 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3760
3359 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3360 3762
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3362 or return; 3764 or return;
3363 3765
3364 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3377 3779
3378 close $fh 3780 close $fh
3379 or return; 3781 or return;
3380 3782
3381 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3784 and return;
3383 3785
3384 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3385 3787
3386 1 3788 1
3789}
3790
3791our $uuid_lock;
3792our $uuid_skip;
3793
3794sub write_uuid_sync($) {
3795 $uuid_skip ||= $_[0];
3796
3797 return if $uuid_lock;
3798 local $uuid_lock = 1;
3799
3800 my $uuid = "$LOCALDIR/uuid";
3801
3802 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3803 or return;
3804
3805 my $value = uuid_seq uuid_cur;
3806
3807 unless ($value) {
3808 info "cowardly refusing to write zero uuid value!\n";
3809 return;
3810 }
3811
3812 my $value = uuid_str $value + $uuid_skip;
3813 $uuid_skip = 0;
3814
3815 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3816 and return;
3817
3818 # always fsync - this file is important
3819 aio_fsync $fh
3820 and return;
3821
3822 close $fh
3823 or return;
3824
3825 aio_rename "$uuid~", $uuid
3826 and return;
3827
3828 trace "uuid file written ($value).\n";
3829
3830 1
3831
3832}
3833
3834sub write_uuid($$) {
3835 my ($skip, $sync) = @_;
3836
3837 $sync ? write_uuid_sync $skip
3838 : async { write_uuid_sync $skip };
3387} 3839}
3388 3840
3389sub emergency_save() { 3841sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3391 3843
3392 warn "enter emergency perl save\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3393 3850
3394 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3395 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3860 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3862 $pl->save;
3404 } 3863 }
3405 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3406 3865
3407 warn "begin emergency map save\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3871 $map->valid or next;
3411 $map->save; 3872 $map->save;
3412 } 3873 }
3413 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3414 3875
3415 warn "begin emergency database checkpoint\n"; 3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 info "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3417 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3881
3882 info "emergency_perl_save: begin write uuid\n";
3883 write_uuid_sync 1;
3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3418 }; 3904 };
3419 3905
3420 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3421} 3907}
3422 3908
3423sub post_cleanup { 3909sub post_cleanup {
3424 my ($make_core) = @_; 3910 my ($make_core) = @_;
3425 3911
3912 IO::AIO::flush;
3913
3426 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3427 if $make_core; 3915 if $make_core;
3916
3917 my $fh = pidfile;
3918 unlink $PIDFILE if <$fh> == $$;
3919}
3920
3921# a safer delete_package, copied from Symbol
3922sub clear_package($) {
3923 my $pkg = shift;
3924
3925 # expand to full symbol table name if needed
3926 unless ($pkg =~ /^main::.*::$/) {
3927 $pkg = "main$pkg" if $pkg =~ /^::/;
3928 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3929 $pkg .= '::' unless $pkg =~ /::$/;
3930 }
3931
3932 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3933 my $stem_symtab = *{$stem}{HASH};
3934
3935 defined $stem_symtab and exists $stem_symtab->{$leaf}
3936 or return;
3937
3938 # clear all symbols
3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3940 for my $name (keys %$leaf_symtab) {
3941 _gv_clear *{"$pkg$name"};
3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3943 }
3428} 3944}
3429 3945
3430sub do_reload_perl() { 3946sub do_reload_perl() {
3431 # can/must only be called in main 3947 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3433 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3434 return; 3950 return;
3435 } 3951 }
3436 3952
3437 warn "reloading..."; 3953 return if $RELOAD++;
3438 3954
3439 warn "entering sync_job"; 3955 my $t1 = AE::time;
3440 3956
3957 while ($RELOAD) {
3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3960
3961 trace "perl_reload: entering sync_job";
3962
3441 cf::sync_job { 3963 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark
3443 cf::emergency_save; 3964 #cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark
3445 3965
3446 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV;
3448
3449 # if anything goes wrong in here, we should simply crash as we already saved
3450
3451 warn "flushing outstanding aio requests";
3452 for (;;) {
3453 BDB::flush;
3454 IO::AIO::flush;
3455 Coro::cede_notself;
3456 last unless IO::AIO::nreqs || BDB::nreqs;
3457 warn "iterate...";
3458 }
3459
3460 ++$RELOAD;
3461
3462 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3463 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3464 %EXT_CORO = (); 3968 %EXT_CORO = ();
3465 3969
3466 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3467 %COMMAND = (); 3971 %COMMAND = ();
3468 3972
3469 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3470 %EXTCMD = (); 3974 %EXTCMD = ();
3471 %EXTICMD = (); 3975 %EXTICMD = ();
3472 3976
3473 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3474 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3475 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3476 3980
3477 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3478 eval { 3982 eval {
3479 $cb->($pkg); 3983 $cb->($pkg);
3480 1 3984 1
3481 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3986 }
3987
3988 trace "... clearing $pkg";
3989 clear_package $pkg;
3482 } 3990 }
3483 3991
3484 warn "... nuking $pkg";
3485 Symbol::delete_package $pkg;
3486 }
3487
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3489 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3995
3492 warn "... unloading $k"; 3996 trace "... unloading $k";
3493 delete $INC{$k}; 3997 delete $INC{$k};
3494 3998
3495 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3497 4001
3498 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3499 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3500 } 4007 }
3501 4008
3502 Symbol::delete_package $k;
3503 }
3504
3505 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3507 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3508 4012
3509 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 4016
3513 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3514 # and global variables created in xs 4018 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3516 4020
3517 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3518 4022
3519 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3520 require cf; 4024 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3522 4026
3523 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3524 cf::reload_config; 4028 cf::reload_config;
3525 4029
3526 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3527 cf::load_extensions; 4031 cf::load_extensions;
3528 4032
4033 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3532 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3535 4041
3536 warn "leaving sync_job"; 4042 cf::_post_init 1;
3537 4043
4044 trace "perl_reload: leaving sync_job";
4045
3538 1 4046 1
3539 } or do { 4047 } or do {
3540 warn $@; 4048 error $@;
3541 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3542 exit 1; 4050 };
4051
4052 --$RELOAD;
3543 }; 4053 }
3544 4054
3545 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3546}; 4057};
3547 4058
3548our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3549 4060
3550sub reload_perl() { 4061sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3553 4064
4065 $RELOAD_WATCHER ||= cf::async {
4066 Coro::AIO::aio_wait cache_extensions;
4067
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4069 do_reload_perl;
3555 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3556 do_reload_perl; 4071 };
3557 }; 4072 };
3558} 4073}
3559 4074
3560register_command "reload" => sub { 4075register_command "reload" => sub {
3561 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3567 reload_perl; 4082 reload_perl;
3568 }; 4083 };
3569 } 4084 }
3570}; 4085};
3571 4086
3572unshift @INC, $LIBDIR; 4087#############################################################################
3573 4088
3574my $bug_warning = 0; 4089my $bug_warning = 0;
3575 4090
3576our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN;
3578
3579sub wait_for_tick { 4091sub wait_for_tick() {
3580 return unless $TICK_WATCHER->is_active; 4092 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3581 return if $Coro::current == $Coro::main;
3582 4093
3583 my $signal = new Coro::Signal; 4094 $WAIT_FOR_TICK->wait;
3584 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait;
3586} 4095}
3587 4096
3588sub wait_for_tick_begin { 4097sub wait_for_tick_begin() {
3589 return unless $TICK_WATCHER->is_active; 4098 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3590 return if $Coro::current == $Coro::main;
3591 4099
3592 my $signal = new Coro::Signal; 4100 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 4101 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 4102 $signal->wait;
3595} 4103}
3596 4104
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4105sub tick {
3598 if ($Coro::current != $Coro::main) { 4106 if ($Coro::current != $Coro::main) {
3599 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4107 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3600 unless ++$bug_warning > 10; 4108 unless ++$bug_warning > 10;
3601 return; 4109 return;
3602 } 4110 }
3603 4111
3604 $NOW = $tick_start = EV::now; 4112 cf::one_tick; # one server iteration
3605 4113
3606 cf::server_tick; # one server iteration 4114 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3607
3608 $RUNTIME += $TICK;
3609 $NEXT_TICK += $TICK;
3610 4115
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4116 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = $NOW + 10; 4117 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 4118 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 4119 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 4120 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 4121 or error "ERROR: unable to write runtime file: $!";
3617 }; 4122 };
3618 } 4123 }
3619 4124
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4125 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3621 $sig->send; 4126 $sig->send;
3622 } 4127 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 4128 $WAIT_FOR_TICK->broadcast;
3624 $sig->send;
3625 }
3626 4129
3627 $LOAD = ($NOW - $tick_start) / $TICK; 4130 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4131 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 4132
3630 _post_tick; 4133 if (0) {
3631}; 4134 if ($NEXT_TICK) {
3632$TICK_WATCHER->priority (EV::MAXPRI); 4135 my $jitter = $TICK_START - $NEXT_TICK;
4136 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4137 debug "jitter $JITTER\n";#d#
4138 }
4139 }
4140}
3633 4141
3634{ 4142{
4143 # configure BDB
4144
3635 BDB::min_parallel 8; 4145 BDB::min_parallel 16;
3636 BDB::max_poll_reqs $TICK * 0.1; 4146 BDB::max_poll_reqs $TICK * 0.1;
4147 #$AnyEvent::BDB::WATCHER->priority (1);
3637 4148
3638 unless ($DB_ENV) { 4149 unless ($DB_ENV) {
3639 $DB_ENV = BDB::db_env_create; 4150 $DB_ENV = BDB::db_env_create;
3640 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4151 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3641 | BDB::LOG_AUTOREMOVE, 1); 4152 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4153 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3642 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4154 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3643 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4155 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3644 4156
3645 cf::sync_job { 4157 cf::sync_job {
3646 eval { 4158 eval {
3668 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4180 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3669 }; 4181 };
3670} 4182}
3671 4183
3672{ 4184{
4185 # configure IO::AIO
4186
3673 IO::AIO::min_parallel 8; 4187 IO::AIO::min_parallel 8;
3674
3675 undef $Coro::AIO::WATCHER;
3676 IO::AIO::max_poll_time $TICK * 0.1; 4188 IO::AIO::max_poll_time $TICK * 0.1;
3677 $AIO_POLL_WATCHER = EV::io IO::AIO::poll_fileno, EV::READ, \&IO::AIO::poll_cb; 4189 undef $AnyEvent::AIO::WATCHER;
3678} 4190}
3679 4191
3680my $_log_backtrace; 4192our $_log_backtrace;
4193our $_log_backtrace_last;
3681 4194
3682sub _log_backtrace { 4195sub _log_backtrace {
3683 my ($msg, @addr) = @_; 4196 my ($msg, @addr) = @_;
3684 4197
3685 $msg =~ s/\n//; 4198 $msg =~ s/\n$//;
3686 4199
4200 if ($_log_backtrace_last eq $msg) {
4201 LOG llevInfo, "[ABT] $msg\n";
4202 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3687 # limit the # of concurrent backtraces 4203 # limit the # of concurrent backtraces
3688 if ($_log_backtrace < 2) { 4204 } elsif ($_log_backtrace < 2) {
4205 $_log_backtrace_last = $msg;
3689 ++$_log_backtrace; 4206 ++$_log_backtrace;
4207 my $perl_bt = Carp::longmess $msg;
3690 async { 4208 async {
3691 $Coro::current->{desc} = "abt $msg"; 4209 $Coro::current->{desc} = "abt $msg";
3692 4210
3693 my @bt = fork_call { 4211 my @bt = fork_call {
3694 @addr = map { sprintf "%x", $_ } @addr; 4212 @addr = map { sprintf "%x", $_ } @addr;
3705 } 4223 }
3706 4224
3707 @funcs 4225 @funcs
3708 }; 4226 };
3709 4227
3710 LOG llevInfo, "[ABT] $msg\n"; 4228 LOG llevInfo, "[ABT] $perl_bt\n";
4229 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3711 LOG llevInfo, "[ABT] $_\n" for @bt; 4230 LOG llevInfo, "[ABT] $_\n" for @bt;
3712 --$_log_backtrace; 4231 --$_log_backtrace;
3713 }; 4232 };
3714 } else { 4233 } else {
3715 LOG llevInfo, "[ABT] $msg\n"; 4234 LOG llevInfo, "[ABT] $msg\n";
3716 LOG llevInfo, "[ABT] [suppressed]\n"; 4235 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3717 } 4236 }
3718} 4237}
3719 4238
3720# load additional modules 4239# load additional modules
3721use cf::pod; 4240require "cf/$_.pm" for @EXTRA_MODULES;
4241cf::_connect_to_perl_2;
3722 4242
3723END { cf::emergency_save } 4243END { cf::emergency_save }
3724 4244
37251 42451
3726 4246

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines