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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.527 by root, Fri Apr 23 04:32:47 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 77
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 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 = 0;#d#
118
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 121our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
99 123
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 127our $DB_ENV;
105 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
106our %CFG; 131our %CFG;
107 132
108our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 134our $RUNTIME;
110our $NOW; 135our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 146our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
123 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 :)
153
124binmode STDOUT; 154binmode STDOUT;
125binmode STDERR; 155binmode STDERR;
126 156
127# read virtual server time, if available 157# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
132} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
133 165
134mkdir $_ 166mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 168
137our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
138 170
139sub 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::"} };
140 187
141############################################################################# 188#############################################################################
142 189
143=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
144 191
191returns 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
192per 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.
193 240
194=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
195 242
196This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
197C<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
198that call. 245that call.
199 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
200=back 253=back
201 254
202=cut 255=cut
203 256
204BEGIN { 257$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 258 my $msg = join "", @_;
207 259
208 $msg .= "\n" 260 $msg .= "\n"
209 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
210 262
211 $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;
212 264
213 LOG llevError, $msg; 265 LOG llevError, $msg;
214 }; 266};
215}
216 267
217$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
219 270
220 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 275 return;#d#
223 }#d# 276 }#d#
224 277
225 # kill coroutine otherwise 278 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 279 Coro::terminate
228}; 280};
229
230$SIG{__DIE__} = sub { }; #d#?
231 281
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 292for my $pkg (qw(
243 cf::global cf::attachable 293 cf::global cf::attachable
244 cf::object cf::object::player 294 cf::object cf::object::player
245 cf::client cf::player 295 cf::client cf::player
246 cf::arch cf::living 296 cf::arch cf::living
297 cf::map cf::mapspace
247 cf::map cf::party cf::region 298 cf::party cf::region
248)) { 299)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 301}
252 302
253$EV::DIED = sub { 303$EV::DIED = sub {
254 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
255}; 305};
256 306
257############################################################################# 307#############################################################################
258 308
259=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
296our $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
297 347
298sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
300 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
301=item cf::lock_wait $string 365=item cf::lock_wait $string
302 366
303Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
304 368
305=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
306 370
307Wait 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
308a 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,
309for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
310returned. 374returned.
311 375
312Locks 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
313deadlocked coro. 377deadlocked coro.
319 383
320Return 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.
321 385
322=cut 386=cut
323 387
324our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 389
327sub lock_wait($) { 390sub lock_wait($) {
328 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 392}
341 393
342sub lock_acquire($) { 394sub lock_acquire($) {
343 my ($key) = @_; 395 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 396}
357 397
358sub lock_active($) { 398sub lock_active($) {
359 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 400}
363 401
364sub freeze_mainloop { 402sub freeze_mainloop {
365 tick_inhibit_inc; 403 tick_inhibit_inc;
366 404
367 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
368} 406}
369 407
370=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
371 409
372Like 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
373get spread over timer. 411get spread over time.
374 412
375=cut 413=cut
376 414
377sub periodic($$) { 415sub periodic($$) {
378 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
395 433
396=cut 434=cut
397 435
398our @SLOT_QUEUE; 436our @SLOT_QUEUE;
399our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
400 439
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
404 443
405 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
406 446
407 while () { 447 while () {
408 next_job: 448 next_job:
449
409 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 451
411 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 456 $job->[2]->send;
415 Coro::cede; 457 Coro::cede;
416 goto next_job; 458 goto next_job;
417 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 461 }
419 } 462 }
420 463
421 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
422 # 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
423 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 467 $signal->wait;
425 } else { 468 } else {
469 $busy = 0;
426 Coro::schedule; 470 Coro::schedule;
427 } 471 }
428 } 472 }
429}; 473};
430 474
431sub get_slot($;$$) { 475sub get_slot($;$$) {
476 return if tick_inhibit || $Coro::current == $Coro::main;
477
432 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
433 479
434 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
435 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
436 483
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
466 513
467sub sync_job(&) { 514sub sync_job(&) {
468 my ($job) = @_; 515 my ($job) = @_;
469 516
470 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
471 my $time = EV::time; 518 my $time = AE::time;
472 519
473 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
474 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
475 522
476 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
493 } else { 540 } else {
494 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
495 } 542 }
496 } 543 }
497 544
498 my $time = EV::time - $time; 545 my $time = AE::time - $time;
499 546
500 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
501 548
502 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
503 } else { 550 } else {
547 reset_signals; 594 reset_signals;
548 &$cb 595 &$cb
549 }, @args; 596 }, @args;
550 597
551 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 )
552} 610}
553 611
554=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
555 613
556=cut 614=cut
722 780
723############################################################################# 781#############################################################################
724 782
725=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
726 784
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
730 788
731In 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>
732C<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
782=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
783 841
784Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
786 844
787Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 847
790These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
791 849
792=over 4 850=over 4
1083 1141
1084sub reattach { 1142sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1143 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1144 my ($obj) = @_;
1087 1145
1146 # no longer needed after getting rid of delete_package?
1088 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
1089 1148
1090 my $registry = $obj->registry; 1149 my $registry = $obj->registry;
1091 1150
1092 @$registry = (); 1151 @$registry = ();
1093 1152
1136 1195
1137 sync_job { 1196 sync_job {
1138 if (length $$rdata) { 1197 if (length $$rdata) {
1139 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1142 1202
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1204 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 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 }
1147 close $fh; 1210 aio_close $fh;
1148 1211
1149 if (@$objs) { 1212 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1214 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1154 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 }
1155 close $fh; 1221 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1223 }
1158 } else { 1224 } else {
1159 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1160 } 1226 }
1161 1227
1162 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1232 } else {
1164 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1165 } 1234 }
1166 } else { 1235 } else {
1167 aio_unlink $filename; 1236 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1169 } 1238 }
1194 $av = $st->{objs}; 1263 $av = $st->{objs};
1195 } 1264 }
1196 1265
1197 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1198 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1199 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1200 1270
1201 ($data, $av) 1271 ($data, $av)
1202} 1272}
1203 1273
1204=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1260 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1261 1331
1262 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1263} 1333}
1264 1334
1335use File::Glob ();
1336
1265cf::player->attach ( 1337cf::player->attach (
1266 on_command => sub { 1338 on_unknown_command => sub {
1267 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1268 1340
1269 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1270 or return; 1342 or return;
1271 1343
1301 1373
1302 cf::override; 1374 cf::override;
1303 }, 1375 },
1304); 1376);
1305 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
1306sub load_extensions { 1391sub load_extensions {
1307 cf::sync_job { 1392 cf::sync_job {
1308 my %todo; 1393 my %todo;
1309 1394
1310 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1329 1414
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1417
1333 $ext{source} = 1418 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1420 . "#line 1 \"$path\"\n{\n"
1336 . $source 1421 . $source
1337 . "\n};\n1"; 1422 . "\n};\n1";
1338 1423
1339 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1340 } 1425 }
1341 1426
1427 my $pass = 0;
1342 my %done; 1428 my %done;
1343 while (%todo) { 1429 while (%todo) {
1344 my $progress; 1430 my $progress;
1345 1431
1432 ++$pass;
1433
1434 ext:
1346 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1347 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1348 goto skip 1437 next ext
1349 unless exists $done{$_}; 1438 unless exists $done{$_};
1350 } 1439 }
1351 1440
1352 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1353 1442
1354 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1355 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1356 : "$v->{base}: extension inactive.\n";
1357 1447
1358 if (exists $v->{meta}{mandatory}) {
1359 warn $msg;
1360 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1361 } 1449 if exists $v->{meta}{mandatory};
1362 1450
1363 warn $msg; 1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1452 delete $todo{$k};
1453 } else {
1454 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg};
1456 $progress = 1;
1457
1458 warn "$v->{base}: extension inactive.\n"
1459 unless $active;
1364 } 1460 }
1365
1366 $done{$k} = delete $todo{$k};
1367 push @EXTS, $v->{pkg};
1368 $progress = 1;
1369 } 1461 }
1370 1462
1371 skip: 1463 unless ($progress) {
1372 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1373 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 }
1374 } 1471 }
1375 }; 1472 };
1376} 1473}
1377 1474
1378############################################################################# 1475#############################################################################
1379 1476
1380=back 1477=back
1381 1478
1382=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1383 1480
1384Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1385 1482
1386=cut 1483=cut
1387 1484
1388package cf::player; 1485package cf::player;
1389 1486
1432 1529
1433sub exists($) { 1530sub exists($) {
1434 my ($login) = @_; 1531 my ($login) = @_;
1435 1532
1436 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1438} 1535}
1439 1536
1440sub find($) { 1537sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1539 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1551 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1552 or return;
1456 1553
1457 my $pl = cf::player::load_pl $f 1554 my $pl = cf::player::load_pl $f
1458 or return; 1555 or return;
1556
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1557 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1558 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1462 } 1560 }
1463 } 1561 }
1464} 1562}
1465 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
1466sub save($) { 1577sub save($) {
1467 my ($pl) = @_; 1578 my ($pl) = @_;
1468 1579
1469 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1470 1581
1473 1584
1474 return if $pl->{deny_save}; 1585 return if $pl->{deny_save};
1475 1586
1476 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1477 $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];
1478 1594
1479 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1596 cf::cede_to_tick;
1481} 1597}
1482 1598
1514 my ($pl) = @_; 1630 my ($pl) = @_;
1515 1631
1516 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1517 1633
1518 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1519 $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
1520 1636
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1638 $pl->deactivate;
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1641 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1642 $pl->ns->destroy if $pl->ns;
1525 1643
1526 my $path = playerdir $pl; 1644 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1645 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1684
1567 for my $login (@$dirs) { 1685 for my $login (@$dirs) {
1568 my $path = path $login; 1686 my $path = path $login;
1569 1687
1570 # a .pst is a dead give-away for a valid player 1688 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1689 # if no pst file found, open and chekc for blocked users
1690 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1691 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1692 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1693 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1694 }
1576 1695
1580 1699
1581 \@logins 1700 \@logins
1582} 1701}
1583 1702
1584=item $player->maps 1703=item $player->maps
1704
1705=item cf::player::maps $login
1585 1706
1586Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1587player. May block. 1708player. May block.
1588 1709
1589=cut 1710=cut
1607 } 1728 }
1608 1729
1609 \@paths 1730 \@paths
1610} 1731}
1611 1732
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1733=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1734
1614Expand crossfire pod fragments into protocol xml. 1735Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1736
1705=item $player->ext_reply ($msgid, @msg) 1737=item $player->ext_reply ($msgid, @msg)
1706 1738
1707Sends an ext reply to the player. 1739Sends an ext reply to the player.
1708 1740
1740 1772
1741=cut 1773=cut
1742 1774
1743sub find_by_path($) { 1775sub find_by_path($) {
1744 my ($path) = @_; 1776 my ($path) = @_;
1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1745 1779
1746 my ($match, $specificity); 1780 my ($match, $specificity);
1747 1781
1748 for my $region (list) { 1782 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782 1816
1783 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1784 $self->_create_random_map ( 1818 $self->_create_random_map (
1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1788 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1789 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1790 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1791 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1813 1847
1814 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1815} 1849}
1816 1850
1817# also paths starting with '/' 1851# also paths starting with '/'
1818$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1819 1853
1820sub thawer_merge { 1854sub thawer_merge {
1821 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1822 1856
1823 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
1909 1943
1910# the temporary/swap location 1944# the temporary/swap location
1911sub save_path { 1945sub save_path {
1912 my ($self) = @_; 1946 my ($self) = @_;
1913 1947
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1948 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 1949 "$TMPDIR/$path.map"
1916} 1950}
1917 1951
1918# the unique path, undef == no special unique path 1952# the unique path, undef == no special unique path
1919sub uniq_path { 1953sub uniq_path {
1920 my ($self) = @_; 1954 my ($self) = @_;
1921 1955
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1957 "$UNIQUEDIR/$path"
1924}
1925
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933} 1958}
1934 1959
1935sub decay_objects { 1960sub decay_objects {
1936 my ($self) = @_; 1961 my ($self) = @_;
1937 1962
2021sub find { 2046sub find {
2022 my ($path, $origin) = @_; 2047 my ($path, $origin) = @_;
2023 2048
2024 $path = normalise $path, $origin && $origin->path; 2049 $path = normalise $path, $origin && $origin->path;
2025 2050
2026 cf::lock_wait "map_data:$path";#d#remove 2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 2052 my $guard2 = cf::lock_acquire "map_find:$path";
2028 2053
2029 $cf::MAP{$path} || do { 2054 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 2055 my $map = new_from_path cf::map $path
2034 or return; 2056 or return;
2035 2057
2036 $map->{last_save} = $cf::RUNTIME; 2058 $map->{last_save} = $cf::RUNTIME;
2037 2059
2039 or return; 2061 or return;
2040 2062
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2063 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2064 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2065 #$cf::WAIT_FOR_TICK->wait;
2066 undef $guard2;
2044 undef $guard1; 2067 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2068 $map->reset;
2047 return find $path; 2069 return find $path;
2048 } 2070 }
2049 2071
2050 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
2051 } 2073 }
2052} 2074}
2053 2075
2054sub pre_load { } 2076sub pre_load { }
2055sub post_load { } 2077#sub post_load { } # XS
2056 2078
2057sub load { 2079sub load {
2058 my ($self) = @_; 2080 my ($self) = @_;
2059 2081
2060 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2099 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2100 $f->skip_block;
2079 $self->_load_objects ($f) 2101 $self->_load_objects ($f)
2080 or return; 2102 or return;
2081 2103
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2104 $self->post_load_original
2083 if delete $self->{load_original}; 2105 if delete $self->{load_original};
2084 2106
2085 if (my $uniq = $self->uniq_path) { 2107 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2108 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2109 unless (aio_stat $uniq) {
2105 unless ($self->{deny_activate}) { 2127 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2128 $self->decay_objects;
2107 $self->fix_auto_apply; 2129 $self->fix_auto_apply;
2108 $self->update_buttons; 2130 $self->update_buttons;
2109 cf::cede_to_tick; 2131 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2132 $self->activate;
2113 } 2133 }
2114 2134
2115 $self->{last_save} = $cf::RUNTIME; 2135 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2136 $self->last_access ($cf::RUNTIME);
2117 2137
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2138 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2139 }
2120 2140
2121 $self->post_load; 2141 $self->post_load;
2122} 2142}
2123 2143
2144# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath
2124sub customise_for { 2147sub customise_for {
2125 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2126 2149
2127 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2128 if $self->per_player; 2151 if $self->per_player;
2144 or next; 2167 or next;
2145 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2146 or next; 2169 or next;
2147 $neigh->load; 2170 $neigh->load;
2148 2171
2172 # now find the diagonal neighbours
2149 push @neigh, 2173 push @neigh,
2150 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2151 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2152 } 2176 }
2153 2177
2181 my ($path, $origin, $load) = @_; 2205 my ($path, $origin, $load) = @_;
2182 2206
2183 $path = normalise $path, $origin && $origin->{path}; 2207 $path = normalise $path, $origin && $origin->{path};
2184 2208
2185 if (my $map = $cf::MAP{$path}) { 2209 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2210 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2211 }
2188 2212
2189 $MAP_PREFETCH{$path} |= $load; 2213 $MAP_PREFETCH{$path} |= $load;
2190 2214
2191 $MAP_PREFETCHER ||= cf::async { 2215 $MAP_PREFETCHER ||= cf::async {
2205 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2206 2230
2207 () 2231 ()
2208} 2232}
2209 2233
2234# common code, used by both ->save and ->swapout
2210sub save { 2235sub _save {
2211 my ($self) = @_; 2236 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2237
2215 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2216 2239
2217 return unless $self->dirty; 2240 return unless $self->dirty;
2218 2241
2227 2250
2228 cf::async { 2251 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2252 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2253 $_->contr->save for $self->players;
2231 }; 2254 };
2255
2256 cf::get_slot 0.02;
2232 2257
2233 if ($uniq) { 2258 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2259 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2260 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2261 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2238 } 2263 }
2239} 2264}
2240 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2241sub swap_out { 2274sub swap_out {
2242 my ($self) = @_; 2275 my ($self) = @_;
2243 2276
2244 # save first because save cedes
2245 $self->save;
2246
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2278
2279 return if $self->in_memory != cf::MAP_ACTIVE;
2280 return if $self->{deny_save};
2249 return if $self->players; 2281 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY;
2251 return if $self->{deny_save};
2252 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2253 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2254 2333
2255 $self->deactivate; 2334 $self->deactivate;
2256 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2257 $self->clear; 2336 $self->clear;
2258}
2259
2260sub reset_at {
2261 my ($self) = @_;
2262
2263 # TODO: safety, remove and allow resettable per-player maps
2264 return 1e99 if $self->{deny_reset};
2265
2266 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2267 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2268
2269 $time + $to
2270}
2271
2272sub should_reset {
2273 my ($self) = @_;
2274
2275 $self->reset_at <= $cf::RUNTIME
2276}
2277
2278sub reset {
2279 my ($self) = @_;
2280
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2283 return if $self->players;
2284
2285 warn "resetting map ", $self->path;
2286
2287 $self->in_memory (cf::MAP_SWAPPED);
2288
2289 # need to save uniques path
2290 unless ($self->{deny_save}) {
2291 my $uniq = $self->uniq_path; utf8::encode $uniq;
2292
2293 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2294 if $uniq;
2295 }
2296
2297 delete $cf::MAP{$self->path};
2298
2299 $self->deactivate;
2300 $_->clear_links_to ($self) for values %cf::MAP;
2301 $self->clear;
2302 2337
2303 $self->unlink_save; 2338 $self->unlink_save;
2304 $self->destroy; 2339 $self->destroy;
2305} 2340}
2306 2341
2314 2349
2315 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2316 2351
2317 $self->unlink_save; 2352 $self->unlink_save;
2318 2353
2319 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2320 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2321 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2322 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2323 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2324 2359
2373 2408
2374sub unique_maps() { 2409sub unique_maps() {
2375 [ 2410 [
2376 map { 2411 map {
2377 utf8::decode $_; 2412 utf8::decode $_;
2378 /\.map$/ 2413 s/\.map$//; # TODO future compatibility hack
2414 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2415 ? ()
2379 ? normalise $_ 2416 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2417 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2418 ]
2383} 2419}
2384 2420
2421=item cf::map::static_maps
2422
2423Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2424file in the shared directory excluding F</styles> and F</editor>). May
2425block.
2426
2427=cut
2428
2429sub static_maps() {
2430 my @dirs = "";
2431 my @maps;
2432
2433 while (@dirs) {
2434 my $dir = shift @dirs;
2435
2436 next if $dir eq "/styles" || $dir eq "/editor";
2437
2438 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2439 or return;
2440
2441 for (@$files) {
2442 s/\.map$// or next;
2443 utf8::decode $_;
2444 push @maps, "$dir/$_";
2445 }
2446
2447 push @dirs, map "$dir/$_", @$dirs;
2448 }
2449
2450 \@maps
2451}
2452
2385=back 2453=back
2386 2454
2387=head3 cf::object 2455=head3 cf::object
2388 2456
2389=cut 2457=cut
2392 2460
2393=over 4 2461=over 4
2394 2462
2395=item $ob->inv_recursive 2463=item $ob->inv_recursive
2396 2464
2397Returns the inventory of the object _and_ their inventories, recursively. 2465Returns the inventory of the object I<and> their inventories, recursively,
2466but I<not> the object itself.
2398 2467
2399=cut 2468=cut
2400 2469
2401sub inv_recursive_; 2470sub inv_recursive_;
2402sub inv_recursive_ { 2471sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2476 inv_recursive_ inv $_[0]
2408} 2477}
2409 2478
2410=item $ref = $ob->ref 2479=item $ref = $ob->ref
2411 2480
2412creates and returns a persistent reference to an objetc that can be stored as a string. 2481Creates and returns a persistent reference to an object that can be stored as a string.
2413 2482
2414=item $ob = cf::object::deref ($refstring) 2483=item $ob = cf::object::deref ($refstring)
2415 2484
2416returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2485returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2417even if the object actually exists. May block. 2486even if the object actually exists. May block.
2449can be C<undef>. Does the right thing when the player is currently in a 2518can be C<undef>. Does the right thing when the player is currently in a
2450dialogue with the given NPC character. 2519dialogue with the given NPC character.
2451 2520
2452=cut 2521=cut
2453 2522
2523our $SAY_CHANNEL = {
2524 id => "say",
2525 title => "Map",
2526 reply => "say ",
2527 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2528};
2529
2530our $CHAT_CHANNEL = {
2531 id => "chat",
2532 title => "Chat",
2533 reply => "chat ",
2534 tooltip => "Player chat and shouts, global to the server.",
2535};
2536
2454# rough implementation of a future "reply" method that works 2537# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2538# with dialog boxes.
2456#TODO: the first argument must go, split into a $npc->reply_to ( method 2539#TODO: the first argument must go, split into a $npc->reply_to ( method
2457sub cf::object::player::reply($$$;$) { 2540sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2541 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2552 my $dialog = $pl->{npc_dialog};
2470 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2553 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2471 2554
2472 } else { 2555 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2556 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2557 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2558 }
2476 } 2559 }
2477} 2560}
2478 2561
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2562=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2587
2505=item $player_object->enter_link 2588=item $player_object->enter_link
2506 2589
2507Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2508 2591
2509The player should be reasonably safe there for short amounts of time. You 2592The player should be reasonably safe there for short amounts of time (e.g.
2510I<MUST> call C<leave_link> as soon as possible, though. 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2594though, as the player cannot control the character while it is on the link
2595map.
2511 2596
2512Will never block. 2597Will never block.
2513 2598
2514=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
2515 2600
2535sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2536 my ($self) = @_; 2621 my ($self) = @_;
2537 2622
2538 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2539 2624
2625 ++$self->{_link_recursion};
2626
2540 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2541 2628
2542 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2543 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2544 2631
2545 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2546} 2633}
2547 2634
2548sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2549 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2550 2637
2567 ($x, $y) = (-1, -1) 2654 ($x, $y) = (-1, -1)
2568 unless (defined $x) && (defined $y); 2655 unless (defined $x) && (defined $y);
2569 2656
2570 # use -1 or undef as default coordinates, not 0, 0 2657 # use -1 or undef as default coordinates, not 0, 0
2571 ($x, $y) = ($map->enter_x, $map->enter_y) 2658 ($x, $y) = ($map->enter_x, $map->enter_y)
2572 if $x <=0 && $y <= 0; 2659 if $x <= 0 && $y <= 0;
2573 2660
2574 $map->load; 2661 $map->load;
2575 $map->load_neighbours; 2662 $map->load_neighbours;
2576 2663
2577 return unless $self->contr->active; 2664 return unless $self->contr->active;
2578 $self->activate_recursive;
2579 2665
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2582} 2668 # entering was successful
2669 delete $self->{_link_recursion};
2670 # only activate afterwards, to support waiting in hooks
2671 $self->activate_recursive;
2672 }
2583 2673
2674}
2675
2584=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2585 2677
2586Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2587her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2588that has to return the map if sucecssful, and then unfreezes the player on 2680that has to return the map if sucecssful, and then unfreezes the player on
2589the new (success) or old (failed) map position. In either case, $done will 2681the new (success) or old (failed) map position. In either case, $done will
2590be called at the end of this process. 2682be called at the end of this process.
2591 2683
2684Note that $check will be called with a potentially non-loaded map, so if
2685it needs a loaded map it has to call C<< ->load >>.
2686
2592=cut 2687=cut
2593 2688
2594our $GOTOGEN; 2689our $GOTOGEN;
2595 2690
2596sub cf::object::player::goto { 2691sub cf::object::player::goto {
2597 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2598 2699
2599 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2600 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2601 2702
2602 $self->enter_link; 2703 $self->enter_link;
2626 my $map = eval { 2727 my $map = eval {
2627 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2628 2729
2629 if ($map) { 2730 if ($map) {
2630 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2631 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2632 } else { 2733 } else {
2633 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2634 } 2735 }
2635 2736
2636 $map 2737 $map
2644 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2645 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2646 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2647 } 2748 }
2648 2749
2649 $done->() if $done; 2750 $done->($self) if $done;
2650 })->prio (1); 2751 })->prio (1);
2651} 2752}
2652 2753
2653=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2654 2755
2674} 2775}
2675 2776
2676sub prepare_random_map { 2777sub prepare_random_map {
2677 my ($exit) = @_; 2778 my ($exit) = @_;
2678 2779
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2780 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2781 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2782 # that depends on the exit object
2684 2783
2685 my $rmp = parse_random_map_params $exit->msg; 2784 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2786 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2787 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2788 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2789 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2790 $rmp->{origin_y} = $exit->y;
2791
2792 $exit->map->touch;
2692 } 2793 }
2693 2794
2694 $rmp->{random_seed} ||= $exit->random_seed; 2795 $rmp->{random_seed} ||= $exit->random_seed;
2695 2796
2696 my $data = cf::encode_json $rmp; 2797 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2798 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2799 my $meta = "$RANDOMDIR/$md5.meta";
2699 2800
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2801 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2802 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2803 undef $fh;
2703 aio_rename "$meta~", $meta; 2804 aio_rename "$meta~", $meta;
2704 2805
2806 my $slaying = "?random/$md5";
2807
2808 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2809 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2810 $exit->msg (undef);
2811 }
2707 } 2812 }
2708} 2813}
2709 2814
2710sub cf::object::player::enter_exit { 2815sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2816 my ($self, $exit) = @_;
2712 2817
2713 return unless $self->type == cf::PLAYER; 2818 return unless $self->type == cf::PLAYER;
2714 2819
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2820 $self->enter_link;
2727 2821
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2822 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2823 $Coro::current->{desc} = "enter_exit";
2734 2824
2735 $self->deactivate_recursive; # just to be sure
2736 unless (eval { 2825 unless (eval {
2826 $self->deactivate_recursive; # just to be sure
2827
2828 # random map handling
2829 {
2830 my $guard = cf::lock_acquire "exit_prepare:$exit";
2831
2832 prepare_random_map $exit
2833 if $exit->slaying eq "/!";
2834 }
2835
2836 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2837 my $x = $exit->stats->hp;
2838 my $y = $exit->stats->sp;
2839
2737 $self->goto ($slaying, $hp, $sp); 2840 $self->goto ($map, $x, $y);
2738 2841
2842 # if exit is damned, update players death & WoR home-position
2843 $self->contr->savebed ($map, $x, $y)
2844 if $exit->flag (cf::FLAG_DAMNED);
2845
2739 1; 2846 1
2740 }) { 2847 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2848 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "I'll try to bring you back to the map you were before. " 2849 . "I'll try to bring you back to the map you were before. "
2743 . "Please report this to the dungeon master!", 2850 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2851 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2852
2746 warn "ERROR in enter_exit: $@"; 2853 warn "ERROR in enter_exit: $@";
2763sub cf::client::send_drawinfo { 2870sub cf::client::send_drawinfo {
2764 my ($self, $text, $flags) = @_; 2871 my ($self, $text, $flags) = @_;
2765 2872
2766 utf8::encode $text; 2873 utf8::encode $text;
2767 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2874 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2875}
2876
2877=item $client->send_big_packet ($pkt)
2878
2879Like C<send_packet>, but tries to compress large packets, and fragments
2880them as required.
2881
2882=cut
2883
2884our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2885
2886sub cf::client::send_big_packet {
2887 my ($self, $pkt) = @_;
2888
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt);
2768} 2900}
2769 2901
2770=item $client->send_msg ($channel, $msg, $color, [extra...]) 2902=item $client->send_msg ($channel, $msg, $color, [extra...])
2771 2903
2772Send a drawinfo or msg packet to the client, formatting the msg for the 2904Send a drawinfo or msg packet to the client, formatting the msg for the
2776 2908
2777=cut 2909=cut
2778 2910
2779# non-persistent channels (usually the info channel) 2911# non-persistent channels (usually the info channel)
2780our %CHANNEL = ( 2912our %CHANNEL = (
2913 "c/motd" => {
2914 id => "infobox",
2915 title => "MOTD",
2916 reply => undef,
2917 tooltip => "The message of the day",
2918 },
2781 "c/identify" => { 2919 "c/identify" => {
2782 id => "infobox", 2920 id => "infobox",
2783 title => "Identify", 2921 title => "Identify",
2784 reply => undef, 2922 reply => undef,
2785 tooltip => "Items recently identified", 2923 tooltip => "Items recently identified",
2787 "c/examine" => { 2925 "c/examine" => {
2788 id => "infobox", 2926 id => "infobox",
2789 title => "Examine", 2927 title => "Examine",
2790 reply => undef, 2928 reply => undef,
2791 tooltip => "Signs and other items you examined", 2929 tooltip => "Signs and other items you examined",
2930 },
2931 "c/shopinfo" => {
2932 id => "infobox",
2933 title => "Shop Info",
2934 reply => undef,
2935 tooltip => "What your bargaining skill tells you about the shop",
2792 }, 2936 },
2793 "c/book" => { 2937 "c/book" => {
2794 id => "infobox", 2938 id => "infobox",
2795 title => "Book", 2939 title => "Book",
2796 reply => undef, 2940 reply => undef,
2812 id => "infobox", 2956 id => "infobox",
2813 title => "Body Parts", 2957 title => "Body Parts",
2814 reply => undef, 2958 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 2959 tooltip => "Shows which body parts you posess and are available",
2816 }, 2960 },
2961 "c/statistics" => {
2962 id => "infobox",
2963 title => "Statistics",
2964 reply => undef,
2965 tooltip => "Shows your primary statistics",
2966 },
2967 "c/skills" => {
2968 id => "infobox",
2969 title => "Skills",
2970 reply => undef,
2971 tooltip => "Shows your experience per skill and item power",
2972 },
2973 "c/shopitems" => {
2974 id => "infobox",
2975 title => "Shop Items",
2976 reply => undef,
2977 tooltip => "Shows the items currently for sale in this shop",
2978 },
2979 "c/resistances" => {
2980 id => "infobox",
2981 title => "Resistances",
2982 reply => undef,
2983 tooltip => "Shows your resistances",
2984 },
2985 "c/pets" => {
2986 id => "infobox",
2987 title => "Pets",
2988 reply => undef,
2989 tooltip => "Shows information abotu your pets/a specific pet",
2990 },
2991 "c/perceiveself" => {
2992 id => "infobox",
2993 title => "Perceive Self",
2994 reply => undef,
2995 tooltip => "You gained detailed knowledge about yourself",
2996 },
2817 "c/uptime" => { 2997 "c/uptime" => {
2818 id => "infobox", 2998 id => "infobox",
2819 title => "Uptime", 2999 title => "Uptime",
2820 reply => undef, 3000 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 3001 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 3004 id => "infobox",
2825 title => "Map Info", 3005 title => "Map Info",
2826 reply => undef, 3006 reply => undef,
2827 tooltip => "Information related to the maps", 3007 tooltip => "Information related to the maps",
2828 }, 3008 },
3009 "c/party" => {
3010 id => "party",
3011 title => "Party",
3012 reply => "gsay ",
3013 tooltip => "Messages and chat related to your party",
3014 },
3015 "c/death" => {
3016 id => "death",
3017 title => "Death",
3018 reply => undef,
3019 tooltip => "Reason for and more info about your most recent death",
3020 },
3021 "c/say" => $SAY_CHANNEL,
3022 "c/chat" => $CHAT_CHANNEL,
2829); 3023);
2830 3024
2831sub cf::client::send_msg { 3025sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 3026 my ($self, $channel, $msg, $color, @extra) = @_;
2833 3027
2834 $msg = $self->pl->expand_cfpod ($msg); 3028 $msg = $self->pl->expand_cfpod ($msg)
3029 unless $color & cf::NDI_VERBATIM;
2835 3030
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 3031 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 3032
2838 # check predefined channels, for the benefit of C 3033 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 3034 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel}; 3035 $channel = $CHANNEL{$channel};
2841 3036
2842 $self->ext_msg (channel_info => $channel) 3037 $self->ext_msg (channel_info => $channel);
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id}; 3038 $channel = $channel->{id};
2846 3039
2847 } elsif (ref $channel) { 3040 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent 3041 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) { 3042 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel; 3043 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel) 3044 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853 } 3045 }
2854 3046
2855 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2856 } 3048 }
2857 3049
2858 return unless @extra || length $msg; 3050 return unless @extra || length $msg;
2859 3051
2860 if ($self->can_msg) {
2861 # default colour, mask it out 3052 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3053 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 3054 if $color & cf::NDI_DEF;
2864 3055
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3056 my $pkt = "msg "
3057 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3058 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867 } else { 3059 );
2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878 3060
2879 $color &= cf::NDI_COLOR_MASK; 3061 $self->send_big_packet ($pkt);
2880
2881 utf8::encode $msg;
2882
2883 if (0 && $msg =~ /\[/) {
2884 # COMMAND/INFO
2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2886 } else {
2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2888 $self->send_packet ("drawinfo $color $msg")
2889 }
2890 }
2891 }
2892} 3062}
2893 3063
2894=item $client->ext_msg ($type, @msg) 3064=item $client->ext_msg ($type, @msg)
2895 3065
2896Sends an ext event to the client. 3066Sends an ext event to the client.
2899 3069
2900sub cf::client::ext_msg($$@) { 3070sub cf::client::ext_msg($$@) {
2901 my ($self, $type, @msg) = @_; 3071 my ($self, $type, @msg) = @_;
2902 3072
2903 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2905 } elsif ($self->extcmd == 1) { # TODO: remove 3075 } elsif ($self->extcmd == 1) { # TODO: remove
2906 push @msg, msgtype => "event_$type"; 3076 push @msg, msgtype => "event_$type";
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2908 } 3078 }
2909} 3079}
2910 3080
2911=item $client->ext_reply ($msgid, @msg) 3081=item $client->ext_reply ($msgid, @msg)
2912 3082
2916 3086
2917sub cf::client::ext_reply($$@) { 3087sub cf::client::ext_reply($$@) {
2918 my ($self, $id, @msg) = @_; 3088 my ($self, $id, @msg) = @_;
2919 3089
2920 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2921 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2922 } elsif ($self->extcmd == 1) { 3092 } elsif ($self->extcmd == 1) {
2923 #TODO: version 1, remove 3093 #TODO: version 1, remove
2924 unshift @msg, msgtype => "reply", msgid => $id; 3094 unshift @msg, msgtype => "reply", msgid => $id;
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2926 } 3096 }
2927} 3097}
2928 3098
2929=item $success = $client->query ($flags, "text", \&cb) 3099=item $success = $client->query ($flags, "text", \&cb)
2930 3100
3031 3201
3032 $coro 3202 $coro
3033} 3203}
3034 3204
3035cf::client->attach ( 3205cf::client->attach (
3036 on_destroy => sub { 3206 on_client_destroy => sub {
3037 my ($ns) = @_; 3207 my ($ns) = @_;
3038 3208
3039 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3040 }, 3210 },
3041); 3211);
3057our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
3058 3228
3059$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
3060 3230
3061$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
3062 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
3063 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
3064 sort time 3234 sort time
3065)); 3235));
3066 3236
3067# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
3070 3240
3071The following functions and methods are available within a safe environment: 3241The following functions and methods are available within a safe environment:
3072 3242
3073 cf::object 3243 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3244 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3245 insert remove name archname title slaying race decrease split
3246 value
3076 3247
3077 cf::object::player 3248 cf::object::player
3078 player 3249 player
3079 3250
3080 cf::player 3251 cf::player
3085 3256
3086=cut 3257=cut
3087 3258
3088for ( 3259for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3260 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3261 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3262 decrease split destroy change_exp value msg lore send_msg)],
3092 ["cf::object::player" => qw(player)], 3263 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3264 ["cf::player" => qw(peaceful send_msg)],
3094 ["cf::map" => qw(trigger)], 3265 ["cf::map" => qw(trigger)],
3095) { 3266) {
3096 no strict 'refs'; 3267 no strict 'refs';
3097 my ($pkg, @funs) = @$_; 3268 my ($pkg, @funs) = @$_;
3098 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3116 3287
3117 my $qcode = $code; 3288 my $qcode = $code;
3118 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3119 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
3120 3291
3292 %vars = (_dummy => 0) unless %vars;
3293
3294 my @res;
3121 local $_; 3295 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3296
3124 my $eval = 3297 my $eval =
3125 "do {\n" 3298 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3301 . $code
3129 . "\n}" 3302 . "\n}"
3130 ; 3303 ;
3131 3304
3305 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3309 sub_generation_inc;
3310 } else {
3311 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval;
3313 }
3135 3314
3136 if ($@) { 3315 if ($@) {
3137 warn "$@"; 3316 warn "$@";
3138 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
3158=cut 3337=cut
3159 3338
3160sub register_script_function { 3339sub register_script_function {
3161 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3162 3341
3163 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3165} 3344}
3166 3345
3167=back 3346=back
3168 3347
3169=cut 3348=cut
3190 3369
3191 $facedata->{version} == 2 3370 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3372
3194 # patch in the exptable 3373 # patch in the exptable
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3376 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3377 data => $exp_table,
3378 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3379 };
3199 cf::cede_to_tick; 3380 cf::cede_to_tick;
3200 3381
3201 { 3382 {
3202 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3387
3207 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3211 3392
3212 cf::cede_to_tick; 3393 cf::cede_to_tick;
3213 } 3394 }
3214 3395
3215 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3239 3420
3240 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3241 } 3422 }
3242 3423
3243 { 3424 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3247 3426
3248 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3428 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3430
3253 if ($info->{type} & 1) { 3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3432 cf::face::set_type $idx, $info->{type};
3268 } else { 3433 } else {
3269 $RESOURCE{$name} = $info; 3434 $RESOURCE{$name} = $info;
3270 } 3435 }
3271 3436
3304 while (my ($k, $v) = each %$want) { 3469 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3470 $ns->fx_want ($k, $v);
3306 } 3471 }
3307}; 3472};
3308 3473
3474sub load_resource_file($) {
3475 my $guard = lock_acquire "load_resource_file";
3476
3477 my $status = load_resource_file_ $_[0];
3478 get_slot 0.1, 100;
3479 cf::arch::commit_load;
3480
3481 $status
3482}
3483
3309sub reload_regions { 3484sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3485 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3486 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3487 %ext::player_env::MUSIC_FACE_CACHE = ();
3313 3488
3326} 3501}
3327 3502
3328sub reload_archetypes { 3503sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3504 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3505 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3506}
3337 3507
3338sub reload_treasures { 3508sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3509 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3510 or die "unable to load treasurelists\n";
3341} 3511}
3342 3512
3343sub reload_resources { 3513sub reload_resources {
3344 warn "reloading resource files...\n"; 3514 warn "reloading resource files...\n";
3345 3515
3516 reload_facedata;
3517 reload_archetypes;
3346 reload_regions; 3518 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3519 reload_treasures;
3351 3520
3352 warn "finished reloading resource files\n"; 3521 warn "finished reloading resource files\n";
3353} 3522}
3354 3523
3355sub init {
3356 reload_resources;
3357}
3358
3359sub reload_config { 3524sub reload_config {
3525 warn "reloading config file...\n";
3526
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3527 open my $fh, "<:utf8", "$CONFDIR/config"
3361 or return; 3528 or return;
3362 3529
3363 local $/; 3530 local $/;
3364 *CFG = YAML::Load <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3365 3532
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3367 3534
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3370 3537
3371 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
3373 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3374 and die "WARNING: m(un)lockall failed: $!\n"; 3541 and die "WARNING: m(un)lockall failed: $!\n";
3375 }; 3542 };
3376 warn $@ if $@; 3543 warn $@ if $@;
3377 } 3544 }
3545
3546 warn "finished reloading resource files\n";
3547}
3548
3549sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!";
3552 flock $fh, &Fcntl::LOCK_EX
3553 or die "$PIDFILE: flock: $!";
3554 $fh
3555}
3556
3557# make sure only one server instance is running at any one time
3558sub atomic {
3559 my $fh = pidfile;
3560
3561 my $pid = <$fh>;
3562 kill 9, $pid if $pid > 0;
3563
3564 seek $fh, 0, 0;
3565 print $fh $$;
3566}
3567
3568sub main_loop {
3569 warn "EV::loop starting\n";
3570 if (1) {
3571 EV::loop;
3572 }
3573 warn "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP;
3378} 3575}
3379 3576
3380sub main { 3577sub main {
3578 cf::init_globals; # initialise logging
3579
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586
3381 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3589 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3590 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3591 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3592 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3593 })->prio (Coro::PRIO_MAX);
3388 }; 3594 };
3389 3595
3390 reload_config;
3391 db_init;
3392 load_extensions;
3393
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3596 evthread_start IO::AIO::poll_fileno;
3396 EV::loop; 3597
3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3604 cf::load_settings;
3605 cf::load_materials;
3606
3607 reload_resources;
3608 reload_config;
3609 db_init;
3610
3611 cf::init_uuid;
3612 cf::init_signals;
3613 cf::init_skills;
3614
3615 cf::init_beforeplay;
3616
3617 atomic;
3618
3619 load_extensions;
3620
3621 utime time, time, $RUNTIMEFILE;
3622
3623 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX ();
3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626
3627 (pop @POST_INIT)->(0) while @POST_INIT;
3628 };
3629
3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3632
3633 main_loop;
3397} 3634}
3398 3635
3399############################################################################# 3636#############################################################################
3400# initialisation and cleanup 3637# initialisation and cleanup
3401 3638
3402# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3403BEGIN { 3640BEGIN {
3404 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3405 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3406 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3407 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3408 }; 3645 };
3409 } 3646 }
3410} 3647}
3411 3648
3412sub write_runtime_sync { 3649sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime"; 3650 my $t0 = AE::time;
3414 3651
3415 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3417 3654
3418 IO::AIO::aio_utime $runtime, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3656
3420 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3421 3658
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3423 or return; 3660 or return;
3424 3661
3425 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3674 aio_utime $fh, undef, undef;
3438 3675
3439 close $fh 3676 close $fh
3440 or return; 3677 or return;
3441 3678
3442 aio_rename "$runtime~", $runtime 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3680 and return;
3444 3681
3445 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3446 3683
3447 1 3684 1
3448} 3685}
3449 3686
3450our $uuid_lock; 3687our $uuid_lock;
3459 my $uuid = "$LOCALDIR/uuid"; 3696 my $uuid = "$LOCALDIR/uuid";
3460 3697
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3698 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3699 or return;
3463 3700
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3701 my $value = uuid_seq uuid_cur;
3702
3703 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n";
3705 return;
3706 }
3707
3708 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3709 $uuid_skip = 0;
3466 3710
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3711 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3712 and return;
3469 3713
3491} 3735}
3492 3736
3493sub emergency_save() { 3737sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3738 my $freeze_guard = cf::freeze_mainloop;
3495 3739
3496 warn "enter emergency perl save\n"; 3740 warn "emergency_perl_save: enter\n";
3497 3741
3498 cf::sync_job { 3742 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747
3499 # use a peculiar iteration method to avoid tripping on perl 3748 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3749 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3750 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3751 warn "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3752 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3753 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3754 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3756 $pl->save;
3508 } 3757 }
3509 warn "end emergency player save\n"; 3758 warn "emergency_perl_save: end player save\n";
3510 3759
3511 warn "begin emergency map save\n"; 3760 warn "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3761 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3762 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3763 $map->valid or next;
3515 $map->save; 3764 $map->save;
3516 } 3765 }
3517 warn "end emergency map save\n"; 3766 warn "emergency_perl_save: end map save\n";
3518 3767
3519 warn "begin emergency database checkpoint\n"; 3768 warn "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3770 warn "emergency_perl_save: end database checkpoint\n";
3522 3771
3523 warn "begin write uuid\n"; 3772 warn "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3773 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3774 warn "emergency_perl_save: end write uuid\n";
3526 }; 3775 };
3527 3776
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3528 warn "leave emergency perl save\n"; 3782 warn "emergency_perl_save: leave\n";
3529} 3783}
3530 3784
3531sub post_cleanup { 3785sub post_cleanup {
3532 my ($make_core) = @_; 3786 my ($make_core) = @_;
3533 3787
3534 warn Carp::longmess "post_cleanup backtrace" 3788 warn Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3789 if $make_core;
3790
3791 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$;
3793}
3794
3795# a safer delete_package, copied from Symbol
3796sub clear_package($) {
3797 my $pkg = shift;
3798
3799 # expand to full symbol table name if needed
3800 unless ($pkg =~ /^main::.*::$/) {
3801 $pkg = "main$pkg" if $pkg =~ /^::/;
3802 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3803 $pkg .= '::' unless $pkg =~ /::$/;
3804 }
3805
3806 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3807 my $stem_symtab = *{$stem}{HASH};
3808
3809 defined $stem_symtab and exists $stem_symtab->{$leaf}
3810 or return;
3811
3812 # clear all symbols
3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3814 for my $name (keys %$leaf_symtab) {
3815 _gv_clear *{"$pkg$name"};
3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3817 }
3536} 3818}
3537 3819
3538sub do_reload_perl() { 3820sub do_reload_perl() {
3539 # can/must only be called in main 3821 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3541 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3542 return; 3824 return;
3543 } 3825 }
3544 3826
3827 return if $RELOAD++;
3828
3829 my $t1 = AE::time;
3830
3831 while ($RELOAD) {
3545 warn "reloading..."; 3832 warn "reloading...";
3546 3833
3547 warn "entering sync_job"; 3834 warn "entering sync_job";
3548 3835
3549 cf::sync_job { 3836 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark 3837 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3838 cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark 3839 cf::write_runtime_sync; # external watchdog should not bark
3553 3840
3554 warn "syncing database to disk"; 3841 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV; 3842 BDB::db_env_txn_checkpoint $DB_ENV;
3556 3843
3557 # if anything goes wrong in here, we should simply crash as we already saved 3844 # if anything goes wrong in here, we should simply crash as we already saved
3558 3845
3559 warn "flushing outstanding aio requests"; 3846 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs; 3847 while (IO::AIO::nreqs || BDB::nreqs) {
3565 warn "iterate..."; 3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = ();
3573
3574 warn "removing commands";
3575 %COMMAND = ();
3576
3577 warn "removing ext/exti commands";
3578 %EXTCMD = ();
3579 %EXTICMD = ();
3580
3581 warn "unloading/nuking all extensions";
3582 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg";
3584
3585 if (my $cb = $pkg->can ("unload")) {
3586 eval {
3587 $cb->($pkg);
3588 1
3589 } or warn "$pkg unloaded, but with errors: $@";
3590 } 3849 }
3591 3850
3592 warn "... nuking $pkg"; 3851 warn "cancelling all extension coros";
3593 Symbol::delete_package $pkg; 3852 $_->cancel for values %EXT_CORO;
3594 } 3853 %EXT_CORO = ();
3595 3854
3596 warn "unloading all perl modules loaded from $LIBDIR"; 3855 warn "removing commands";
3597 while (my ($k, $v) = each %INC) { 3856 %COMMAND = ();
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 3857
3858 warn "removing ext/exti commands";
3859 %EXTCMD = ();
3860 %EXTICMD = ();
3861
3862 warn "unloading/nuking all extensions";
3863 for my $pkg (@EXTS) {
3600 warn "... unloading $k"; 3864 warn "... unloading $pkg";
3601 delete $INC{$k};
3602 3865
3603 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g;
3605
3606 if (my $cb = $k->can ("unload_module")) { 3866 if (my $cb = $pkg->can ("unload")) {
3867 eval {
3607 $cb->(); 3868 $cb->($pkg);
3869 1
3870 } or warn "$pkg unloaded, but with errors: $@";
3871 }
3872
3873 warn "... clearing $pkg";
3874 clear_package $pkg;
3608 } 3875 }
3609 3876
3610 Symbol::delete_package $k; 3877 warn "unloading all perl modules loaded from $LIBDIR";
3878 while (my ($k, $v) = each %INC) {
3879 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880
3881 warn "... unloading $k";
3882 delete $INC{$k};
3883
3884 $k =~ s/\.pm$//;
3885 $k =~ s/\//::/g;
3886
3887 if (my $cb = $k->can ("unload_module")) {
3888 $cb->();
3889 }
3890
3891 clear_package $k;
3611 } 3892 }
3612 3893
3613 warn "getting rid of safe::, as good as possible"; 3894 warn "getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 3895 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 3897
3617 warn "unloading cf.pm \"a bit\""; 3898 warn "unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 3899 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3620 3901
3621 # don't, removes xs symbols, too, 3902 # don't, removes xs symbols, too,
3622 # and global variables created in xs 3903 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 3904 #clear_package __PACKAGE__;
3624 3905
3625 warn "unload completed, starting to reload now"; 3906 warn "unload completed, starting to reload now";
3626 3907
3627 warn "reloading cf.pm"; 3908 warn "reloading cf.pm";
3628 require cf; 3909 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3910 cf::_connect_to_perl_1;
3630 3911
3631 warn "loading config and database again"; 3912 warn "loading config and database again";
3632 cf::reload_config; 3913 cf::reload_config;
3633 3914
3634 warn "loading extensions"; 3915 warn "loading extensions";
3635 cf::load_extensions; 3916 cf::load_extensions;
3636 3917
3918 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 3919 warn "reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 3920 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 3921 warn "reattaching attachments to maps";
3640 reattach $_ for values %MAP; 3922 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 3923 warn "reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 3924 reattach $_ for values %PLAYER;
3925 }
3643 3926
3927 warn "running post_init jobs";
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3929
3644 warn "leaving sync_job"; 3930 warn "leaving sync_job";
3645 3931
3646 1 3932 1
3647 } or do { 3933 } or do {
3648 warn $@; 3934 warn $@;
3649 cf::cleanup "error while reloading, exiting."; 3935 cf::cleanup "error while reloading, exiting.";
3650 }; 3936 };
3651 3937
3652 warn "reloaded"; 3938 warn "reloaded";
3939 --$RELOAD;
3940 }
3941
3942 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n";
3653}; 3944};
3654 3945
3655our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3656 3947
3657sub reload_perl() { 3948sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 3949 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3660 3951
3952 $RELOAD_WATCHER ||= cf::async {
3953 Coro::AIO::aio_wait cache_extensions;
3954
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 3956 do_reload_perl;
3663 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3958 };
3664 }; 3959 };
3665} 3960}
3666 3961
3667register_command "reload" => sub { 3962register_command "reload" => sub {
3668 my ($who, $arg) = @_; 3963 my ($who, $arg) = @_;
3682 3977
3683our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3685 3980
3686sub wait_for_tick { 3981sub wait_for_tick {
3687 return if tick_inhibit;
3688 return if $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3689 3983
3690 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3691 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait; 3986 $signal->wait;
3693} 3987}
3694 3988
3695sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3696 return if tick_inhibit;
3697 return if $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3698 3991
3699 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 3994 $signal->wait;
3702} 3995}
3707 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3708 return; 4001 return;
3709 } 4002 }
3710 4003
3711 cf::server_tick; # one server iteration 4004 cf::server_tick; # one server iteration
4005
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3712 4007
3713 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3714 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3715 Coro::async_pool { 4010 Coro::async_pool {
3716 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
3739} 4034}
3740 4035
3741{ 4036{
3742 # configure BDB 4037 # configure BDB
3743 4038
3744 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3745 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3747 4042
3748 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 4046 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4047 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4048 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4049 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 4050
3755 cf::sync_job { 4051 cf::sync_job {
3756 eval { 4052 eval {
3782{ 4078{
3783 # configure IO::AIO 4079 # configure IO::AIO
3784 4080
3785 IO::AIO::min_parallel 8; 4081 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 4082 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 4083 undef $AnyEvent::AIO::WATCHER;
3788} 4084}
3789 4085
3790my $_log_backtrace; 4086my $_log_backtrace;
3791 4087
3792sub _log_backtrace { 4088sub _log_backtrace {
3795 $msg =~ s/\n//; 4091 $msg =~ s/\n//;
3796 4092
3797 # limit the # of concurrent backtraces 4093 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 4094 if ($_log_backtrace < 2) {
3799 ++$_log_backtrace; 4095 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg;
3800 async { 4097 async {
3801 $Coro::current->{desc} = "abt $msg"; 4098 $Coro::current->{desc} = "abt $msg";
3802 4099
3803 my @bt = fork_call { 4100 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 4101 @addr = map { sprintf "%x", $_ } @addr;
3815 } 4112 }
3816 4113
3817 @funcs 4114 @funcs
3818 }; 4115 };
3819 4116
3820 LOG llevInfo, "[ABT] $msg\n"; 4117 LOG llevInfo, "[ABT] $perl_bt\n";
4118 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 4119 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 4120 --$_log_backtrace;
3823 }; 4121 };
3824 } else { 4122 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 4123 LOG llevInfo, "[ABT] $msg\n";
3826 LOG llevInfo, "[ABT] [suppressed]\n"; 4124 LOG llevInfo, "[ABT] [suppressed]\n";
3827 } 4125 }
3828} 4126}
3829 4127
3830# load additional modules 4128# load additional modules
3831use cf::pod; 4129require "cf/$_.pm" for @EXTRA_MODULES;
4130cf::_connect_to_perl_2;
3832 4131
3833END { cf::emergency_save } 4132END { cf::emergency_save }
3834 4133
38351 41341
3836 4135

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines