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.406 by root, Mon Dec 17 08:27:44 2007 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines