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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.529 by root, Wed Apr 28 11:28:22 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV 1.86; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 58use Fcntl;
32use YAML::Syck (); 59use YAML::XS ();
33use IO::AIO 2.51 (); 60use IO::AIO ();
34use Time::HiRes; 61use Time::HiRes;
35use Compress::LZF; 62use Compress::LZF;
36use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
37 66
38# configure various modules to our taste 67# configure various modules to our taste
39# 68#
40$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 77
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
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;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
74our %RESOURCE; 111our %RESOURCE;
75 112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
118
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $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 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 121our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
82 123
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 127our $DB_ENV;
88 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
89our %CFG; 131our %CFG;
90 132
91our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 134our $RUNTIME;
93our $NOW; 135our $NOW;
99# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 143
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
105 153
106binmode STDOUT; 154binmode STDOUT;
107binmode STDERR; 155binmode STDERR;
108 156
109# read virtual server time, if available 157# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
114} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
115 165
116mkdir $_ 166mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 168
119our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
120 170
121sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 187
123############################################################################# 188#############################################################################
124 189
125=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
126 191
173returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 240
176=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
177 242
178This array contains the results of the last C<invoke ()> call. When 243This 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 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 245that call.
181 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
182=back 253=back
183 254
184=cut 255=cut
185 256
186BEGIN { 257$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 258 my $msg = join "", @_;
189 259
190 $msg .= "\n" 260 $msg .= "\n"
191 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
192 262
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 264
195 LOG llevError, $msg; 265 LOG llevError, $msg;
196 }; 266};
197}
198 267
199$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "=="
270
200 warn Carp::longmess $_[0]; 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d#
276 }#d#
277
278 # kill coroutine otherwise
201 Coro::terminate; 279 Coro::terminate
202}; 280};
203 281
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214for my $pkg (qw( 292for my $pkg (qw(
215 cf::global cf::attachable 293 cf::global cf::attachable
216 cf::object cf::object::player 294 cf::object cf::object::player
217 cf::client cf::player 295 cf::client cf::player
218 cf::arch cf::living 296 cf::arch cf::living
297 cf::map cf::mapspace
219 cf::map cf::party cf::region 298 cf::party cf::region
220)) { 299)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 301}
224 302
225$EV::DIED = sub { 303$EV::DIED = sub {
226 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
227}; 305};
228 306
229############################################################################# 307#############################################################################
230 308
231=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
269 347
270sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
271sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
272 350
351=item cf::post_init { BLOCK }
352
353Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again.
355
356The cdoeblock will have a single boolean argument to indicate whether this
357is a reload or not.
358
359=cut
360
361sub post_init(&) {
362 push @POST_INIT, shift;
363}
364
273=item cf::lock_wait $string 365=item cf::lock_wait $string
274 366
275Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
276 368
277=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
278 370
279Wait until the given lock is available and then acquires it and returns 371Wait until the given lock is available and then acquires it and returns
280a Coro::guard object. If the guard object gets destroyed (goes out of scope, 372a L<Guard> object. If the guard object gets destroyed (goes out of scope,
281for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
282returned. 374returned.
283 375
284Locks are *not* recursive, locking from the same coro twice results in a 376Locks are *not* recursive, locking from the same coro twice results in a
285deadlocked coro. 377deadlocked coro.
291 383
292Return true if the lock is currently active, i.e. somebody has locked it. 384Return true if the lock is currently active, i.e. somebody has locked it.
293 385
294=cut 386=cut
295 387
296our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
297our %LOCKER;#d#
298 389
299sub lock_wait($) { 390sub lock_wait($) {
300 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
306
307 # wait for lock, if any
308 while ($LOCK{$key}) {
309 push @{ $LOCK{$key} }, $Coro::current;
310 Coro::schedule;
311 }
312} 392}
313 393
314sub lock_acquire($) { 394sub lock_acquire($) {
315 my ($key) = @_; 395 $LOCKS->guard ($_[0])
316
317 # wait, to be sure we are not locked
318 lock_wait $key;
319
320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
322
323 Coro::guard {
324 delete $LOCKER{$key};#d#
325 # wake up all waiters, to be on the safe side
326 $_->ready for @{ delete $LOCK{$key} };
327 }
328} 396}
329 397
330sub lock_active($) { 398sub lock_active($) {
331 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
332
333 ! ! $LOCK{$key}
334} 400}
335 401
336sub freeze_mainloop { 402sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 403 tick_inhibit_inc;
338 404
339 my $guard = Coro::guard { 405 &Guard::guard (\&tick_inhibit_dec);
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 406}
345 407
346=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
347 409
348Like EV::periodic, but randomly selects a starting point so that the actions 410Like EV::periodic, but randomly selects a starting point so that the actions
349get spread over timer. 411get spread over time.
350 412
351=cut 413=cut
352 414
353sub periodic($$) { 415sub periodic($$) {
354 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
371 433
372=cut 434=cut
373 435
374our @SLOT_QUEUE; 436our @SLOT_QUEUE;
375our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
376 439
377$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
378$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
379 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
380 443
381 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
382 446
383 while () { 447 while () {
384 next_job: 448 next_job:
449
385 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
386 if ($avail > 0.01) { 451
387 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
388 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
389 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
390 $job->[2]->send; 456 $job->[2]->send;
391 Coro::cede; 457 Coro::cede;
392 goto next_job; 458 goto next_job;
393 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
394 } 461 }
395 } 462 }
396 463
397 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
398 # we do not use wait_for_tick() as it returns immediately when tick is inactive 465 # we do not use wait_for_tick() as it returns immediately when tick is inactive
399 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
400 $signal->wait; 467 $signal->wait;
401 } else { 468 } else {
469 $busy = 0;
402 Coro::schedule; 470 Coro::schedule;
403 } 471 }
404 } 472 }
405}; 473};
406 474
407sub get_slot($;$$) { 475sub get_slot($;$$) {
476 return if tick_inhibit || $Coro::current == $Coro::main;
477
408 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
409 479
410 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
411 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
412 483
413 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
414 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
415 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
442 513
443sub sync_job(&) { 514sub sync_job(&) {
444 my ($job) = @_; 515 my ($job) = @_;
445 516
446 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
447 my $time = EV::time; 518 my $time = AE::time;
448 519
449 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
451 522
452 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
453 524
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 525 my $freeze_guard = freeze_mainloop;
457 526
458 my $busy = 1; 527 my $busy = 1;
459 my @res; 528 my @res;
460 529
471 } else { 540 } else {
472 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
473 } 542 }
474 } 543 }
475 544
476 $time = EV::time - $time; 545 my $time = AE::time - $time;
477 546
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
482 548
483 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
484 } else { 550 } else {
485 # we are in another coroutine, how wonderful, everything just works 551 # we are in another coroutine, how wonderful, everything just works
486 552
528 reset_signals; 594 reset_signals;
529 &$cb 595 &$cb
530 }, @args; 596 }, @args;
531 597
532 wantarray ? @res : $res[-1] 598 wantarray ? @res : $res[-1]
599}
600
601sub objinfo {
602 (
603 "counter value" => cf::object::object_count,
604 "objects created" => cf::object::create_count,
605 "objects destroyed" => cf::object::destroy_count,
606 "freelist size" => cf::object::free_count,
607 "allocated objects" => cf::object::objects_size,
608 "active objects" => cf::object::actives_size,
609 )
610}
611
612=item $coin = coin_from_name $name
613
614=cut
615
616our %coin_alias = (
617 "silver" => "silvercoin",
618 "silvercoin" => "silvercoin",
619 "silvercoins" => "silvercoin",
620 "gold" => "goldcoin",
621 "goldcoin" => "goldcoin",
622 "goldcoins" => "goldcoin",
623 "platinum" => "platinacoin",
624 "platinumcoin" => "platinacoin",
625 "platinumcoins" => "platinacoin",
626 "platina" => "platinacoin",
627 "platinacoin" => "platinacoin",
628 "platinacoins" => "platinacoin",
629 "royalty" => "royalty",
630 "royalties" => "royalty",
631);
632
633sub coin_from_name($) {
634 $coin_alias{$_[0]}
635 ? cf::arch::find $coin_alias{$_[0]}
636 : undef
533} 637}
534 638
535=item $value = cf::db_get $family => $key 639=item $value = cf::db_get $family => $key
536 640
537Returns a single value from the environment database. 641Returns a single value from the environment database.
676 780
677############################################################################# 781#############################################################################
678 782
679=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
680 784
681Many objects in crossfire are so-called attachable objects. That means you can 785Many objects in deliantra are so-called attachable objects. That means you can
682attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
683to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
684 788
685In the following description, CLASS can be any of C<global>, C<object> 789In the following description, CLASS can be any of C<global>, C<object>
686C<player>, C<client> or C<map> (i.e. the attachable objects in 790C<player>, C<client> or C<map> (i.e. the attachable objects in
736=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
737 841
738Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
739given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
740 844
741Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
742that are attached at load/instantiate time, thus the need for a name. 846that are attached at load/instantiate time, thus the need for a name.
743 847
744These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
745 849
746=over 4 850=over 4
1037 1141
1038sub reattach { 1142sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1143 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1144 my ($obj) = @_;
1041 1145
1146 # no longer needed after getting rid of delete_package?
1042 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1147 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1043 1148
1044 my $registry = $obj->registry; 1149 my $registry = $obj->registry;
1045 1150
1046 @$registry = (); 1151 @$registry = ();
1047 1152
1090 1195
1091 sync_job { 1196 sync_job {
1092 if (length $$rdata) { 1197 if (length $$rdata) {
1093 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1096 1202
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1204 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 aio_fsync $fh if $cf::USE_FSYNC; 1206 if ($cf::USE_FSYNC) {
1207 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;
1208 aio_fsync $fh;
1209 }
1101 close $fh; 1210 aio_close $fh;
1102 1211
1103 if (@$objs) { 1212 if (@$objs) {
1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1213 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1214 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1108 aio_fsync $fh if $cf::USE_FSYNC; 1217 if ($cf::USE_FSYNC) {
1218 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;
1219 aio_fsync $fh;
1220 }
1109 close $fh; 1221 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1223 }
1112 } else { 1224 } else {
1113 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1114 } 1226 }
1115 1227
1116 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1117 } else { 1232 } else {
1118 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1119 } 1234 }
1120 } else { 1235 } else {
1121 aio_unlink $filename; 1236 aio_unlink $filename;
1122 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1123 } 1238 }
1148 $av = $st->{objs}; 1263 $av = $st->{objs};
1149 } 1264 }
1150 1265
1151 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1152 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1153 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1154 1270
1155 ($data, $av) 1271 ($data, $av)
1156} 1272}
1157 1273
1158=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1214 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1215 1331
1216 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1217} 1333}
1218 1334
1335use File::Glob ();
1336
1219cf::player->attach ( 1337cf::player->attach (
1220 on_command => sub { 1338 on_unknown_command => sub {
1221 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1222 1340
1223 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1224 or return; 1342 or return;
1225 1343
1255 1373
1256 cf::override; 1374 cf::override;
1257 }, 1375 },
1258); 1376);
1259 1377
1378# "readahead" all extensions
1379sub cache_extensions {
1380 my $grp = IO::AIO::aio_group;
1381
1382 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1383 for (grep /\.ext$/, @{$_[0]}) {
1384 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1385 }
1386 };
1387
1388 $grp
1389}
1390
1260sub load_extensions { 1391sub load_extensions {
1261 cf::sync_job { 1392 cf::sync_job {
1262 my %todo; 1393 my %todo;
1263 1394
1264 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1283 1414
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1417
1287 $ext{source} = 1418 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1289 . "#line 1 \"$path\"\n{\n" 1420 . "#line 1 \"$path\"\n{\n"
1290 . $source 1421 . $source
1291 . "\n};\n1"; 1422 . "\n};\n1";
1292 1423
1293 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1294 } 1425 }
1295 1426
1427 my $pass = 0;
1296 my %done; 1428 my %done;
1297 while (%todo) { 1429 while (%todo) {
1298 my $progress; 1430 my $progress;
1299 1431
1432 ++$pass;
1433
1434 ext:
1300 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1301 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1302 goto skip 1437 next ext
1303 unless exists $done{$_}; 1438 unless exists $done{$_};
1304 } 1439 }
1305 1440
1306 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1307 1442
1308 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1309 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1310 : "$v->{base}: extension inactive.\n";
1311 1447
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1312 if (exists $v->{meta}{mandatory}) { 1449 if exists $v->{meta}{mandatory};
1313 warn $msg; 1450
1314 warn "mandatory extension failed to load, exiting.\n"; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1315 exit 1; 1452 delete $todo{$k};
1316 } 1453 } else {
1317 1454 $done{$k} = delete $todo{$k};
1318 warn $msg; 1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1319 } 1460 }
1320
1321 $done{$k} = delete $todo{$k};
1322 push @EXTS, $v->{pkg};
1323 $progress = 1;
1324 } 1461 }
1325 1462
1326 skip: 1463 unless ($progress) {
1327 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1328 unless $progress; 1465
1466 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory};
1469 }
1470 }
1329 } 1471 }
1330 }; 1472 };
1331} 1473}
1332 1474
1333############################################################################# 1475#############################################################################
1334 1476
1335=back 1477=back
1336 1478
1337=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1338 1480
1339Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1340 1482
1341=cut 1483=cut
1342 1484
1343package cf::player; 1485package cf::player;
1344 1486
1387 1529
1388sub exists($) { 1530sub exists($) {
1389 my ($login) = @_; 1531 my ($login) = @_;
1390 1532
1391 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1392 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1393} 1535}
1394 1536
1395sub find($) { 1537sub find($) {
1396 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1397 my $login = $_[0]; 1539 my $login = $_[0];
1409 my $f = new_from_file cf::object::thawer path $login 1551 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1552 or return;
1411 1553
1412 my $pl = cf::player::load_pl $f 1554 my $pl = cf::player::load_pl $f
1413 or return; 1555 or return;
1556
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1557 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1558 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1417 } 1560 }
1418 } 1561 }
1419} 1562}
1420 1563
1564cf::player->attach (
1565 on_load => sub {
1566 my ($pl, $path) = @_;
1567
1568 # restore slots saved in save, below
1569 my $slots = delete $pl->{_slots};
1570
1571 $pl->ob->current_weapon ($slots->[0]);
1572 $pl->combat_ob ($slots->[1]);
1573 $pl->ranged_ob ($slots->[2]);
1574 },
1575);
1576
1421sub save($) { 1577sub save($) {
1422 my ($pl) = @_; 1578 my ($pl) = @_;
1423 1579
1424 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1425 1581
1428 1584
1429 return if $pl->{deny_save}; 1585 return if $pl->{deny_save};
1430 1586
1431 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1589
1590 cf::get_slot 0.01;
1591
1592 # save slots, to be restored later
1593 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1433 1594
1434 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1596 cf::cede_to_tick;
1436} 1597}
1437 1598
1469 my ($pl) = @_; 1630 my ($pl) = @_;
1470 1631
1471 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1472 1633
1473 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1474 $pl->password ("*"); # this should lock out the player until we nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1475 1636
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477 $pl->deactivate; 1638 $pl->deactivate;
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1479 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1480 1642
1481 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1521 1683
1522 for my $login (@$dirs) { 1684 for my $login (@$dirs) {
1523 my $path = path $login; 1685 my $path = path $login;
1524 1686
1525 # a .pst is a dead give-away for a valid player 1687 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1688 # if no pst file found, open and chekc for blocked users
1689 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1690 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1691 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1692 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1693 }
1531 1694
1535 1698
1536 \@logins 1699 \@logins
1537} 1700}
1538 1701
1539=item $player->maps 1702=item $player->maps
1703
1704=item cf::player::maps $login
1540 1705
1541Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1542player. May block. 1707player. May block.
1543 1708
1544=cut 1709=cut
1562 } 1727 }
1563 1728
1564 \@paths 1729 \@paths
1565} 1730}
1566 1731
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1732=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568 1733
1569Expand crossfire pod fragments into protocol xml. 1734Expand deliantra pod fragments into protocol xml.
1570
1571=cut
1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod {
1585 my ($self, $pod) = @_;
1586
1587 my $xml;
1588
1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group;
1597 } elsif ($pod =~ m%\G
1598 ([BCGHITU])
1599 <
1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659 1735
1660=item $player->ext_reply ($msgid, @msg) 1736=item $player->ext_reply ($msgid, @msg)
1661 1737
1662Sends an ext reply to the player. 1738Sends an ext reply to the player.
1663 1739
1695 1771
1696=cut 1772=cut
1697 1773
1698sub find_by_path($) { 1774sub find_by_path($) {
1699 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1700 1778
1701 my ($match, $specificity); 1779 my ($match, $specificity);
1702 1780
1703 for my $region (list) { 1781 for my $region (list) {
1704 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1730our $MAX_RESET = 3600; 1808our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1809our $DEFAULT_RESET = 3000;
1732 1810
1733sub generate_random_map { 1811sub generate_random_map {
1734 my ($self, $rmp) = @_; 1812 my ($self, $rmp) = @_;
1813
1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1815
1735 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1817 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 1846
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1848}
1768 1849
1769# also paths starting with '/' 1850# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1852
1772sub thawer_merge { 1853sub thawer_merge {
1773 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1774 1855
1775 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1861 1942
1862# the temporary/swap location 1943# the temporary/swap location
1863sub save_path { 1944sub save_path {
1864 my ($self) = @_; 1945 my ($self) = @_;
1865 1946
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1948 "$TMPDIR/$path.map"
1868} 1949}
1869 1950
1870# the unique path, undef == no special unique path 1951# the unique path, undef == no special unique path
1871sub uniq_path { 1952sub uniq_path {
1872 my ($self) = @_; 1953 my ($self) = @_;
1873 1954
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1876}
1877
1878# and all this just because we cannot iterate over
1879# all maps in C++...
1880sub change_all_map_light {
1881 my ($change) = @_;
1882
1883 $_->change_map_light ($change)
1884 for grep $_->outdoor, values %cf::MAP;
1885} 1957}
1886 1958
1887sub decay_objects { 1959sub decay_objects {
1888 my ($self) = @_; 1960 my ($self) = @_;
1889 1961
1973sub find { 2045sub find {
1974 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
1975 2047
1976 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
1977 2049
1978 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
1980 2052
1981 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1985 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
1986 or return; 2055 or return;
1987 2056
1988 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
1989 2058
1991 or return; 2060 or return;
1992 2061
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2062 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 2063 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 2064 #$cf::WAIT_FOR_TICK->wait;
2065 undef $guard2;
1996 undef $guard1; 2066 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 2067 $map->reset;
1999 return find $path; 2068 return find $path;
2000 } 2069 }
2001 2070
2002 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2003 } 2072 }
2004} 2073}
2005 2074
2006sub pre_load { } 2075sub pre_load { }
2007sub post_load { } 2076#sub post_load { } # XS
2008 2077
2009sub load { 2078sub load {
2010 my ($self) = @_; 2079 my ($self) = @_;
2011 2080
2012 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2098 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2099 $f->skip_block;
2031 $self->_load_objects ($f) 2100 $self->_load_objects ($f)
2032 or return; 2101 or return;
2033 2102
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2103 $self->post_load_original
2035 if delete $self->{load_original}; 2104 if delete $self->{load_original};
2036 2105
2037 if (my $uniq = $self->uniq_path) { 2106 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2107 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2108 unless (aio_stat $uniq) {
2057 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2058 $self->decay_objects; 2127 $self->decay_objects;
2059 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2060 $self->update_buttons; 2129 $self->update_buttons;
2061 cf::cede_to_tick; 2130 cf::cede_to_tick;
2062 $self->set_darkness_map;
2063 cf::cede_to_tick;
2064 $self->activate; 2131 $self->activate;
2065 } 2132 }
2066 2133
2067 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2069 2136
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2137 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2138 }
2072 2139
2073 $self->post_load; 2140 $self->post_load;
2074} 2141}
2075 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2076sub customise_for { 2146sub customise_for {
2077 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2078 2148
2079 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2080 if $self->per_player; 2150 if $self->per_player;
2096 or next; 2166 or next;
2097 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2098 or next; 2168 or next;
2099 $neigh->load; 2169 $neigh->load;
2100 2170
2171 # now find the diagonal neighbours
2101 push @neigh, 2172 push @neigh,
2102 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2103 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2104 } 2175 }
2105 2176
2133 my ($path, $origin, $load) = @_; 2204 my ($path, $origin, $load) = @_;
2134 2205
2135 $path = normalise $path, $origin && $origin->{path}; 2206 $path = normalise $path, $origin && $origin->{path};
2136 2207
2137 if (my $map = $cf::MAP{$path}) { 2208 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2210 }
2140 2211
2141 $MAP_PREFETCH{$path} |= $load; 2212 $MAP_PREFETCH{$path} |= $load;
2142 2213
2143 $MAP_PREFETCHER ||= cf::async { 2214 $MAP_PREFETCHER ||= cf::async {
2157 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2158 2229
2159 () 2230 ()
2160} 2231}
2161 2232
2233# common code, used by both ->save and ->swapout
2162sub save { 2234sub _save {
2163 my ($self) = @_; 2235 my ($self) = @_;
2164
2165 my $lock = cf::lock_acquire "map_data:$self->{path}";
2166 2236
2167 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2168 2238
2169 return unless $self->dirty; 2239 return unless $self->dirty;
2170 2240
2179 2249
2180 cf::async { 2250 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2251 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2252 $_->contr->save for $self->players;
2183 }; 2253 };
2254
2255 cf::get_slot 0.02;
2184 2256
2185 if ($uniq) { 2257 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2258 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2259 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2260 } else {
2189 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2190 } 2262 }
2191} 2263}
2192 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2193sub swap_out { 2273sub swap_out {
2194 my ($self) = @_; 2274 my ($self) = @_;
2195 2275
2196 # save first because save cedes
2197 $self->save;
2198
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2277
2278 return if $self->in_memory != cf::MAP_ACTIVE;
2279 return if $self->{deny_save};
2201 return if $self->players; 2280 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY;
2203 return if $self->{deny_save};
2204 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2206 2332
2207 $self->deactivate; 2333 $self->deactivate;
2208 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2209 $self->clear; 2335 $self->clear;
2210}
2211
2212sub reset_at {
2213 my ($self) = @_;
2214
2215 # TODO: safety, remove and allow resettable per-player maps
2216 return 1e99 if $self->{deny_reset};
2217
2218 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2219 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2220
2221 $time + $to
2222}
2223
2224sub should_reset {
2225 my ($self) = @_;
2226
2227 $self->reset_at <= $cf::RUNTIME
2228}
2229
2230sub reset {
2231 my ($self) = @_;
2232
2233 my $lock = cf::lock_acquire "map_data:$self->{path}";
2234
2235 return if $self->players;
2236
2237 warn "resetting map ", $self->path;
2238
2239 $self->in_memory (cf::MAP_SWAPPED);
2240
2241 # need to save uniques path
2242 unless ($self->{deny_save}) {
2243 my $uniq = $self->uniq_path; utf8::encode $uniq;
2244
2245 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2246 if $uniq;
2247 }
2248
2249 delete $cf::MAP{$self->path};
2250
2251 $self->deactivate;
2252 $_->clear_links_to ($self) for values %cf::MAP;
2253 $self->clear;
2254 2336
2255 $self->unlink_save; 2337 $self->unlink_save;
2256 $self->destroy; 2338 $self->destroy;
2257} 2339}
2258 2340
2266 2348
2267 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2268 2350
2269 $self->unlink_save; 2351 $self->unlink_save;
2270 2352
2271 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2272 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2273 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2274 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2275 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2276 2358
2325 2407
2326sub unique_maps() { 2408sub unique_maps() {
2327 [ 2409 [
2328 map { 2410 map {
2329 utf8::decode $_; 2411 utf8::decode $_;
2330 /\.map$/ 2412 s/\.map$//; # TODO future compatibility hack
2413 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2414 ? ()
2331 ? normalise $_ 2415 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2417 ]
2335} 2418}
2336 2419
2337package cf; 2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2338 2451
2339=back 2452=back
2340 2453
2341=head3 cf::object 2454=head3 cf::object
2342 2455
2346 2459
2347=over 4 2460=over 4
2348 2461
2349=item $ob->inv_recursive 2462=item $ob->inv_recursive
2350 2463
2351Returns the inventory of the object _and_ their inventories, recursively. 2464Returns the inventory of the object I<and> their inventories, recursively,
2465but I<not> the object itself.
2352 2466
2353=cut 2467=cut
2354 2468
2355sub inv_recursive_; 2469sub inv_recursive_;
2356sub inv_recursive_ { 2470sub inv_recursive_ {
2361 inv_recursive_ inv $_[0] 2475 inv_recursive_ inv $_[0]
2362} 2476}
2363 2477
2364=item $ref = $ob->ref 2478=item $ref = $ob->ref
2365 2479
2366creates and returns a persistent reference to an objetc that can be stored as a string. 2480Creates and returns a persistent reference to an object that can be stored as a string.
2367 2481
2368=item $ob = cf::object::deref ($refstring) 2482=item $ob = cf::object::deref ($refstring)
2369 2483
2370returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2484returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2371even if the object actually exists. May block. 2485even if the object actually exists. May block.
2403can be C<undef>. Does the right thing when the player is currently in a 2517can be C<undef>. Does the right thing when the player is currently in a
2404dialogue with the given NPC character. 2518dialogue with the given NPC character.
2405 2519
2406=cut 2520=cut
2407 2521
2522our $SAY_CHANNEL = {
2523 id => "say",
2524 title => "Map",
2525 reply => "say ",
2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2527};
2528
2529our $CHAT_CHANNEL = {
2530 id => "chat",
2531 title => "Chat",
2532 reply => "chat ",
2533 tooltip => "Player chat and shouts, global to the server.",
2534};
2535
2408# rough implementation of a future "reply" method that works 2536# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2537# with dialog boxes.
2410#TODO: the first argument must go, split into a $npc->reply_to ( method 2538#TODO: the first argument must go, split into a $npc->reply_to ( method
2411sub cf::object::player::reply($$$;$) { 2539sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2540 my ($self, $npc, $msg, $flags) = @_;
2423 my $dialog = $pl->{npc_dialog}; 2551 my $dialog = $pl->{npc_dialog};
2424 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2552 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2425 2553
2426 } else { 2554 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2555 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2556 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2557 }
2430 } 2558 }
2431} 2559}
2432 2560
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2561=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 2586
2459=item $player_object->enter_link 2587=item $player_object->enter_link
2460 2588
2461Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2462 2590
2463The player should be reasonably safe there for short amounts of time. You 2591The player should be reasonably safe there for short amounts of time (e.g.
2464I<MUST> call C<leave_link> as soon as possible, though. 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2593though, as the player cannot control the character while it is on the link
2594map.
2465 2595
2466Will never block. 2596Will never block.
2467 2597
2468=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2469 2599
2489sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2490 my ($self) = @_; 2620 my ($self) = @_;
2491 2621
2492 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2493 2623
2624 ++$self->{_link_recursion};
2625
2494 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2495 2627
2496 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2497 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2498 2630
2499 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2500} 2632}
2501 2633
2502sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2503 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2504 2636
2521 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2522 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2523 2655
2524 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2525 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2526 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2527 2659
2528 $map->load; 2660 $map->load;
2529 $map->load_neighbours; 2661 $map->load_neighbours;
2530 2662
2531 return unless $self->contr->active; 2663 return unless $self->contr->active;
2532 $self->activate_recursive;
2533 2664
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2536} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2537 2672
2673}
2674
2538=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2539 2676
2540Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2541her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2542that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2543the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2544be called at the end of this process. 2681be called at the end of this process.
2545 2682
2683Note that $check will be called with a potentially non-loaded map, so if
2684it needs a loaded map it has to call C<< ->load >>.
2685
2546=cut 2686=cut
2547 2687
2548our $GOTOGEN; 2688our $GOTOGEN;
2549 2689
2550sub cf::object::player::goto { 2690sub cf::object::player::goto {
2551 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2552 2698
2553 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2701
2556 $self->enter_link; 2702 $self->enter_link;
2580 my $map = eval { 2726 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2582 2728
2583 if ($map) { 2729 if ($map) {
2584 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2732 } else {
2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588 } 2734 }
2589 2735
2590 $map 2736 $map
2598 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2601 } 2747 }
2602 2748
2603 $done->() if $done; 2749 $done->($self) if $done;
2604 })->prio (1); 2750 })->prio (1);
2605} 2751}
2606 2752
2607=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2608 2754
2628} 2774}
2629 2775
2630sub prepare_random_map { 2776sub prepare_random_map {
2631 my ($exit) = @_; 2777 my ($exit) = @_;
2632 2778
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2779 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2780 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2781 # that depends on the exit object
2638 2782
2639 my $rmp = parse_random_map_params $exit->msg; 2783 my $rmp = parse_random_map_params $exit->msg;
2641 if ($exit->map) { 2785 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2786 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2787 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2788 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2789 $rmp->{origin_y} = $exit->y;
2790
2791 $exit->map->touch;
2646 } 2792 }
2647 2793
2648 $rmp->{random_seed} ||= $exit->random_seed; 2794 $rmp->{random_seed} ||= $exit->random_seed;
2649 2795
2650 my $data = cf::encode_json $rmp; 2796 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2797 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2798 my $meta = "$RANDOMDIR/$md5.meta";
2653 2799
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2800 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2801 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2802 undef $fh;
2657 aio_rename "$meta~", $meta; 2803 aio_rename "$meta~", $meta;
2658 2804
2805 my $slaying = "?random/$md5";
2806
2807 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2808 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2809 $exit->msg (undef);
2810 }
2661 } 2811 }
2662} 2812}
2663 2813
2664sub cf::object::player::enter_exit { 2814sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2815 my ($self, $exit) = @_;
2666 2816
2667 return unless $self->type == cf::PLAYER; 2817 return unless $self->type == cf::PLAYER;
2668 2818
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2819 $self->enter_link;
2681 2820
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2821 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2822 $Coro::current->{desc} = "enter_exit";
2688 2823
2689 $self->deactivate_recursive; # just to be sure
2690 unless (eval { 2824 unless (eval {
2825 $self->deactivate_recursive; # just to be sure
2826
2827 # random map handling
2828 {
2829 my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831 prepare_random_map $exit
2832 if $exit->slaying eq "/!";
2833 }
2834
2835 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2836 my $x = $exit->stats->hp;
2837 my $y = $exit->stats->sp;
2838
2691 $self->goto ($slaying, $hp, $sp); 2839 $self->goto ($map, $x, $y);
2692 2840
2841 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y)
2843 if $exit->flag (cf::FLAG_DAMNED);
2844
2693 1; 2845 1
2694 }) { 2846 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2847 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "I'll try to bring you back to the map you were before. " 2848 . "I'll try to bring you back to the map you were before. "
2697 . "Please report this to the dungeon master!", 2849 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2850 cf::NDI_UNIQUE | cf::NDI_RED);
2699 2851
2700 warn "ERROR in enter_exit: $@"; 2852 warn "ERROR in enter_exit: $@";
2717sub cf::client::send_drawinfo { 2869sub cf::client::send_drawinfo {
2718 my ($self, $text, $flags) = @_; 2870 my ($self, $text, $flags) = @_;
2719 2871
2720 utf8::encode $text; 2872 utf8::encode $text;
2721 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2874}
2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2722} 2899}
2723 2900
2724=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2725 2902
2726Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2730 2907
2731=cut 2908=cut
2732 2909
2733# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2734our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2735 "c/identify" => { 2918 "c/identify" => {
2736 id => "infobox", 2919 id => "infobox",
2737 title => "Identify", 2920 title => "Identify",
2738 reply => undef, 2921 reply => undef,
2739 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2741 "c/examine" => { 2924 "c/examine" => {
2742 id => "infobox", 2925 id => "infobox",
2743 title => "Examine", 2926 title => "Examine",
2744 reply => undef, 2927 reply => undef,
2745 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2746 }, 2935 },
2747 "c/book" => { 2936 "c/book" => {
2748 id => "infobox", 2937 id => "infobox",
2749 title => "Book", 2938 title => "Book",
2750 reply => undef, 2939 reply => undef,
2766 id => "infobox", 2955 id => "infobox",
2767 title => "Body Parts", 2956 title => "Body Parts",
2768 reply => undef, 2957 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2770 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2966 "c/skills" => {
2967 id => "infobox",
2968 title => "Skills",
2969 reply => undef,
2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2995 },
2771 "c/uptime" => { 2996 "c/uptime" => {
2772 id => "infobox", 2997 id => "infobox",
2773 title => "Uptime", 2998 title => "Uptime",
2774 reply => undef, 2999 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
2778 id => "infobox", 3003 id => "infobox",
2779 title => "Map Info", 3004 title => "Map Info",
2780 reply => undef, 3005 reply => undef,
2781 tooltip => "Information related to the maps", 3006 tooltip => "Information related to the maps",
2782 }, 3007 },
3008 "c/party" => {
3009 id => "party",
3010 title => "Party",
3011 reply => "gsay ",
3012 tooltip => "Messages and chat related to your party",
3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2783); 3022);
2784 3023
2785sub cf::client::send_msg { 3024sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2787 3026
2788 $msg = $self->pl->expand_cfpod ($msg); 3027 $msg = $self->pl->expand_cfpod ($msg)
3028 unless $color & cf::NDI_VERBATIM;
2789 3029
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 3030 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 3031
2792 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2794 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2795 3035
2796 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2797 if $self->can_msg;
2798
2799 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2800 3038
2801 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2802 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2803 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2804 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2805 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2806 if $self->can_msg;
2807 } 3044 }
2808 3045
2809 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2810 } 3047 }
2811 3048
2812 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2813 3050
2814 if ($self->can_msg) {
2815 # default colour, mask it out 3051 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2818 3054
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3055 my $pkt = "msg "
3056 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2821 } else { 3058 );
2822 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones
2824 for ($msg) {
2825 1 while
2826 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2827 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2828 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2829 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2830 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2831 }
2832 3059
2833 $color &= cf::NDI_COLOR_MASK; 3060 $self->send_big_packet ($pkt);
2834
2835 utf8::encode $msg;
2836
2837 if (0 && $msg =~ /\[/) {
2838 # COMMAND/INFO
2839 $self->send_packet ("drawextinfo $color 10 8 $msg")
2840 } else {
2841 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2842 $self->send_packet ("drawinfo $color $msg")
2843 }
2844 }
2845 }
2846} 3061}
2847 3062
2848=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2849 3064
2850Sends an ext event to the client. 3065Sends an ext event to the client.
2853 3068
2854sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2855 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2856 3071
2857 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2858 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2859 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2860 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2861 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2862 } 3077 }
2863} 3078}
2864 3079
2865=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2866 3081
2870 3085
2871sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2872 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2873 3088
2874 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2875 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2876 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2877 #TODO: version 1, remove 3092 #TODO: version 1, remove
2878 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2879 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2880 } 3095 }
2881} 3096}
2882 3097
2883=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2884 3099
2985 3200
2986 $coro 3201 $coro
2987} 3202}
2988 3203
2989cf::client->attach ( 3204cf::client->attach (
2990 on_destroy => sub { 3205 on_client_destroy => sub {
2991 my ($ns) = @_; 3206 my ($ns) = @_;
2992 3207
2993 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2994 }, 3209 },
2995); 3210);
3011our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3012 3227
3013$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3014 3229
3015$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3016 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3017 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3018 sort time 3233 sort time
3019)); 3234));
3020 3235
3021# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3024 3239
3025The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3026 3241
3027 cf::object 3242 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr 3244 insert remove name archname title slaying race decrease split
3245 value
3030 3246
3031 cf::object::player 3247 cf::object::player
3032 player 3248 player
3033 3249
3034 cf::player 3250 cf::player
3039 3255
3040=cut 3256=cut
3041 3257
3042for ( 3258for (
3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3046 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3048 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3049) { 3265) {
3050 no strict 'refs'; 3266 no strict 'refs';
3051 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3052 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3070 3286
3071 my $qcode = $code; 3287 my $qcode = $code;
3072 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3073 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3074 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3075 local $_; 3294 local $_;
3076 local @safe::cf::_safe_eval_args = values %vars;
3077 3295
3078 my $eval = 3296 my $eval =
3079 "do {\n" 3297 "do {\n"
3080 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3081 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3082 . $code 3300 . $code
3083 . "\n}" 3301 . "\n}"
3084 ; 3302 ;
3085 3303
3304 if ($CFG{safe_eval}) {
3086 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3087 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3088 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3089 3313
3090 if ($@) { 3314 if ($@) {
3091 warn "$@"; 3315 warn "$@";
3092 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3093 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3112=cut 3336=cut
3113 3337
3114sub register_script_function { 3338sub register_script_function {
3115 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3116 3340
3117 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3118 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3119} 3343}
3120 3344
3121=back 3345=back
3122 3346
3123=cut 3347=cut
3144 3368
3145 $facedata->{version} == 2 3369 $facedata->{version} == 2
3146 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3147 3371
3148 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3149 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3150 type => FT_RSRC, 3375 type => FT_RSRC,
3151 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3152 }; 3378 };
3153 cf::cede_to_tick; 3379 cf::cede_to_tick;
3154 3380
3155 { 3381 {
3156 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3158 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3159 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3160 3386
3161 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3162 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3163 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3164 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3165 3391
3166 cf::cede_to_tick; 3392 cf::cede_to_tick;
3167 } 3393 }
3168 3394
3169 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3193 3419
3194 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3195 } 3421 }
3196 3422
3197 { 3423 {
3198 # TODO: for gcfclient pleasure, we should give resources
3199 # that gcfclient doesn't grok a >10000 face index.
3200 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3201 3425
3202 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3203 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3204 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3205 my $data;
3206 3429
3207 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3208 # prepend meta info
3209
3210 my $meta = $enc->encode ({
3211 name => $name,
3212 %{ $info->{meta} || {} },
3213 });
3214
3215 $data = pack "(w/a*)*", $meta, $info->{data};
3216 } else {
3217 $data = $info->{data};
3218 }
3219
3220 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3221 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3222 } else { 3432 } else {
3223 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info;
3224 } 3434 }
3225 3435
3258 while (my ($k, $v) = each %$want) { 3468 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3469 $ns->fx_want ($k, $v);
3260 } 3470 }
3261}; 3471};
3262 3472
3473sub load_resource_file($) {
3474 my $guard = lock_acquire "load_resource_file";
3475
3476 my $status = load_resource_file_ $_[0];
3477 get_slot 0.1, 100;
3478 cf::arch::commit_load;
3479
3480 $status
3481}
3482
3263sub reload_regions { 3483sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3484 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3485 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3486 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3487
3280} 3500}
3281 3501
3282sub reload_archetypes { 3502sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3503 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3504 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3505}
3291 3506
3292sub reload_treasures { 3507sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3508 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3509 or die "unable to load treasurelists\n";
3295} 3510}
3296 3511
3297sub reload_resources { 3512sub reload_resources {
3298 warn "reloading resource files...\n"; 3513 warn "reloading resource files...\n";
3299 3514
3515 reload_facedata;
3516 reload_archetypes;
3300 reload_regions; 3517 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3518 reload_treasures;
3305 3519
3306 warn "finished reloading resource files\n"; 3520 warn "finished reloading resource files\n";
3307} 3521}
3308 3522
3309sub init {
3310 reload_resources;
3311}
3312
3313sub reload_config { 3523sub reload_config {
3524 warn "reloading config file...\n";
3525
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3526 open my $fh, "<:utf8", "$CONFDIR/config"
3315 or return; 3527 or return;
3316 3528
3317 local $/; 3529 local $/;
3318 *CFG = YAML::Syck::Load <$fh>; 3530 *CFG = YAML::XS::Load scalar <$fh>;
3319 3531
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3321 3533
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3534 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3535 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3324 3536
3325 if (exists $CFG{mlockall}) { 3537 if (exists $CFG{mlockall}) {
3327 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3328 and die "WARNING: m(un)lockall failed: $!\n"; 3540 and die "WARNING: m(un)lockall failed: $!\n";
3329 }; 3541 };
3330 warn $@ if $@; 3542 warn $@ if $@;
3331 } 3543 }
3544
3545 warn "finished reloading resource files\n";
3546}
3547
3548sub pidfile() {
3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550 or die "$PIDFILE: $!";
3551 flock $fh, &Fcntl::LOCK_EX
3552 or die "$PIDFILE: flock: $!";
3553 $fh
3554}
3555
3556# make sure only one server instance is running at any one time
3557sub atomic {
3558 my $fh = pidfile;
3559
3560 my $pid = <$fh>;
3561 kill 9, $pid if $pid > 0;
3562
3563 seek $fh, 0, 0;
3564 print $fh $$;
3565}
3566
3567sub main_loop {
3568 warn "EV::loop starting\n";
3569 if (1) {
3570 EV::loop;
3571 }
3572 warn "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP;
3332} 3574}
3333 3575
3334sub main { 3576sub main {
3577 cf::init_globals; # initialise logging
3578
3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583
3584 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3585
3335 # we must not ever block the main coroutine 3586 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3587 local $Coro::idle = sub {
3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3588 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3338 (async { 3589 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3590 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3591 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3592 })->prio (Coro::PRIO_MAX);
3342 }; 3593 };
3343 3594
3595 evthread_start IO::AIO::poll_fileno;
3596
3597 cf::sync_job {
3598 cf::init_experience;
3599 cf::init_anim;
3600 cf::init_attackmess;
3601 cf::init_dynamic;
3602
3603 cf::load_settings;
3604 cf::load_materials;
3605
3606 reload_resources;
3344 reload_config; 3607 reload_config;
3345 db_init; 3608 db_init;
3609
3610 cf::init_uuid;
3611 cf::init_signals;
3612 cf::init_skills;
3613
3614 cf::init_beforeplay;
3615
3616 atomic;
3617
3346 load_extensions; 3618 load_extensions;
3347 3619
3348 $TICK_WATCHER->start; 3620 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3621
3350 EV::loop; 3622 # no (long-running) fork's whatsoever before this point(!)
3623 use POSIX ();
3624 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3625
3626 (pop @POST_INIT)->(0) while @POST_INIT;
3627 };
3628
3629 cf::object::thawer::errors_are_fatal 0;
3630 warn "parse errors in files are no longer fatal from this point on.\n";
3631
3632 main_loop;
3351} 3633}
3352 3634
3353############################################################################# 3635#############################################################################
3354# initialisation and cleanup 3636# initialisation and cleanup
3355 3637
3356# install some emergency cleanup handlers 3638# install some emergency cleanup handlers
3357BEGIN { 3639BEGIN {
3358 our %SIGWATCHER = (); 3640 our %SIGWATCHER = ();
3359 for my $signal (qw(INT HUP TERM)) { 3641 for my $signal (qw(INT HUP TERM)) {
3360 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3642 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3361 cf::cleanup "SIG$signal"; 3643 cf::cleanup "SIG$signal";
3362 }; 3644 };
3363 } 3645 }
3364} 3646}
3365 3647
3366sub write_runtime { 3648sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime"; 3649 my $t0 = AE::time;
3368 3650
3369 # first touch the runtime file to show we are still running: 3651 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3652 # the fsync below can take a very very long time.
3371 3653
3372 IO::AIO::aio_utime $runtime, undef, undef; 3654 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 3655
3374 my $guard = cf::lock_acquire "write_runtime"; 3656 my $guard = cf::lock_acquire "write_runtime";
3375 3657
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3377 or return; 3659 or return;
3378 3660
3379 my $value = $cf::RUNTIME + 90 + 10; 3661 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 3662 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 3663 # 60 allows for the watchdog to kill the server.
3391 aio_utime $fh, undef, undef; 3673 aio_utime $fh, undef, undef;
3392 3674
3393 close $fh 3675 close $fh
3394 or return; 3676 or return;
3395 3677
3396 aio_rename "$runtime~", $runtime 3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 3679 and return;
3398 3680
3399 warn "runtime file written.\n"; 3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3400 3682
3401 1 3683 1
3684}
3685
3686our $uuid_lock;
3687our $uuid_skip;
3688
3689sub write_uuid_sync($) {
3690 $uuid_skip ||= $_[0];
3691
3692 return if $uuid_lock;
3693 local $uuid_lock = 1;
3694
3695 my $uuid = "$LOCALDIR/uuid";
3696
3697 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3698 or return;
3699
3700 my $value = uuid_seq uuid_cur;
3701
3702 unless ($value) {
3703 warn "cowardly refusing to write zero uuid value!\n";
3704 return;
3705 }
3706
3707 my $value = uuid_str $value + $uuid_skip;
3708 $uuid_skip = 0;
3709
3710 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3711 and return;
3712
3713 # always fsync - this file is important
3714 aio_fsync $fh
3715 and return;
3716
3717 close $fh
3718 or return;
3719
3720 aio_rename "$uuid~", $uuid
3721 and return;
3722
3723 warn "uuid file written ($value).\n";
3724
3725 1
3726
3727}
3728
3729sub write_uuid($$) {
3730 my ($skip, $sync) = @_;
3731
3732 $sync ? write_uuid_sync $skip
3733 : async { write_uuid_sync $skip };
3402} 3734}
3403 3735
3404sub emergency_save() { 3736sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3737 my $freeze_guard = cf::freeze_mainloop;
3406 3738
3407 warn "enter emergency perl save\n"; 3739 warn "emergency_perl_save: enter\n";
3408 3740
3409 cf::sync_job { 3741 cf::sync_job {
3742 # this is a trade-off: we want to be very quick here, so
3743 # save all maps without fsync, and later call a global sync
3744 # (which in turn might be very very slow)
3745 local $USE_FSYNC = 0;
3746
3410 # use a peculiar iteration method to avoid tripping on perl 3747 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 3748 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 3749 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 3750 warn "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 3751 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 3752 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 3753 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3754 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 3755 $pl->save;
3419 } 3756 }
3420 warn "end emergency player save\n"; 3757 warn "emergency_perl_save: end player save\n";
3421 3758
3422 warn "begin emergency map save\n"; 3759 warn "emergency_perl_save: begin map save\n";
3423 for my $path (keys %cf::MAP) { 3760 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 3761 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 3762 $map->valid or next;
3426 $map->save; 3763 $map->save;
3427 } 3764 }
3428 warn "end emergency map save\n"; 3765 warn "emergency_perl_save: end map save\n";
3429 3766
3430 warn "begin emergency database checkpoint\n"; 3767 warn "emergency_perl_save: begin database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3768 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3769 warn "emergency_perl_save: end database checkpoint\n";
3770
3771 warn "emergency_perl_save: begin write uuid\n";
3772 write_uuid_sync 1;
3773 warn "emergency_perl_save: end write uuid\n";
3433 }; 3774 };
3434 3775
3776 warn "emergency_perl_save: starting sync()\n";
3777 IO::AIO::aio_sync sub {
3778 warn "emergency_perl_save: finished sync()\n";
3779 };
3780
3435 warn "leave emergency perl save\n"; 3781 warn "emergency_perl_save: leave\n";
3436} 3782}
3437 3783
3438sub post_cleanup { 3784sub post_cleanup {
3439 my ($make_core) = @_; 3785 my ($make_core) = @_;
3440 3786
3441 warn Carp::longmess "post_cleanup backtrace" 3787 warn Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3788 if $make_core;
3789
3790 my $fh = pidfile;
3791 unlink $PIDFILE if <$fh> == $$;
3792}
3793
3794# a safer delete_package, copied from Symbol
3795sub clear_package($) {
3796 my $pkg = shift;
3797
3798 # expand to full symbol table name if needed
3799 unless ($pkg =~ /^main::.*::$/) {
3800 $pkg = "main$pkg" if $pkg =~ /^::/;
3801 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3802 $pkg .= '::' unless $pkg =~ /::$/;
3803 }
3804
3805 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3806 my $stem_symtab = *{$stem}{HASH};
3807
3808 defined $stem_symtab and exists $stem_symtab->{$leaf}
3809 or return;
3810
3811 # clear all symbols
3812 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3813 for my $name (keys %$leaf_symtab) {
3814 _gv_clear *{"$pkg$name"};
3815# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3816 }
3443} 3817}
3444 3818
3445sub do_reload_perl() { 3819sub do_reload_perl() {
3446 # can/must only be called in main 3820 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3821 if (in_main) {
3448 warn "can only reload from main coroutine"; 3822 warn "can only reload from main coroutine";
3449 return; 3823 return;
3450 } 3824 }
3451 3825
3826 return if $RELOAD++;
3827
3828 my $t1 = AE::time;
3829
3830 while ($RELOAD) {
3452 warn "reloading..."; 3831 warn "reloading...";
3453 3832
3454 warn "entering sync_job"; 3833 warn "entering sync_job";
3455 3834
3456 cf::sync_job { 3835 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark 3836 cf::write_runtime_sync; # external watchdog should not bark
3458 cf::emergency_save; 3837 cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark 3838 cf::write_runtime_sync; # external watchdog should not bark
3460 3839
3461 warn "syncing database to disk"; 3840 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV; 3841 BDB::db_env_txn_checkpoint $DB_ENV;
3463 3842
3464 # if anything goes wrong in here, we should simply crash as we already saved 3843 # if anything goes wrong in here, we should simply crash as we already saved
3465 3844
3466 warn "flushing outstanding aio requests"; 3845 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs; 3846 while (IO::AIO::nreqs || BDB::nreqs) {
3472 warn "iterate..."; 3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = ();
3480
3481 warn "removing commands";
3482 %COMMAND = ();
3483
3484 warn "removing ext/exti commands";
3485 %EXTCMD = ();
3486 %EXTICMD = ();
3487
3488 warn "unloading/nuking all extensions";
3489 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg";
3491
3492 if (my $cb = $pkg->can ("unload")) {
3493 eval {
3494 $cb->($pkg);
3495 1
3496 } or warn "$pkg unloaded, but with errors: $@";
3497 } 3848 }
3498 3849
3499 warn "... nuking $pkg"; 3850 warn "cancelling all extension coros";
3500 Symbol::delete_package $pkg; 3851 $_->cancel for values %EXT_CORO;
3501 } 3852 %EXT_CORO = ();
3502 3853
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3854 warn "removing commands";
3504 while (my ($k, $v) = each %INC) { 3855 %COMMAND = ();
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3856
3857 warn "removing ext/exti commands";
3858 %EXTCMD = ();
3859 %EXTICMD = ();
3860
3861 warn "unloading/nuking all extensions";
3862 for my $pkg (@EXTS) {
3507 warn "... unloading $k"; 3863 warn "... unloading $pkg";
3508 delete $INC{$k};
3509 3864
3510 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g;
3512
3513 if (my $cb = $k->can ("unload_module")) { 3865 if (my $cb = $pkg->can ("unload")) {
3866 eval {
3514 $cb->(); 3867 $cb->($pkg);
3868 1
3869 } or warn "$pkg unloaded, but with errors: $@";
3870 }
3871
3872 warn "... clearing $pkg";
3873 clear_package $pkg;
3515 } 3874 }
3516 3875
3517 Symbol::delete_package $k; 3876 warn "unloading all perl modules loaded from $LIBDIR";
3877 while (my ($k, $v) = each %INC) {
3878 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879
3880 warn "... unloading $k";
3881 delete $INC{$k};
3882
3883 $k =~ s/\.pm$//;
3884 $k =~ s/\//::/g;
3885
3886 if (my $cb = $k->can ("unload_module")) {
3887 $cb->();
3888 }
3889
3890 clear_package $k;
3518 } 3891 }
3519 3892
3520 warn "getting rid of safe::, as good as possible"; 3893 warn "getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3894 clear_package "safe::$_"
3522 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3895 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523 3896
3524 warn "unloading cf.pm \"a bit\""; 3897 warn "unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3898 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3527 3900
3528 # don't, removes xs symbols, too, 3901 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3902 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3903 #clear_package __PACKAGE__;
3531 3904
3532 warn "unload completed, starting to reload now"; 3905 warn "unload completed, starting to reload now";
3533 3906
3534 warn "reloading cf.pm"; 3907 warn "reloading cf.pm";
3535 require cf; 3908 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3909 cf::_connect_to_perl_1;
3537 3910
3538 warn "loading config and database again"; 3911 warn "loading config and database again";
3539 cf::reload_config; 3912 cf::reload_config;
3540 3913
3541 warn "loading extensions"; 3914 warn "loading extensions";
3542 cf::load_extensions; 3915 cf::load_extensions;
3543 3916
3917 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 3918 warn "reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3919 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3920 warn "reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3921 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3922 warn "reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3923 reattach $_ for values %PLAYER;
3924 }
3550 3925
3926 warn "running post_init jobs";
3927 (pop @POST_INIT)->(1) while @POST_INIT;
3928
3551 warn "leaving sync_job"; 3929 warn "leaving sync_job";
3552 3930
3553 1 3931 1
3554 } or do { 3932 } or do {
3555 warn $@; 3933 warn $@;
3556 warn "error while reloading, exiting."; 3934 cf::cleanup "error while reloading, exiting.";
3557 exit 1;
3558 }; 3935 };
3559 3936
3560 warn "reloaded"; 3937 warn "reloaded";
3938 --$RELOAD;
3939 }
3940
3941 $t1 = AE::time - $t1;
3942 warn "reload completed in ${t1}s\n";
3561}; 3943};
3562 3944
3563our $RELOAD_WATCHER; # used only during reload 3945our $RELOAD_WATCHER; # used only during reload
3564 3946
3565sub reload_perl() { 3947sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 3948 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 3949 # coro crashes during coro_state_free->destroy here.
3568 3950
3951 $RELOAD_WATCHER ||= cf::async {
3952 Coro::AIO::aio_wait cache_extensions;
3953
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3954 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3955 do_reload_perl;
3570 undef $RELOAD_WATCHER; 3956 undef $RELOAD_WATCHER;
3571 do_reload_perl; 3957 };
3572 }; 3958 };
3573} 3959}
3574 3960
3575register_command "reload" => sub { 3961register_command "reload" => sub {
3576 my ($who, $arg) = @_; 3962 my ($who, $arg) = @_;
3590 3976
3591our @WAIT_FOR_TICK; 3977our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 3978our @WAIT_FOR_TICK_BEGIN;
3593 3979
3594sub wait_for_tick { 3980sub wait_for_tick {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3597 3982
3598 my $signal = new Coro::Signal; 3983 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 3984 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 3985 $signal->wait;
3601} 3986}
3602 3987
3603sub wait_for_tick_begin { 3988sub wait_for_tick_begin {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3606 3990
3607 my $signal = new Coro::Signal; 3991 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 3992 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 3993 $signal->wait;
3610} 3994}
3611 3995
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3996sub tick {
3613 if ($Coro::current != $Coro::main) { 3997 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3998 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 3999 unless ++$bug_warning > 10;
3616 return; 4000 return;
3617 } 4001 }
3618 4002
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 4003 cf::server_tick; # one server iteration
3622 4004
3623 $RUNTIME += $TICK; 4005 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3624 $NEXT_TICK = $_[0]->at;
3625 4006
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4007 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4008 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 4009 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 4010 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 4011 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 4012 or warn "ERROR: unable to write runtime file: $!";
3632 }; 4013 };
3633 } 4014 }
3634 4015
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4016 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3637 } 4018 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 4019 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 4020 $sig->send;
3640 } 4021 }
3641 4022
3642 $LOAD = ($NOW - $tick_start) / $TICK; 4023 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4024 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 4025
3645 _post_tick; 4026 if (0) {
3646}; 4027 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 4028 my $jitter = $TICK_START - $NEXT_TICK;
4029 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030 warn "jitter $JITTER\n";#d#
4031 }
4032 }
4033}
3648 4034
3649{ 4035{
3650 # configure BDB 4036 # configure BDB
3651 4037
3652 BDB::min_parallel 8; 4038 BDB::min_parallel 16;
3653 BDB::max_poll_reqs $TICK * 0.1; 4039 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 4040 $AnyEvent::BDB::WATCHER->priority (1);
3655 4041
3656 unless ($DB_ENV) { 4042 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 4043 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4044 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | BDB::LOG_AUTOREMOVE, 1); 4045 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4046 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4047 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4048 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 4049
3663 cf::sync_job { 4050 cf::sync_job {
3664 eval { 4051 eval {
3690{ 4077{
3691 # configure IO::AIO 4078 # configure IO::AIO
3692 4079
3693 IO::AIO::min_parallel 8; 4080 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 4081 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 4082 undef $AnyEvent::AIO::WATCHER;
3696} 4083}
3697 4084
3698my $_log_backtrace; 4085my $_log_backtrace;
3699 4086
3700sub _log_backtrace { 4087sub _log_backtrace {
3703 $msg =~ s/\n//; 4090 $msg =~ s/\n//;
3704 4091
3705 # limit the # of concurrent backtraces 4092 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 4093 if ($_log_backtrace < 2) {
3707 ++$_log_backtrace; 4094 ++$_log_backtrace;
4095 my $perl_bt = Carp::longmess $msg;
3708 async { 4096 async {
3709 $Coro::current->{desc} = "abt $msg"; 4097 $Coro::current->{desc} = "abt $msg";
3710 4098
3711 my @bt = fork_call { 4099 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 4100 @addr = map { sprintf "%x", $_ } @addr;
3723 } 4111 }
3724 4112
3725 @funcs 4113 @funcs
3726 }; 4114 };
3727 4115
3728 LOG llevInfo, "[ABT] $msg\n"; 4116 LOG llevInfo, "[ABT] $perl_bt\n";
4117 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 4118 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 4119 --$_log_backtrace;
3731 }; 4120 };
3732 } else { 4121 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 4122 LOG llevInfo, "[ABT] $msg\n";
3734 LOG llevInfo, "[ABT] [suppressed]\n"; 4123 LOG llevInfo, "[ABT] [suppressed]\n";
3735 } 4124 }
3736} 4125}
3737 4126
3738# load additional modules 4127# load additional modules
3739use cf::pod; 4128require "cf/$_.pm" for @EXTRA_MODULES;
4129cf::_connect_to_perl_2;
3740 4130
3741END { cf::emergency_save } 4131END { cf::emergency_save }
3742 4132
37431 41331
3744 4134

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines