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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.386 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.570 by root, Wed May 4 07:41:14 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines