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.373 by root, Sat Sep 15 15:58:06 2007 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 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 Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.64 (); 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.32 (); 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 {
526 $Coro::current->desc ("timeslot manager");
527
359 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
360 530
361 while () { 531 while () {
362 next_job: 532 next_job:
533
363 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
364 if ($avail > 0.01) { 535
365 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
366 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
367 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
368 $job->[2]->send; 540 $job->[2]->send;
369 Coro::cede; 541 Coro::cede;
370 goto next_job; 542 goto next_job;
371 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
372 } 545 }
373 } 546 }
374 547
375 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
376 # 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
377 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 551 $signal->wait;
379 } else { 552 } else {
553 $busy = 0;
380 Coro::schedule; 554 Coro::schedule;
381 } 555 }
382 } 556 }
383}; 557};
384 558
385sub get_slot($;$$) { 559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
386 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
387 563
388 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
389 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
390 567
391 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
392 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
393 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
404 581
405BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
406 583
407=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
408 585
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
411partly 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
412acceptable. 589acceptable.
413 590
414If 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
415the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
419=cut 596=cut
420 597
421sub sync_job(&) { 598sub sync_job(&) {
422 my ($job) = @_; 599 my ($job) = @_;
423 600
424 if ($Coro::current == $Coro::main) { 601 if (in_main) {
425 my $time = Event::time; 602 my $time = AE::time;
426 603
427 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
429 606
430 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 608
432 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
433 610
434 my $busy = 1; 611 my $busy = 1;
435 my @res; 612 my @res;
436 613
437 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 616 @res = eval { $job->() };
439 warn $@ if $@; 617 error $@ if $@;
440 undef $busy; 618 undef $busy;
441 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
442 620
443 while ($busy) { 621 while ($busy) {
444 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
445 } 626 }
627 }
446 628
447 $time = Event::time - $time; 629 my $time = AE::time - $time;
448 630
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
453 632
454 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
455 } else { 634 } else {
456 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
457 636
477 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
478 657
479 $coro 658 $coro
480} 659}
481 660
482=item fork_call { }, $args 661=item fork_call { }, @args
483 662
484Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
488 667
489=cut 668=cut
669
670sub post_fork {
671 reset_signals;
672}
490 673
491sub fork_call(&@) { 674sub fork_call(&@) {
492 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
493 676
494 # 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,
495 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
496 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
497 680
498 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
499 reset_signals; 682 cf::post_fork;
500 &$cb 683 &$cb
501 }, @args; 684 } @args;
502 685
503 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
504} 725}
505 726
506=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
507 728
508Returns a single value from the environment database. 729Returns a single value from the environment database.
518within each server. 739within each server.
519 740
520=cut 741=cut
521 742
522sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
523 my ($name) = @_; 747 my ($name) = @_;
524 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
525 749
526 eval { 750 eval {
527 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
537} 761}
538 762
539our $DB; 763our $DB;
540 764
541sub db_init { 765sub db_init {
542 cf::sync_job {
543 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
544 };
545} 767}
546 768
547sub db_get($$) { 769sub db_get($$) {
548 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
549 771
550 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
551 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
552 776
553 $! ? () 777 $! ? ()
554 : $data 778 : $data
555 }
556} 779}
557 780
558sub db_put($$$) { 781sub db_put($$$) {
559 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
560 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
588 811
589 my @data; 812 my @data;
590 my $md5; 813 my $md5;
591 814
592 for (0 .. $#$src) { 815 for (0 .. $#$src) {
593 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
594 or Carp::croak "$src->[$_]: $!";
595 } 817 }
596 818
597 # if processing is expensive, check 819 # if processing is expensive, check
598 # checksum first 820 # checksum first
599 if (1) { 821 if (1) {
616 838
617 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
618 my $data = $process->(\@data); 840 my $data = $process->(\@data);
619 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
620 842
621 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
622 844
623 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
624 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
625 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
626 848
636 858
637=cut 859=cut
638 860
639sub datalog($@) { 861sub datalog($@) {
640 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
641 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
642} 864}
643 865
644=back 866=back
645 867
646=cut 868=cut
647 869
648############################################################################# 870#############################################################################
649 871
650=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
651 873
652Many 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
653attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
655 877
656In 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>
657C<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
658Crossfire TRT). 880Deliantra).
659 881
660=over 4 882=over 4
661 883
662=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
663 885
707=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
708 930
709Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
711 933
712Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
713that 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.
714 936
715These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
716 938
717=over 4 939=over 4
841 1063
842 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
843 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
844 1066
845 } elsif (ref $type) { 1067 } elsif (ref $type) {
846 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
847 1069
848 } else { 1070 } else {
849 shift @arg; 1071 shift @arg;
850 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
851 } 1073 }
852 } 1074 }
853} 1075}
854 1076
855sub _object_attach { 1077sub _object_attach {
865 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
866 } 1088 }
867 1089
868 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
869 } else { 1091 } else {
870 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
871 } 1093 }
872 1094
873 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
874} 1096}
875 1097
934 1156
935 for (@$callbacks) { 1157 for (@$callbacks) {
936 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
937 1159
938 if ($@) { 1160 if ($@) {
939 warn "$@";
940 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
941 override; 1162 override;
942 } 1163 }
943 1164
944 return 1 if $override; 1165 return 1 if $override;
945 } 1166 }
946 1167
947 0 1168 0
948} 1169}
949 1170
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1172
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1174
954Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
955 1176
961 1182
962=cut 1183=cut
963 1184
964############################################################################# 1185#############################################################################
965# object support 1186# object support
966#
967 1187
1188sub _object_equal($$);
1189sub _object_equal($$) {
1190 my ($a, $b) = @_;
1191
1192 return 0 unless (ref $a) eq (ref $b);
1193
1194 if ("HASH" eq ref $a) {
1195 my @ka = keys %$a;
1196 my @kb = keys %$b;
1197
1198 return 0 if @ka != @kb;
1199
1200 for (0 .. $#ka) {
1201 return 0 unless $ka[$_] eq $kb[$_];
1202 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1203 }
1204
1205 } elsif ("ARRAY" eq ref $a) {
1206
1207 return 0 if @$a != @$b;
1208
1209 for (0 .. $#$a) {
1210 return 0 unless _object_equal $a->[$_], $b->[$_];
1211 }
1212
1213 } elsif ($a ne $b) {
1214 return 0;
1215 }
1216
1217 1
1218}
1219
1220our $SLOW_MERGES;#d#
968sub _can_merge { 1221sub _can_merge {
969 my ($ob1, $ob2) = @_; 1222 my ($ob1, $ob2) = @_;
970 1223
971 local $Storable::canonical = 1; 1224 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1225
975 $fob1 eq $fob2 1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
976} 1228}
977 1229
978sub reattach { 1230sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1232 my ($obj) = @_;
981 1233
1234 # no longer needed after getting rid of delete_package?
982 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
983 1236
984 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
985 1238
986 @$registry = (); 1239 @$registry = ();
987 1240
992 for (@$attach) { 1245 for (@$attach) {
993 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
994 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
995 } 1248 }
996 } else { 1249 } else {
997 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
998 } 1251 }
999 } 1252 }
1000} 1253}
1001 1254
1002cf::attachable->attach ( 1255cf::attachable->attach (
1003 prio => -1000000, 1256 prio => -1000000,
1004 on_instantiate => sub { 1257 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
1006 1259
1007 $data = from_json $data; 1260 $data = decode_json $data;
1008 1261
1009 for (@$data) { 1262 for (@$data) {
1010 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
1011 1264
1012 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
1029 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1030 1283
1031 sync_job { 1284 sync_job {
1032 if (length $$rdata) { 1285 if (length $$rdata) {
1033 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1034 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1035 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1036 1290
1037 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1038 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
1039 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1040 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 }
1041 close $fh; 1298 aio_close $fh;
1042 1299
1043 if (@$objs) { 1300 if (@$objs) {
1044 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) {
1045 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
1046 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1047 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1048 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 }
1049 close $fh; 1309 aio_close $fh;
1050 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1051 } 1311 }
1052 } else { 1312 } else {
1053 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1054 } 1314 }
1055 1315
1056 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
1057 } else { 1320 } else {
1058 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1059 } 1322 }
1060 } else { 1323 } else {
1061 aio_unlink $filename; 1324 aio_unlink $filename;
1062 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1063 } 1326 }
1082 1345
1083 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1084 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1085 or return; 1348 or return;
1086 1349
1087 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1088 } 1352 }
1089 1353
1090 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1091 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1092 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1093 1358
1094 ($data, $av) 1359 ($data, $av)
1095} 1360}
1096 1361
1097=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1153 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1154 1419
1155 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1156} 1421}
1157 1422
1423use File::Glob ();
1424
1158cf::player->attach ( 1425cf::player->attach (
1159 on_command => sub { 1426 on_unknown_command => sub {
1160 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1161 1428
1162 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1163 or return; 1430 or return;
1164 1431
1187 1454
1188 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1189 if $reply; 1456 if $reply;
1190 1457
1191 } else { 1458 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1460 }
1194 1461
1195 cf::override; 1462 cf::override;
1196 }, 1463 },
1197); 1464);
1198 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
1199sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1200 cf::sync_job { 1482 cf::sync_job {
1201 my %todo; 1483 my %todo;
1202 1484
1203 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1204 next unless -r $path; 1486 next unless -r $path;
1222 1504
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1507
1226 $ext{source} = 1508 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1228 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1229 . $source 1511 . $source
1230 . "\n};\n1"; 1512 . "\n};\n1";
1231 1513
1232 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1233 } 1515 }
1234 1516
1517 my $pass = 0;
1235 my %done; 1518 my %done;
1236 while (%todo) { 1519 while (%todo) {
1237 my $progress; 1520 my $progress;
1238 1521
1522 ++$pass;
1523
1524 ext:
1239 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1240 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1241 goto skip 1527 next ext
1242 unless exists $done{$_}; 1528 unless exists $done{$_};
1243 } 1529 }
1244 1530
1245 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1246 1532
1247 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1248 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1249 : "$v->{base}: extension inactive.\n";
1250 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1251 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1252 warn $msg; 1540
1253 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1254 exit 1; 1542 delete $todo{$k};
1255 } 1543 } else {
1256 1544 $done{$k} = delete $todo{$k};
1257 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1258 } 1550 }
1259
1260 $done{$k} = delete $todo{$k};
1261 push @EXTS, $v->{pkg};
1262 $progress = 1;
1263 } 1551 }
1264 1552
1265 skip: 1553 unless ($progress) {
1266 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1267 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 }
1268 } 1561 }
1269 }; 1562 };
1270} 1563}
1271 1564
1272############################################################################# 1565#############################################################################
1273 1566
1274=back 1567=back
1275 1568
1276=head2 CORE EXTENSIONS 1569=head2 CORE EXTENSIONS
1277 1570
1278Functions and methods that extend core crossfire objects. 1571Functions and methods that extend core deliantra objects.
1279 1572
1280=cut 1573=cut
1281 1574
1282package cf::player; 1575package cf::player;
1283 1576
1326 1619
1327sub exists($) { 1620sub exists($) {
1328 my ($login) = @_; 1621 my ($login) = @_;
1329 1622
1330 $cf::PLAYER{$login} 1623 $cf::PLAYER{$login}
1331 or cf::sync_job { !aio_stat path $login } 1624 or !aio_stat path $login
1332} 1625}
1333 1626
1334sub find($) { 1627sub find($) {
1335 return $cf::PLAYER{$_[0]} || do { 1628 return $cf::PLAYER{$_[0]} || do {
1336 my $login = $_[0]; 1629 my $login = $_[0];
1348 my $f = new_from_file cf::object::thawer path $login 1641 my $f = new_from_file cf::object::thawer path $login
1349 or return; 1642 or return;
1350 1643
1351 my $pl = cf::player::load_pl $f 1644 my $pl = cf::player::load_pl $f
1352 or return; 1645 or return;
1646
1353 local $cf::PLAYER_LOADING{$login} = $pl; 1647 local $cf::PLAYER_LOADING{$login} = $pl;
1354 $f->resolve_delayed_derefs; 1648 $f->resolve_delayed_derefs;
1355 $cf::PLAYER{$login} = $pl 1649 $cf::PLAYER{$login} = $pl
1356 } 1650 }
1357 } 1651 }
1358} 1652}
1359 1653
1654cf::player->attach (
1655 on_load => sub {
1656 my ($pl, $path) = @_;
1657
1658 # restore slots saved in save, below
1659 my $slots = delete $pl->{_slots};
1660
1661 $pl->ob->current_weapon ($slots->[0]);
1662 $pl->combat_ob ($slots->[1]);
1663 $pl->ranged_ob ($slots->[2]);
1664 },
1665);
1666
1360sub save($) { 1667sub save($) {
1361 my ($pl) = @_; 1668 my ($pl) = @_;
1362 1669
1363 return if $pl->{deny_save}; 1670 return if $pl->{deny_save};
1364 1671
1367 1674
1368 return if $pl->{deny_save}; 1675 return if $pl->{deny_save};
1369 1676
1370 aio_mkdir playerdir $pl, 0770; 1677 aio_mkdir playerdir $pl, 0770;
1371 $pl->{last_save} = $cf::RUNTIME; 1678 $pl->{last_save} = $cf::RUNTIME;
1679
1680 cf::get_slot 0.01;
1681
1682 # save slots, to be restored later
1683 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1372 1684
1373 $pl->save_pl ($path); 1685 $pl->save_pl ($path);
1374 cf::cede_to_tick; 1686 cf::cede_to_tick;
1375} 1687}
1376 1688
1408 my ($pl) = @_; 1720 my ($pl) = @_;
1409 1721
1410 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1411 1723
1412 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1413 $pl->password ("*"); # this should lock out the player until we nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1414 1726
1415 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1416 $pl->deactivate; 1728 $pl->deactivate;
1729
1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1417 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1418 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1419 1735
1420 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1421 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1422 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
1460 1776
1461 for my $login (@$dirs) { 1777 for my $login (@$dirs) {
1462 my $path = path $login; 1778 my $path = path $login;
1463 1779
1464 # a .pst is a dead give-away for a valid player 1780 # a .pst is a dead give-away for a valid player
1465 unless (-e "$path.pst") { 1781 # if no pst file found, open and chekc for blocked users
1782 if (aio_stat "$path.pst") {
1466 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1783 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1467 aio_read $fh, 0, 512, my $buf, 0 or next; 1784 aio_read $fh, 0, 512, my $buf, 0 or next;
1468 $buf !~ /^password -------------$/m or next; # official not-valid tag 1785 $buf !~ /^password -------------$/m or next; # official not-valid tag
1469 } 1786 }
1470 1787
1474 1791
1475 \@logins 1792 \@logins
1476} 1793}
1477 1794
1478=item $player->maps 1795=item $player->maps
1796
1797=item cf::player::maps $login
1479 1798
1480Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1481player. May block. 1800player. May block.
1482 1801
1483=cut 1802=cut
1501 } 1820 }
1502 1821
1503 \@paths 1822 \@paths
1504} 1823}
1505 1824
1506=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1825=item $protocol_xml = $player->expand_cfpod ($cfpod)
1507 1826
1508Expand crossfire pod fragments into protocol xml. 1827Expand deliantra pod fragments into protocol xml.
1509
1510=cut
1511
1512sub expand_cfpod {
1513 ((my $self), (local $_)) = @_;
1514
1515 # escape & and <
1516 s/&/&amp;/g;
1517 s/(?<![BIUGHT])</&lt;/g;
1518
1519 # this is buggy, it needs to properly take care of nested <'s
1520
1521 1 while
1522 # replace B<>, I<>, U<> etc.
1523 s/B<([^\>]*)>/<b>$1<\/b>/
1524 || s/I<([^\>]*)>/<i>$1<\/i>/
1525 || s/U<([^\>]*)>/<u>$1<\/u>/
1526 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1527 # replace G<male|female> tags
1528 || s{G<([^>|]*)\|([^>]*)>}{
1529 $self->gender ? $2 : $1
1530 }ge
1531 # replace H<hint text>
1532 || s{H<([^\>]*)>}
1533 {
1534 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1535 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1536 "")
1537 [$self->{hintmode}]
1538 }ge;
1539
1540 # create single paragraphs (very hackish)
1541 s/(?<=\S)\n(?=\w)/ /g;
1542
1543 # compress some whitespace
1544 s/\s+\n/\n/g; # ws line-ends
1545 s/\n\n+/\n/g; # double lines
1546 s/^\n+//; # beginning lines
1547 s/\n+$//; # ending lines
1548
1549 $_
1550}
1551
1552sub hintmode {
1553 $_[0]{hintmode} = $_[1] if @_ > 1;
1554 $_[0]{hintmode}
1555}
1556 1828
1557=item $player->ext_reply ($msgid, @msg) 1829=item $player->ext_reply ($msgid, @msg)
1558 1830
1559Sends an ext reply to the player. 1831Sends an ext reply to the player.
1560 1832
1592 1864
1593=cut 1865=cut
1594 1866
1595sub find_by_path($) { 1867sub find_by_path($) {
1596 my ($path) = @_; 1868 my ($path) = @_;
1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1597 1871
1598 my ($match, $specificity); 1872 my ($match, $specificity);
1599 1873
1600 for my $region (list) { 1874 for my $region (list) {
1601 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1627our $MAX_RESET = 3600; 1901our $MAX_RESET = 3600;
1628our $DEFAULT_RESET = 3000; 1902our $DEFAULT_RESET = 3000;
1629 1903
1630sub generate_random_map { 1904sub generate_random_map {
1631 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1632 # mit "rum" bekleckern, nicht 1906
1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1908
1633 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1634 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1635 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1636 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1637 $rmp->{exit_on_final_map},
1638 $rmp->{xsize}, $rmp->{ysize},
1639 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1640 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1641 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1642 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1643 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1644 (cf::region::find $rmp->{region}), $rmp->{custom}
1645 )
1646} 1910}
1647 1911
1648=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1649 1913
1650Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
1655 1919
1656sub register { 1920sub register {
1657 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1658 my $pkg = caller; 1922 my $pkg = caller;
1659 1923
1660 no strict;
1661 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1662 1925
1663 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1664} 1927}
1665 1928
1666# also paths starting with '/' 1929# also paths starting with '/'
1667$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1668 1931
1669sub thawer_merge { 1932sub thawer_merge {
1670 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1671 1934
1672 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
1677} 1940}
1678 1941
1679sub normalise { 1942sub normalise {
1680 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1681 1944
1682 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1683 1946
1684 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1685 1948
1686 # map plan: 1949 # map plan:
1687 # 1950 #
1702 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1703 $path = "$base/$path"; 1966 $path = "$base/$path";
1704 } 1967 }
1705 1968
1706 for ($path) { 1969 for ($path) {
1707 redo if s{//}{/};
1708 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1709 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1710 } 1972 }
1711 1973
1712 $path 1974 $path
1726 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1727 return $self; 1989 return $self;
1728 } 1990 }
1729 } 1991 }
1730 1992
1731 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1732 () 1994 ()
1733} 1995}
1734 1996
1735sub init { 1997sub init {
1736 my ($self) = @_; 1998 my ($self) = @_;
1758 2020
1759# the temporary/swap location 2021# the temporary/swap location
1760sub save_path { 2022sub save_path {
1761 my ($self) = @_; 2023 my ($self) = @_;
1762 2024
1763 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2025 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1764 "$TMPDIR/$path.map" 2026 "$TMPDIR/$path.map"
1765} 2027}
1766 2028
1767# the unique path, undef == no special unique path 2029# the unique path, undef == no special unique path
1768sub uniq_path { 2030sub uniq_path {
1769 my ($self) = @_; 2031 my ($self) = @_;
1770 2032
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2033 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$UNIQUEDIR/$path" 2034 "$UNIQUEDIR/$path"
1773}
1774
1775# and all this just because we cannot iterate over
1776# all maps in C++...
1777sub change_all_map_light {
1778 my ($change) = @_;
1779
1780 $_->change_map_light ($change)
1781 for grep $_->outdoor, values %cf::MAP;
1782} 2035}
1783 2036
1784sub decay_objects { 2037sub decay_objects {
1785 my ($self) = @_; 2038 my ($self) = @_;
1786 2039
1868 2121
1869sub find; 2122sub find;
1870sub find { 2123sub find {
1871 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
1872 2125
2126 cf::cede_to_tick;
2127
1873 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
1874 2129
1875 cf::lock_wait "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1876 cf::lock_wait "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
1877 2132
1878 $cf::MAP{$path} || do { 2133 $cf::MAP{$path} || do {
1879 my $guard1 = cf::lock_acquire "map_find:$path";
1880 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1881
1882 my $map = new_from_path cf::map $path 2134 my $map = new_from_path cf::map $path
1883 or return; 2135 or return;
1884 2136
1885 $map->{last_save} = $cf::RUNTIME; 2137 $map->{last_save} = $cf::RUNTIME;
1886 2138
1888 or return; 2140 or return;
1889 2141
1890 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2142 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1891 # doing this can freeze the server in a sync job, obviously 2143 # doing this can freeze the server in a sync job, obviously
1892 #$cf::WAIT_FOR_TICK->wait; 2144 #$cf::WAIT_FOR_TICK->wait;
2145 undef $guard2;
1893 undef $guard1; 2146 undef $guard1;
1894 undef $guard2;
1895 $map->reset; 2147 $map->reset;
1896 return find $path; 2148 return find $path;
1897 } 2149 }
1898 2150
1899 $cf::MAP{$path} = $map 2151 $cf::MAP{$path} = $map
1900 } 2152 }
1901} 2153}
1902 2154
1903sub pre_load { } 2155sub pre_load { }
1904sub post_load { } 2156#sub post_load { } # XS
1905 2157
1906sub load { 2158sub load {
1907 my ($self) = @_; 2159 my ($self) = @_;
1908 2160
1909 local $self->{deny_reset} = 1; # loading can take a long time 2161 local $self->{deny_reset} = 1; # loading can take a long time
1926 my $f = new_from_file cf::object::thawer $self->{load_path}; 2178 my $f = new_from_file cf::object::thawer $self->{load_path};
1927 $f->skip_block; 2179 $f->skip_block;
1928 $self->_load_objects ($f) 2180 $self->_load_objects ($f)
1929 or return; 2181 or return;
1930 2182
1931 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2183 $self->post_load_original
1932 if delete $self->{load_original}; 2184 if delete $self->{load_original};
1933 2185
1934 if (my $uniq = $self->uniq_path) { 2186 if (my $uniq = $self->uniq_path) {
1935 utf8::encode $uniq; 2187 utf8::encode $uniq;
1936 unless (aio_stat $uniq) { 2188 unless (aio_stat $uniq) {
1954 unless ($self->{deny_activate}) { 2206 unless ($self->{deny_activate}) {
1955 $self->decay_objects; 2207 $self->decay_objects;
1956 $self->fix_auto_apply; 2208 $self->fix_auto_apply;
1957 $self->update_buttons; 2209 $self->update_buttons;
1958 cf::cede_to_tick; 2210 cf::cede_to_tick;
1959 $self->set_darkness_map;
1960 cf::cede_to_tick;
1961 $self->activate; 2211 $self->activate;
1962 } 2212 }
1963 2213
1964 $self->{last_save} = $cf::RUNTIME; 2214 $self->{last_save} = $cf::RUNTIME;
1965 $self->last_access ($cf::RUNTIME); 2215 $self->last_access ($cf::RUNTIME);
1966 2216
1967 $self->in_memory (cf::MAP_IN_MEMORY); 2217 $self->in_memory (cf::MAP_ACTIVE);
1968 } 2218 }
1969 2219
1970 $self->post_load; 2220 $self->post_load;
1971}
1972 2221
2222 1
2223}
2224
2225# customize the map for a given player, i.e.
2226# return the _real_ map. used by e.g. per-player
2227# maps to change the path to ~playername/mappath
1973sub customise_for { 2228sub customise_for {
1974 my ($self, $ob) = @_; 2229 my ($self, $ob) = @_;
1975 2230
1976 return find "~" . $ob->name . "/" . $self->{path} 2231 return find "~" . $ob->name . "/" . $self->{path}
1977 if $self->per_player; 2232 if $self->per_player;
1993 or next; 2248 or next;
1994 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
1995 or next; 2250 or next;
1996 $neigh->load; 2251 $neigh->load;
1997 2252
2253 # now find the diagonal neighbours
1998 push @neigh, 2254 push @neigh,
1999 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2000 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2001 } 2257 }
2002 2258
2009} 2265}
2010 2266
2011sub find_sync { 2267sub find_sync {
2012 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2013 2269
2014 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2015} 2274}
2016 2275
2017sub do_load_sync { 2276sub do_load_sync {
2018 my ($map) = @_; 2277 my ($map) = @_;
2019 2278
2020 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2021 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2022 2281
2023 cf::sync_job { $map->load }; 2282 $map->load;
2024} 2283}
2025 2284
2026our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2027our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2028 2287
2030 my ($path, $origin, $load) = @_; 2289 my ($path, $origin, $load) = @_;
2031 2290
2032 $path = normalise $path, $origin && $origin->{path}; 2291 $path = normalise $path, $origin && $origin->{path};
2033 2292
2034 if (my $map = $cf::MAP{$path}) { 2293 if (my $map = $cf::MAP{$path}) {
2035 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2294 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2036 } 2295 }
2037 2296
2038 $MAP_PREFETCH{$path} |= $load; 2297 $MAP_PREFETCH{$path} |= $load;
2039 2298
2040 $MAP_PREFETCHER ||= cf::async { 2299 $MAP_PREFETCHER ||= cf::async {
2300 $Coro::current->{desc} = "map prefetcher";
2301
2041 while (%MAP_PREFETCH) { 2302 while (%MAP_PREFETCH) {
2042 while (my ($k, $v) = each %MAP_PREFETCH) { 2303 while (my ($k, $v) = each %MAP_PREFETCH) {
2043 if (my $map = find $k) { 2304 if (my $map = find $k) {
2044 $map->load if $v; 2305 $map->load if $v;
2045 } 2306 }
2052 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2053 2314
2054 () 2315 ()
2055} 2316}
2056 2317
2318# common code, used by both ->save and ->swapout
2057sub save { 2319sub _save {
2058 my ($self) = @_; 2320 my ($self) = @_;
2059
2060 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2321
2062 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2063 2323
2064 return unless $self->dirty; 2324 return unless $self->dirty;
2065 2325
2071 return if $self->{deny_save}; 2331 return if $self->{deny_save};
2072 2332
2073 local $self->{last_access} = $self->last_access;#d# 2333 local $self->{last_access} = $self->last_access;#d#
2074 2334
2075 cf::async { 2335 cf::async {
2336 $Coro::current->{desc} = "map player save";
2076 $_->contr->save for $self->players; 2337 $_->contr->save for $self->players;
2077 }; 2338 };
2339
2340 cf::get_slot 0.02;
2078 2341
2079 if ($uniq) { 2342 if ($uniq) {
2080 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2343 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2081 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2344 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2082 } else { 2345 } else {
2083 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2084 } 2347 }
2085} 2348}
2086 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2087sub swap_out { 2358sub swap_out {
2088 my ($self) = @_; 2359 my ($self) = @_;
2089 2360
2090 # save first because save cedes
2091 $self->save;
2092
2093 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2094 2362
2363 return if $self->in_memory != cf::MAP_ACTIVE;
2364 return if $self->{deny_save};
2095 return if $self->players; 2365 return if $self->players;
2096 return if $self->in_memory != cf::MAP_IN_MEMORY;
2097 return if $self->{deny_save};
2098 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2099 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2100 2417
2101 $self->deactivate; 2418 $self->deactivate;
2102 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2103 $self->clear; 2420 $self->clear;
2104}
2105
2106sub reset_at {
2107 my ($self) = @_;
2108
2109 # TODO: safety, remove and allow resettable per-player maps
2110 return 1e99 if $self->{deny_reset};
2111
2112 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2113 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2114
2115 $time + $to
2116}
2117
2118sub should_reset {
2119 my ($self) = @_;
2120
2121 $self->reset_at <= $cf::RUNTIME
2122}
2123
2124sub reset {
2125 my ($self) = @_;
2126
2127 my $lock = cf::lock_acquire "map_data:$self->{path}";
2128
2129 return if $self->players;
2130
2131 warn "resetting map ", $self->path;
2132
2133 $self->in_memory (cf::MAP_SWAPPED);
2134
2135 # need to save uniques path
2136 unless ($self->{deny_save}) {
2137 my $uniq = $self->uniq_path; utf8::encode $uniq;
2138
2139 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2140 if $uniq;
2141 }
2142
2143 delete $cf::MAP{$self->path};
2144
2145 $self->deactivate;
2146 $_->clear_links_to ($self) for values %cf::MAP;
2147 $self->clear;
2148 2421
2149 $self->unlink_save; 2422 $self->unlink_save;
2150 $self->destroy; 2423 $self->destroy;
2151} 2424}
2152 2425
2160 2433
2161 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2162 2435
2163 $self->unlink_save; 2436 $self->unlink_save;
2164 2437
2165 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2166 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2167 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2168 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2169 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2170 2443
2219 2492
2220sub unique_maps() { 2493sub unique_maps() {
2221 [ 2494 [
2222 map { 2495 map {
2223 utf8::decode $_; 2496 utf8::decode $_;
2224 /\.map$/ 2497 s/\.map$//; # TODO future compatibility hack
2498 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2499 ? ()
2225 ? normalise $_ 2500 : normalise $_
2226 : ()
2227 } @{ aio_readdir $UNIQUEDIR or [] } 2501 } @{ aio_readdir $UNIQUEDIR or [] }
2228 ] 2502 ]
2229} 2503}
2230 2504
2231package cf; 2505=item cf::map::static_maps
2506
2507Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2508file in the shared directory excluding F</styles> and F</editor>). May
2509block.
2510
2511=cut
2512
2513sub static_maps() {
2514 my @dirs = "";
2515 my @maps;
2516
2517 while (@dirs) {
2518 my $dir = shift @dirs;
2519
2520 next if $dir eq "/styles" || $dir eq "/editor";
2521
2522 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2523 or return;
2524
2525 for (@$files) {
2526 s/\.map$// or next;
2527 utf8::decode $_;
2528 push @maps, "$dir/$_";
2529 }
2530
2531 push @dirs, map "$dir/$_", @$dirs;
2532 }
2533
2534 \@maps
2535}
2232 2536
2233=back 2537=back
2234 2538
2235=head3 cf::object 2539=head3 cf::object
2236 2540
2240 2544
2241=over 4 2545=over 4
2242 2546
2243=item $ob->inv_recursive 2547=item $ob->inv_recursive
2244 2548
2245Returns the inventory of the object _and_ their inventories, recursively. 2549Returns the inventory of the object I<and> their inventories, recursively,
2550but I<not> the object itself.
2246 2551
2247=cut 2552=cut
2248 2553
2249sub inv_recursive_; 2554sub inv_recursive_;
2250sub inv_recursive_ { 2555sub inv_recursive_ {
2255 inv_recursive_ inv $_[0] 2560 inv_recursive_ inv $_[0]
2256} 2561}
2257 2562
2258=item $ref = $ob->ref 2563=item $ref = $ob->ref
2259 2564
2260creates and returns a persistent reference to an objetc that can be stored as a string. 2565Creates and returns a persistent reference to an object that can be stored as a string.
2261 2566
2262=item $ob = cf::object::deref ($refstring) 2567=item $ob = cf::object::deref ($refstring)
2263 2568
2264returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2569returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2265even if the object actually exists. May block. 2570even if the object actually exists. May block.
2267=cut 2572=cut
2268 2573
2269sub deref { 2574sub deref {
2270 my ($ref) = @_; 2575 my ($ref) = @_;
2271 2576
2272 # temporary compatibility#TODO#remove
2273 $ref =~ s{^<}{player/<};
2274
2275 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2577 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2276 my ($uuid, $name) = ($1, $2); 2578 my ($uuid, $name) = ($1, $2);
2277 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2579 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2278 or return; 2580 or return;
2279 $pl->ob->uuid eq $uuid 2581 $pl->ob->uuid eq $uuid
2280 or return; 2582 or return;
2300can be C<undef>. Does the right thing when the player is currently in a 2602can be C<undef>. Does the right thing when the player is currently in a
2301dialogue with the given NPC character. 2603dialogue with the given NPC character.
2302 2604
2303=cut 2605=cut
2304 2606
2607our $SAY_CHANNEL = {
2608 id => "say",
2609 title => "Map",
2610 reply => "say ",
2611 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2612};
2613
2614our $CHAT_CHANNEL = {
2615 id => "chat",
2616 title => "Chat",
2617 reply => "chat ",
2618 tooltip => "Player chat and shouts, global to the server.",
2619};
2620
2305# rough implementation of a future "reply" method that works 2621# rough implementation of a future "reply" method that works
2306# with dialog boxes. 2622# with dialog boxes.
2307#TODO: the first argument must go, split into a $npc->reply_to ( method 2623#TODO: the first argument must go, split into a $npc->reply_to ( method
2308sub cf::object::player::reply($$$;$) { 2624sub cf::object::player::reply($$$;$) {
2309 my ($self, $npc, $msg, $flags) = @_; 2625 my ($self, $npc, $msg, $flags) = @_;
2320 my $dialog = $pl->{npc_dialog}; 2636 my $dialog = $pl->{npc_dialog};
2321 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2637 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2322 2638
2323 } else { 2639 } else {
2324 $msg = $npc->name . " says: $msg" if $npc; 2640 $msg = $npc->name . " says: $msg" if $npc;
2325 $self->message ($msg, $flags); 2641 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2326 } 2642 }
2327 } 2643 }
2328} 2644}
2329 2645
2330=item $object->send_msg ($channel, $msg, $color, [extra...]) 2646=item $object->send_msg ($channel, $msg, $color, [extra...])
2355 2671
2356=item $player_object->enter_link 2672=item $player_object->enter_link
2357 2673
2358Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2359 2675
2360The player should be reasonably safe there for short amounts of time. You 2676The player should be reasonably safe there for short amounts of time (e.g.
2361I<MUST> call C<leave_link> as soon as possible, though. 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2678though, as the player cannot control the character while it is on the link
2679map.
2362 2680
2363Will never block. 2681Will never block.
2364 2682
2365=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
2366 2684
2386sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2387 my ($self) = @_; 2705 my ($self) = @_;
2388 2706
2389 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2390 2708
2709 ++$self->{_link_recursion};
2710
2391 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2392 2712
2393 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2394 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2395 2715
2396 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2397} 2717}
2398 2718
2399sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2400 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2401 2721
2418 ($x, $y) = (-1, -1) 2738 ($x, $y) = (-1, -1)
2419 unless (defined $x) && (defined $y); 2739 unless (defined $x) && (defined $y);
2420 2740
2421 # use -1 or undef as default coordinates, not 0, 0 2741 # use -1 or undef as default coordinates, not 0, 0
2422 ($x, $y) = ($map->enter_x, $map->enter_y) 2742 ($x, $y) = ($map->enter_x, $map->enter_y)
2423 if $x <=0 && $y <= 0; 2743 if $x <= 0 && $y <= 0;
2424 2744
2425 $map->load; 2745 $map->load;
2426 $map->load_neighbours; 2746 $map->load_neighbours;
2427 2747
2428 return unless $self->contr->active; 2748 return unless $self->contr->active;
2429 $self->activate_recursive;
2430 2749
2431 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2432 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2433} 2752 # entering was successful
2753 delete $self->{_link_recursion};
2754 # only activate afterwards, to support waiting in hooks
2755 $self->activate_recursive;
2756 }
2434 2757
2758}
2759
2435=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2436 2761
2437Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2438her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2439that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2440the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
2441be called at the end of this process. 2766be called at the end of this process.
2442 2767
2768Note that $check will be called with a potentially non-loaded map, so if
2769it needs a loaded map it has to call C<< ->load >>.
2770
2443=cut 2771=cut
2444 2772
2445our $GOTOGEN; 2773our $GOTOGEN;
2446 2774
2447sub cf::object::player::goto { 2775sub cf::object::player::goto {
2448 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2449 2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2783
2450 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2451 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2452 2786
2453 $self->enter_link; 2787 $self->enter_link;
2454 2788
2455 (async { 2789 (async {
2790 $Coro::current->{desc} = "player::goto $path $x $y";
2791
2456 # *tag paths override both path and x|y 2792 # *tag paths override both path and x|y
2457 if ($path =~ /^\*(.*)$/) { 2793 if ($path =~ /^\*(.*)$/) {
2458 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2794 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2459 my $ob = $obs[rand @obs]; 2795 my $ob = $obs[rand @obs];
2460 2796
2475 my $map = eval { 2811 my $map = eval {
2476 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2477 2813
2478 if ($map) { 2814 if ($map) {
2479 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2480 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2481 } else { 2817 } else {
2482 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2483 } 2819 }
2484 2820
2485 $map 2821 $map
2493 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2494 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2495 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2496 } 2832 }
2497 2833
2498 $done->() if $done; 2834 $done->($self) if $done;
2499 })->prio (1); 2835 })->prio (1);
2500} 2836}
2501 2837
2502=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2503 2839
2523} 2859}
2524 2860
2525sub prepare_random_map { 2861sub prepare_random_map {
2526 my ($exit) = @_; 2862 my ($exit) = @_;
2527 2863
2528 my $guard = cf::lock_acquire "exit_prepare:$exit";
2529
2530 # all this does is basically replace the /! path by 2864 # all this does is basically replace the /! path by
2531 # a new random map path (?random/...) with a seed 2865 # a new random map path (?random/...) with a seed
2532 # that depends on the exit object 2866 # that depends on the exit object
2533 2867
2534 my $rmp = parse_random_map_params $exit->msg; 2868 my $rmp = parse_random_map_params $exit->msg;
2536 if ($exit->map) { 2870 if ($exit->map) {
2537 $rmp->{region} = $exit->region->name; 2871 $rmp->{region} = $exit->region->name;
2538 $rmp->{origin_map} = $exit->map->path; 2872 $rmp->{origin_map} = $exit->map->path;
2539 $rmp->{origin_x} = $exit->x; 2873 $rmp->{origin_x} = $exit->x;
2540 $rmp->{origin_y} = $exit->y; 2874 $rmp->{origin_y} = $exit->y;
2875
2876 $exit->map->touch;
2541 } 2877 }
2542 2878
2543 $rmp->{random_seed} ||= $exit->random_seed; 2879 $rmp->{random_seed} ||= $exit->random_seed;
2544 2880
2545 my $data = cf::to_json $rmp; 2881 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2546 my $md5 = Digest::MD5::md5_hex $data; 2882 my $md5 = Digest::MD5::md5_hex $data;
2547 my $meta = "$RANDOMDIR/$md5.meta"; 2883 my $meta = "$RANDOMDIR/$md5.meta";
2548 2884
2549 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2885 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2550 aio_write $fh, 0, (length $data), $data, 0; 2886 aio_write $fh, 0, (length $data), $data, 0;
2551 undef $fh; 2887 undef $fh;
2552 aio_rename "$meta~", $meta; 2888 aio_rename "$meta~", $meta;
2553 2889
2890 my $slaying = "?random/$md5";
2891
2892 if ($exit->valid) {
2554 $exit->slaying ("?random/$md5"); 2893 $exit->slaying ("?random/$md5");
2555 $exit->msg (undef); 2894 $exit->msg (undef);
2895 }
2556 } 2896 }
2557} 2897}
2558 2898
2559sub cf::object::player::enter_exit { 2899sub cf::object::player::enter_exit {
2560 my ($self, $exit) = @_; 2900 my ($self, $exit) = @_;
2561 2901
2562 return unless $self->type == cf::PLAYER; 2902 return unless $self->type == cf::PLAYER;
2563 2903
2564 if ($exit->slaying eq "/!") {
2565 #TODO: this should de-fi-ni-te-ly not be a sync-job
2566 # the problem is that $exit might not survive long enough
2567 # so it needs to be done right now, right here
2568 cf::sync_job { prepare_random_map $exit };
2569 }
2570
2571 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2572 my $hp = $exit->stats->hp;
2573 my $sp = $exit->stats->sp;
2574
2575 $self->enter_link; 2904 $self->enter_link;
2576 2905
2577 # if exit is damned, update players death & WoR home-position
2578 $self->contr->savebed ($slaying, $hp, $sp)
2579 if $exit->flag (FLAG_DAMNED);
2580
2581 (async { 2906 (async {
2582 $self->deactivate_recursive; # just to be sure 2907 $Coro::current->{desc} = "enter_exit";
2908
2583 unless (eval { 2909 unless (eval {
2910 $self->deactivate_recursive; # just to be sure
2911
2912 # random map handling
2913 {
2914 my $guard = cf::lock_acquire "exit_prepare:$exit";
2915
2916 prepare_random_map $exit
2917 if $exit->slaying eq "/!";
2918 }
2919
2920 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2921 my $x = $exit->stats->hp;
2922 my $y = $exit->stats->sp;
2923
2584 $self->goto ($slaying, $hp, $sp); 2924 $self->goto ($map, $x, $y);
2585 2925
2926 # if exit is damned, update players death & WoR home-position
2927 $self->contr->savebed ($map, $x, $y)
2928 if $exit->flag (cf::FLAG_DAMNED);
2929
2586 1; 2930 1
2587 }) { 2931 }) {
2588 $self->message ("Something went wrong deep within the crossfire server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2589 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2590 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2591 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2592 2936
2593 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2594 $self->leave_link; 2938 $self->leave_link;
2595 } 2939 }
2596 })->prio (1); 2940 })->prio (1);
2597} 2941}
2598 2942
2610sub cf::client::send_drawinfo { 2954sub cf::client::send_drawinfo {
2611 my ($self, $text, $flags) = @_; 2955 my ($self, $text, $flags) = @_;
2612 2956
2613 utf8::encode $text; 2957 utf8::encode $text;
2614 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2958 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2959}
2960
2961=item $client->send_big_packet ($pkt)
2962
2963Like C<send_packet>, but tries to compress large packets, and fragments
2964them as required.
2965
2966=cut
2967
2968our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2969
2970sub cf::client::send_big_packet {
2971 my ($self, $pkt) = @_;
2972
2973 # try lzf for large packets
2974 $pkt = "lzf " . Compress::LZF::compress $pkt
2975 if 1024 <= length $pkt and $self->{can_lzf};
2976
2977 # split very large packets
2978 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2979 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2980 $pkt = "frag";
2981 }
2982
2983 $self->send_packet ($pkt);
2615} 2984}
2616 2985
2617=item $client->send_msg ($channel, $msg, $color, [extra...]) 2986=item $client->send_msg ($channel, $msg, $color, [extra...])
2618 2987
2619Send a drawinfo or msg packet to the client, formatting the msg for the 2988Send a drawinfo or msg packet to the client, formatting the msg for the
2621the message, with C<log> being the default. If C<$color> is negative, suppress 2990the message, with C<log> being the default. If C<$color> is negative, suppress
2622the message unless the client supports the msg packet. 2991the message unless the client supports the msg packet.
2623 2992
2624=cut 2993=cut
2625 2994
2995# non-persistent channels (usually the info channel)
2626our %CHANNEL = ( 2996our %CHANNEL = (
2997 "c/motd" => {
2998 id => "infobox",
2999 title => "MOTD",
3000 reply => undef,
3001 tooltip => "The message of the day",
3002 },
2627 "c/identify" => { 3003 "c/identify" => {
2628 id => "identify", 3004 id => "infobox",
2629 title => "Identify", 3005 title => "Identify",
2630 reply => undef, 3006 reply => undef,
2631 tooltip => "Items recently identified", 3007 tooltip => "Items recently identified",
2632 }, 3008 },
2633 "c/examine" => { 3009 "c/examine" => {
2634 id => "examine", 3010 id => "infobox",
2635 title => "Examine", 3011 title => "Examine",
2636 reply => undef, 3012 reply => undef,
2637 tooltip => "Signs and other items you examined", 3013 tooltip => "Signs and other items you examined",
2638 }, 3014 },
3015 "c/shopinfo" => {
3016 id => "infobox",
3017 title => "Shop Info",
3018 reply => undef,
3019 tooltip => "What your bargaining skill tells you about the shop",
3020 },
3021 "c/book" => {
3022 id => "infobox",
3023 title => "Book",
3024 reply => undef,
3025 tooltip => "The contents of a note or book",
3026 },
3027 "c/lookat" => {
3028 id => "infobox",
3029 title => "Look",
3030 reply => undef,
3031 tooltip => "What you saw there",
3032 },
3033 "c/who" => {
3034 id => "infobox",
3035 title => "Players",
3036 reply => undef,
3037 tooltip => "Shows players who are currently online",
3038 },
3039 "c/body" => {
3040 id => "infobox",
3041 title => "Body Parts",
3042 reply => undef,
3043 tooltip => "Shows which body parts you posess and are available",
3044 },
3045 "c/statistics" => {
3046 id => "infobox",
3047 title => "Statistics",
3048 reply => undef,
3049 tooltip => "Shows your primary statistics",
3050 },
3051 "c/skills" => {
3052 id => "infobox",
3053 title => "Skills",
3054 reply => undef,
3055 tooltip => "Shows your experience per skill and item power",
3056 },
3057 "c/shopitems" => {
3058 id => "infobox",
3059 title => "Shop Items",
3060 reply => undef,
3061 tooltip => "Shows the items currently for sale in this shop",
3062 },
3063 "c/resistances" => {
3064 id => "infobox",
3065 title => "Resistances",
3066 reply => undef,
3067 tooltip => "Shows your resistances",
3068 },
3069 "c/pets" => {
3070 id => "infobox",
3071 title => "Pets",
3072 reply => undef,
3073 tooltip => "Shows information abotu your pets/a specific pet",
3074 },
3075 "c/perceiveself" => {
3076 id => "infobox",
3077 title => "Perceive Self",
3078 reply => undef,
3079 tooltip => "You gained detailed knowledge about yourself",
3080 },
3081 "c/uptime" => {
3082 id => "infobox",
3083 title => "Uptime",
3084 reply => undef,
3085 tooltip => "How long the server has been running since last restart",
3086 },
3087 "c/mapinfo" => {
3088 id => "infobox",
3089 title => "Map Info",
3090 reply => undef,
3091 tooltip => "Information related to the maps",
3092 },
3093 "c/party" => {
3094 id => "party",
3095 title => "Party",
3096 reply => "gsay ",
3097 tooltip => "Messages and chat related to your party",
3098 },
3099 "c/death" => {
3100 id => "death",
3101 title => "Death",
3102 reply => undef,
3103 tooltip => "Reason for and more info about your most recent death",
3104 },
3105 "c/say" => $SAY_CHANNEL,
3106 "c/chat" => $CHAT_CHANNEL,
2639); 3107);
2640 3108
2641sub cf::client::send_msg { 3109sub cf::client::send_msg {
2642 my ($self, $channel, $msg, $color, @extra) = @_; 3110 my ($self, $channel, $msg, $color, @extra) = @_;
2643 3111
2644 $msg = $self->pl->expand_cfpod ($msg); 3112 $msg = $self->pl->expand_cfpod ($msg)
3113 unless $color & cf::NDI_VERBATIM;
2645 3114
2646 $color &= cf::NDI_CLIENT_MASK; # just in case... 3115 $color &= cf::NDI_CLIENT_MASK; # just in case...
2647 3116
2648 # check predefined channels, for the benefit of C 3117 # check predefined channels, for the benefit of C
2649 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3118 if ($CHANNEL{$channel}) {
3119 $channel = $CHANNEL{$channel};
2650 3120
3121 $self->ext_msg (channel_info => $channel);
3122 $channel = $channel->{id};
3123
2651 if (ref $channel) { 3124 } elsif (ref $channel) {
2652 # send meta info to client, if not yet sent 3125 # send meta info to client, if not yet sent
2653 unless (exists $self->{channel}{$channel->{id}}) { 3126 unless (exists $self->{channel}{$channel->{id}}) {
2654 $self->{channel}{$channel->{id}} = $channel; 3127 $self->{channel}{$channel->{id}} = $channel;
2655 $self->ext_msg (channel_info => $channel) 3128 $self->ext_msg (channel_info => $channel);
2656 if $self->can_msg;
2657 } 3129 }
2658 3130
2659 $channel = $channel->{id}; 3131 $channel = $channel->{id};
2660 } 3132 }
2661 3133
2662 return unless @extra || length $msg; 3134 return unless @extra || length $msg;
2663 3135
2664 if ($self->can_msg) {
2665 # default colour, mask it out 3136 # default colour, mask it out
2666 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3137 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2667 if $color & cf::NDI_DEF; 3138 if $color & cf::NDI_DEF;
2668 3139
2669 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3140 my $pkt = "msg "
3141 . $self->{json_coder}->encode (
2670 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3142 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2671 } else { 3143 );
2672 if ($color >= 0) {
2673 # replace some tags by gcfclient-compatible ones
2674 for ($msg) {
2675 1 while
2676 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2677 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2678 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2679 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2680 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2681 }
2682 3144
2683 $color &= cf::NDI_COLOR_MASK; 3145 $self->send_big_packet ($pkt);
2684
2685 utf8::encode $msg;
2686
2687 if (0 && $msg =~ /\[/) {
2688 # COMMAND/INFO
2689 $self->send_packet ("drawextinfo $color 10 8 $msg")
2690 } else {
2691 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2692 $self->send_packet ("drawinfo $color $msg")
2693 }
2694 }
2695 }
2696} 3146}
2697 3147
2698=item $client->ext_msg ($type, @msg) 3148=item $client->ext_msg ($type, @msg)
2699 3149
2700Sends an ext event to the client. 3150Sends an ext event to the client.
2703 3153
2704sub cf::client::ext_msg($$@) { 3154sub cf::client::ext_msg($$@) {
2705 my ($self, $type, @msg) = @_; 3155 my ($self, $type, @msg) = @_;
2706 3156
2707 if ($self->extcmd == 2) { 3157 if ($self->extcmd == 2) {
2708 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3158 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2709 } elsif ($self->extcmd == 1) { # TODO: remove 3159 } elsif ($self->extcmd == 1) { # TODO: remove
2710 push @msg, msgtype => "event_$type"; 3160 push @msg, msgtype => "event_$type";
2711 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3161 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2712 } 3162 }
2713} 3163}
2714 3164
2715=item $client->ext_reply ($msgid, @msg) 3165=item $client->ext_reply ($msgid, @msg)
2716 3166
2720 3170
2721sub cf::client::ext_reply($$@) { 3171sub cf::client::ext_reply($$@) {
2722 my ($self, $id, @msg) = @_; 3172 my ($self, $id, @msg) = @_;
2723 3173
2724 if ($self->extcmd == 2) { 3174 if ($self->extcmd == 2) {
2725 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3175 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2726 } elsif ($self->extcmd == 1) { 3176 } elsif ($self->extcmd == 1) {
2727 #TODO: version 1, remove 3177 #TODO: version 1, remove
2728 unshift @msg, msgtype => "reply", msgid => $id; 3178 unshift @msg, msgtype => "reply", msgid => $id;
2729 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3179 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2730 } 3180 }
2731} 3181}
2732 3182
2733=item $success = $client->query ($flags, "text", \&cb) 3183=item $success = $client->query ($flags, "text", \&cb)
2734 3184
2805 3255
2806 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
2807 if $reply; 3257 if $reply;
2808 3258
2809 } else { 3259 } else {
2810 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2811 } 3261 }
2812 3262
2813 cf::override; 3263 cf::override;
2814 }, 3264 },
2815); 3265);
2835 3285
2836 $coro 3286 $coro
2837} 3287}
2838 3288
2839cf::client->attach ( 3289cf::client->attach (
2840 on_destroy => sub { 3290 on_client_destroy => sub {
2841 my ($ns) = @_; 3291 my ($ns) = @_;
2842 3292
2843 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3293 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2844 }, 3294 },
2845); 3295);
2861our $safe_hole = new Safe::Hole; 3311our $safe_hole = new Safe::Hole;
2862 3312
2863$SIG{FPE} = 'IGNORE'; 3313$SIG{FPE} = 'IGNORE';
2864 3314
2865$safe->permit_only (Opcode::opset qw( 3315$safe->permit_only (Opcode::opset qw(
2866 :base_core :base_mem :base_orig :base_math 3316 :base_core :base_mem :base_orig :base_math :base_loop
2867 grepstart grepwhile mapstart mapwhile 3317 grepstart grepwhile mapstart mapwhile
2868 sort time 3318 sort time
2869)); 3319));
2870 3320
2871# here we export the classes and methods available to script code 3321# here we export the classes and methods available to script code
2873=pod 3323=pod
2874 3324
2875The following functions and methods are available within a safe environment: 3325The following functions and methods are available within a safe environment:
2876 3326
2877 cf::object 3327 cf::object
2878 contr pay_amount pay_player map x y force_find force_add 3328 contr pay_amount pay_player map x y force_find force_add destroy
2879 insert remove name archname title slaying race decrease_ob_nr 3329 insert remove name archname title slaying race decrease split
3330 value
2880 3331
2881 cf::object::player 3332 cf::object::player
2882 player 3333 player
2883 3334
2884 cf::player 3335 cf::player
2889 3340
2890=cut 3341=cut
2891 3342
2892for ( 3343for (
2893 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3344 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2894 insert remove inv name archname title slaying race 3345 insert remove inv nrof name archname title slaying race
2895 decrease_ob_nr)], 3346 decrease split destroy change_exp value msg lore send_msg)],
2896 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
2897 ["cf::player" => qw(peaceful)], 3348 ["cf::player" => qw(peaceful send_msg)],
2898 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
2899) { 3350) {
2900 no strict 'refs';
2901 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
2902 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2903 for @funs; 3353 for @funs;
2904} 3354}
2905 3355
2920 3370
2921 my $qcode = $code; 3371 my $qcode = $code;
2922 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3372 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2923 $qcode =~ s/\n/\\n/g; 3373 $qcode =~ s/\n/\\n/g;
2924 3374
3375 %vars = (_dummy => 0) unless %vars;
3376
3377 my @res;
2925 local $_; 3378 local $_;
2926 local @safe::cf::_safe_eval_args = values %vars;
2927 3379
2928 my $eval = 3380 my $eval =
2929 "do {\n" 3381 "do {\n"
2930 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3382 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2931 . "#line 0 \"{$qcode}\"\n" 3383 . "#line 0 \"{$qcode}\"\n"
2932 . $code 3384 . $code
2933 . "\n}" 3385 . "\n}"
2934 ; 3386 ;
2935 3387
3388 if ($CFG{safe_eval}) {
2936 sub_generation_inc; 3389 sub_generation_inc;
3390 local @safe::cf::_safe_eval_args = values %vars;
2937 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3391 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2938 sub_generation_inc; 3392 sub_generation_inc;
3393 } else {
3394 local @cf::_safe_eval_args = values %vars;
3395 @res = wantarray ? eval eval : scalar eval $eval;
3396 }
2939 3397
2940 if ($@) { 3398 if ($@) {
2941 warn "$@"; 3399 warn "$@",
2942 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
2943 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
2944 } 3402 }
2945 3403
2946 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
2947} 3405}
2948 3406
2962=cut 3420=cut
2963 3421
2964sub register_script_function { 3422sub register_script_function {
2965 my ($fun, $cb) = @_; 3423 my ($fun, $cb) = @_;
2966 3424
2967 no strict 'refs'; 3425 $fun = "safe::$fun" if $CFG{safe_eval};
2968 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3426 *$fun = $safe_hole->wrap ($cb);
2969} 3427}
2970 3428
2971=back 3429=back
2972 3430
2973=cut 3431=cut
2982 # for this (global event?) 3440 # for this (global event?)
2983 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
2984 3442
2985 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2986 3444
2987 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
2988 3446
2989 my $facedata; 3447 my $facedata = decode_storable load_file $path;
2990 0 < aio_load $path, $facedata
2991 or die "$path: $!";
2992
2993 $facedata = Coro::Storable::thaw $facedata;
2994 3448
2995 $facedata->{version} == 2 3449 $facedata->{version} == 2
2996 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
2997 3451
2998 # patch in the exptable 3452 # patch in the exptable
3453 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
2999 $facedata->{resource}{"res/exp_table"} = { 3454 $facedata->{resource}{"res/exp_table"} = {
3000 type => FT_RSRC, 3455 type => FT_RSRC,
3001 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3456 data => $exp_table,
3457 hash => (Digest::MD5::md5 $exp_table),
3002 }; 3458 };
3003 cf::cede_to_tick; 3459 cf::cede_to_tick;
3004 3460
3005 { 3461 {
3006 my $faces = $facedata->{faceinfo}; 3462 my $faces = $facedata->{faceinfo};
3007 3463
3008 while (my ($face, $info) = each %$faces) { 3464 while (my ($face, $info) = each %$faces) {
3009 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3465 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3466
3010 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3011 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3012 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3013 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3014 3472
3015 cf::cede_to_tick; 3473 cf::cede_to_tick;
3016 } 3474 }
3017 3475
3018 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
3019 next unless $info->{smooth}; 3477 next unless $info->{smooth};
3478
3020 my $idx = cf::face::find $face 3479 my $idx = cf::face::find $face
3021 or next; 3480 or next;
3481
3022 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3023 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3024 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3025 } else { 3485 } else {
3026 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3027 } 3487 }
3028 3488
3029 cf::cede_to_tick; 3489 cf::cede_to_tick;
3030 } 3490 }
3031 } 3491 }
3040 3500
3041 cf::anim::invalidate_all; # d'oh 3501 cf::anim::invalidate_all; # d'oh
3042 } 3502 }
3043 3503
3044 { 3504 {
3045 # TODO: for gcfclient pleasure, we should give resources
3046 # that gcfclient doesn't grok a >10000 face index.
3047 my $res = $facedata->{resource}; 3505 my $res = $facedata->{resource};
3048 3506
3049 my $soundconf = delete $res->{"res/sound.conf"};
3050
3051 while (my ($name, $info) = each %$res) { 3507 while (my ($name, $info) = each %$res) {
3508 if (defined $info->{type}) {
3052 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3053 my $data;
3054 3510
3055 if ($info->{type} & 1) { 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3056 # prepend meta info 3512 cf::face::set_type $idx, $info->{type};
3057
3058 my $meta = $enc->encode ({
3059 name => $name,
3060 %{ $info->{meta} || {} },
3061 });
3062
3063 $data = pack "(w/a*)*", $meta, $info->{data};
3064 } else { 3513 } else {
3065 $data = $info->{data}; 3514 $RESOURCE{$name} = $info; # unused
3066 } 3515 }
3067 3516
3068 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3069 cf::face::set_type $idx, $info->{type};
3070
3071 cf::cede_to_tick; 3517 cf::cede_to_tick;
3072 } 3518 }
3073
3074 if ($soundconf) {
3075 $soundconf = $enc->decode (delete $soundconf->{data});
3076
3077 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3078 my $sound = $soundconf->{compat}[$_]
3079 or next;
3080
3081 my $face = cf::face::find "sound/$sound->[1]";
3082 cf::sound::set $sound->[0] => $face;
3083 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3084 }
3085
3086 while (my ($k, $v) = each %{$soundconf->{event}}) {
3087 my $face = cf::face::find "sound/$v";
3088 cf::sound::set $k => $face;
3089 }
3090 }
3091 } 3519 }
3520
3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3092 3522
3093 1 3523 1
3094} 3524}
3095 3525
3096register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3098 3528
3099 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
3100 $ns->fx_want ($k, $v); 3530 $ns->fx_want ($k, $v);
3101 } 3531 }
3102}; 3532};
3533
3534sub load_resource_file($) {
3535 my $guard = lock_acquire "load_resource_file";
3536
3537 my $status = load_resource_file_ $_[0];
3538 get_slot 0.1, 100;
3539 cf::arch::commit_load;
3540
3541 $status
3542}
3103 3543
3104sub reload_regions { 3544sub reload_regions {
3105 # HACK to clear player env face cache, we need some signal framework 3545 # HACK to clear player env face cache, we need some signal framework
3106 # for this (global event?) 3546 # for this (global event?)
3107 %ext::player_env::MUSIC_FACE_CACHE = (); 3547 %ext::player_env::MUSIC_FACE_CACHE = ();
3121} 3561}
3122 3562
3123sub reload_archetypes { 3563sub reload_archetypes {
3124 load_resource_file "$DATADIR/archetypes" 3564 load_resource_file "$DATADIR/archetypes"
3125 or die "unable to load archetypes\n"; 3565 or die "unable to load archetypes\n";
3126 #d# NEED to laod twice to resolve forward references
3127 # this really needs to be done in an extra post-pass
3128 # (which needs to be synchronous, so solve it differently)
3129 load_resource_file "$DATADIR/archetypes"
3130 or die "unable to load archetypes\n";
3131} 3566}
3132 3567
3133sub reload_treasures { 3568sub reload_treasures {
3134 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3135 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3136} 3571}
3137 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3138sub reload_resources { 3593sub reload_resources {
3139 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3140 3595
3596 reload_exp_table;
3597 reload_materials;
3598 reload_facedata;
3599 reload_sound;
3600 reload_archetypes;
3141 reload_regions; 3601 reload_regions;
3142 reload_facedata;
3143 #reload_archetypes;#d#
3144 reload_archetypes;
3145 reload_treasures; 3602 reload_treasures;
3146 3603
3147 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3148}
3149
3150sub init {
3151 reload_resources;
3152} 3605}
3153 3606
3154sub reload_config { 3607sub reload_config {
3155 open my $fh, "<:utf8", "$CONFDIR/config" 3608 trace "reloading config file...\n";
3156 or return;
3157 3609
3158 local $/; 3610 my $config = load_file "$CONFDIR/config";
3159 *CFG = YAML::Syck::Load <$fh>; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3160 3613
3161 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3162 3615
3163 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3164 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3165 3618
3166 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
3170 }; 3623 };
3171 warn $@ if $@; 3624 warn $@ if $@;
3172 } 3625 }
3173} 3626}
3174 3627
3628sub pidfile() {
3629 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3630 or die "$PIDFILE: $!";
3631 flock $fh, &Fcntl::LOCK_EX
3632 or die "$PIDFILE: flock: $!";
3633 $fh
3634}
3635
3636# make sure only one server instance is running at any one time
3637sub atomic {
3638 my $fh = pidfile;
3639
3640 my $pid = <$fh>;
3641 kill 9, $pid if $pid > 0;
3642
3643 seek $fh, 0, 0;
3644 print $fh $$;
3645}
3646
3647sub main_loop {
3648 trace "EV::loop starting\n";
3649 if (1) {
3650 EV::loop;
3651 }
3652 trace "EV::loop returned\n";
3653 goto &main_loop unless $REALLY_UNLOOP;
3654}
3655
3175sub main { 3656sub main {
3657 cf::init_globals; # initialise logging
3658
3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3663
3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3665
3176 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3177 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
3178 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3668 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3179 (async { 3669 (async {
3180 Event::one_event; 3670 $Coro::current->{desc} = "IDLE BUG HANDLER";
3671 EV::loop EV::LOOP_ONESHOT;
3181 })->prio (Coro::PRIO_MAX); 3672 })->prio (Coro::PRIO_MAX);
3182 }; 3673 };
3183 3674
3675 evthread_start IO::AIO::poll_fileno;
3676
3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3684 cf::load_settings;
3685
3686 reload_resources;
3184 reload_config; 3687 reload_config;
3185 db_init; 3688 db_init;
3689
3690 cf::init_uuid;
3691 cf::init_signals;
3692 cf::init_skills;
3693
3694 cf::init_beforeplay;
3695
3696 atomic;
3697
3186 load_extensions; 3698 load_extensions;
3187 3699
3188 $TICK_WATCHER->start; 3700 utime time, time, $RUNTIMEFILE;
3189 Event::loop; 3701
3702 # no (long-running) fork's whatsoever before this point(!)
3703 use POSIX ();
3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3705
3706 cf::_post_init 0;
3707 };
3708
3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3717 goto &main_loop;
3190} 3718}
3191 3719
3192############################################################################# 3720#############################################################################
3193# initialisation and cleanup 3721# initialisation and cleanup
3194 3722
3195# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3196BEGIN { 3724BEGIN {
3725 our %SIGWATCHER = ();
3197 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3198 Event->signal ( 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3199 reentrant => 0,
3200 data => WF_AUTOCANCEL,
3201 signal => $signal,
3202 prio => 0,
3203 cb => sub {
3204 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3205 },
3206 ); 3729 };
3207 } 3730 }
3208} 3731}
3209 3732
3210sub write_runtime { 3733sub write_runtime_sync {
3211 my $runtime = "$LOCALDIR/runtime"; 3734 my $t0 = AE::time;
3212 3735
3213 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3214 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3215 3738
3216 IO::AIO::aio_utime $runtime, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3217 3740
3218 my $guard = cf::lock_acquire "write_runtime"; 3741 my $guard = cf::lock_acquire "write_runtime";
3219 3742
3220 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3743 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3221 or return; 3744 or return;
3222 3745
3223 my $value = $cf::RUNTIME + 90 + 10; 3746 my $value = $cf::RUNTIME + 90 + 10;
3224 # 10 is the runtime save interval, for a monotonic clock 3747 # 10 is the runtime save interval, for a monotonic clock
3225 # 60 allows for the watchdog to kill the server. 3748 # 60 allows for the watchdog to kill the server.
3235 aio_utime $fh, undef, undef; 3758 aio_utime $fh, undef, undef;
3236 3759
3237 close $fh 3760 close $fh
3238 or return; 3761 or return;
3239 3762
3240 aio_rename "$runtime~", $runtime 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3241 and return; 3764 and return;
3242 3765
3243 warn "runtime file written.\n"; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3244 3767
3245 1 3768 1
3769}
3770
3771our $uuid_lock;
3772our $uuid_skip;
3773
3774sub write_uuid_sync($) {
3775 $uuid_skip ||= $_[0];
3776
3777 return if $uuid_lock;
3778 local $uuid_lock = 1;
3779
3780 my $uuid = "$LOCALDIR/uuid";
3781
3782 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3783 or return;
3784
3785 my $value = uuid_seq uuid_cur;
3786
3787 unless ($value) {
3788 info "cowardly refusing to write zero uuid value!\n";
3789 return;
3790 }
3791
3792 my $value = uuid_str $value + $uuid_skip;
3793 $uuid_skip = 0;
3794
3795 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3796 and return;
3797
3798 # always fsync - this file is important
3799 aio_fsync $fh
3800 and return;
3801
3802 close $fh
3803 or return;
3804
3805 aio_rename "$uuid~", $uuid
3806 and return;
3807
3808 trace "uuid file written ($value).\n";
3809
3810 1
3811
3812}
3813
3814sub write_uuid($$) {
3815 my ($skip, $sync) = @_;
3816
3817 $sync ? write_uuid_sync $skip
3818 : async { write_uuid_sync $skip };
3246} 3819}
3247 3820
3248sub emergency_save() { 3821sub emergency_save() {
3249 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3250 3823
3251 warn "enter emergency perl save\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3252 3830
3253 cf::sync_job { 3831 cf::sync_job {
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3254 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3255 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3256 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3257 warn "begin emergency player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3258 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3259 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3260 $pl->valid or next; 3840 $pl->valid or next;
3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3261 $pl->save; 3842 $pl->save;
3262 } 3843 }
3263 warn "end emergency player save\n"; 3844 info "emergency_perl_save: end player save\n";
3264 3845
3265 warn "begin emergency map save\n"; 3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 info "emergency_perl_save: begin map save\n";
3266 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3267 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3268 $map->valid or next; 3851 $map->valid or next;
3269 $map->save; 3852 $map->save;
3270 } 3853 }
3271 warn "end emergency map save\n"; 3854 info "emergency_perl_save: end map save\n";
3272 3855
3273 warn "begin emergency database checkpoint\n"; 3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 info "emergency_perl_save: begin database checkpoint\n";
3274 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3275 warn "end emergency database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3861
3862 info "emergency_perl_save: begin write uuid\n";
3863 write_uuid_sync 1;
3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3276 }; 3884 };
3277 3885
3278 warn "leave emergency perl save\n"; 3886 info "emergency_perl_save: leave\n";
3279} 3887}
3280 3888
3281sub post_cleanup { 3889sub post_cleanup {
3282 my ($make_core) = @_; 3890 my ($make_core) = @_;
3283 3891
3892 IO::AIO::flush;
3893
3284 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3285 if $make_core; 3895 if $make_core;
3896
3897 my $fh = pidfile;
3898 unlink $PIDFILE if <$fh> == $$;
3899}
3900
3901# a safer delete_package, copied from Symbol
3902sub clear_package($) {
3903 my $pkg = shift;
3904
3905 # expand to full symbol table name if needed
3906 unless ($pkg =~ /^main::.*::$/) {
3907 $pkg = "main$pkg" if $pkg =~ /^::/;
3908 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3909 $pkg .= '::' unless $pkg =~ /::$/;
3910 }
3911
3912 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3913 my $stem_symtab = *{$stem}{HASH};
3914
3915 defined $stem_symtab and exists $stem_symtab->{$leaf}
3916 or return;
3917
3918 # clear all symbols
3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3920 for my $name (keys %$leaf_symtab) {
3921 _gv_clear *{"$pkg$name"};
3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3923 }
3286} 3924}
3287 3925
3288sub do_reload_perl() { 3926sub do_reload_perl() {
3289 # can/must only be called in main 3927 # can/must only be called in main
3290 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3291 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3292 return; 3930 return;
3293 } 3931 }
3294 3932
3295 warn "reloading..."; 3933 return if $RELOAD++;
3296 3934
3297 warn "entering sync_job"; 3935 my $t1 = AE::time;
3298 3936
3937 while ($RELOAD) {
3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3940
3941 trace "perl_reload: entering sync_job";
3942
3299 cf::sync_job { 3943 cf::sync_job {
3300 cf::write_runtime; # external watchdog should not bark
3301 cf::emergency_save; 3944 #cf::emergency_save;
3302 cf::write_runtime; # external watchdog should not bark
3303 3945
3304 warn "syncing database to disk";
3305 BDB::db_env_txn_checkpoint $DB_ENV;
3306
3307 # if anything goes wrong in here, we should simply crash as we already saved
3308
3309 warn "cancelling all WF_AUTOCANCEL watchers";
3310 for (Event::all_watchers) {
3311 $_->cancel if $_->data & WF_AUTOCANCEL;
3312 }
3313
3314 warn "flushing outstanding aio requests";
3315 for (;;) {
3316 BDB::flush;
3317 IO::AIO::flush;
3318 Coro::cede;
3319 last unless IO::AIO::nreqs || BDB::nreqs;
3320 warn "iterate...";
3321 }
3322
3323 ++$RELOAD;
3324
3325 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3326 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3327 %EXT_CORO = (); 3948 %EXT_CORO = ();
3328 3949
3329 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3330 %COMMAND = (); 3951 %COMMAND = ();
3331 3952
3332 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3333 %EXTCMD = (); 3954 %EXTCMD = ();
3334 %EXTICMD = (); 3955 %EXTICMD = ();
3335 3956
3336 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3337 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3338 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3339 3960
3340 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3341 eval { 3962 eval {
3342 $cb->($pkg); 3963 $cb->($pkg);
3343 1 3964 1
3344 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3966 }
3967
3968 trace "... clearing $pkg";
3969 clear_package $pkg;
3345 } 3970 }
3346 3971
3347 warn "... nuking $pkg";
3348 Symbol::delete_package $pkg;
3349 }
3350
3351 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3352 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3353 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3354 3975
3355 warn "... unloading $k"; 3976 trace "... unloading $k";
3356 delete $INC{$k}; 3977 delete $INC{$k};
3357 3978
3358 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3359 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3360 3981
3361 if (my $cb = $k->can ("unload_module")) { 3982 if (my $cb = $k->can ("unload_module")) {
3362 $cb->(); 3983 $cb->();
3984 }
3985
3986 clear_package $k;
3363 } 3987 }
3364 3988
3365 Symbol::delete_package $k;
3366 }
3367
3368 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3369 Symbol::delete_package "safe::$_" 3990 clear_package "safe::$_"
3370 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3371 3992
3372 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3373 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3374 delete $INC{"cf/pod.pm"}; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3375 3996
3376 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3377 # and global variables created in xs 3998 # and global variables created in xs
3378 #Symbol::delete_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3379 4000
3380 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3381 4002
3382 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3383 require cf; 4004 require cf;
3384 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4005 cf::_connect_to_perl_1;
3385 4006
3386 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3387 cf::reload_config; 4008 cf::reload_config;
3388 4009
3389 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3390 cf::load_extensions; 4011 cf::load_extensions;
3391 4012
4013 if ($REATTACH_ON_RELOAD) {
3392 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3393 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3394 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3395 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3396 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3397 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
4020 }
3398 4021
3399 warn "leaving sync_job"; 4022 cf::_post_init 1;
3400 4023
4024 trace "perl_reload: leaving sync_job";
4025
3401 1 4026 1
3402 } or do { 4027 } or do {
3403 warn $@; 4028 error $@;
3404 warn "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3405 exit 1; 4030 };
4031
4032 --$RELOAD;
3406 }; 4033 }
3407 4034
3408 warn "reloaded"; 4035 $t1 = AE::time - $t1;
4036 info "perl_reload: completed in ${t1}s\n";
3409}; 4037};
3410 4038
3411our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3412 4040
3413sub reload_perl() { 4041sub reload_perl() {
3414 # doing reload synchronously and two reloads happen back-to-back, 4042 # doing reload synchronously and two reloads happen back-to-back,
3415 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3416 4044
3417 $RELOAD_WATCHER ||= Event->timer ( 4045 $RELOAD_WATCHER ||= cf::async {
3418 reentrant => 0, 4046 Coro::AIO::aio_wait cache_extensions;
3419 after => 0, 4047
3420 data => WF_AUTOCANCEL, 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3421 cb => sub {
3422 do_reload_perl; 4049 do_reload_perl;
3423 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
3424 }, 4051 };
3425 ); 4052 };
3426} 4053}
3427 4054
3428register_command "reload" => sub { 4055register_command "reload" => sub {
3429 my ($who, $arg) = @_; 4056 my ($who, $arg) = @_;
3430 4057
3431 if ($who->flag (FLAG_WIZ)) { 4058 if ($who->flag (FLAG_WIZ)) {
3432 $who->message ("reloading server."); 4059 $who->message ("reloading server.");
4060 async {
4061 $Coro::current->{desc} = "perl_reload";
3433 async { reload_perl }; 4062 reload_perl;
4063 };
3434 } 4064 }
3435}; 4065};
3436 4066
3437unshift @INC, $LIBDIR; 4067#############################################################################
3438 4068
3439my $bug_warning = 0; 4069my $bug_warning = 0;
3440 4070
3441our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3442our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3443 4073
3444sub wait_for_tick { 4074sub wait_for_tick() {
3445 return unless $TICK_WATCHER->is_active;
3446 return if $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3447 4076
3448 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3449 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3450 $signal->wait; 4079 $signal->wait;
3451} 4080}
3452 4081
3453sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3454 return unless $TICK_WATCHER->is_active;
3455 return if $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3456 4084
3457 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3458 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3459 $signal->wait; 4087 $signal->wait;
3460} 4088}
3461 4089
3462$TICK_WATCHER = Event->timer ( 4090sub tick {
3463 reentrant => 0,
3464 parked => 1,
3465 prio => 0,
3466 at => $NEXT_TICK || $TICK,
3467 data => WF_AUTOCANCEL,
3468 cb => sub {
3469 if ($Coro::current != $Coro::main) { 4091 if ($Coro::current != $Coro::main) {
3470 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4092 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3471 unless ++$bug_warning > 10; 4093 unless ++$bug_warning > 10;
3472 return; 4094 return;
3473 } 4095 }
3474 4096
3475 $NOW = $tick_start = Event::time;
3476
3477 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3478 4098
3479 $RUNTIME += $TICK; 4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3480 $NEXT_TICK += $TICK;
3481 4100
3482 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3483 $NEXT_RUNTIME_WRITE = $NOW + 10; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3484 Coro::async_pool { 4103 Coro::async_pool {
4104 $Coro::current->{desc} = "runtime saver";
3485 write_runtime 4105 write_runtime_sync
3486 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3487 };
3488 } 4107 };
4108 }
3489 4109
3490 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3491 $sig->send; 4111 $sig->send;
3492 } 4112 }
3493 while (my $sig = shift @WAIT_FOR_TICK) { 4113 while (my $sig = shift @WAIT_FOR_TICK) {
3494 $sig->send; 4114 $sig->send;
3495 } 4115 }
3496 4116
3497 $NOW = Event::time; 4117 $LOAD = ($NOW - $TICK_START) / $TICK;
3498
3499 # if we are delayed by four ticks or more, skip them all
3500 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3501
3502 $TICK_WATCHER->at ($NEXT_TICK);
3503 $TICK_WATCHER->start;
3504
3505 $LOAD = ($NOW - $tick_start) / $TICK;
3506 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4118 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3507 4119
3508 _post_tick; 4120 if (0) {
4121 if ($NEXT_TICK) {
4122 my $jitter = $TICK_START - $NEXT_TICK;
4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4124 debug "jitter $JITTER\n";#d#
4125 }
3509 }, 4126 }
3510); 4127}
3511 4128
3512{ 4129{
4130 # configure BDB
4131
3513 BDB::min_parallel 8; 4132 BDB::min_parallel 16;
3514 BDB::max_poll_time $TICK * 0.1; 4133 BDB::max_poll_reqs $TICK * 0.1;
3515 $BDB_POLL_WATCHER = Event->io ( 4134 $AnyEvent::BDB::WATCHER->priority (1);
3516 reentrant => 0,
3517 fd => BDB::poll_fileno,
3518 poll => 'r',
3519 prio => 0,
3520 data => WF_AUTOCANCEL,
3521 cb => \&BDB::poll_cb,
3522 );
3523
3524 BDB::set_sync_prepare {
3525 my $status;
3526 my $current = $Coro::current;
3527 (
3528 sub {
3529 $status = $!;
3530 $current->ready; undef $current;
3531 },
3532 sub {
3533 Coro::schedule while defined $current;
3534 $! = $status;
3535 },
3536 )
3537 };
3538 4135
3539 unless ($DB_ENV) { 4136 unless ($DB_ENV) {
3540 $DB_ENV = BDB::db_env_create; 4137 $DB_ENV = BDB::db_env_create;
3541 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4138 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3542 | BDB::LOG_AUTOREMOVE, 1); 4139 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4140 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3543 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4141 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3544 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4142 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3545 4143
3546 cf::sync_job { 4144 cf::sync_job {
3547 eval { 4145 eval {
3557 4155
3558 cf::cleanup "db_env_open(db): $@" if $@; 4156 cf::cleanup "db_env_open(db): $@" if $@;
3559 }; 4157 };
3560 } 4158 }
3561 4159
3562 $BDB_DEADLOCK_WATCHER = Event->timer ( 4160 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3563 after => 3,
3564 interval => 1,
3565 hard => 1,
3566 prio => 0,
3567 data => WF_AUTOCANCEL,
3568 cb => sub {
3569 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4161 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3570 },
3571 ); 4162 };
3572 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4163 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3573 after => 11,
3574 interval => 60,
3575 hard => 1,
3576 prio => 0,
3577 data => WF_AUTOCANCEL,
3578 cb => sub {
3579 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4164 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3580 },
3581 ); 4165 };
3582 $BDB_TRICKLE_WATCHER = Event->timer ( 4166 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3583 after => 5,
3584 interval => 10,
3585 hard => 1,
3586 prio => 0,
3587 data => WF_AUTOCANCEL,
3588 cb => sub {
3589 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4167 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3590 },
3591 ); 4168 };
3592} 4169}
3593 4170
3594{ 4171{
4172 # configure IO::AIO
4173
3595 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
3596
3597 undef $Coro::AIO::WATCHER;
3598 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
3599 $AIO_POLL_WATCHER = Event->io ( 4176 undef $AnyEvent::AIO::WATCHER;
3600 reentrant => 0,
3601 data => WF_AUTOCANCEL,
3602 fd => IO::AIO::poll_fileno,
3603 poll => 'r',
3604 prio => 6,
3605 cb => \&IO::AIO::poll_cb,
3606 );
3607} 4177}
3608 4178
3609my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
3610 4181
3611sub _log_backtrace { 4182sub _log_backtrace {
3612 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
3613 4184
3614 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
3615 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3616 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
3617 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
3618 ++$_log_backtrace; 4193 ++$_log_backtrace;
4194 my $perl_bt = Carp::longmess $msg;
3619 async { 4195 async {
4196 $Coro::current->{desc} = "abt $msg";
4197
3620 my @bt = fork_call { 4198 my @bt = fork_call {
3621 @addr = map { sprintf "%x", $_ } @addr; 4199 @addr = map { sprintf "%x", $_ } @addr;
3622 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4200 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3623 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4201 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3624 or die "addr2line: $!"; 4202 or die "addr2line: $!";
3632 } 4210 }
3633 4211
3634 @funcs 4212 @funcs
3635 }; 4213 };
3636 4214
3637 LOG llevInfo, "[ABT] $msg\n"; 4215 LOG llevInfo, "[ABT] $perl_bt\n";
4216 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3638 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
3639 --$_log_backtrace; 4218 --$_log_backtrace;
3640 }; 4219 };
3641 } else { 4220 } else {
3642 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
3643 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3644 } 4223 }
3645} 4224}
3646 4225
3647# load additional modules 4226# load additional modules
3648use cf::pod; 4227require "cf/$_.pm" for @EXTRA_MODULES;
4228cf::_connect_to_perl_2;
3649 4229
3650END { cf::emergency_save } 4230END { cf::emergency_save }
3651 4231
36521 42321
3653 4233

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines