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.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.565 by root, Sat Apr 30 05:41:17 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 }
970 1167
971 0 1168 0
972} 1169}
973 1170
974=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
975 1172
976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
977 1174
978Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
979 1176
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
1966 2139
1967sub find; 2140sub find;
1968sub find { 2141sub find {
1969 my ($path, $origin) = @_; 2142 my ($path, $origin) = @_;
1970 2143
2144 cf::cede_to_tick;
2145
1971 $path = normalise $path, $origin && $origin->path; 2146 $path = normalise $path, $origin;
1972 2147
1973 cf::lock_wait "map_data:$path";#d#remove 2148 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1974 cf::lock_wait "map_find:$path"; 2149 my $guard2 = cf::lock_acquire "map_find:$path";
1975 2150
1976 $cf::MAP{$path} || do { 2151 $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 2152 my $map = new_from_path cf::map $path
1981 or return; 2153 or return;
1982 2154
1983 $map->{last_save} = $cf::RUNTIME; 2155 $map->{last_save} = $cf::RUNTIME;
1984 2156
1986 or return; 2158 or return;
1987 2159
1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2160 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989 # doing this can freeze the server in a sync job, obviously 2161 # doing this can freeze the server in a sync job, obviously
1990 #$cf::WAIT_FOR_TICK->wait; 2162 #$cf::WAIT_FOR_TICK->wait;
2163 undef $guard2;
1991 undef $guard1; 2164 undef $guard1;
1992 undef $guard2;
1993 $map->reset; 2165 $map->reset;
1994 return find $path; 2166 return find $path;
1995 } 2167 }
1996 2168
1997 $cf::MAP{$path} = $map 2169 $cf::MAP{$path} = $map
1998 } 2170 }
1999} 2171}
2000 2172
2001sub pre_load { } 2173sub pre_load { }
2002sub post_load { } 2174#sub post_load { } # XS
2003 2175
2004sub load { 2176sub load {
2005 my ($self) = @_; 2177 my ($self) = @_;
2006 2178
2007 local $self->{deny_reset} = 1; # loading can take a long time 2179 local $self->{deny_reset} = 1; # loading can take a long time
2019 $self->alloc; 2191 $self->alloc;
2020 2192
2021 $self->pre_load; 2193 $self->pre_load;
2022 cf::cede_to_tick; 2194 cf::cede_to_tick;
2023 2195
2196 if (exists $self->{load_path}) {
2024 my $f = new_from_file cf::object::thawer $self->{load_path}; 2197 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block; 2198 $f->skip_block;
2026 $self->_load_objects ($f) 2199 $self->_load_objects ($f)
2027 or return; 2200 or return;
2028 2201
2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2202 $self->post_load_original
2030 if delete $self->{load_original}; 2203 if delete $self->{load_original};
2031 2204
2032 if (my $uniq = $self->uniq_path) { 2205 if (my $uniq = $self->uniq_path) {
2033 utf8::encode $uniq; 2206 utf8::encode $uniq;
2034 unless (aio_stat $uniq) { 2207 unless (aio_stat $uniq) {
2035 if (my $f = new_from_file cf::object::thawer $uniq) { 2208 if (my $f = new_from_file cf::object::thawer $uniq) {
2036 $self->clear_unique_items; 2209 $self->clear_unique_items;
2037 $self->_load_objects ($f); 2210 $self->_load_objects ($f);
2038 $f->resolve_delayed_derefs; 2211 $f->resolve_delayed_derefs;
2212 }
2039 } 2213 }
2040 } 2214 }
2041 }
2042 2215
2043 $f->resolve_delayed_derefs; 2216 $f->resolve_delayed_derefs;
2217 }
2044 2218
2045 cf::cede_to_tick; 2219 cf::cede_to_tick;
2046 # now do the right thing for maps 2220 # now do the right thing for maps
2047 $self->link_multipart_objects; 2221 $self->link_multipart_objects;
2048 $self->difficulty ($self->estimate_difficulty) 2222 $self->difficulty ($self->estimate_difficulty)
2052 unless ($self->{deny_activate}) { 2226 unless ($self->{deny_activate}) {
2053 $self->decay_objects; 2227 $self->decay_objects;
2054 $self->fix_auto_apply; 2228 $self->fix_auto_apply;
2055 $self->update_buttons; 2229 $self->update_buttons;
2056 cf::cede_to_tick; 2230 cf::cede_to_tick;
2057 $self->set_darkness_map;
2058 cf::cede_to_tick;
2059 $self->activate; 2231 $self->activate;
2060 } 2232 }
2061 2233
2062 $self->{last_save} = $cf::RUNTIME; 2234 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2235 $self->last_access ($cf::RUNTIME);
2064 2236
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2237 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2238 }
2067 2239
2068 $self->post_load; 2240 $self->post_load;
2069}
2070 2241
2242 1
2243}
2244
2245# customize the map for a given player, i.e.
2246# return the _real_ map. used by e.g. per-player
2247# maps to change the path to ~playername/mappath
2071sub customise_for { 2248sub customise_for {
2072 my ($self, $ob) = @_; 2249 my ($self, $ob) = @_;
2073 2250
2074 return find "~" . $ob->name . "/" . $self->{path} 2251 return find "~" . $ob->name . "/" . $self->{path}
2075 if $self->per_player; 2252 if $self->per_player;
2091 or next; 2268 or next;
2092 $neigh = find $neigh, $map 2269 $neigh = find $neigh, $map
2093 or next; 2270 or next;
2094 $neigh->load; 2271 $neigh->load;
2095 2272
2273 # now find the diagonal neighbours
2096 push @neigh, 2274 push @neigh,
2097 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2275 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2098 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2276 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2099 } 2277 }
2100 2278
2107} 2285}
2108 2286
2109sub find_sync { 2287sub find_sync {
2110 my ($path, $origin) = @_; 2288 my ($path, $origin) = @_;
2111 2289
2112 cf::sync_job { find $path, $origin } 2290 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2291 if $Coro::current == $Coro::main;
2292
2293 find $path, $origin
2113} 2294}
2114 2295
2115sub do_load_sync { 2296sub do_load_sync {
2116 my ($map) = @_; 2297 my ($map) = @_;
2117 2298
2118 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2299 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2119 if $Coro::current == $Coro::main; 2300 if $Coro::current == $Coro::main;
2120 2301
2121 cf::sync_job { $map->load }; 2302 $map->load;
2122} 2303}
2123 2304
2124our %MAP_PREFETCH; 2305our %MAP_PREFETCH;
2125our $MAP_PREFETCHER = undef; 2306our $MAP_PREFETCHER = undef;
2126 2307
2127sub find_async { 2308sub find_async {
2128 my ($path, $origin, $load) = @_; 2309 my ($path, $origin, $load) = @_;
2129 2310
2130 $path = normalise $path, $origin && $origin->{path}; 2311 $path = normalise $path, $origin;
2131 2312
2132 if (my $map = $cf::MAP{$path}) { 2313 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2314 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2315 }
2135 2316
2136 $MAP_PREFETCH{$path} |= $load; 2317 $MAP_PREFETCH{$path} |= $load;
2137 2318
2138 $MAP_PREFETCHER ||= cf::async { 2319 $MAP_PREFETCHER ||= cf::async {
2152 $MAP_PREFETCHER->prio (6); 2333 $MAP_PREFETCHER->prio (6);
2153 2334
2154 () 2335 ()
2155} 2336}
2156 2337
2338# common code, used by both ->save and ->swapout
2157sub save { 2339sub _save {
2158 my ($self) = @_; 2340 my ($self) = @_;
2159
2160 my $lock = cf::lock_acquire "map_data:$self->{path}";
2161 2341
2162 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2163 2343
2164 return unless $self->dirty; 2344 return unless $self->dirty;
2165 2345
2174 2354
2175 cf::async { 2355 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2356 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2357 $_->contr->save for $self->players;
2178 }; 2358 };
2359
2360 cf::get_slot 0.02;
2179 2361
2180 if ($uniq) { 2362 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2363 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2364 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2365 } else {
2184 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2366 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2185 } 2367 }
2186} 2368}
2187 2369
2370sub save {
2371 my ($self) = @_;
2372
2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2374
2375 $self->_save;
2376}
2377
2188sub swap_out { 2378sub swap_out {
2189 my ($self) = @_; 2379 my ($self) = @_;
2190 2380
2191 # save first because save cedes
2192 $self->save;
2193
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2381 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2382
2383 return if $self->in_memory != cf::MAP_ACTIVE;
2384 return if $self->{deny_save};
2196 return if $self->players; 2385 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY;
2198 return if $self->{deny_save};
2199 2386
2387 # first deactivate the map and "unlink" it from the core
2388 $self->deactivate;
2389 $_->clear_links_to ($self) for values %cf::MAP;
2200 $self->in_memory (cf::MAP_SWAPPED); 2390 $self->in_memory (cf::MAP_SWAPPED);
2391
2392 # then atomically save
2393 $self->_save;
2394
2395 # then free the map
2396 $self->clear;
2397}
2398
2399sub reset_at {
2400 my ($self) = @_;
2401
2402 # TODO: safety, remove and allow resettable per-player maps
2403 return 1e99 if $self->{deny_reset};
2404
2405 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2406 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2407
2408 $time + $to
2409}
2410
2411sub should_reset {
2412 my ($self) = @_;
2413
2414 $self->reset_at <= $cf::RUNTIME
2415}
2416
2417sub reset {
2418 my ($self) = @_;
2419
2420 my $lock = cf::lock_acquire "map_data:$self->{path}";
2421
2422 return if $self->players;
2423
2424 cf::trace "resetting map ", $self->path, "\n";
2425
2426 $self->in_memory (cf::MAP_SWAPPED);
2427
2428 # need to save uniques path
2429 unless ($self->{deny_save}) {
2430 my $uniq = $self->uniq_path; utf8::encode $uniq;
2431
2432 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2433 if $uniq;
2434 }
2435
2436 delete $cf::MAP{$self->path};
2201 2437
2202 $self->deactivate; 2438 $self->deactivate;
2203 $_->clear_links_to ($self) for values %cf::MAP; 2439 $_->clear_links_to ($self) for values %cf::MAP;
2204 $self->clear; 2440 $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 2441
2250 $self->unlink_save; 2442 $self->unlink_save;
2251 $self->destroy; 2443 $self->destroy;
2252} 2444}
2253 2445
2261 2453
2262 delete $cf::MAP{$self->path}; 2454 delete $cf::MAP{$self->path};
2263 2455
2264 $self->unlink_save; 2456 $self->unlink_save;
2265 2457
2266 bless $self, "cf::map"; 2458 bless $self, "cf::map::wrap";
2267 delete $self->{deny_reset}; 2459 delete $self->{deny_reset};
2268 $self->{deny_save} = 1; 2460 $self->{deny_save} = 1;
2269 $self->reset_timeout (1); 2461 $self->reset_timeout (1);
2270 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2462 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2271 2463
2320 2512
2321sub unique_maps() { 2513sub unique_maps() {
2322 [ 2514 [
2323 map { 2515 map {
2324 utf8::decode $_; 2516 utf8::decode $_;
2325 /\.map$/ 2517 s/\.map$//; # TODO future compatibility hack
2518 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2519 ? ()
2326 ? normalise $_ 2520 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2521 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2522 ]
2330} 2523}
2331 2524
2332package cf; 2525=item cf::map::static_maps
2526
2527Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2528file in the shared directory excluding F</styles> and F</editor>). May
2529block.
2530
2531=cut
2532
2533sub static_maps() {
2534 my @dirs = "";
2535 my @maps;
2536
2537 while (@dirs) {
2538 my $dir = shift @dirs;
2539
2540 next if $dir eq "/styles" || $dir eq "/editor";
2541
2542 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2543 or return;
2544
2545 for (@$files) {
2546 s/\.map$// or next;
2547 utf8::decode $_;
2548 push @maps, "$dir/$_";
2549 }
2550
2551 push @dirs, map "$dir/$_", @$dirs;
2552 }
2553
2554 \@maps
2555}
2333 2556
2334=back 2557=back
2335 2558
2336=head3 cf::object 2559=head3 cf::object
2337 2560
2341 2564
2342=over 4 2565=over 4
2343 2566
2344=item $ob->inv_recursive 2567=item $ob->inv_recursive
2345 2568
2346Returns the inventory of the object _and_ their inventories, recursively. 2569Returns the inventory of the object I<and> their inventories, recursively,
2570but I<not> the object itself.
2347 2571
2348=cut 2572=cut
2349 2573
2350sub inv_recursive_; 2574sub inv_recursive_;
2351sub inv_recursive_ { 2575sub inv_recursive_ {
2356 inv_recursive_ inv $_[0] 2580 inv_recursive_ inv $_[0]
2357} 2581}
2358 2582
2359=item $ref = $ob->ref 2583=item $ref = $ob->ref
2360 2584
2361creates and returns a persistent reference to an objetc that can be stored as a string. 2585Creates and returns a persistent reference to an object that can be stored as a string.
2362 2586
2363=item $ob = cf::object::deref ($refstring) 2587=item $ob = cf::object::deref ($refstring)
2364 2588
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2589returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block. 2590even if the object actually exists. May block.
2398can be C<undef>. Does the right thing when the player is currently in a 2622can be C<undef>. Does the right thing when the player is currently in a
2399dialogue with the given NPC character. 2623dialogue with the given NPC character.
2400 2624
2401=cut 2625=cut
2402 2626
2627our $SAY_CHANNEL = {
2628 id => "say",
2629 title => "Map",
2630 reply => "say ",
2631 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2632};
2633
2634our $CHAT_CHANNEL = {
2635 id => "chat",
2636 title => "Chat",
2637 reply => "chat ",
2638 tooltip => "Player chat and shouts, global to the server.",
2639};
2640
2403# rough implementation of a future "reply" method that works 2641# rough implementation of a future "reply" method that works
2404# with dialog boxes. 2642# with dialog boxes.
2405#TODO: the first argument must go, split into a $npc->reply_to ( method 2643#TODO: the first argument must go, split into a $npc->reply_to ( method
2406sub cf::object::player::reply($$$;$) { 2644sub cf::object::player::reply($$$;$) {
2407 my ($self, $npc, $msg, $flags) = @_; 2645 my ($self, $npc, $msg, $flags) = @_;
2418 my $dialog = $pl->{npc_dialog}; 2656 my $dialog = $pl->{npc_dialog};
2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2657 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2420 2658
2421 } else { 2659 } else {
2422 $msg = $npc->name . " says: $msg" if $npc; 2660 $msg = $npc->name . " says: $msg" if $npc;
2423 $self->message ($msg, $flags); 2661 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424 } 2662 }
2425 } 2663 }
2426} 2664}
2427 2665
2428=item $object->send_msg ($channel, $msg, $color, [extra...]) 2666=item $object->send_msg ($channel, $msg, $color, [extra...])
2453 2691
2454=item $player_object->enter_link 2692=item $player_object->enter_link
2455 2693
2456Freezes the player and moves him/her to a special map (C<{link}>). 2694Freezes the player and moves him/her to a special map (C<{link}>).
2457 2695
2458The player should be reasonably safe there for short amounts of time. You 2696The player should be reasonably safe there for short amounts of time (e.g.
2459I<MUST> call C<leave_link> as soon as possible, though. 2697for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2698though, as the player cannot control the character while it is on the link
2699map.
2460 2700
2461Will never block. 2701Will never block.
2462 2702
2463=item $player_object->leave_link ($map, $x, $y) 2703=item $player_object->leave_link ($map, $x, $y)
2464 2704
2484sub cf::object::player::enter_link { 2724sub cf::object::player::enter_link {
2485 my ($self) = @_; 2725 my ($self) = @_;
2486 2726
2487 $self->deactivate_recursive; 2727 $self->deactivate_recursive;
2488 2728
2729 ++$self->{_link_recursion};
2730
2489 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2731 return if UNIVERSAL::isa $self->map, "ext::map_link";
2490 2732
2491 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2733 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2492 if $self->map && $self->map->{path} ne "{link}"; 2734 if $self->map && $self->map->{path} ne "{link}";
2493 2735
2494 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2736 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2495} 2737}
2496 2738
2497sub cf::object::player::leave_link { 2739sub cf::object::player::leave_link {
2498 my ($self, $map, $x, $y) = @_; 2740 my ($self, $map, $x, $y) = @_;
2499 2741
2516 ($x, $y) = (-1, -1) 2758 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2759 unless (defined $x) && (defined $y);
2518 2760
2519 # use -1 or undef as default coordinates, not 0, 0 2761 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2762 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2763 if $x <= 0 && $y <= 0;
2522 2764
2523 $map->load; 2765 $map->load;
2524 $map->load_neighbours; 2766 $map->load_neighbours;
2525 2767
2526 return unless $self->contr->active; 2768 return unless $self->contr->active;
2527 $self->activate_recursive;
2528 2769
2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2770 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2530 $self->enter_map ($map, $x, $y); 2771 if ($self->enter_map ($map, $x, $y)) {
2531} 2772 # entering was successful
2773 delete $self->{_link_recursion};
2774 # only activate afterwards, to support waiting in hooks
2775 $self->activate_recursive;
2776 }
2532 2777
2778}
2779
2533=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2780=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2534 2781
2535Moves the player to the given map-path and coordinates by first freezing 2782Moves the player to the given map-path and coordinates by first freezing
2536her, loading and preparing them map, calling the provided $check callback 2783her, loading and preparing them map, calling the provided $check callback
2537that has to return the map if sucecssful, and then unfreezes the player on 2784that 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 2785the new (success) or old (failed) map position. In either case, $done will
2539be called at the end of this process. 2786be called at the end of this process.
2540 2787
2788Note that $check will be called with a potentially non-loaded map, so if
2789it needs a loaded map it has to call C<< ->load >>.
2790
2541=cut 2791=cut
2542 2792
2543our $GOTOGEN; 2793our $GOTOGEN;
2544 2794
2545sub cf::object::player::goto { 2795sub cf::object::player::goto {
2546 my ($self, $path, $x, $y, $check, $done) = @_; 2796 my ($self, $path, $x, $y, $check, $done) = @_;
2797
2798 if ($self->{_link_recursion} >= $MAX_LINKS) {
2799 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2800 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2801 ($path, $x, $y) = @$EMERGENCY_POSITION;
2802 }
2547 2803
2548 # do generation counting so two concurrent goto's will be executed in-order 2804 # do generation counting so two concurrent goto's will be executed in-order
2549 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2805 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2550 2806
2551 $self->enter_link; 2807 $self->enter_link;
2571 ($path, $x, $y) = (undef, undef, undef); 2827 ($path, $x, $y) = (undef, undef, undef);
2572 } 2828 }
2573 } 2829 }
2574 2830
2575 my $map = eval { 2831 my $map = eval {
2576 my $map = defined $path ? cf::map::find $path : undef; 2832 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2577 2833
2578 if ($map) { 2834 if ($map) {
2579 $map = $map->customise_for ($self); 2835 $map = $map->customise_for ($self);
2580 $map = $check->($map) if $check && $map; 2836 $map = $check->($map, $x, $y, $self) if $check && $map;
2581 } else { 2837 } else {
2582 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2838 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2583 } 2839 }
2584 2840
2585 $map 2841 $map
2593 if ($gen == $self->{_goto_generation}) { 2849 if ($gen == $self->{_goto_generation}) {
2594 delete $self->{_goto_generation}; 2850 delete $self->{_goto_generation};
2595 $self->leave_link ($map, $x, $y); 2851 $self->leave_link ($map, $x, $y);
2596 } 2852 }
2597 2853
2598 $done->() if $done; 2854 $done->($self) if $done;
2599 })->prio (1); 2855 })->prio (1);
2600} 2856}
2601 2857
2602=item $player_object->enter_exit ($exit_object) 2858=item $player_object->enter_exit ($exit_object)
2603 2859
2623} 2879}
2624 2880
2625sub prepare_random_map { 2881sub prepare_random_map {
2626 my ($exit) = @_; 2882 my ($exit) = @_;
2627 2883
2628 my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630 # all this does is basically replace the /! path by 2884 # all this does is basically replace the /! path by
2631 # a new random map path (?random/...) with a seed 2885 # a new random map path (?random/...) with a seed
2632 # that depends on the exit object 2886 # that depends on the exit object
2633 2887
2634 my $rmp = parse_random_map_params $exit->msg; 2888 my $rmp = parse_random_map_params $exit->msg;
2636 if ($exit->map) { 2890 if ($exit->map) {
2637 $rmp->{region} = $exit->region->name; 2891 $rmp->{region} = $exit->region->name;
2638 $rmp->{origin_map} = $exit->map->path; 2892 $rmp->{origin_map} = $exit->map->path;
2639 $rmp->{origin_x} = $exit->x; 2893 $rmp->{origin_x} = $exit->x;
2640 $rmp->{origin_y} = $exit->y; 2894 $rmp->{origin_y} = $exit->y;
2895
2896 $exit->map->touch;
2641 } 2897 }
2642 2898
2643 $rmp->{random_seed} ||= $exit->random_seed; 2899 $rmp->{random_seed} ||= $exit->random_seed;
2644 2900
2645 my $data = cf::encode_json $rmp; 2901 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2902 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2903 my $meta = "$RANDOMDIR/$md5.meta";
2648 2904
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2905 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2906 aio_write $fh, 0, (length $data), $data, 0;
2651 undef $fh; 2907 undef $fh;
2652 aio_rename "$meta~", $meta; 2908 aio_rename "$meta~", $meta;
2653 2909
2910 my $slaying = "?random/$md5";
2911
2912 if ($exit->valid) {
2654 $exit->slaying ("?random/$md5"); 2913 $exit->slaying ("?random/$md5");
2655 $exit->msg (undef); 2914 $exit->msg (undef);
2915 }
2656 } 2916 }
2657} 2917}
2658 2918
2659sub cf::object::player::enter_exit { 2919sub cf::object::player::enter_exit {
2660 my ($self, $exit) = @_; 2920 my ($self, $exit) = @_;
2661 2921
2662 return unless $self->type == cf::PLAYER; 2922 return unless $self->type == cf::PLAYER;
2663 2923
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; 2924 $self->enter_link;
2676 2925
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 { 2926 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2927 $Coro::current->{desc} = "enter_exit";
2683 2928
2684 $self->deactivate_recursive; # just to be sure
2685 unless (eval { 2929 unless (eval {
2930 $self->deactivate_recursive; # just to be sure
2931
2932 # random map handling
2933 {
2934 my $guard = cf::lock_acquire "exit_prepare:$exit";
2935
2936 prepare_random_map $exit
2937 if $exit->slaying eq "/!";
2938 }
2939
2940 my $map = cf::map::normalise $exit->slaying, $exit->map;
2941 my $x = $exit->stats->hp;
2942 my $y = $exit->stats->sp;
2943
2686 $self->goto ($slaying, $hp, $sp); 2944 $self->goto ($map, $x, $y);
2687 2945
2946 # if exit is damned, update players death & WoR home-position
2947 $self->contr->savebed ($map, $x, $y)
2948 if $exit->flag (cf::FLAG_DAMNED);
2949
2688 1; 2950 1
2689 }) { 2951 }) {
2690 $self->message ("Something went wrong deep within the crossfire server. " 2952 $self->message ("Something went wrong deep within the deliantra server. "
2691 . "I'll try to bring you back to the map you were before. " 2953 . "I'll try to bring you back to the map you were before. "
2692 . "Please report this to the dungeon master!", 2954 . "Please report this to the dungeon master!",
2693 cf::NDI_UNIQUE | cf::NDI_RED); 2955 cf::NDI_UNIQUE | cf::NDI_RED);
2694 2956
2695 warn "ERROR in enter_exit: $@"; 2957 error "ERROR in enter_exit: $@";
2696 $self->leave_link; 2958 $self->leave_link;
2697 } 2959 }
2698 })->prio (1); 2960 })->prio (1);
2699} 2961}
2700 2962
2712sub cf::client::send_drawinfo { 2974sub cf::client::send_drawinfo {
2713 my ($self, $text, $flags) = @_; 2975 my ($self, $text, $flags) = @_;
2714 2976
2715 utf8::encode $text; 2977 utf8::encode $text;
2716 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2978 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2979}
2980
2981=item $client->send_big_packet ($pkt)
2982
2983Like C<send_packet>, but tries to compress large packets, and fragments
2984them as required.
2985
2986=cut
2987
2988our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2989
2990sub cf::client::send_big_packet {
2991 my ($self, $pkt) = @_;
2992
2993 # try lzf for large packets
2994 $pkt = "lzf " . Compress::LZF::compress $pkt
2995 if 1024 <= length $pkt and $self->{can_lzf};
2996
2997 # split very large packets
2998 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2999 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3000 $pkt = "frag";
3001 }
3002
3003 $self->send_packet ($pkt);
2717} 3004}
2718 3005
2719=item $client->send_msg ($channel, $msg, $color, [extra...]) 3006=item $client->send_msg ($channel, $msg, $color, [extra...])
2720 3007
2721Send a drawinfo or msg packet to the client, formatting the msg for the 3008Send a drawinfo or msg packet to the client, formatting the msg for the
2725 3012
2726=cut 3013=cut
2727 3014
2728# non-persistent channels (usually the info channel) 3015# non-persistent channels (usually the info channel)
2729our %CHANNEL = ( 3016our %CHANNEL = (
3017 "c/motd" => {
3018 id => "infobox",
3019 title => "MOTD",
3020 reply => undef,
3021 tooltip => "The message of the day",
3022 },
2730 "c/identify" => { 3023 "c/identify" => {
2731 id => "infobox", 3024 id => "infobox",
2732 title => "Identify", 3025 title => "Identify",
2733 reply => undef, 3026 reply => undef,
2734 tooltip => "Items recently identified", 3027 tooltip => "Items recently identified",
2736 "c/examine" => { 3029 "c/examine" => {
2737 id => "infobox", 3030 id => "infobox",
2738 title => "Examine", 3031 title => "Examine",
2739 reply => undef, 3032 reply => undef,
2740 tooltip => "Signs and other items you examined", 3033 tooltip => "Signs and other items you examined",
3034 },
3035 "c/shopinfo" => {
3036 id => "infobox",
3037 title => "Shop Info",
3038 reply => undef,
3039 tooltip => "What your bargaining skill tells you about the shop",
2741 }, 3040 },
2742 "c/book" => { 3041 "c/book" => {
2743 id => "infobox", 3042 id => "infobox",
2744 title => "Book", 3043 title => "Book",
2745 reply => undef, 3044 reply => undef,
2761 id => "infobox", 3060 id => "infobox",
2762 title => "Body Parts", 3061 title => "Body Parts",
2763 reply => undef, 3062 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available", 3063 tooltip => "Shows which body parts you posess and are available",
2765 }, 3064 },
3065 "c/statistics" => {
3066 id => "infobox",
3067 title => "Statistics",
3068 reply => undef,
3069 tooltip => "Shows your primary statistics",
3070 },
3071 "c/skills" => {
3072 id => "infobox",
3073 title => "Skills",
3074 reply => undef,
3075 tooltip => "Shows your experience per skill and item power",
3076 },
3077 "c/shopitems" => {
3078 id => "infobox",
3079 title => "Shop Items",
3080 reply => undef,
3081 tooltip => "Shows the items currently for sale in this shop",
3082 },
3083 "c/resistances" => {
3084 id => "infobox",
3085 title => "Resistances",
3086 reply => undef,
3087 tooltip => "Shows your resistances",
3088 },
3089 "c/pets" => {
3090 id => "infobox",
3091 title => "Pets",
3092 reply => undef,
3093 tooltip => "Shows information abotu your pets/a specific pet",
3094 },
3095 "c/perceiveself" => {
3096 id => "infobox",
3097 title => "Perceive Self",
3098 reply => undef,
3099 tooltip => "You gained detailed knowledge about yourself",
3100 },
2766 "c/uptime" => { 3101 "c/uptime" => {
2767 id => "infobox", 3102 id => "infobox",
2768 title => "Uptime", 3103 title => "Uptime",
2769 reply => undef, 3104 reply => undef,
2770 tooltip => "How long the server has been running since last restart", 3105 tooltip => "How long the server has been running since last restart",
2773 id => "infobox", 3108 id => "infobox",
2774 title => "Map Info", 3109 title => "Map Info",
2775 reply => undef, 3110 reply => undef,
2776 tooltip => "Information related to the maps", 3111 tooltip => "Information related to the maps",
2777 }, 3112 },
3113 "c/party" => {
3114 id => "party",
3115 title => "Party",
3116 reply => "gsay ",
3117 tooltip => "Messages and chat related to your party",
3118 },
3119 "c/death" => {
3120 id => "death",
3121 title => "Death",
3122 reply => undef,
3123 tooltip => "Reason for and more info about your most recent death",
3124 },
3125 "c/say" => $SAY_CHANNEL,
3126 "c/chat" => $CHAT_CHANNEL,
2778); 3127);
2779 3128
2780sub cf::client::send_msg { 3129sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 3130 my ($self, $channel, $msg, $color, @extra) = @_;
2782 3131
2783 $msg = $self->pl->expand_cfpod ($msg); 3132 $msg = $self->pl->expand_cfpod ($msg)
3133 unless $color & cf::NDI_VERBATIM;
2784 3134
2785 $color &= cf::NDI_CLIENT_MASK; # just in case... 3135 $color &= cf::NDI_CLIENT_MASK; # just in case...
2786 3136
2787 # check predefined channels, for the benefit of C 3137 # check predefined channels, for the benefit of C
2788 if ($CHANNEL{$channel}) { 3138 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel}; 3139 $channel = $CHANNEL{$channel};
2790 3140
2791 $self->ext_msg (channel_info => $channel) 3141 $self->ext_msg (channel_info => $channel);
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id}; 3142 $channel = $channel->{id};
2795 3143
2796 } elsif (ref $channel) { 3144 } elsif (ref $channel) {
2797 # send meta info to client, if not yet sent 3145 # send meta info to client, if not yet sent
2798 unless (exists $self->{channel}{$channel->{id}}) { 3146 unless (exists $self->{channel}{$channel->{id}}) {
2799 $self->{channel}{$channel->{id}} = $channel; 3147 $self->{channel}{$channel->{id}} = $channel;
2800 $self->ext_msg (channel_info => $channel) 3148 $self->ext_msg (channel_info => $channel);
2801 if $self->can_msg;
2802 } 3149 }
2803 3150
2804 $channel = $channel->{id}; 3151 $channel = $channel->{id};
2805 } 3152 }
2806 3153
2807 return unless @extra || length $msg; 3154 return unless @extra || length $msg;
2808 3155
2809 if ($self->can_msg) {
2810 # default colour, mask it out 3156 # default colour, mask it out
2811 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3157 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812 if $color & cf::NDI_DEF; 3158 if $color & cf::NDI_DEF;
2813 3159
2814 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3160 my $pkt = "msg "
3161 . $self->{json_coder}->encode (
2815 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3162 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2816 } else { 3163 );
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 3164
2828 $color &= cf::NDI_COLOR_MASK; 3165 $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} 3166}
2842 3167
2843=item $client->ext_msg ($type, @msg) 3168=item $client->ext_msg ($type, @msg)
2844 3169
2845Sends an ext event to the client. 3170Sends an ext event to the client.
2848 3173
2849sub cf::client::ext_msg($$@) { 3174sub cf::client::ext_msg($$@) {
2850 my ($self, $type, @msg) = @_; 3175 my ($self, $type, @msg) = @_;
2851 3176
2852 if ($self->extcmd == 2) { 3177 if ($self->extcmd == 2) {
2853 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3178 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2854 } elsif ($self->extcmd == 1) { # TODO: remove 3179 } elsif ($self->extcmd == 1) { # TODO: remove
2855 push @msg, msgtype => "event_$type"; 3180 push @msg, msgtype => "event_$type";
2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3181 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 } 3182 }
2858} 3183}
2859 3184
2860=item $client->ext_reply ($msgid, @msg) 3185=item $client->ext_reply ($msgid, @msg)
2861 3186
2865 3190
2866sub cf::client::ext_reply($$@) { 3191sub cf::client::ext_reply($$@) {
2867 my ($self, $id, @msg) = @_; 3192 my ($self, $id, @msg) = @_;
2868 3193
2869 if ($self->extcmd == 2) { 3194 if ($self->extcmd == 2) {
2870 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3195 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2871 } elsif ($self->extcmd == 1) { 3196 } elsif ($self->extcmd == 1) {
2872 #TODO: version 1, remove 3197 #TODO: version 1, remove
2873 unshift @msg, msgtype => "reply", msgid => $id; 3198 unshift @msg, msgtype => "reply", msgid => $id;
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3199 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2875 } 3200 }
2876} 3201}
2877 3202
2878=item $success = $client->query ($flags, "text", \&cb) 3203=item $success = $client->query ($flags, "text", \&cb)
2879 3204
2950 3275
2951 $ns->ext_reply ($reply, @reply) 3276 $ns->ext_reply ($reply, @reply)
2952 if $reply; 3277 if $reply;
2953 3278
2954 } else { 3279 } else {
2955 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3280 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2956 } 3281 }
2957 3282
2958 cf::override; 3283 cf::override;
2959 }, 3284 },
2960); 3285);
2980 3305
2981 $coro 3306 $coro
2982} 3307}
2983 3308
2984cf::client->attach ( 3309cf::client->attach (
2985 on_destroy => sub { 3310 on_client_destroy => sub {
2986 my ($ns) = @_; 3311 my ($ns) = @_;
2987 3312
2988 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3313 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2989 }, 3314 },
2990); 3315);
3006our $safe_hole = new Safe::Hole; 3331our $safe_hole = new Safe::Hole;
3007 3332
3008$SIG{FPE} = 'IGNORE'; 3333$SIG{FPE} = 'IGNORE';
3009 3334
3010$safe->permit_only (Opcode::opset qw( 3335$safe->permit_only (Opcode::opset qw(
3011 :base_core :base_mem :base_orig :base_math 3336 :base_core :base_mem :base_orig :base_math :base_loop
3012 grepstart grepwhile mapstart mapwhile 3337 grepstart grepwhile mapstart mapwhile
3013 sort time 3338 sort time
3014)); 3339));
3015 3340
3016# here we export the classes and methods available to script code 3341# here we export the classes and methods available to script code
3019 3344
3020The following functions and methods are available within a safe environment: 3345The following functions and methods are available within a safe environment:
3021 3346
3022 cf::object 3347 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy 3348 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr 3349 insert remove name archname title slaying race decrease split
3350 value
3025 3351
3026 cf::object::player 3352 cf::object::player
3027 player 3353 player
3028 3354
3029 cf::player 3355 cf::player
3034 3360
3035=cut 3361=cut
3036 3362
3037for ( 3363for (
3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3364 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race 3365 insert remove inv nrof name archname title slaying race
3040 decrease_ob_nr destroy)], 3366 decrease split destroy change_exp value msg lore send_msg)],
3041 ["cf::object::player" => qw(player)], 3367 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3368 ["cf::player" => qw(peaceful send_msg)],
3043 ["cf::map" => qw(trigger)], 3369 ["cf::map" => qw(trigger)],
3044) { 3370) {
3045 no strict 'refs';
3046 my ($pkg, @funs) = @$_; 3371 my ($pkg, @funs) = @$_;
3047 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3372 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3048 for @funs; 3373 for @funs;
3049} 3374}
3050 3375
3065 3390
3066 my $qcode = $code; 3391 my $qcode = $code;
3067 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3392 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3068 $qcode =~ s/\n/\\n/g; 3393 $qcode =~ s/\n/\\n/g;
3069 3394
3395 %vars = (_dummy => 0) unless %vars;
3396
3397 my @res;
3070 local $_; 3398 local $_;
3071 local @safe::cf::_safe_eval_args = values %vars;
3072 3399
3073 my $eval = 3400 my $eval =
3074 "do {\n" 3401 "do {\n"
3075 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3402 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3076 . "#line 0 \"{$qcode}\"\n" 3403 . "#line 0 \"{$qcode}\"\n"
3077 . $code 3404 . $code
3078 . "\n}" 3405 . "\n}"
3079 ; 3406 ;
3080 3407
3408 if ($CFG{safe_eval}) {
3081 sub_generation_inc; 3409 sub_generation_inc;
3410 local @safe::cf::_safe_eval_args = values %vars;
3082 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3411 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3083 sub_generation_inc; 3412 sub_generation_inc;
3413 } else {
3414 local @cf::_safe_eval_args = values %vars;
3415 @res = wantarray ? eval eval : scalar eval $eval;
3416 }
3084 3417
3085 if ($@) { 3418 if ($@) {
3086 warn "$@"; 3419 warn "$@",
3087 warn "while executing safe code '$code'\n"; 3420 "while executing safe code '$code'\n",
3088 warn "with arguments " . (join " ", %vars) . "\n"; 3421 "with arguments " . (join " ", %vars) . "\n";
3089 } 3422 }
3090 3423
3091 wantarray ? @res : $res[0] 3424 wantarray ? @res : $res[0]
3092} 3425}
3093 3426
3107=cut 3440=cut
3108 3441
3109sub register_script_function { 3442sub register_script_function {
3110 my ($fun, $cb) = @_; 3443 my ($fun, $cb) = @_;
3111 3444
3112 no strict 'refs'; 3445 $fun = "safe::$fun" if $CFG{safe_eval};
3113 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3446 *$fun = $safe_hole->wrap ($cb);
3114} 3447}
3115 3448
3116=back 3449=back
3117 3450
3118=cut 3451=cut
3127 # for this (global event?) 3460 # for this (global event?)
3128 %ext::player_env::MUSIC_FACE_CACHE = (); 3461 %ext::player_env::MUSIC_FACE_CACHE = ();
3129 3462
3130 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3463 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3131 3464
3132 warn "loading facedata from $path\n"; 3465 trace "loading facedata from $path\n";
3133 3466
3134 my $facedata; 3467 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 3468
3140 $facedata->{version} == 2 3469 $facedata->{version} == 2
3141 or cf::cleanup "$path: version mismatch, cannot proceed."; 3470 or cf::cleanup "$path: version mismatch, cannot proceed.";
3142 3471
3143 # patch in the exptable 3472 # patch in the exptable
3473 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3144 $facedata->{resource}{"res/exp_table"} = { 3474 $facedata->{resource}{"res/exp_table"} = {
3145 type => FT_RSRC, 3475 type => FT_RSRC,
3146 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3476 data => $exp_table,
3477 hash => (Digest::MD5::md5 $exp_table),
3147 }; 3478 };
3148 cf::cede_to_tick; 3479 cf::cede_to_tick;
3149 3480
3150 { 3481 {
3151 my $faces = $facedata->{faceinfo}; 3482 my $faces = $facedata->{faceinfo};
3153 while (my ($face, $info) = each %$faces) { 3484 while (my ($face, $info) = each %$faces) {
3154 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3485 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155 3486
3156 cf::face::set_visibility $idx, $info->{visibility}; 3487 cf::face::set_visibility $idx, $info->{visibility};
3157 cf::face::set_magicmap $idx, $info->{magicmap}; 3488 cf::face::set_magicmap $idx, $info->{magicmap};
3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3489 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3490 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3491 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3160 3492
3161 cf::cede_to_tick; 3493 cf::cede_to_tick;
3162 } 3494 }
3163 3495
3164 while (my ($face, $info) = each %$faces) { 3496 while (my ($face, $info) = each %$faces) {
3169 3501
3170 if (my $smooth = cf::face::find $info->{smooth}) { 3502 if (my $smooth = cf::face::find $info->{smooth}) {
3171 cf::face::set_smooth $idx, $smooth; 3503 cf::face::set_smooth $idx, $smooth;
3172 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3504 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3173 } else { 3505 } else {
3174 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3506 error "smooth face '$info->{smooth}' not found for face '$face'";
3175 } 3507 }
3176 3508
3177 cf::cede_to_tick; 3509 cf::cede_to_tick;
3178 } 3510 }
3179 } 3511 }
3188 3520
3189 cf::anim::invalidate_all; # d'oh 3521 cf::anim::invalidate_all; # d'oh
3190 } 3522 }
3191 3523
3192 { 3524 {
3193 # TODO: for gcfclient pleasure, we should give resources
3194 # that gcfclient doesn't grok a >10000 face index.
3195 my $res = $facedata->{resource}; 3525 my $res = $facedata->{resource};
3196 3526
3197 while (my ($name, $info) = each %$res) { 3527 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) { 3528 if (defined $info->{type}) {
3199 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3529 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3200 my $data;
3201 3530
3202 if ($info->{type} & 1) { 3531 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}; 3532 cf::face::set_type $idx, $info->{type};
3217 } else { 3533 } else {
3218 $RESOURCE{$name} = $info; 3534 $RESOURCE{$name} = $info; # unused
3219 } 3535 }
3220 3536
3221 cf::cede_to_tick; 3537 cf::cede_to_tick;
3222 } 3538 }
3223
3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3225 $soundconf = $enc->decode (delete $soundconf->{data});
3226
3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3228 my $sound = $soundconf->{compat}[$_]
3229 or next;
3230
3231 my $face = cf::face::find "sound/$sound->[1]";
3232 cf::sound::set $sound->[0] => $face;
3233 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3234 }
3235
3236 while (my ($k, $v) = each %{$soundconf->{event}}) {
3237 my $face = cf::face::find "sound/$v";
3238 cf::sound::set $k => $face;
3239 }
3240 }
3241 } 3539 }
3540
3541 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3242 3542
3243 1 3543 1
3244} 3544}
3245 3545
3246register_exticmd fx_want => sub { 3546register_exticmd fx_want => sub {
3248 3548
3249 while (my ($k, $v) = each %$want) { 3549 while (my ($k, $v) = each %$want) {
3250 $ns->fx_want ($k, $v); 3550 $ns->fx_want ($k, $v);
3251 } 3551 }
3252}; 3552};
3553
3554sub load_resource_file($) {
3555 my $guard = lock_acquire "load_resource_file";
3556
3557 my $status = load_resource_file_ $_[0];
3558 get_slot 0.1, 100;
3559 cf::arch::commit_load;
3560
3561 $status
3562}
3253 3563
3254sub reload_regions { 3564sub reload_regions {
3255 # HACK to clear player env face cache, we need some signal framework 3565 # HACK to clear player env face cache, we need some signal framework
3256 # for this (global event?) 3566 # for this (global event?)
3257 %ext::player_env::MUSIC_FACE_CACHE = (); 3567 %ext::player_env::MUSIC_FACE_CACHE = ();
3271} 3581}
3272 3582
3273sub reload_archetypes { 3583sub reload_archetypes {
3274 load_resource_file "$DATADIR/archetypes" 3584 load_resource_file "$DATADIR/archetypes"
3275 or die "unable to load archetypes\n"; 3585 or die "unable to load archetypes\n";
3276 #d# NEED to laod twice to resolve forward references
3277 # this really needs to be done in an extra post-pass
3278 # (which needs to be synchronous, so solve it differently)
3279 load_resource_file "$DATADIR/archetypes"
3280 or die "unable to load archetypes\n";
3281} 3586}
3282 3587
3283sub reload_treasures { 3588sub reload_treasures {
3284 load_resource_file "$DATADIR/treasures" 3589 load_resource_file "$DATADIR/treasures"
3285 or die "unable to load treasurelists\n"; 3590 or die "unable to load treasurelists\n";
3286} 3591}
3287 3592
3593sub reload_sound {
3594 trace "loading sound config from $DATADIR/sound\n";
3595
3596 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3597
3598 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3599 my $sound = $soundconf->{compat}[$_]
3600 or next;
3601
3602 my $face = cf::face::find "sound/$sound->[1]";
3603 cf::sound::set $sound->[0] => $face;
3604 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3605 }
3606
3607 while (my ($k, $v) = each %{$soundconf->{event}}) {
3608 my $face = cf::face::find "sound/$v";
3609 cf::sound::set $k => $face;
3610 }
3611}
3612
3288sub reload_resources { 3613sub reload_resources {
3289 warn "reloading resource files...\n"; 3614 trace "reloading resource files...\n";
3290 3615
3616 reload_exp_table;
3617 reload_materials;
3618 reload_facedata;
3619 reload_sound;
3620 reload_archetypes;
3291 reload_regions; 3621 reload_regions;
3292 reload_facedata;
3293 #reload_archetypes;#d#
3294 reload_archetypes;
3295 reload_treasures; 3622 reload_treasures;
3296 3623
3297 warn "finished reloading resource files\n"; 3624 trace "finished reloading resource files\n";
3298}
3299
3300sub init {
3301 reload_resources;
3302} 3625}
3303 3626
3304sub reload_config { 3627sub reload_config {
3305 open my $fh, "<:utf8", "$CONFDIR/config" 3628 trace "reloading config file...\n";
3306 or return;
3307 3629
3308 local $/; 3630 my $config = load_file "$CONFDIR/config";
3309 *CFG = YAML::Syck::Load <$fh>; 3631 utf8::decode $config;
3632 *CFG = decode_yaml $config;
3310 3633
3311 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3634 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3312 3635
3313 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3636 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3314 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3637 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3315 3638
3316 if (exists $CFG{mlockall}) { 3639 if (exists $CFG{mlockall}) {
3320 }; 3643 };
3321 warn $@ if $@; 3644 warn $@ if $@;
3322 } 3645 }
3323} 3646}
3324 3647
3648sub pidfile() {
3649 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3650 or die "$PIDFILE: $!";
3651 flock $fh, &Fcntl::LOCK_EX
3652 or die "$PIDFILE: flock: $!";
3653 $fh
3654}
3655
3656# make sure only one server instance is running at any one time
3657sub atomic {
3658 my $fh = pidfile;
3659
3660 my $pid = <$fh>;
3661 kill 9, $pid if $pid > 0;
3662
3663 seek $fh, 0, 0;
3664 print $fh $$;
3665}
3666
3667sub main_loop {
3668 trace "EV::loop starting\n";
3669 if (1) {
3670 EV::loop;
3671 }
3672 trace "EV::loop returned\n";
3673 goto &main_loop unless $REALLY_UNLOOP;
3674}
3675
3325sub main { 3676sub main {
3677 cf::init_globals; # initialise logging
3678
3679 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3680 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3681 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3682 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3683
3684 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3685
3326 # we must not ever block the main coroutine 3686 # we must not ever block the main coroutine
3327 local $Coro::idle = sub { 3687 local $Coro::idle = sub {
3328 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3688 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3329 (async { 3689 (async {
3330 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3690 $Coro::current->{desc} = "IDLE BUG HANDLER";
3331 EV::loop EV::LOOP_ONESHOT; 3691 EV::loop EV::LOOP_ONESHOT;
3332 })->prio (Coro::PRIO_MAX); 3692 })->prio (Coro::PRIO_MAX);
3333 }; 3693 };
3334 3694
3695 evthread_start IO::AIO::poll_fileno;
3696
3697 cf::sync_job {
3698 cf::incloader::init ();
3699
3700 cf::init_anim;
3701 cf::init_attackmess;
3702 cf::init_dynamic;
3703
3704 cf::load_settings;
3705
3706 reload_resources;
3335 reload_config; 3707 reload_config;
3336 db_init; 3708 db_init;
3709
3710 cf::init_uuid;
3711 cf::init_signals;
3712 cf::init_skills;
3713
3714 cf::init_beforeplay;
3715
3716 atomic;
3717
3337 load_extensions; 3718 load_extensions;
3338 3719
3339 $TICK_WATCHER->start; 3720 utime time, time, $RUNTIMEFILE;
3340 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3721
3341 EV::loop; 3722 # no (long-running) fork's whatsoever before this point(!)
3723 use POSIX ();
3724 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3725
3726 cf::_post_init 0;
3727 };
3728
3729 cf::object::thawer::errors_are_fatal 0;
3730 info "parse errors in files are no longer fatal from this point on.\n";
3731
3732 my $free_main; $free_main = EV::idle sub {
3733 undef $free_main;
3734 undef &main; # free gobs of memory :)
3735 };
3736
3737 goto &main_loop;
3342} 3738}
3343 3739
3344############################################################################# 3740#############################################################################
3345# initialisation and cleanup 3741# initialisation and cleanup
3346 3742
3347# install some emergency cleanup handlers 3743# install some emergency cleanup handlers
3348BEGIN { 3744BEGIN {
3349 our %SIGWATCHER = (); 3745 our %SIGWATCHER = ();
3350 for my $signal (qw(INT HUP TERM)) { 3746 for my $signal (qw(INT HUP TERM)) {
3351 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3747 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3352 cf::cleanup "SIG$signal"; 3748 cf::cleanup "SIG$signal";
3353 }; 3749 };
3354 } 3750 }
3355} 3751}
3356 3752
3357sub write_runtime { 3753sub write_runtime_sync {
3358 my $runtime = "$LOCALDIR/runtime"; 3754 my $t0 = AE::time;
3359 3755
3360 # first touch the runtime file to show we are still running: 3756 # first touch the runtime file to show we are still running:
3361 # the fsync below can take a very very long time. 3757 # the fsync below can take a very very long time.
3362 3758
3363 IO::AIO::aio_utime $runtime, undef, undef; 3759 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3364 3760
3365 my $guard = cf::lock_acquire "write_runtime"; 3761 my $guard = cf::lock_acquire "write_runtime";
3366 3762
3367 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3763 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3368 or return; 3764 or return;
3369 3765
3370 my $value = $cf::RUNTIME + 90 + 10; 3766 my $value = $cf::RUNTIME + 90 + 10;
3371 # 10 is the runtime save interval, for a monotonic clock 3767 # 10 is the runtime save interval, for a monotonic clock
3372 # 60 allows for the watchdog to kill the server. 3768 # 60 allows for the watchdog to kill the server.
3382 aio_utime $fh, undef, undef; 3778 aio_utime $fh, undef, undef;
3383 3779
3384 close $fh 3780 close $fh
3385 or return; 3781 or return;
3386 3782
3387 aio_rename "$runtime~", $runtime 3783 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3388 and return; 3784 and return;
3389 3785
3390 warn "runtime file written.\n"; 3786 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3391 3787
3392 1 3788 1
3789}
3790
3791our $uuid_lock;
3792our $uuid_skip;
3793
3794sub write_uuid_sync($) {
3795 $uuid_skip ||= $_[0];
3796
3797 return if $uuid_lock;
3798 local $uuid_lock = 1;
3799
3800 my $uuid = "$LOCALDIR/uuid";
3801
3802 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3803 or return;
3804
3805 my $value = uuid_seq uuid_cur;
3806
3807 unless ($value) {
3808 info "cowardly refusing to write zero uuid value!\n";
3809 return;
3810 }
3811
3812 my $value = uuid_str $value + $uuid_skip;
3813 $uuid_skip = 0;
3814
3815 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3816 and return;
3817
3818 # always fsync - this file is important
3819 aio_fsync $fh
3820 and return;
3821
3822 close $fh
3823 or return;
3824
3825 aio_rename "$uuid~", $uuid
3826 and return;
3827
3828 trace "uuid file written ($value).\n";
3829
3830 1
3831
3832}
3833
3834sub write_uuid($$) {
3835 my ($skip, $sync) = @_;
3836
3837 $sync ? write_uuid_sync $skip
3838 : async { write_uuid_sync $skip };
3393} 3839}
3394 3840
3395sub emergency_save() { 3841sub emergency_save() {
3396 my $freeze_guard = cf::freeze_mainloop; 3842 my $freeze_guard = cf::freeze_mainloop;
3397 3843
3398 warn "enter emergency perl save\n"; 3844 info "emergency_perl_save: enter\n";
3845
3846 # this is a trade-off: we want to be very quick here, so
3847 # save all maps without fsync, and later call a global sync
3848 # (which in turn might be very very slow)
3849 local $USE_FSYNC = 0;
3399 3850
3400 cf::sync_job { 3851 cf::sync_job {
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3401 # use a peculiar iteration method to avoid tripping on perl 3854 # use a peculiar iteration method to avoid tripping on perl
3402 # refcount bugs in for. also avoids problems with players 3855 # refcount bugs in for. also avoids problems with players
3403 # and maps saved/destroyed asynchronously. 3856 # and maps saved/destroyed asynchronously.
3404 warn "begin emergency player save\n"; 3857 info "emergency_perl_save: begin player save\n";
3405 for my $login (keys %cf::PLAYER) { 3858 for my $login (keys %cf::PLAYER) {
3406 my $pl = $cf::PLAYER{$login} or next; 3859 my $pl = $cf::PLAYER{$login} or next;
3407 $pl->valid or next; 3860 $pl->valid or next;
3408 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3861 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3409 $pl->save; 3862 $pl->save;
3410 } 3863 }
3411 warn "end emergency player save\n"; 3864 info "emergency_perl_save: end player save\n";
3412 3865
3413 warn "begin emergency map save\n"; 3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 info "emergency_perl_save: begin map save\n";
3414 for my $path (keys %cf::MAP) { 3869 for my $path (keys %cf::MAP) {
3415 my $map = $cf::MAP{$path} or next; 3870 my $map = $cf::MAP{$path} or next;
3416 $map->valid or next; 3871 $map->valid or next;
3417 $map->save; 3872 $map->save;
3418 } 3873 }
3419 warn "end emergency map save\n"; 3874 info "emergency_perl_save: end map save\n";
3420 3875
3421 warn "begin emergency database checkpoint\n"; 3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 info "emergency_perl_save: begin database checkpoint\n";
3422 BDB::db_env_txn_checkpoint $DB_ENV; 3879 BDB::db_env_txn_checkpoint $DB_ENV;
3423 warn "end emergency database checkpoint\n"; 3880 info "emergency_perl_save: end database checkpoint\n";
3881
3882 info "emergency_perl_save: begin write uuid\n";
3883 write_uuid_sync 1;
3884 info "emergency_perl_save: end write uuid\n";
3885
3886 cf::write_runtime_sync; # external watchdog should not bark
3887
3888 trace "emergency_perl_save: syncing database to disk";
3889 BDB::db_env_txn_checkpoint $DB_ENV;
3890
3891 info "emergency_perl_save: starting sync\n";
3892 IO::AIO::aio_sync sub {
3893 info "emergency_perl_save: finished sync\n";
3894 };
3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3898 trace "emergency_perl_save: flushing outstanding aio requests";
3899 while (IO::AIO::nreqs || BDB::nreqs) {
3900 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3901 }
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3424 }; 3904 };
3425 3905
3426 warn "leave emergency perl save\n"; 3906 info "emergency_perl_save: leave\n";
3427} 3907}
3428 3908
3429sub post_cleanup { 3909sub post_cleanup {
3430 my ($make_core) = @_; 3910 my ($make_core) = @_;
3431 3911
3912 IO::AIO::flush;
3913
3432 warn Carp::longmess "post_cleanup backtrace" 3914 error Carp::longmess "post_cleanup backtrace"
3433 if $make_core; 3915 if $make_core;
3916
3917 my $fh = pidfile;
3918 unlink $PIDFILE if <$fh> == $$;
3919}
3920
3921# a safer delete_package, copied from Symbol
3922sub clear_package($) {
3923 my $pkg = shift;
3924
3925 # expand to full symbol table name if needed
3926 unless ($pkg =~ /^main::.*::$/) {
3927 $pkg = "main$pkg" if $pkg =~ /^::/;
3928 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3929 $pkg .= '::' unless $pkg =~ /::$/;
3930 }
3931
3932 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3933 my $stem_symtab = *{$stem}{HASH};
3934
3935 defined $stem_symtab and exists $stem_symtab->{$leaf}
3936 or return;
3937
3938 # clear all symbols
3939 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3940 for my $name (keys %$leaf_symtab) {
3941 _gv_clear *{"$pkg$name"};
3942# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3943 }
3434} 3944}
3435 3945
3436sub do_reload_perl() { 3946sub do_reload_perl() {
3437 # can/must only be called in main 3947 # can/must only be called in main
3438 if ($Coro::current != $Coro::main) { 3948 unless (in_main) {
3439 warn "can only reload from main coroutine"; 3949 error "can only reload from main coroutine";
3440 return; 3950 return;
3441 } 3951 }
3442 3952
3443 warn "reloading..."; 3953 return if $RELOAD++;
3444 3954
3445 warn "entering sync_job"; 3955 my $t1 = AE::time;
3446 3956
3957 while ($RELOAD) {
3958 cf::get_slot 0.1, -1, "reload_perl";
3959 info "perl_reload: reloading...";
3960
3961 trace "perl_reload: entering sync_job";
3962
3447 cf::sync_job { 3963 cf::sync_job {
3448 cf::write_runtime; # external watchdog should not bark
3449 cf::emergency_save; 3964 #cf::emergency_save;
3450 cf::write_runtime; # external watchdog should not bark
3451 3965
3452 warn "syncing database to disk";
3453 BDB::db_env_txn_checkpoint $DB_ENV;
3454
3455 # if anything goes wrong in here, we should simply crash as we already saved
3456
3457 warn "flushing outstanding aio requests";
3458 for (;;) {
3459 BDB::flush;
3460 IO::AIO::flush;
3461 Coro::cede_notself;
3462 last unless IO::AIO::nreqs || BDB::nreqs;
3463 warn "iterate...";
3464 }
3465
3466 ++$RELOAD;
3467
3468 warn "cancelling all extension coros"; 3966 trace "perl_reload: cancelling all extension coros";
3469 $_->cancel for values %EXT_CORO; 3967 $_->cancel for values %EXT_CORO;
3470 %EXT_CORO = (); 3968 %EXT_CORO = ();
3471 3969
3472 warn "removing commands"; 3970 trace "perl_reload: removing commands";
3473 %COMMAND = (); 3971 %COMMAND = ();
3474 3972
3475 warn "removing ext/exti commands"; 3973 trace "perl_reload: removing ext/exti commands";
3476 %EXTCMD = (); 3974 %EXTCMD = ();
3477 %EXTICMD = (); 3975 %EXTICMD = ();
3478 3976
3479 warn "unloading/nuking all extensions"; 3977 trace "perl_reload: unloading/nuking all extensions";
3480 for my $pkg (@EXTS) { 3978 for my $pkg (@EXTS) {
3481 warn "... unloading $pkg"; 3979 trace "... unloading $pkg";
3482 3980
3483 if (my $cb = $pkg->can ("unload")) { 3981 if (my $cb = $pkg->can ("unload")) {
3484 eval { 3982 eval {
3485 $cb->($pkg); 3983 $cb->($pkg);
3486 1 3984 1
3487 } or warn "$pkg unloaded, but with errors: $@"; 3985 } or error "$pkg unloaded, but with errors: $@";
3986 }
3987
3988 trace "... clearing $pkg";
3989 clear_package $pkg;
3488 } 3990 }
3489 3991
3490 warn "... nuking $pkg";
3491 Symbol::delete_package $pkg;
3492 }
3493
3494 warn "unloading all perl modules loaded from $LIBDIR"; 3992 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3495 while (my ($k, $v) = each %INC) { 3993 while (my ($k, $v) = each %INC) {
3496 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3994 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3497 3995
3498 warn "... unloading $k"; 3996 trace "... unloading $k";
3499 delete $INC{$k}; 3997 delete $INC{$k};
3500 3998
3501 $k =~ s/\.pm$//; 3999 $k =~ s/\.pm$//;
3502 $k =~ s/\//::/g; 4000 $k =~ s/\//::/g;
3503 4001
3504 if (my $cb = $k->can ("unload_module")) { 4002 if (my $cb = $k->can ("unload_module")) {
3505 $cb->(); 4003 $cb->();
4004 }
4005
4006 clear_package $k;
3506 } 4007 }
3507 4008
3508 Symbol::delete_package $k;
3509 }
3510
3511 warn "getting rid of safe::, as good as possible"; 4009 trace "perl_reload: getting rid of safe::, as good as possible";
3512 Symbol::delete_package "safe::$_" 4010 clear_package "safe::$_"
3513 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4011 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3514 4012
3515 warn "unloading cf.pm \"a bit\""; 4013 trace "perl_reload: unloading cf.pm \"a bit\"";
3516 delete $INC{"cf.pm"}; 4014 delete $INC{"cf.pm"};
3517 delete $INC{"cf/pod.pm"}; 4015 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3518 4016
3519 # don't, removes xs symbols, too, 4017 # don't, removes xs symbols, too,
3520 # and global variables created in xs 4018 # and global variables created in xs
3521 #Symbol::delete_package __PACKAGE__; 4019 #clear_package __PACKAGE__;
3522 4020
3523 warn "unload completed, starting to reload now"; 4021 info "perl_reload: unload completed, starting to reload now";
3524 4022
3525 warn "reloading cf.pm"; 4023 trace "perl_reload: reloading cf.pm";
3526 require cf; 4024 require cf;
3527 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4025 cf::_connect_to_perl_1;
3528 4026
3529 warn "loading config and database again"; 4027 trace "perl_reload: loading config and database again";
3530 cf::reload_config; 4028 cf::reload_config;
3531 4029
3532 warn "loading extensions"; 4030 trace "perl_reload: loading extensions";
3533 cf::load_extensions; 4031 cf::load_extensions;
3534 4032
4033 if ($REATTACH_ON_RELOAD) {
3535 warn "reattaching attachments to objects/players"; 4034 trace "perl_reload: reattaching attachments to objects/players";
3536 _global_reattach; # objects, sockets 4035 _global_reattach; # objects, sockets
3537 warn "reattaching attachments to maps"; 4036 trace "perl_reload: reattaching attachments to maps";
3538 reattach $_ for values %MAP; 4037 reattach $_ for values %MAP;
3539 warn "reattaching attachments to players"; 4038 trace "perl_reload: reattaching attachments to players";
3540 reattach $_ for values %PLAYER; 4039 reattach $_ for values %PLAYER;
4040 }
3541 4041
3542 warn "leaving sync_job"; 4042 cf::_post_init 1;
3543 4043
4044 trace "perl_reload: leaving sync_job";
4045
3544 1 4046 1
3545 } or do { 4047 } or do {
3546 warn $@; 4048 error $@;
3547 warn "error while reloading, exiting."; 4049 cf::cleanup "perl_reload: error, exiting.";
3548 exit 1; 4050 };
4051
4052 --$RELOAD;
3549 }; 4053 }
3550 4054
3551 warn "reloaded"; 4055 $t1 = AE::time - $t1;
4056 info "perl_reload: completed in ${t1}s\n";
3552}; 4057};
3553 4058
3554our $RELOAD_WATCHER; # used only during reload 4059our $RELOAD_WATCHER; # used only during reload
3555 4060
3556sub reload_perl() { 4061sub reload_perl() {
3557 # doing reload synchronously and two reloads happen back-to-back, 4062 # doing reload synchronously and two reloads happen back-to-back,
3558 # coro crashes during coro_state_free->destroy here. 4063 # coro crashes during coro_state_free->destroy here.
3559 4064
4065 $RELOAD_WATCHER ||= cf::async {
4066 Coro::AIO::aio_wait cache_extensions;
4067
3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4068 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
4069 do_reload_perl;
3561 undef $RELOAD_WATCHER; 4070 undef $RELOAD_WATCHER;
3562 do_reload_perl; 4071 };
3563 }; 4072 };
3564} 4073}
3565 4074
3566register_command "reload" => sub { 4075register_command "reload" => sub {
3567 my ($who, $arg) = @_; 4076 my ($who, $arg) = @_;
3573 reload_perl; 4082 reload_perl;
3574 }; 4083 };
3575 } 4084 }
3576}; 4085};
3577 4086
3578unshift @INC, $LIBDIR; 4087#############################################################################
3579 4088
3580my $bug_warning = 0; 4089my $bug_warning = 0;
3581 4090
3582our @WAIT_FOR_TICK; 4091our @WAIT_FOR_TICK;
3583our @WAIT_FOR_TICK_BEGIN; 4092our @WAIT_FOR_TICK_BEGIN;
3584 4093
3585sub wait_for_tick { 4094sub wait_for_tick() {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 4095 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3588 4096
3589 my $signal = new Coro::Signal; 4097 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK, $signal; 4098 push @WAIT_FOR_TICK, $signal;
3591 $signal->wait; 4099 $signal->wait;
3592} 4100}
3593 4101
3594sub wait_for_tick_begin { 4102sub wait_for_tick_begin() {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 4103 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3597 4104
3598 my $signal = new Coro::Signal; 4105 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK_BEGIN, $signal; 4106 push @WAIT_FOR_TICK_BEGIN, $signal;
3600 $signal->wait; 4107 $signal->wait;
3601} 4108}
3602 4109
3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4110sub tick {
3604 if ($Coro::current != $Coro::main) { 4111 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4112 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 4113 unless ++$bug_warning > 10;
3607 return; 4114 return;
3608 } 4115 }
3609 4116
3610 $NOW = $tick_start = EV::now;
3611
3612 cf::server_tick; # one server iteration 4117 cf::server_tick; # one server iteration
3613 4118
3614 $RUNTIME += $TICK; 4119 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3615 $NEXT_TICK = $_[0]->at;
3616 4120
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4121 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4122 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 4123 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 4124 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 4125 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 4126 or error "ERROR: unable to write runtime file: $!";
3623 }; 4127 };
3624 } 4128 }
3625 4129
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4130 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 4131 $sig->send;
3628 } 4132 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 4133 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 4134 $sig->send;
3631 } 4135 }
3632 4136
3633 $LOAD = ($NOW - $tick_start) / $TICK; 4137 $LOAD = ($NOW - $TICK_START) / $TICK;
3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4138 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3635 4139
3636 _post_tick; 4140 if (0) {
3637}; 4141 if ($NEXT_TICK) {
3638$TICK_WATCHER->priority (EV::MAXPRI); 4142 my $jitter = $TICK_START - $NEXT_TICK;
4143 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4144 debug "jitter $JITTER\n";#d#
4145 }
4146 }
4147}
3639 4148
3640{ 4149{
3641 # configure BDB 4150 # configure BDB
3642 4151
3643 BDB::min_parallel 8; 4152 BDB::min_parallel 16;
3644 BDB::max_poll_reqs $TICK * 0.1; 4153 BDB::max_poll_reqs $TICK * 0.1;
3645 $Coro::BDB::WATCHER->priority (1); 4154 $AnyEvent::BDB::WATCHER->priority (1);
3646 4155
3647 unless ($DB_ENV) { 4156 unless ($DB_ENV) {
3648 $DB_ENV = BDB::db_env_create; 4157 $DB_ENV = BDB::db_env_create;
3649 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4158 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3650 | BDB::LOG_AUTOREMOVE, 1); 4159 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4160 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3651 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4161 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3652 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4162 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3653 4163
3654 cf::sync_job { 4164 cf::sync_job {
3655 eval { 4165 eval {
3681{ 4191{
3682 # configure IO::AIO 4192 # configure IO::AIO
3683 4193
3684 IO::AIO::min_parallel 8; 4194 IO::AIO::min_parallel 8;
3685 IO::AIO::max_poll_time $TICK * 0.1; 4195 IO::AIO::max_poll_time $TICK * 0.1;
3686 $Coro::AIO::WATCHER->priority (1); 4196 undef $AnyEvent::AIO::WATCHER;
3687} 4197}
3688 4198
3689my $_log_backtrace; 4199our $_log_backtrace;
4200our $_log_backtrace_last;
3690 4201
3691sub _log_backtrace { 4202sub _log_backtrace {
3692 my ($msg, @addr) = @_; 4203 my ($msg, @addr) = @_;
3693 4204
3694 $msg =~ s/\n//; 4205 $msg =~ s/\n$//;
3695 4206
4207 if ($_log_backtrace_last eq $msg) {
4208 LOG llevInfo, "[ABT] $msg\n";
4209 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3696 # limit the # of concurrent backtraces 4210 # limit the # of concurrent backtraces
3697 if ($_log_backtrace < 2) { 4211 } elsif ($_log_backtrace < 2) {
4212 $_log_backtrace_last = $msg;
3698 ++$_log_backtrace; 4213 ++$_log_backtrace;
4214 my $perl_bt = Carp::longmess $msg;
3699 async { 4215 async {
3700 $Coro::current->{desc} = "abt $msg"; 4216 $Coro::current->{desc} = "abt $msg";
3701 4217
3702 my @bt = fork_call { 4218 my @bt = fork_call {
3703 @addr = map { sprintf "%x", $_ } @addr; 4219 @addr = map { sprintf "%x", $_ } @addr;
3714 } 4230 }
3715 4231
3716 @funcs 4232 @funcs
3717 }; 4233 };
3718 4234
3719 LOG llevInfo, "[ABT] $msg\n"; 4235 LOG llevInfo, "[ABT] $perl_bt\n";
4236 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3720 LOG llevInfo, "[ABT] $_\n" for @bt; 4237 LOG llevInfo, "[ABT] $_\n" for @bt;
3721 --$_log_backtrace; 4238 --$_log_backtrace;
3722 }; 4239 };
3723 } else { 4240 } else {
3724 LOG llevInfo, "[ABT] $msg\n"; 4241 LOG llevInfo, "[ABT] $msg\n";
3725 LOG llevInfo, "[ABT] [suppressed]\n"; 4242 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3726 } 4243 }
3727} 4244}
3728 4245
3729# load additional modules 4246# load additional modules
3730use cf::pod; 4247require "cf/$_.pm" for @EXTRA_MODULES;
4248cf::_connect_to_perl_2;
3731 4249
3732END { cf::emergency_save } 4250END { cf::emergency_save }
3733 4251
37341 42521
3735 4253

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines