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.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.531 by root, Wed Apr 28 21:07:41 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; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
93 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;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1525 1642
1526 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1683
1567 for my $login (@$dirs) { 1684 for my $login (@$dirs) {
1568 my $path = path $login; 1685 my $path = path $login;
1569 1686
1570 # a .pst is a dead give-away for a valid player 1687 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1688 # if no pst file found, open and chekc for blocked users
1689 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1690 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1691 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1692 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1693 }
1576 1694
… …
1580 1698
1581 \@logins 1699 \@logins
1582} 1700}
1583 1701
1584=item $player->maps 1702=item $player->maps
1703
1704=item cf::player::maps $login
1585 1705
1586Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1587player. May block. 1707player. May block.
1588 1708
1589=cut 1709=cut
… …
1607 } 1727 }
1608 1728
1609 \@paths 1729 \@paths
1610} 1730}
1611 1731
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1732=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1733
1614Expand crossfire pod fragments into protocol xml. 1734Expand 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 1735
1705=item $player->ext_reply ($msgid, @msg) 1736=item $player->ext_reply ($msgid, @msg)
1706 1737
1707Sends an ext reply to the player. 1738Sends an ext reply to the player.
1708 1739
… …
1740 1771
1741=cut 1772=cut
1742 1773
1743sub find_by_path($) { 1774sub find_by_path($) {
1744 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1745 1778
1746 my ($match, $specificity); 1779 my ($match, $specificity);
1747 1780
1748 for my $region (list) { 1781 for my $region (list) {
1749 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
… …
1775our $MAX_RESET = 3600; 1808our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1809our $DEFAULT_RESET = 3000;
1777 1810
1778sub generate_random_map { 1811sub generate_random_map {
1779 my ($self, $rmp) = @_; 1812 my ($self, $rmp) = @_;
1813
1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1815
1780 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1817 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1785 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1786 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1787 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1788 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1810 1846
1811 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1812} 1848}
1813 1849
1814# also paths starting with '/' 1850# also paths starting with '/'
1815$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1816 1852
1817sub thawer_merge { 1853sub thawer_merge {
1818 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1819 1855
1820 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
… …
1906 1942
1907# the temporary/swap location 1943# the temporary/swap location
1908sub save_path { 1944sub save_path {
1909 my ($self) = @_; 1945 my ($self) = @_;
1910 1946
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1948 "$TMPDIR/$path.map"
1913} 1949}
1914 1950
1915# the unique path, undef == no special unique path 1951# the unique path, undef == no special unique path
1916sub uniq_path { 1952sub uniq_path {
1917 my ($self) = @_; 1953 my ($self) = @_;
1918 1954
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 1957}
1931 1958
1932sub decay_objects { 1959sub decay_objects {
1933 my ($self) = @_; 1960 my ($self) = @_;
1934 1961
… …
2018sub find { 2045sub find {
2019 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
2020 2047
2021 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
2022 2049
2023 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
2025 2052
2026 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
2031 or return; 2055 or return;
2032 2056
2033 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
2034 2058
… …
2036 or return; 2060 or return;
2037 2061
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2062 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2063 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2064 #$cf::WAIT_FOR_TICK->wait;
2065 undef $guard2;
2041 undef $guard1; 2066 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2067 $map->reset;
2044 return find $path; 2068 return find $path;
2045 } 2069 }
2046 2070
2047 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2048 } 2072 }
2049} 2073}
2050 2074
2051sub pre_load { } 2075sub pre_load { }
2052sub post_load { } 2076#sub post_load { } # XS
2053 2077
2054sub load { 2078sub load {
2055 my ($self) = @_; 2079 my ($self) = @_;
2056 2080
2057 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
… …
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2098 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2099 $f->skip_block;
2076 $self->_load_objects ($f) 2100 $self->_load_objects ($f)
2077 or return; 2101 or return;
2078 2102
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2103 $self->post_load_original
2080 if delete $self->{load_original}; 2104 if delete $self->{load_original};
2081 2105
2082 if (my $uniq = $self->uniq_path) { 2106 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2107 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2108 unless (aio_stat $uniq) {
… …
2102 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2127 $self->decay_objects;
2104 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2105 $self->update_buttons; 2129 $self->update_buttons;
2106 cf::cede_to_tick; 2130 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2131 $self->activate;
2110 } 2132 }
2111 2133
2112 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2114 2136
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2137 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2138 }
2117 2139
2118 $self->post_load; 2140 $self->post_load;
2119} 2141}
2120 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2121sub customise_for { 2146sub customise_for {
2122 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2123 2148
2124 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2125 if $self->per_player; 2150 if $self->per_player;
… …
2141 or next; 2166 or next;
2142 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2143 or next; 2168 or next;
2144 $neigh->load; 2169 $neigh->load;
2145 2170
2171 # now find the diagonal neighbours
2146 push @neigh, 2172 push @neigh,
2147 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2148 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2149 } 2175 }
2150 2176
… …
2178 my ($path, $origin, $load) = @_; 2204 my ($path, $origin, $load) = @_;
2179 2205
2180 $path = normalise $path, $origin && $origin->{path}; 2206 $path = normalise $path, $origin && $origin->{path};
2181 2207
2182 if (my $map = $cf::MAP{$path}) { 2208 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2210 }
2185 2211
2186 $MAP_PREFETCH{$path} |= $load; 2212 $MAP_PREFETCH{$path} |= $load;
2187 2213
2188 $MAP_PREFETCHER ||= cf::async { 2214 $MAP_PREFETCHER ||= cf::async {
… …
2202 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2203 2229
2204 () 2230 ()
2205} 2231}
2206 2232
2233# common code, used by both ->save and ->swapout
2207sub save { 2234sub _save {
2208 my ($self) = @_; 2235 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211 2236
2212 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2213 2238
2214 return unless $self->dirty; 2239 return unless $self->dirty;
2215 2240
… …
2224 2249
2225 cf::async { 2250 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2251 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2252 $_->contr->save for $self->players;
2228 }; 2253 };
2254
2255 cf::get_slot 0.02;
2229 2256
2230 if ($uniq) { 2257 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2258 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2259 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2260 } else {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2235 } 2262 }
2236} 2263}
2237 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2238sub swap_out { 2273sub swap_out {
2239 my ($self) = @_; 2274 my ($self) = @_;
2240 2275
2241 # save first because save cedes
2242 $self->save;
2243
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2277
2278 return if $self->in_memory != cf::MAP_ACTIVE;
2279 return if $self->{deny_save};
2246 return if $self->players; 2280 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY;
2248 return if $self->{deny_save};
2249 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2250 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2251 2332
2252 $self->deactivate; 2333 $self->deactivate;
2253 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2254 $self->clear; 2335 $self->clear;
2255}
2256
2257sub reset_at {
2258 my ($self) = @_;
2259
2260 # TODO: safety, remove and allow resettable per-player maps
2261 return 1e99 if $self->{deny_reset};
2262
2263 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2264 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2265
2266 $time + $to
2267}
2268
2269sub should_reset {
2270 my ($self) = @_;
2271
2272 $self->reset_at <= $cf::RUNTIME
2273}
2274
2275sub reset {
2276 my ($self) = @_;
2277
2278 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279
2280 return if $self->players;
2281
2282 warn "resetting map ", $self->path;
2283
2284 $self->in_memory (cf::MAP_SWAPPED);
2285
2286 # need to save uniques path
2287 unless ($self->{deny_save}) {
2288 my $uniq = $self->uniq_path; utf8::encode $uniq;
2289
2290 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2291 if $uniq;
2292 }
2293
2294 delete $cf::MAP{$self->path};
2295
2296 $self->deactivate;
2297 $_->clear_links_to ($self) for values %cf::MAP;
2298 $self->clear;
2299 2336
2300 $self->unlink_save; 2337 $self->unlink_save;
2301 $self->destroy; 2338 $self->destroy;
2302} 2339}
2303 2340
… …
2311 2348
2312 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2313 2350
2314 $self->unlink_save; 2351 $self->unlink_save;
2315 2352
2316 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2317 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2318 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2319 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2320 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2321 2358
… …
2370 2407
2371sub unique_maps() { 2408sub unique_maps() {
2372 [ 2409 [
2373 map { 2410 map {
2374 utf8::decode $_; 2411 utf8::decode $_;
2375 /\.map$/ 2412 s/\.map$//; # TODO future compatibility hack
2413 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2414 ? ()
2376 ? normalise $_ 2415 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2417 ]
2380} 2418}
2381 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2382=back 2452=back
2383 2453
2384=head3 cf::object 2454=head3 cf::object
2385 2455
2386=cut 2456=cut
… …
2389 2459
2390=over 4 2460=over 4
2391 2461
2392=item $ob->inv_recursive 2462=item $ob->inv_recursive
2393 2463
2394Returns the inventory of the object _and_ their inventories, recursively. 2464Returns the inventory of the object I<and> their inventories, recursively,
2465but I<not> the object itself.
2395 2466
2396=cut 2467=cut
2397 2468
2398sub inv_recursive_; 2469sub inv_recursive_;
2399sub inv_recursive_ { 2470sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2475 inv_recursive_ inv $_[0]
2405} 2476}
2406 2477
2407=item $ref = $ob->ref 2478=item $ref = $ob->ref
2408 2479
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2480Creates and returns a persistent reference to an object that can be stored as a string.
2410 2481
2411=item $ob = cf::object::deref ($refstring) 2482=item $ob = cf::object::deref ($refstring)
2412 2483
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2484returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2485even if the object actually exists. May block.
… …
2446can be C<undef>. Does the right thing when the player is currently in a 2517can be C<undef>. Does the right thing when the player is currently in a
2447dialogue with the given NPC character. 2518dialogue with the given NPC character.
2448 2519
2449=cut 2520=cut
2450 2521
2522our $SAY_CHANNEL = {
2523 id => "say",
2524 title => "Map",
2525 reply => "say ",
2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2527};
2528
2529our $CHAT_CHANNEL = {
2530 id => "chat",
2531 title => "Chat",
2532 reply => "chat ",
2533 tooltip => "Player chat and shouts, global to the server.",
2534};
2535
2451# rough implementation of a future "reply" method that works 2536# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2537# with dialog boxes.
2453#TODO: the first argument must go, split into a $npc->reply_to ( method 2538#TODO: the first argument must go, split into a $npc->reply_to ( method
2454sub cf::object::player::reply($$$;$) { 2539sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2540 my ($self, $npc, $msg, $flags) = @_;
… …
2466 my $dialog = $pl->{npc_dialog}; 2551 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2552 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468 2553
2469 } else { 2554 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2555 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2556 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2557 }
2473 } 2558 }
2474} 2559}
2475 2560
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2561=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2501 2586
2502=item $player_object->enter_link 2587=item $player_object->enter_link
2503 2588
2504Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2505 2590
2506The player should be reasonably safe there for short amounts of time. You 2591The player should be reasonably safe there for short amounts of time (e.g.
2507I<MUST> call C<leave_link> as soon as possible, though. 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2593though, as the player cannot control the character while it is on the link
2594map.
2508 2595
2509Will never block. 2596Will never block.
2510 2597
2511=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2512 2599
… …
2532sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2533 my ($self) = @_; 2620 my ($self) = @_;
2534 2621
2535 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2536 2623
2624 ++$self->{_link_recursion};
2625
2537 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2538 2627
2539 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2540 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2541 2630
2542 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2543} 2632}
2544 2633
2545sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2546 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2547 2636
… …
2564 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2565 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2566 2655
2567 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2568 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2569 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2570 2659
2571 $map->load; 2660 $map->load;
2572 $map->load_neighbours; 2661 $map->load_neighbours;
2573 2662
2574 return unless $self->contr->active; 2663 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2664
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2579} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2580 2672
2673}
2674
2581=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2582 2676
2583Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2584her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2585that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2586the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process. 2681be called at the end of this process.
2588 2682
2683Note that $check will be called with a potentially non-loaded map, so if
2684it needs a loaded map it has to call C<< ->load >>.
2685
2589=cut 2686=cut
2590 2687
2591our $GOTOGEN; 2688our $GOTOGEN;
2592 2689
2593sub cf::object::player::goto { 2690sub cf::object::player::goto {
2594 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2595 2698
2596 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2597 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2598 2701
2599 $self->enter_link; 2702 $self->enter_link;
… …
2623 my $map = eval { 2726 my $map = eval {
2624 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2625 2728
2626 if ($map) { 2729 if ($map) {
2627 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2628 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2629 } else { 2732 } else {
2630 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2631 } 2734 }
2632 2735
2633 $map 2736 $map
… …
2641 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2642 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2643 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2644 } 2747 }
2645 2748
2646 $done->() if $done; 2749 $done->($self) if $done;
2647 })->prio (1); 2750 })->prio (1);
2648} 2751}
2649 2752
2650=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2651 2754
… …
2671} 2774}
2672 2775
2673sub prepare_random_map { 2776sub prepare_random_map {
2674 my ($exit) = @_; 2777 my ($exit) = @_;
2675 2778
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2779 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2780 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2781 # that depends on the exit object
2681 2782
2682 my $rmp = parse_random_map_params $exit->msg; 2783 my $rmp = parse_random_map_params $exit->msg;
… …
2684 if ($exit->map) { 2785 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2786 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2787 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2788 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2789 $rmp->{origin_y} = $exit->y;
2790
2791 $exit->map->touch;
2689 } 2792 }
2690 2793
2691 $rmp->{random_seed} ||= $exit->random_seed; 2794 $rmp->{random_seed} ||= $exit->random_seed;
2692 2795
2693 my $data = cf::encode_json $rmp; 2796 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2797 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2798 my $meta = "$RANDOMDIR/$md5.meta";
2696 2799
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2800 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2801 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2802 undef $fh;
2700 aio_rename "$meta~", $meta; 2803 aio_rename "$meta~", $meta;
2701 2804
2805 my $slaying = "?random/$md5";
2806
2807 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2808 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2809 $exit->msg (undef);
2810 }
2704 } 2811 }
2705} 2812}
2706 2813
2707sub cf::object::player::enter_exit { 2814sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2815 my ($self, $exit) = @_;
2709 2816
2710 return unless $self->type == cf::PLAYER; 2817 return unless $self->type == cf::PLAYER;
2711 2818
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2819 $self->enter_link;
2724 2820
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2821 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2822 $Coro::current->{desc} = "enter_exit";
2731 2823
2732 $self->deactivate_recursive; # just to be sure
2733 unless (eval { 2824 unless (eval {
2825 $self->deactivate_recursive; # just to be sure
2826
2827 # random map handling
2828 {
2829 my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831 prepare_random_map $exit
2832 if $exit->slaying eq "/!";
2833 }
2834
2835 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2836 my $x = $exit->stats->hp;
2837 my $y = $exit->stats->sp;
2838
2734 $self->goto ($slaying, $hp, $sp); 2839 $self->goto ($map, $x, $y);
2735 2840
2841 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y)
2843 if $exit->flag (cf::FLAG_DAMNED);
2844
2736 1; 2845 1
2737 }) { 2846 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2847 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "I'll try to bring you back to the map you were before. " 2848 . "I'll try to bring you back to the map you were before. "
2740 . "Please report this to the dungeon master!", 2849 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2850 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2851
2743 warn "ERROR in enter_exit: $@"; 2852 warn "ERROR in enter_exit: $@";
… …
2760sub cf::client::send_drawinfo { 2869sub cf::client::send_drawinfo {
2761 my ($self, $text, $flags) = @_; 2870 my ($self, $text, $flags) = @_;
2762 2871
2763 utf8::encode $text; 2872 utf8::encode $text;
2764 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2874}
2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2765} 2899}
2766 2900
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2902
2769Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2773 2907
2774=cut 2908=cut
2775 2909
2776# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2778 "c/identify" => { 2918 "c/identify" => {
2779 id => "infobox", 2919 id => "infobox",
2780 title => "Identify", 2920 title => "Identify",
2781 reply => undef, 2921 reply => undef,
2782 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
… …
2784 "c/examine" => { 2924 "c/examine" => {
2785 id => "infobox", 2925 id => "infobox",
2786 title => "Examine", 2926 title => "Examine",
2787 reply => undef, 2927 reply => undef,
2788 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2789 }, 2935 },
2790 "c/book" => { 2936 "c/book" => {
2791 id => "infobox", 2937 id => "infobox",
2792 title => "Book", 2938 title => "Book",
2793 reply => undef, 2939 reply => undef,
… …
2809 id => "infobox", 2955 id => "infobox",
2810 title => "Body Parts", 2956 title => "Body Parts",
2811 reply => undef, 2957 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2813 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2966 "c/skills" => {
2967 id => "infobox",
2968 title => "Skills",
2969 reply => undef,
2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2995 },
2814 "c/uptime" => { 2996 "c/uptime" => {
2815 id => "infobox", 2997 id => "infobox",
2816 title => "Uptime", 2998 title => "Uptime",
2817 reply => undef, 2999 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
… …
2821 id => "infobox", 3003 id => "infobox",
2822 title => "Map Info", 3004 title => "Map Info",
2823 reply => undef, 3005 reply => undef,
2824 tooltip => "Information related to the maps", 3006 tooltip => "Information related to the maps",
2825 }, 3007 },
3008 "c/party" => {
3009 id => "party",
3010 title => "Party",
3011 reply => "gsay ",
3012 tooltip => "Messages and chat related to your party",
3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2826); 3022);
2827 3023
2828sub cf::client::send_msg { 3024sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2830 3026
2831 $msg = $self->pl->expand_cfpod ($msg); 3027 $msg = $self->pl->expand_cfpod ($msg)
3028 unless $color & cf::NDI_VERBATIM;
2832 3029
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 3030 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 3031
2835 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2838 3035
2839 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2843 3038
2844 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 3044 }
2851 3045
2852 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2853 } 3047 }
2854 3048
2855 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2856 3050
2857 if ($self->can_msg) {
2858 # default colour, mask it out 3051 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2861 3054
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3055 my $pkt = "msg "
3056 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 3058 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 3059
2876 $color &= cf::NDI_COLOR_MASK; 3060 $self->send_big_packet ($pkt);
2877
2878 utf8::encode $msg;
2879
2880 if (0 && $msg =~ /\[/) {
2881 # COMMAND/INFO
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 }
2889} 3061}
2890 3062
2891=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2892 3064
2893Sends an ext event to the client. 3065Sends an ext event to the client.
… …
2896 3068
2897sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2899 3071
2900 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3077 }
2906} 3078}
2907 3079
2908=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2909 3081
… …
2913 3085
2914sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2916 3088
2917 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3092 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3095 }
2924} 3096}
2925 3097
2926=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2927 3099
… …
3028 3200
3029 $coro 3201 $coro
3030} 3202}
3031 3203
3032cf::client->attach ( 3204cf::client->attach (
3033 on_destroy => sub { 3205 on_client_destroy => sub {
3034 my ($ns) = @_; 3206 my ($ns) = @_;
3035 3207
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3209 },
3038); 3210);
… …
3054our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3055 3227
3056$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3057 3229
3058$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3061 sort time 3233 sort time
3062)); 3234));
3063 3235
3064# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
… …
3067 3239
3068The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3069 3241
3070 cf::object 3242 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr 3244 insert remove name archname title slaying race decrease split
3245 value
3073 3246
3074 cf::object::player 3247 cf::object::player
3075 player 3248 player
3076 3249
3077 cf::player 3250 cf::player
… …
3082 3255
3083=cut 3256=cut
3084 3257
3085for ( 3258for (
3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3092) { 3265) {
3093 no strict 'refs'; 3266 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3113 3286
3114 my $qcode = $code; 3287 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3117 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3118 local $_; 3294 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars;
3120 3295
3121 my $eval = 3296 my $eval =
3122 "do {\n" 3297 "do {\n"
3123 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3124 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3125 . $code 3300 . $code
3126 . "\n}" 3301 . "\n}"
3127 ; 3302 ;
3128 3303
3304 if ($CFG{safe_eval}) {
3129 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3130 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3131 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3132 3313
3133 if ($@) { 3314 if ($@) {
3134 warn "$@"; 3315 warn "$@";
3135 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3136 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
… …
3155=cut 3336=cut
3156 3337
3157sub register_script_function { 3338sub register_script_function {
3158 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3159 3340
3160 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3161 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3162} 3343}
3163 3344
3164=back 3345=back
3165 3346
3166=cut 3347=cut
… …
3187 3368
3188 $facedata->{version} == 2 3369 $facedata->{version} == 2
3189 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3190 3371
3191 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3192 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3193 type => FT_RSRC, 3375 type => FT_RSRC,
3194 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3195 }; 3378 };
3196 cf::cede_to_tick; 3379 cf::cede_to_tick;
3197 3380
3198 { 3381 {
3199 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
… …
3201 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3202 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3203 3386
3204 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3205 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3206 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3207 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3208 3391
3209 cf::cede_to_tick; 3392 cf::cede_to_tick;
3210 } 3393 }
3211 3394
3212 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
… …
3236 3419
3237 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3238 } 3421 }
3239 3422
3240 { 3423 {
3241 # TODO: for gcfclient pleasure, we should give resources
3242 # that gcfclient doesn't grok a >10000 face index.
3243 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3244 3425
3245 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3246 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3247 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3248 my $data;
3249 3429
3250 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3251 # prepend meta info
3252
3253 my $meta = $enc->encode ({
3254 name => $name,
3255 %{ $info->{meta} || {} },
3256 });
3257
3258 $data = pack "(w/a*)*", $meta, $info->{data};
3259 } else {
3260 $data = $info->{data};
3261 }
3262
3263 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3264 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3265 } else { 3432 } else {
3266 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info; # unused
3267 } 3434 }
3268 3435
3269 cf::cede_to_tick; 3436 cf::cede_to_tick;
3270 } 3437 }
3271 } 3438 }
3272 3439
3273 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3274 3441
3275 1 3442 1
3276} 3443}
3277
3278cf::global->attach (on_resource_update => sub {
3279 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3280 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3281
3282 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3283 my $sound = $soundconf->{compat}[$_]
3284 or next;
3285
3286 my $face = cf::face::find "sound/$sound->[1]";
3287 cf::sound::set $sound->[0] => $face;
3288 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3289 }
3290
3291 while (my ($k, $v) = each %{$soundconf->{event}}) {
3292 my $face = cf::face::find "sound/$v";
3293 cf::sound::set $k => $face;
3294 }
3295 }
3296});
3297 3444
3298register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
3299 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
3300 3447
3301 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3449 $ns->fx_want ($k, $v);
3303 } 3450 }
3304}; 3451};
3452
3453sub load_resource_file($) {
3454 my $guard = lock_acquire "load_resource_file";
3455
3456 my $status = load_resource_file_ $_[0];
3457 get_slot 0.1, 100;
3458 cf::arch::commit_load;
3459
3460 $status
3461}
3305 3462
3306sub reload_regions { 3463sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3464 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3465 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3466 %ext::player_env::MUSIC_FACE_CACHE = ();
… …
3323} 3480}
3324 3481
3325sub reload_archetypes { 3482sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3483 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3484 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3485}
3334 3486
3335sub reload_treasures { 3487sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
3338} 3490}
3339 3491
3492sub reload_sound {
3493 warn "loading sound config from $DATADIR/sound\n";
3494
3495 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3496 or die "$DATADIR/sound $!";
3497
3498 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3499
3500 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3501 my $sound = $soundconf->{compat}[$_]
3502 or next;
3503
3504 my $face = cf::face::find "sound/$sound->[1]";
3505 cf::sound::set $sound->[0] => $face;
3506 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3507 }
3508
3509 while (my ($k, $v) = each %{$soundconf->{event}}) {
3510 my $face = cf::face::find "sound/$v";
3511 cf::sound::set $k => $face;
3512 }
3513}
3514
3340sub reload_resources { 3515sub reload_resources {
3341 warn "reloading resource files...\n"; 3516 warn "reloading resource files...\n";
3342 3517
3518 reload_facedata;
3519 reload_sound;
3520 reload_archetypes;
3343 reload_regions; 3521 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3522 reload_treasures;
3348 3523
3349 warn "finished reloading resource files\n"; 3524 warn "finished reloading resource files\n";
3350} 3525}
3351 3526
3352sub init {
3353 reload_resources;
3354}
3355
3356sub reload_config { 3527sub reload_config {
3528 warn "reloading config file...\n";
3529
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3530 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3531 or return;
3359 3532
3360 local $/; 3533 local $/;
3361 *CFG = YAML::Load <$fh>; 3534 *CFG = YAML::XS::Load scalar <$fh>;
3362 3535
3363 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3536 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3364 3537
3365 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3538 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3366 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3539 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3367 3540
3368 if (exists $CFG{mlockall}) { 3541 if (exists $CFG{mlockall}) {
… …
3370 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3543 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3371 and die "WARNING: m(un)lockall failed: $!\n"; 3544 and die "WARNING: m(un)lockall failed: $!\n";
3372 }; 3545 };
3373 warn $@ if $@; 3546 warn $@ if $@;
3374 } 3547 }
3548
3549 warn "finished reloading resource files\n";
3550}
3551
3552sub pidfile() {
3553 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3554 or die "$PIDFILE: $!";
3555 flock $fh, &Fcntl::LOCK_EX
3556 or die "$PIDFILE: flock: $!";
3557 $fh
3558}
3559
3560# make sure only one server instance is running at any one time
3561sub atomic {
3562 my $fh = pidfile;
3563
3564 my $pid = <$fh>;
3565 kill 9, $pid if $pid > 0;
3566
3567 seek $fh, 0, 0;
3568 print $fh $$;
3569}
3570
3571sub main_loop {
3572 warn "EV::loop starting\n";
3573 if (1) {
3574 EV::loop;
3575 }
3576 warn "EV::loop returned\n";
3577 goto &main_loop unless $REALLY_UNLOOP;
3375} 3578}
3376 3579
3377sub main { 3580sub main {
3581 cf::init_globals; # initialise logging
3582
3583 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3584 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3585 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3586 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3587
3588 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3589
3378 # we must not ever block the main coroutine 3590 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3591 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3592 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3593 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3594 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3595 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3596 })->prio (Coro::PRIO_MAX);
3385 }; 3597 };
3386 3598
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3599 evthread_start IO::AIO::poll_fileno;
3393 EV::loop; 3600
3601 cf::sync_job {
3602 cf::init_experience;
3603 cf::init_anim;
3604 cf::init_attackmess;
3605 cf::init_dynamic;
3606
3607 cf::load_settings;
3608 cf::load_materials;
3609
3610 reload_resources;
3611 reload_config;
3612 db_init;
3613
3614 cf::init_uuid;
3615 cf::init_signals;
3616 cf::init_skills;
3617
3618 cf::init_beforeplay;
3619
3620 atomic;
3621
3622 load_extensions;
3623
3624 utime time, time, $RUNTIMEFILE;
3625
3626 # no (long-running) fork's whatsoever before this point(!)
3627 use POSIX ();
3628 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3629
3630 (pop @POST_INIT)->(0) while @POST_INIT;
3631 };
3632
3633 cf::object::thawer::errors_are_fatal 0;
3634 warn "parse errors in files are no longer fatal from this point on.\n";
3635
3636 main_loop;
3394} 3637}
3395 3638
3396############################################################################# 3639#############################################################################
3397# initialisation and cleanup 3640# initialisation and cleanup
3398 3641
3399# install some emergency cleanup handlers 3642# install some emergency cleanup handlers
3400BEGIN { 3643BEGIN {
3401 our %SIGWATCHER = (); 3644 our %SIGWATCHER = ();
3402 for my $signal (qw(INT HUP TERM)) { 3645 for my $signal (qw(INT HUP TERM)) {
3403 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3646 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3404 cf::cleanup "SIG$signal"; 3647 cf::cleanup "SIG$signal";
3405 }; 3648 };
3406 } 3649 }
3407} 3650}
3408 3651
3409sub write_runtime_sync { 3652sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime"; 3653 my $t0 = AE::time;
3411 3654
3412 # first touch the runtime file to show we are still running: 3655 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3656 # the fsync below can take a very very long time.
3414 3657
3415 IO::AIO::aio_utime $runtime, undef, undef; 3658 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3659
3417 my $guard = cf::lock_acquire "write_runtime"; 3660 my $guard = cf::lock_acquire "write_runtime";
3418 3661
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3662 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3420 or return; 3663 or return;
3421 3664
3422 my $value = $cf::RUNTIME + 90 + 10; 3665 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3666 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3667 # 60 allows for the watchdog to kill the server.
… …
3434 aio_utime $fh, undef, undef; 3677 aio_utime $fh, undef, undef;
3435 3678
3436 close $fh 3679 close $fh
3437 or return; 3680 or return;
3438 3681
3439 aio_rename "$runtime~", $runtime 3682 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3683 and return;
3441 3684
3442 warn "runtime file written.\n"; 3685 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3443 3686
3444 1 3687 1
3445} 3688}
3446 3689
3447our $uuid_lock; 3690our $uuid_lock;
… …
3456 my $uuid = "$LOCALDIR/uuid"; 3699 my $uuid = "$LOCALDIR/uuid";
3457 3700
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3701 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3702 or return;
3460 3703
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3704 my $value = uuid_seq uuid_cur;
3705
3706 unless ($value) {
3707 warn "cowardly refusing to write zero uuid value!\n";
3708 return;
3709 }
3710
3711 my $value = uuid_str $value + $uuid_skip;
3462 $uuid_skip = 0; 3712 $uuid_skip = 0;
3463 3713
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3714 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3715 and return;
3466 3716
… …
3488} 3738}
3489 3739
3490sub emergency_save() { 3740sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3741 my $freeze_guard = cf::freeze_mainloop;
3492 3742
3493 warn "enter emergency perl save\n"; 3743 warn "emergency_perl_save: enter\n";
3494 3744
3495 cf::sync_job { 3745 cf::sync_job {
3746 # this is a trade-off: we want to be very quick here, so
3747 # save all maps without fsync, and later call a global sync
3748 # (which in turn might be very very slow)
3749 local $USE_FSYNC = 0;
3750
3496 # use a peculiar iteration method to avoid tripping on perl 3751 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3752 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3753 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3754 warn "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3755 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3756 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3757 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3758 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3759 $pl->save;
3505 } 3760 }
3506 warn "end emergency player save\n"; 3761 warn "emergency_perl_save: end player save\n";
3507 3762
3508 warn "begin emergency map save\n"; 3763 warn "emergency_perl_save: begin map save\n";
3509 for my $path (keys %cf::MAP) { 3764 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3765 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3766 $map->valid or next;
3512 $map->save; 3767 $map->save;
3513 } 3768 }
3514 warn "end emergency map save\n"; 3769 warn "emergency_perl_save: end map save\n";
3515 3770
3516 warn "begin emergency database checkpoint\n"; 3771 warn "emergency_perl_save: begin database checkpoint\n";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3772 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3773 warn "emergency_perl_save: end database checkpoint\n";
3519 3774
3520 warn "begin write uuid\n"; 3775 warn "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3776 write_uuid_sync 1;
3522 warn "end write uuid\n"; 3777 warn "emergency_perl_save: end write uuid\n";
3523 }; 3778 };
3524 3779
3780 warn "emergency_perl_save: starting sync()\n";
3781 IO::AIO::aio_sync sub {
3782 warn "emergency_perl_save: finished sync()\n";
3783 };
3784
3525 warn "leave emergency perl save\n"; 3785 warn "emergency_perl_save: leave\n";
3526} 3786}
3527 3787
3528sub post_cleanup { 3788sub post_cleanup {
3529 my ($make_core) = @_; 3789 my ($make_core) = @_;
3530 3790
3531 warn Carp::longmess "post_cleanup backtrace" 3791 warn Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3792 if $make_core;
3793
3794 my $fh = pidfile;
3795 unlink $PIDFILE if <$fh> == $$;
3796}
3797
3798# a safer delete_package, copied from Symbol
3799sub clear_package($) {
3800 my $pkg = shift;
3801
3802 # expand to full symbol table name if needed
3803 unless ($pkg =~ /^main::.*::$/) {
3804 $pkg = "main$pkg" if $pkg =~ /^::/;
3805 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3806 $pkg .= '::' unless $pkg =~ /::$/;
3807 }
3808
3809 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3810 my $stem_symtab = *{$stem}{HASH};
3811
3812 defined $stem_symtab and exists $stem_symtab->{$leaf}
3813 or return;
3814
3815 # clear all symbols
3816 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3817 for my $name (keys %$leaf_symtab) {
3818 _gv_clear *{"$pkg$name"};
3819# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3820 }
3533} 3821}
3534 3822
3535sub do_reload_perl() { 3823sub do_reload_perl() {
3536 # can/must only be called in main 3824 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3825 if (in_main) {
3538 warn "can only reload from main coroutine"; 3826 warn "can only reload from main coroutine";
3539 return; 3827 return;
3540 } 3828 }
3541 3829
3830 return if $RELOAD++;
3831
3832 my $t1 = AE::time;
3833
3834 while ($RELOAD) {
3542 warn "reloading..."; 3835 warn "reloading...";
3543 3836
3544 warn "entering sync_job"; 3837 warn "entering sync_job";
3545 3838
3546 cf::sync_job { 3839 cf::sync_job {
3547 cf::write_runtime_sync; # external watchdog should not bark 3840 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3841 cf::emergency_save;
3549 cf::write_runtime_sync; # external watchdog should not bark 3842 cf::write_runtime_sync; # external watchdog should not bark
3550 3843
3551 warn "syncing database to disk"; 3844 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3845 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3846
3554 # if anything goes wrong in here, we should simply crash as we already saved 3847 # if anything goes wrong in here, we should simply crash as we already saved
3555 3848
3556 warn "flushing outstanding aio requests"; 3849 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs; 3850 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3851 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = ();
3570
3571 warn "removing commands";
3572 %COMMAND = ();
3573
3574 warn "removing ext/exti commands";
3575 %EXTCMD = ();
3576 %EXTICMD = ();
3577
3578 warn "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg";
3581
3582 if (my $cb = $pkg->can ("unload")) {
3583 eval {
3584 $cb->($pkg);
3585 1
3586 } or warn "$pkg unloaded, but with errors: $@";
3587 } 3852 }
3588 3853
3589 warn "... nuking $pkg"; 3854 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3855 $_->cancel for values %EXT_CORO;
3591 } 3856 %EXT_CORO = ();
3592 3857
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3858 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3859 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3860
3861 warn "removing ext/exti commands";
3862 %EXTCMD = ();
3863 %EXTICMD = ();
3864
3865 warn "unloading/nuking all extensions";
3866 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3867 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3868
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3869 if (my $cb = $pkg->can ("unload")) {
3870 eval {
3604 $cb->(); 3871 $cb->($pkg);
3872 1
3873 } or warn "$pkg unloaded, but with errors: $@";
3874 }
3875
3876 warn "... clearing $pkg";
3877 clear_package $pkg;
3605 } 3878 }
3606 3879
3607 Symbol::delete_package $k; 3880 warn "unloading all perl modules loaded from $LIBDIR";
3881 while (my ($k, $v) = each %INC) {
3882 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3883
3884 warn "... unloading $k";
3885 delete $INC{$k};
3886
3887 $k =~ s/\.pm$//;
3888 $k =~ s/\//::/g;
3889
3890 if (my $cb = $k->can ("unload_module")) {
3891 $cb->();
3892 }
3893
3894 clear_package $k;
3608 } 3895 }
3609 3896
3610 warn "getting rid of safe::, as good as possible"; 3897 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3898 clear_package "safe::$_"
3612 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3899 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613 3900
3614 warn "unloading cf.pm \"a bit\""; 3901 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3902 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3903 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 3904
3618 # don't, removes xs symbols, too, 3905 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3906 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3907 #clear_package __PACKAGE__;
3621 3908
3622 warn "unload completed, starting to reload now"; 3909 warn "unload completed, starting to reload now";
3623 3910
3624 warn "reloading cf.pm"; 3911 warn "reloading cf.pm";
3625 require cf; 3912 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3913 cf::_connect_to_perl_1;
3627 3914
3628 warn "loading config and database again"; 3915 warn "loading config and database again";
3629 cf::reload_config; 3916 cf::reload_config;
3630 3917
3631 warn "loading extensions"; 3918 warn "loading extensions";
3632 cf::load_extensions; 3919 cf::load_extensions;
3633 3920
3921 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3922 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3923 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3924 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3925 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3926 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3927 reattach $_ for values %PLAYER;
3928 }
3640 3929
3930 warn "running post_init jobs";
3931 (pop @POST_INIT)->(1) while @POST_INIT;
3932
3641 warn "leaving sync_job"; 3933 warn "leaving sync_job";
3642 3934
3643 1 3935 1
3644 } or do { 3936 } or do {
3645 warn $@; 3937 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3938 cf::cleanup "error while reloading, exiting.";
3647 }; 3939 };
3648 3940
3649 warn "reloaded"; 3941 warn "reloaded";
3942 --$RELOAD;
3943 }
3944
3945 $t1 = AE::time - $t1;
3946 warn "reload completed in ${t1}s\n";
3650}; 3947};
3651 3948
3652our $RELOAD_WATCHER; # used only during reload 3949our $RELOAD_WATCHER; # used only during reload
3653 3950
3654sub reload_perl() { 3951sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3952 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3953 # coro crashes during coro_state_free->destroy here.
3657 3954
3955 $RELOAD_WATCHER ||= cf::async {
3956 Coro::AIO::aio_wait cache_extensions;
3957
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3958 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3959 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3960 undef $RELOAD_WATCHER;
3961 };
3661 }; 3962 };
3662} 3963}
3663 3964
3664register_command "reload" => sub { 3965register_command "reload" => sub {
3665 my ($who, $arg) = @_; 3966 my ($who, $arg) = @_;
… …
3679 3980
3680our @WAIT_FOR_TICK; 3981our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3982our @WAIT_FOR_TICK_BEGIN;
3682 3983
3683sub wait_for_tick { 3984sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3985 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3686 3986
3687 my $signal = new Coro::Signal; 3987 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3988 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3989 $signal->wait;
3690} 3990}
3691 3991
3692sub wait_for_tick_begin { 3992sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3993 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3695 3994
3696 my $signal = new Coro::Signal; 3995 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3996 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3997 $signal->wait;
3699} 3998}
… …
3704 unless ++$bug_warning > 10; 4003 unless ++$bug_warning > 10;
3705 return; 4004 return;
3706 } 4005 }
3707 4006
3708 cf::server_tick; # one server iteration 4007 cf::server_tick; # one server iteration
4008
4009 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3709 4010
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4011 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4012 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3712 Coro::async_pool { 4013 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 4014 $Coro::current->{desc} = "runtime saver";
… …
3736} 4037}
3737 4038
3738{ 4039{
3739 # configure BDB 4040 # configure BDB
3740 4041
3741 BDB::min_parallel 8; 4042 BDB::min_parallel 16;
3742 BDB::max_poll_reqs $TICK * 0.1; 4043 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 4044 $AnyEvent::BDB::WATCHER->priority (1);
3744 4045
3745 unless ($DB_ENV) { 4046 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 4047 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4048 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 4049 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4050 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4051 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4052 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 4053
3752 cf::sync_job { 4054 cf::sync_job {
3753 eval { 4055 eval {
… …
3779{ 4081{
3780 # configure IO::AIO 4082 # configure IO::AIO
3781 4083
3782 IO::AIO::min_parallel 8; 4084 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 4085 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 4086 undef $AnyEvent::AIO::WATCHER;
3785} 4087}
3786 4088
3787my $_log_backtrace; 4089my $_log_backtrace;
3788 4090
3789sub _log_backtrace { 4091sub _log_backtrace {
… …
3792 $msg =~ s/\n//; 4094 $msg =~ s/\n//;
3793 4095
3794 # limit the # of concurrent backtraces 4096 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 4097 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 4098 ++$_log_backtrace;
4099 my $perl_bt = Carp::longmess $msg;
3797 async { 4100 async {
3798 $Coro::current->{desc} = "abt $msg"; 4101 $Coro::current->{desc} = "abt $msg";
3799 4102
3800 my @bt = fork_call { 4103 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 4104 @addr = map { sprintf "%x", $_ } @addr;
… …
3812 } 4115 }
3813 4116
3814 @funcs 4117 @funcs
3815 }; 4118 };
3816 4119
3817 LOG llevInfo, "[ABT] $msg\n"; 4120 LOG llevInfo, "[ABT] $perl_bt\n";
4121 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 4122 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 4123 --$_log_backtrace;
3820 }; 4124 };
3821 } else { 4125 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 4126 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 4127 LOG llevInfo, "[ABT] [suppressed]\n";
3824 } 4128 }
3825} 4129}
3826 4130
3827# load additional modules 4131# load additional modules
3828use cf::pod; 4132require "cf/$_.pm" for @EXTRA_MODULES;
4133cf::_connect_to_perl_2;
3829 4134
3830END { cf::emergency_save } 4135END { cf::emergency_save }
3831 4136
38321 41371
3833 4138

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines