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.444 by root, Mon Sep 8 11:27:25 2008 UTC vs.
Revision 1.528 by root, Fri Apr 23 04:42:12 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
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
63 66
64# configure various modules to our taste 67# configure various modules to our taste
65# 68#
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::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";
68Compress::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
69 77
70$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" };
71 80
72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
73 82
74our %COMMAND = (); 83our %COMMAND = ();
75our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
78our %EXTCMD = (); 87our %EXTCMD = ();
79our %EXTICMD = (); 88our %EXTICMD = ();
80our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
81our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
82 91
83our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
84our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
85 96
86our $CONFDIR = confdir; 97our $CONFDIR = confdir;
87our $DATADIR = datadir; 98our $DATADIR = datadir;
88our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
97our %RESOURCE; 111our %RESOURCE;
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;
98 118
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
101our $NEXT_TICK; 121our $NEXT_TICK;
102our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
103 123
104our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
106our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
107our $DB_ENV; 127our $DB_ENV;
108 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
109our %CFG; 131our %CFG;
110 132
111our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
112our $RUNTIME; 134our $RUNTIME;
113our $NOW; 135our $NOW;
122our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter 146our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
126 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
127binmode STDOUT; 154binmode STDOUT;
128binmode STDERR; 155binmode STDERR;
129 156
130# read virtual server time, if available 157# read virtual server time, if available
131unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
132 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
133 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
134 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
135} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
136 165
137mkdir $_ 166mkdir $_
138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
139 168
140our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
141 170
142sub 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::"} };
143 187
144############################################################################# 188#############################################################################
145 189
146=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
147 191
194returns 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
195per 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.
196 240
197=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
198 242
199This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
200C<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
201that call. 245that call.
202 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
203=back 253=back
204 254
205=cut 255=cut
206 256
207BEGIN { 257$Coro::State::WARNHOOK = sub {
208 *CORE::GLOBAL::warn = sub {
209 my $msg = join "", @_; 258 my $msg = join "", @_;
210 259
211 $msg .= "\n" 260 $msg .= "\n"
212 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
213 262
214 $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;
215 264
216 LOG llevError, $msg; 265 LOG llevError, $msg;
217 }; 266};
218}
219 267
220$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
222 270
223 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d# 275 return;#d#
226 }#d# 276 }#d#
227 277
228 # kill coroutine otherwise 278 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate 279 Coro::terminate
231}; 280};
232
233$SIG{__DIE__} = sub { }; #d#?
234 281
235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
252)) { 299)) {
253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
254} 301}
255 302
256$EV::DIED = sub { 303$EV::DIED = sub {
257 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
258}; 305};
259 306
260############################################################################# 307#############################################################################
261 308
262=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
299our $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
300 347
301sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
302sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
303 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
304=item cf::lock_wait $string 365=item cf::lock_wait $string
305 366
306Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
307 368
308=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
309 370
310Wait 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
311a 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,
312for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
313returned. 374returned.
314 375
315Locks 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
316deadlocked coro. 377deadlocked coro.
322 383
323Return 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.
324 385
325=cut 386=cut
326 387
327our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
328our %LOCKER;#d#
329 389
330sub lock_wait($) { 390sub lock_wait($) {
331 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
337
338 # wait for lock, if any
339 while ($LOCK{$key}) {
340 push @{ $LOCK{$key} }, $Coro::current;
341 Coro::schedule;
342 }
343} 392}
344 393
345sub lock_acquire($) { 394sub lock_acquire($) {
346 my ($key) = @_; 395 $LOCKS->guard ($_[0])
347
348 # wait, to be sure we are not locked
349 lock_wait $key;
350
351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
353
354 Coro::guard {
355 delete $LOCKER{$key};#d#
356 # wake up all waiters, to be on the safe side
357 $_->ready for @{ delete $LOCK{$key} };
358 }
359} 396}
360 397
361sub lock_active($) { 398sub lock_active($) {
362 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
363
364 ! ! $LOCK{$key}
365} 400}
366 401
367sub freeze_mainloop { 402sub freeze_mainloop {
368 tick_inhibit_inc; 403 tick_inhibit_inc;
369 404
370 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
371} 406}
372 407
373=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
374 409
375Like 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
376get spread over timer. 411get spread over time.
377 412
378=cut 413=cut
379 414
380sub periodic($$) { 415sub periodic($$) {
381 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
398 433
399=cut 434=cut
400 435
401our @SLOT_QUEUE; 436our @SLOT_QUEUE;
402our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
403 439
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
407 443
408 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
409 446
410 while () { 447 while () {
411 next_job: 448 next_job:
449
412 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 451
414 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 456 $job->[2]->send;
418 Coro::cede; 457 Coro::cede;
419 goto next_job; 458 goto next_job;
420 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 461 }
422 } 462 }
423 463
424 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
425 # 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
426 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 467 $signal->wait;
428 } else { 468 } else {
469 $busy = 0;
429 Coro::schedule; 470 Coro::schedule;
430 } 471 }
431 } 472 }
432}; 473};
433 474
434sub get_slot($;$$) { 475sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
436 477
437 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
438 479
439 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
440 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
441 483
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
471 513
472sub sync_job(&) { 514sub sync_job(&) {
473 my ($job) = @_; 515 my ($job) = @_;
474 516
475 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
476 my $time = EV::time; 518 my $time = AE::time;
477 519
478 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
480 522
481 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
498 } else { 540 } else {
499 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
500 } 542 }
501 } 543 }
502 544
503 my $time = EV::time - $time; 545 my $time = AE::time - $time;
504 546
505 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
506 548
507 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
508 } else { 550 } else {
552 reset_signals; 594 reset_signals;
553 &$cb 595 &$cb
554 }, @args; 596 }, @args;
555 597
556 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 )
557} 610}
558 611
559=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
560 613
561=cut 614=cut
727 780
728############################################################################# 781#############################################################################
729 782
730=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
731 784
732Many 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
733attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
734to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
735 788
736In 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>
737C<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
787=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
788 841
789Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
790given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
791 844
792Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
793that 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.
794 847
795These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
796 849
797=over 4 850=over 4
1142 1195
1143 sync_job { 1196 sync_job {
1144 if (length $$rdata) { 1197 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1148 1202
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 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 }
1153 aio_close $fh; 1210 aio_close $fh;
1154 1211
1155 if (@$objs) { 1212 if (@$objs) {
1156 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) {
1157 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1160 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 }
1161 aio_close $fh; 1221 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1223 }
1164 } else { 1224 } else {
1165 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1166 } 1226 }
1167 1227
1168 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1169 } else { 1232 } else {
1170 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1171 } 1234 }
1172 } else { 1235 } else {
1173 aio_unlink $filename; 1236 aio_unlink $filename;
1174 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1175 } 1238 }
1200 $av = $st->{objs}; 1263 $av = $st->{objs};
1201 } 1264 }
1202 1265
1203 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1204 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1205 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1206 1270
1207 ($data, $av) 1271 ($data, $av)
1208} 1272}
1209 1273
1210=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1266 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1267 1331
1268 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1269} 1333}
1270 1334
1335use File::Glob ();
1336
1271cf::player->attach ( 1337cf::player->attach (
1272 on_command => sub { 1338 on_unknown_command => sub {
1273 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1274 1340
1275 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1276 or return; 1342 or return;
1277 1343
1307 1373
1308 cf::override; 1374 cf::override;
1309 }, 1375 },
1310); 1376);
1311 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
1312sub load_extensions { 1391sub load_extensions {
1313 cf::sync_job { 1392 cf::sync_job {
1314 my %todo; 1393 my %todo;
1315 1394
1316 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1343 . "\n};\n1"; 1422 . "\n};\n1";
1344 1423
1345 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1346 } 1425 }
1347 1426
1427 my $pass = 0;
1348 my %done; 1428 my %done;
1349 while (%todo) { 1429 while (%todo) {
1350 my $progress; 1430 my $progress;
1351 1431
1432 ++$pass;
1433
1434 ext:
1352 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip 1437 next ext
1355 unless exists $done{$_}; 1438 unless exists $done{$_};
1356 } 1439 }
1357 1440
1358 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1359 1442
1360 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1361 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1362 : "$v->{base}: extension inactive.\n";
1363 1447
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1367 } 1449 if exists $v->{meta}{mandatory};
1368 1450
1369 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;
1370 } 1460 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
1375 } 1461 }
1376 1462
1377 skip: 1463 unless ($progress) {
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1379 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 }
1380 } 1471 }
1381 }; 1472 };
1382} 1473}
1383 1474
1384############################################################################# 1475#############################################################################
1385 1476
1386=back 1477=back
1387 1478
1388=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1389 1480
1390Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1391 1482
1392=cut 1483=cut
1393 1484
1394package cf::player; 1485package cf::player;
1395 1486
1438 1529
1439sub exists($) { 1530sub exists($) {
1440 my ($login) = @_; 1531 my ($login) = @_;
1441 1532
1442 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1443 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1444} 1535}
1445 1536
1446sub find($) { 1537sub find($) {
1447 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1448 my $login = $_[0]; 1539 my $login = $_[0];
1468 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1469 } 1560 }
1470 } 1561 }
1471} 1562}
1472 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
1473sub save($) { 1577sub save($) {
1474 my ($pl) = @_; 1578 my ($pl) = @_;
1475 1579
1476 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1477 1581
1482 1586
1483 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1484 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1485 1589
1486 cf::get_slot 0.01; 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];
1487 1594
1488 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1489 cf::cede_to_tick; 1596 cf::cede_to_tick;
1490} 1597}
1491 1598
1593 \@logins 1700 \@logins
1594} 1701}
1595 1702
1596=item $player->maps 1703=item $player->maps
1597 1704
1705=item cf::player::maps $login
1706
1598Returns an arrayref of map paths that are private for this 1707Returns an arrayref of map paths that are private for this
1599player. May block. 1708player. May block.
1600 1709
1601=cut 1710=cut
1602 1711
1619 } 1728 }
1620 1729
1621 \@paths 1730 \@paths
1622} 1731}
1623 1732
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1733=item $protocol_xml = $player->expand_cfpod ($cfpod)
1625 1734
1626Expand crossfire pod fragments into protocol xml. 1735Expand deliantra pod fragments into protocol xml.
1627 1736
1628=item $player->ext_reply ($msgid, @msg) 1737=item $player->ext_reply ($msgid, @msg)
1629 1738
1630Sends an ext reply to the player. 1739Sends an ext reply to the player.
1631 1740
1663 1772
1664=cut 1773=cut
1665 1774
1666sub find_by_path($) { 1775sub find_by_path($) {
1667 my ($path) = @_; 1776 my ($path) = @_;
1777
1778 $path =~ s/^~[^\/]*//; # skip ~login
1668 1779
1669 my ($match, $specificity); 1780 my ($match, $specificity);
1670 1781
1671 for my $region (list) { 1782 for my $region (list) {
1672 if ($region->{match} && $path =~ $region->{match}) { 1783 if ($region->{match} && $path =~ $region->{match}) {
1704 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1705 1816
1706 # mit "rum" bekleckern, nicht 1817 # mit "rum" bekleckern, nicht
1707 $self->_create_random_map ( 1818 $self->_create_random_map (
1708 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1709 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1710 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1711 $rmp->{exit_on_final_map}, 1822 $rmp->{exit_on_final_map},
1712 $rmp->{xsize}, $rmp->{ysize}, 1823 $rmp->{xsize}, $rmp->{ysize},
1713 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1714 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1736 1847
1737 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1738} 1849}
1739 1850
1740# also paths starting with '/' 1851# also paths starting with '/'
1741$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1852$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1742 1853
1743sub thawer_merge { 1854sub thawer_merge {
1744 my ($self, $merge) = @_; 1855 my ($self, $merge) = @_;
1745 1856
1746 # we have to keep some variables in memory intact 1857 # we have to keep some variables in memory intact
1844 1955
1845 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1956 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1846 "$UNIQUEDIR/$path" 1957 "$UNIQUEDIR/$path"
1847} 1958}
1848 1959
1849# and all this just because we cannot iterate over
1850# all maps in C++...
1851sub change_all_map_light {
1852 my ($change) = @_;
1853
1854 $_->change_map_light ($change)
1855 for grep $_->outdoor, values %cf::MAP;
1856}
1857
1858sub decay_objects { 1960sub decay_objects {
1859 my ($self) = @_; 1961 my ($self) = @_;
1860 1962
1861 return if $self->{deny_reset}; 1963 return if $self->{deny_reset};
1862 1964
1944sub find { 2046sub find {
1945 my ($path, $origin) = @_; 2047 my ($path, $origin) = @_;
1946 2048
1947 $path = normalise $path, $origin && $origin->path; 2049 $path = normalise $path, $origin && $origin->path;
1948 2050
1949 cf::lock_wait "map_data:$path";#d#remove 2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1950 cf::lock_wait "map_find:$path"; 2052 my $guard2 = cf::lock_acquire "map_find:$path";
1951 2053
1952 $cf::MAP{$path} || do { 2054 $cf::MAP{$path} || do {
1953 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1954 my $guard2 = cf::lock_acquire "map_find:$path";
1955
1956 my $map = new_from_path cf::map $path 2055 my $map = new_from_path cf::map $path
1957 or return; 2056 or return;
1958 2057
1959 $map->{last_save} = $cf::RUNTIME; 2058 $map->{last_save} = $cf::RUNTIME;
1960 2059
1972 2071
1973 $cf::MAP{$path} = $map 2072 $cf::MAP{$path} = $map
1974 } 2073 }
1975} 2074}
1976 2075
1977sub pre_load { } 2076sub pre_load { }
1978sub post_load { } 2077#sub post_load { } # XS
1979 2078
1980sub load { 2079sub load {
1981 my ($self) = @_; 2080 my ($self) = @_;
1982 2081
1983 local $self->{deny_reset} = 1; # loading can take a long time 2082 local $self->{deny_reset} = 1; # loading can take a long time
2028 unless ($self->{deny_activate}) { 2127 unless ($self->{deny_activate}) {
2029 $self->decay_objects; 2128 $self->decay_objects;
2030 $self->fix_auto_apply; 2129 $self->fix_auto_apply;
2031 $self->update_buttons; 2130 $self->update_buttons;
2032 cf::cede_to_tick; 2131 cf::cede_to_tick;
2033 $self->set_darkness_map;
2034 cf::cede_to_tick;
2035 $self->activate; 2132 $self->activate;
2036 } 2133 }
2037 2134
2038 $self->{last_save} = $cf::RUNTIME; 2135 $self->{last_save} = $cf::RUNTIME;
2039 $self->last_access ($cf::RUNTIME); 2136 $self->last_access ($cf::RUNTIME);
2042 } 2139 }
2043 2140
2044 $self->post_load; 2141 $self->post_load;
2045} 2142}
2046 2143
2144# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath
2047sub customise_for { 2147sub customise_for {
2048 my ($self, $ob) = @_; 2148 my ($self, $ob) = @_;
2049 2149
2050 return find "~" . $ob->name . "/" . $self->{path} 2150 return find "~" . $ob->name . "/" . $self->{path}
2051 if $self->per_player; 2151 if $self->per_player;
2067 or next; 2167 or next;
2068 $neigh = find $neigh, $map 2168 $neigh = find $neigh, $map
2069 or next; 2169 or next;
2070 $neigh->load; 2170 $neigh->load;
2071 2171
2172 # now find the diagonal neighbours
2072 push @neigh, 2173 push @neigh,
2073 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2074 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2075 } 2176 }
2076 2177
2128 $MAP_PREFETCHER->prio (6); 2229 $MAP_PREFETCHER->prio (6);
2129 2230
2130 () 2231 ()
2131} 2232}
2132 2233
2234# common code, used by both ->save and ->swapout
2133sub save { 2235sub _save {
2134 my ($self) = @_; 2236 my ($self) = @_;
2135
2136 my $lock = cf::lock_acquire "map_data:$self->{path}";
2137 2237
2138 $self->{last_save} = $cf::RUNTIME; 2238 $self->{last_save} = $cf::RUNTIME;
2139 2239
2140 return unless $self->dirty; 2240 return unless $self->dirty;
2141 2241
2161 } else { 2261 } else {
2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2262 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2163 } 2263 }
2164} 2264}
2165 2265
2266sub save {
2267 my ($self) = @_;
2268
2269 my $lock = cf::lock_acquire "map_data:$self->{path}";
2270
2271 $self->_save;
2272}
2273
2166sub swap_out { 2274sub swap_out {
2167 my ($self) = @_; 2275 my ($self) = @_;
2168 2276
2169 # save first because save cedes
2170 $self->save;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2277 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2278
2174 return if $self->players;
2175 return if $self->in_memory != cf::MAP_ACTIVE; 2279 return if $self->in_memory != cf::MAP_ACTIVE;
2176 return if $self->{deny_save}; 2280 return if $self->{deny_save};
2281 return if $self->players;
2177 2282
2283 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP;
2178 $self->in_memory (cf::MAP_SWAPPED); 2286 $self->in_memory (cf::MAP_SWAPPED);
2287
2288 # then atomically save
2289 $self->_save;
2290
2291 # then free the map
2292 $self->clear;
2293}
2294
2295sub reset_at {
2296 my ($self) = @_;
2297
2298 # TODO: safety, remove and allow resettable per-player maps
2299 return 1e99 if $self->{deny_reset};
2300
2301 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2302 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2303
2304 $time + $to
2305}
2306
2307sub should_reset {
2308 my ($self) = @_;
2309
2310 $self->reset_at <= $cf::RUNTIME
2311}
2312
2313sub reset {
2314 my ($self) = @_;
2315
2316 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317
2318 return if $self->players;
2319
2320 warn "resetting map ", $self->path, "\n";
2321
2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # need to save uniques path
2325 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327
2328 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2329 if $uniq;
2330 }
2331
2332 delete $cf::MAP{$self->path};
2179 2333
2180 $self->deactivate; 2334 $self->deactivate;
2181 $_->clear_links_to ($self) for values %cf::MAP; 2335 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->clear; 2336 $self->clear;
2183}
2184
2185sub reset_at {
2186 my ($self) = @_;
2187
2188 # TODO: safety, remove and allow resettable per-player maps
2189 return 1e99 if $self->{deny_reset};
2190
2191 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2192 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2193
2194 $time + $to
2195}
2196
2197sub should_reset {
2198 my ($self) = @_;
2199
2200 $self->reset_at <= $cf::RUNTIME
2201}
2202
2203sub reset {
2204 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207
2208 return if $self->players;
2209
2210 warn "resetting map ", $self->path;
2211
2212 $self->in_memory (cf::MAP_SWAPPED);
2213
2214 # need to save uniques path
2215 unless ($self->{deny_save}) {
2216 my $uniq = $self->uniq_path; utf8::encode $uniq;
2217
2218 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2219 if $uniq;
2220 }
2221
2222 delete $cf::MAP{$self->path};
2223
2224 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP;
2226 $self->clear;
2227 2337
2228 $self->unlink_save; 2338 $self->unlink_save;
2229 $self->destroy; 2339 $self->destroy;
2230} 2340}
2231 2341
2239 2349
2240 delete $cf::MAP{$self->path}; 2350 delete $cf::MAP{$self->path};
2241 2351
2242 $self->unlink_save; 2352 $self->unlink_save;
2243 2353
2244 bless $self, "cf::map"; 2354 bless $self, "cf::map::wrap";
2245 delete $self->{deny_reset}; 2355 delete $self->{deny_reset};
2246 $self->{deny_save} = 1; 2356 $self->{deny_save} = 1;
2247 $self->reset_timeout (1); 2357 $self->reset_timeout (1);
2248 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2358 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2249 2359
2306 : normalise $_ 2416 : normalise $_
2307 } @{ aio_readdir $UNIQUEDIR or [] } 2417 } @{ aio_readdir $UNIQUEDIR or [] }
2308 ] 2418 ]
2309} 2419}
2310 2420
2421=item cf::map::static_maps
2422
2423Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2424file in the shared directory excluding F</styles> and F</editor>). May
2425block.
2426
2427=cut
2428
2429sub static_maps() {
2430 my @dirs = "";
2431 my @maps;
2432
2433 while (@dirs) {
2434 my $dir = shift @dirs;
2435
2436 next if $dir eq "/styles" || $dir eq "/editor";
2437
2438 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2439 or return;
2440
2441 for (@$files) {
2442 s/\.map$// or next;
2443 utf8::decode $_;
2444 push @maps, "$dir/$_";
2445 }
2446
2447 push @dirs, map "$dir/$_", @$dirs;
2448 }
2449
2450 \@maps
2451}
2452
2311=back 2453=back
2312 2454
2313=head3 cf::object 2455=head3 cf::object
2314 2456
2315=cut 2457=cut
2380 2522
2381our $SAY_CHANNEL = { 2523our $SAY_CHANNEL = {
2382 id => "say", 2524 id => "say",
2383 title => "Map", 2525 title => "Map",
2384 reply => "say ", 2526 reply => "say ",
2385 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2527 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2386}; 2528};
2387 2529
2388our $CHAT_CHANNEL = { 2530our $CHAT_CHANNEL = {
2389 id => "chat", 2531 id => "chat",
2390 title => "Chat", 2532 title => "Chat",
2445 2587
2446=item $player_object->enter_link 2588=item $player_object->enter_link
2447 2589
2448Freezes the player and moves him/her to a special map (C<{link}>). 2590Freezes the player and moves him/her to a special map (C<{link}>).
2449 2591
2450The player should be reasonably safe there for short amounts of time. You 2592The player should be reasonably safe there for short amounts of time (e.g.
2451I<MUST> call C<leave_link> as soon as possible, though. 2593for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2594though, as the player cannot control the character while it is on the link
2595map.
2452 2596
2453Will never block. 2597Will never block.
2454 2598
2455=item $player_object->leave_link ($map, $x, $y) 2599=item $player_object->leave_link ($map, $x, $y)
2456 2600
2476sub cf::object::player::enter_link { 2620sub cf::object::player::enter_link {
2477 my ($self) = @_; 2621 my ($self) = @_;
2478 2622
2479 $self->deactivate_recursive; 2623 $self->deactivate_recursive;
2480 2624
2625 ++$self->{_link_recursion};
2626
2481 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2627 return if UNIVERSAL::isa $self->map, "ext::map_link";
2482 2628
2483 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2629 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2484 if $self->map && $self->map->{path} ne "{link}"; 2630 if $self->map && $self->map->{path} ne "{link}";
2485 2631
2486 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2632 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2487} 2633}
2488 2634
2489sub cf::object::player::leave_link { 2635sub cf::object::player::leave_link {
2490 my ($self, $map, $x, $y) = @_; 2636 my ($self, $map, $x, $y) = @_;
2491 2637
2508 ($x, $y) = (-1, -1) 2654 ($x, $y) = (-1, -1)
2509 unless (defined $x) && (defined $y); 2655 unless (defined $x) && (defined $y);
2510 2656
2511 # use -1 or undef as default coordinates, not 0, 0 2657 # use -1 or undef as default coordinates, not 0, 0
2512 ($x, $y) = ($map->enter_x, $map->enter_y) 2658 ($x, $y) = ($map->enter_x, $map->enter_y)
2513 if $x <=0 && $y <= 0; 2659 if $x <= 0 && $y <= 0;
2514 2660
2515 $map->load; 2661 $map->load;
2516 $map->load_neighbours; 2662 $map->load_neighbours;
2517 2663
2518 return unless $self->contr->active; 2664 return unless $self->contr->active;
2519 $self->activate_recursive;
2520 2665
2521 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2522 $self->enter_map ($map, $x, $y); 2667 if ($self->enter_map ($map, $x, $y)) {
2523} 2668 # entering was successful
2669 delete $self->{_link_recursion};
2670 # only activate afterwards, to support waiting in hooks
2671 $self->activate_recursive;
2672 }
2524 2673
2674}
2675
2525=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2676=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2526 2677
2527Moves the player to the given map-path and coordinates by first freezing 2678Moves the player to the given map-path and coordinates by first freezing
2528her, loading and preparing them map, calling the provided $check callback 2679her, loading and preparing them map, calling the provided $check callback
2529that has to return the map if sucecssful, and then unfreezes the player on 2680that has to return the map if sucecssful, and then unfreezes the player on
2530the new (success) or old (failed) map position. In either case, $done will 2681the new (success) or old (failed) map position. In either case, $done will
2537 2688
2538our $GOTOGEN; 2689our $GOTOGEN;
2539 2690
2540sub cf::object::player::goto { 2691sub cf::object::player::goto {
2541 my ($self, $path, $x, $y, $check, $done) = @_; 2692 my ($self, $path, $x, $y, $check, $done) = @_;
2693
2694 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 }
2542 2699
2543 # do generation counting so two concurrent goto's will be executed in-order 2700 # do generation counting so two concurrent goto's will be executed in-order
2544 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2701 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2545 2702
2546 $self->enter_link; 2703 $self->enter_link;
2570 my $map = eval { 2727 my $map = eval {
2571 my $map = defined $path ? cf::map::find $path : undef; 2728 my $map = defined $path ? cf::map::find $path : undef;
2572 2729
2573 if ($map) { 2730 if ($map) {
2574 $map = $map->customise_for ($self); 2731 $map = $map->customise_for ($self);
2575 $map = $check->($map) if $check && $map; 2732 $map = $check->($map, $x, $y, $self) if $check && $map;
2576 } else { 2733 } else {
2577 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2734 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 } 2735 }
2579 2736
2580 $map 2737 $map
2588 if ($gen == $self->{_goto_generation}) { 2745 if ($gen == $self->{_goto_generation}) {
2589 delete $self->{_goto_generation}; 2746 delete $self->{_goto_generation};
2590 $self->leave_link ($map, $x, $y); 2747 $self->leave_link ($map, $x, $y);
2591 } 2748 }
2592 2749
2593 $done->() if $done; 2750 $done->($self) if $done;
2594 })->prio (1); 2751 })->prio (1);
2595} 2752}
2596 2753
2597=item $player_object->enter_exit ($exit_object) 2754=item $player_object->enter_exit ($exit_object)
2598 2755
2686 $self->contr->savebed ($map, $x, $y) 2843 $self->contr->savebed ($map, $x, $y)
2687 if $exit->flag (cf::FLAG_DAMNED); 2844 if $exit->flag (cf::FLAG_DAMNED);
2688 2845
2689 1 2846 1
2690 }) { 2847 }) {
2691 $self->message ("Something went wrong deep within the crossfire server. " 2848 $self->message ("Something went wrong deep within the deliantra server. "
2692 . "I'll try to bring you back to the map you were before. " 2849 . "I'll try to bring you back to the map you were before. "
2693 . "Please report this to the dungeon master!", 2850 . "Please report this to the dungeon master!",
2694 cf::NDI_UNIQUE | cf::NDI_RED); 2851 cf::NDI_UNIQUE | cf::NDI_RED);
2695 2852
2696 warn "ERROR in enter_exit: $@"; 2853 warn "ERROR in enter_exit: $@";
2713sub cf::client::send_drawinfo { 2870sub cf::client::send_drawinfo {
2714 my ($self, $text, $flags) = @_; 2871 my ($self, $text, $flags) = @_;
2715 2872
2716 utf8::encode $text; 2873 utf8::encode $text;
2717 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2874 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2875}
2876
2877=item $client->send_big_packet ($pkt)
2878
2879Like C<send_packet>, but tries to compress large packets, and fragments
2880them as required.
2881
2882=cut
2883
2884our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2885
2886sub cf::client::send_big_packet {
2887 my ($self, $pkt) = @_;
2888
2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2892
2893 # split very large packets
2894 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2895 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2896 $pkt = "frag";
2897 }
2898
2899 $self->send_packet ($pkt);
2718} 2900}
2719 2901
2720=item $client->send_msg ($channel, $msg, $color, [extra...]) 2902=item $client->send_msg ($channel, $msg, $color, [extra...])
2721 2903
2722Send a drawinfo or msg packet to the client, formatting the msg for the 2904Send a drawinfo or msg packet to the client, formatting the msg for the
2726 2908
2727=cut 2909=cut
2728 2910
2729# non-persistent channels (usually the info channel) 2911# non-persistent channels (usually the info channel)
2730our %CHANNEL = ( 2912our %CHANNEL = (
2913 "c/motd" => {
2914 id => "infobox",
2915 title => "MOTD",
2916 reply => undef,
2917 tooltip => "The message of the day",
2918 },
2731 "c/identify" => { 2919 "c/identify" => {
2732 id => "infobox", 2920 id => "infobox",
2733 title => "Identify", 2921 title => "Identify",
2734 reply => undef, 2922 reply => undef,
2735 tooltip => "Items recently identified", 2923 tooltip => "Items recently identified",
2737 "c/examine" => { 2925 "c/examine" => {
2738 id => "infobox", 2926 id => "infobox",
2739 title => "Examine", 2927 title => "Examine",
2740 reply => undef, 2928 reply => undef,
2741 tooltip => "Signs and other items you examined", 2929 tooltip => "Signs and other items you examined",
2930 },
2931 "c/shopinfo" => {
2932 id => "infobox",
2933 title => "Shop Info",
2934 reply => undef,
2935 tooltip => "What your bargaining skill tells you about the shop",
2742 }, 2936 },
2743 "c/book" => { 2937 "c/book" => {
2744 id => "infobox", 2938 id => "infobox",
2745 title => "Book", 2939 title => "Book",
2746 reply => undef, 2940 reply => undef,
2762 id => "infobox", 2956 id => "infobox",
2763 title => "Body Parts", 2957 title => "Body Parts",
2764 reply => undef, 2958 reply => undef,
2765 tooltip => "Shows which body parts you posess and are available", 2959 tooltip => "Shows which body parts you posess and are available",
2766 }, 2960 },
2961 "c/statistics" => {
2962 id => "infobox",
2963 title => "Statistics",
2964 reply => undef,
2965 tooltip => "Shows your primary statistics",
2966 },
2967 "c/skills" => {
2968 id => "infobox",
2969 title => "Skills",
2970 reply => undef,
2971 tooltip => "Shows your experience per skill and item power",
2972 },
2973 "c/shopitems" => {
2974 id => "infobox",
2975 title => "Shop Items",
2976 reply => undef,
2977 tooltip => "Shows the items currently for sale in this shop",
2978 },
2979 "c/resistances" => {
2980 id => "infobox",
2981 title => "Resistances",
2982 reply => undef,
2983 tooltip => "Shows your resistances",
2984 },
2985 "c/pets" => {
2986 id => "infobox",
2987 title => "Pets",
2988 reply => undef,
2989 tooltip => "Shows information abotu your pets/a specific pet",
2990 },
2991 "c/perceiveself" => {
2992 id => "infobox",
2993 title => "Perceive Self",
2994 reply => undef,
2995 tooltip => "You gained detailed knowledge about yourself",
2996 },
2767 "c/uptime" => { 2997 "c/uptime" => {
2768 id => "infobox", 2998 id => "infobox",
2769 title => "Uptime", 2999 title => "Uptime",
2770 reply => undef, 3000 reply => undef,
2771 tooltip => "How long the server has been running since last restart", 3001 tooltip => "How long the server has been running since last restart",
2780 id => "party", 3010 id => "party",
2781 title => "Party", 3011 title => "Party",
2782 reply => "gsay ", 3012 reply => "gsay ",
2783 tooltip => "Messages and chat related to your party", 3013 tooltip => "Messages and chat related to your party",
2784 }, 3014 },
3015 "c/death" => {
3016 id => "death",
3017 title => "Death",
3018 reply => undef,
3019 tooltip => "Reason for and more info about your most recent death",
3020 },
3021 "c/say" => $SAY_CHANNEL,
3022 "c/chat" => $CHAT_CHANNEL,
2785); 3023);
2786 3024
2787sub cf::client::send_msg { 3025sub cf::client::send_msg {
2788 my ($self, $channel, $msg, $color, @extra) = @_; 3026 my ($self, $channel, $msg, $color, @extra) = @_;
2789 3027
2790 $msg = $self->pl->expand_cfpod ($msg); 3028 $msg = $self->pl->expand_cfpod ($msg)
3029 unless $color & cf::NDI_VERBATIM;
2791 3030
2792 $color &= cf::NDI_CLIENT_MASK; # just in case... 3031 $color &= cf::NDI_CLIENT_MASK; # just in case...
2793 3032
2794 # check predefined channels, for the benefit of C 3033 # check predefined channels, for the benefit of C
2795 if ($CHANNEL{$channel}) { 3034 if ($CHANNEL{$channel}) {
2796 $channel = $CHANNEL{$channel}; 3035 $channel = $CHANNEL{$channel};
2797 3036
2798 $self->ext_msg (channel_info => $channel) 3037 $self->ext_msg (channel_info => $channel);
2799 if $self->can_msg;
2800
2801 $channel = $channel->{id}; 3038 $channel = $channel->{id};
2802 3039
2803 } elsif (ref $channel) { 3040 } elsif (ref $channel) {
2804 # send meta info to client, if not yet sent 3041 # send meta info to client, if not yet sent
2805 unless (exists $self->{channel}{$channel->{id}}) { 3042 unless (exists $self->{channel}{$channel->{id}}) {
2806 $self->{channel}{$channel->{id}} = $channel; 3043 $self->{channel}{$channel->{id}} = $channel;
2807 $self->ext_msg (channel_info => $channel) 3044 $self->ext_msg (channel_info => $channel);
2808 if $self->can_msg;
2809 } 3045 }
2810 3046
2811 $channel = $channel->{id}; 3047 $channel = $channel->{id};
2812 } 3048 }
2813 3049
2814 return unless @extra || length $msg; 3050 return unless @extra || length $msg;
2815 3051
2816 if ($self->can_msg) {
2817 # default colour, mask it out 3052 # default colour, mask it out
2818 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3053 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2819 if $color & cf::NDI_DEF; 3054 if $color & cf::NDI_DEF;
2820 3055
2821 my $pkt = "msg " 3056 my $pkt = "msg "
2822 . $self->{json_coder}->encode ( 3057 . $self->{json_coder}->encode (
2823 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3058 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2824 ); 3059 );
2825 3060
2826 # try lzf for large packets
2827 $pkt = "lzf " . Compress::LZF::compress $pkt
2828 if 1024 <= length $pkt and $self->{can_lzf};
2829
2830 # split very large packets
2831 if (8192 < length $pkt and $self->{can_lzf}) {
2832 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2833 $pkt = "frag";
2834 }
2835
2836 $self->send_packet ($pkt); 3061 $self->send_big_packet ($pkt);
2837 } else {
2838 if ($color >= 0) {
2839 # replace some tags by gcfclient-compatible ones
2840 for ($msg) {
2841 1 while
2842 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2843 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2844 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2845 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2846 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2847 }
2848
2849 $color &= cf::NDI_COLOR_MASK;
2850
2851 utf8::encode $msg;
2852
2853 if (0 && $msg =~ /\[/) {
2854 # COMMAND/INFO
2855 $self->send_packet ("drawextinfo $color 10 8 $msg")
2856 } else {
2857 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2858 $self->send_packet ("drawinfo $color $msg")
2859 }
2860 }
2861 }
2862} 3062}
2863 3063
2864=item $client->ext_msg ($type, @msg) 3064=item $client->ext_msg ($type, @msg)
2865 3065
2866Sends an ext event to the client. 3066Sends an ext event to the client.
2869 3069
2870sub cf::client::ext_msg($$@) { 3070sub cf::client::ext_msg($$@) {
2871 my ($self, $type, @msg) = @_; 3071 my ($self, $type, @msg) = @_;
2872 3072
2873 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2875 } elsif ($self->extcmd == 1) { # TODO: remove 3075 } elsif ($self->extcmd == 1) { # TODO: remove
2876 push @msg, msgtype => "event_$type"; 3076 push @msg, msgtype => "event_$type";
2877 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2878 } 3078 }
2879} 3079}
2880 3080
2881=item $client->ext_reply ($msgid, @msg) 3081=item $client->ext_reply ($msgid, @msg)
2882 3082
2886 3086
2887sub cf::client::ext_reply($$@) { 3087sub cf::client::ext_reply($$@) {
2888 my ($self, $id, @msg) = @_; 3088 my ($self, $id, @msg) = @_;
2889 3089
2890 if ($self->extcmd == 2) { 3090 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2892 } elsif ($self->extcmd == 1) { 3092 } elsif ($self->extcmd == 1) {
2893 #TODO: version 1, remove 3093 #TODO: version 1, remove
2894 unshift @msg, msgtype => "reply", msgid => $id; 3094 unshift @msg, msgtype => "reply", msgid => $id;
2895 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2896 } 3096 }
2897} 3097}
2898 3098
2899=item $success = $client->query ($flags, "text", \&cb) 3099=item $success = $client->query ($flags, "text", \&cb)
2900 3100
3001 3201
3002 $coro 3202 $coro
3003} 3203}
3004 3204
3005cf::client->attach ( 3205cf::client->attach (
3006 on_destroy => sub { 3206 on_client_destroy => sub {
3007 my ($ns) = @_; 3207 my ($ns) = @_;
3008 3208
3009 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3209 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3010 }, 3210 },
3011); 3211);
3027our $safe_hole = new Safe::Hole; 3227our $safe_hole = new Safe::Hole;
3028 3228
3029$SIG{FPE} = 'IGNORE'; 3229$SIG{FPE} = 'IGNORE';
3030 3230
3031$safe->permit_only (Opcode::opset qw( 3231$safe->permit_only (Opcode::opset qw(
3032 :base_core :base_mem :base_orig :base_math 3232 :base_core :base_mem :base_orig :base_math :base_loop
3033 grepstart grepwhile mapstart mapwhile 3233 grepstart grepwhile mapstart mapwhile
3034 sort time 3234 sort time
3035)); 3235));
3036 3236
3037# here we export the classes and methods available to script code 3237# here we export the classes and methods available to script code
3041The following functions and methods are available within a safe environment: 3241The following functions and methods are available within a safe environment:
3042 3242
3043 cf::object 3243 cf::object
3044 contr pay_amount pay_player map x y force_find force_add destroy 3244 contr pay_amount pay_player map x y force_find force_add destroy
3045 insert remove name archname title slaying race decrease split 3245 insert remove name archname title slaying race decrease split
3246 value
3046 3247
3047 cf::object::player 3248 cf::object::player
3048 player 3249 player
3049 3250
3050 cf::player 3251 cf::player
3056=cut 3257=cut
3057 3258
3058for ( 3259for (
3059 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3260 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3060 insert remove inv nrof name archname title slaying race 3261 insert remove inv nrof name archname title slaying race
3061 decrease split destroy change_exp)], 3262 decrease split destroy change_exp value msg lore send_msg)],
3062 ["cf::object::player" => qw(player)], 3263 ["cf::object::player" => qw(player)],
3063 ["cf::player" => qw(peaceful)], 3264 ["cf::player" => qw(peaceful send_msg)],
3064 ["cf::map" => qw(trigger)], 3265 ["cf::map" => qw(trigger)],
3065) { 3266) {
3066 no strict 'refs'; 3267 no strict 'refs';
3067 my ($pkg, @funs) = @$_; 3268 my ($pkg, @funs) = @$_;
3068 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3086 3287
3087 my $qcode = $code; 3288 my $qcode = $code;
3088 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3289 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3089 $qcode =~ s/\n/\\n/g; 3290 $qcode =~ s/\n/\\n/g;
3090 3291
3292 %vars = (_dummy => 0) unless %vars;
3293
3294 my @res;
3091 local $_; 3295 local $_;
3092 local @safe::cf::_safe_eval_args = values %vars;
3093 3296
3094 my $eval = 3297 my $eval =
3095 "do {\n" 3298 "do {\n"
3096 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3299 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3097 . "#line 0 \"{$qcode}\"\n" 3300 . "#line 0 \"{$qcode}\"\n"
3098 . $code 3301 . $code
3099 . "\n}" 3302 . "\n}"
3100 ; 3303 ;
3101 3304
3305 if ($CFG{safe_eval}) {
3102 sub_generation_inc; 3306 sub_generation_inc;
3307 local @safe::cf::_safe_eval_args = values %vars;
3103 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3308 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3104 sub_generation_inc; 3309 sub_generation_inc;
3310 } else {
3311 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval;
3313 }
3105 3314
3106 if ($@) { 3315 if ($@) {
3107 warn "$@"; 3316 warn "$@";
3108 warn "while executing safe code '$code'\n"; 3317 warn "while executing safe code '$code'\n";
3109 warn "with arguments " . (join " ", %vars) . "\n"; 3318 warn "with arguments " . (join " ", %vars) . "\n";
3128=cut 3337=cut
3129 3338
3130sub register_script_function { 3339sub register_script_function {
3131 my ($fun, $cb) = @_; 3340 my ($fun, $cb) = @_;
3132 3341
3133 no strict 'refs'; 3342 $fun = "safe::$fun" if $CFG{safe_eval};
3134 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3343 *$fun = $safe_hole->wrap ($cb);
3135} 3344}
3136 3345
3137=back 3346=back
3138 3347
3139=cut 3348=cut
3160 3369
3161 $facedata->{version} == 2 3370 $facedata->{version} == 2
3162 or cf::cleanup "$path: version mismatch, cannot proceed."; 3371 or cf::cleanup "$path: version mismatch, cannot proceed.";
3163 3372
3164 # patch in the exptable 3373 # patch in the exptable
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3165 $facedata->{resource}{"res/exp_table"} = { 3375 $facedata->{resource}{"res/exp_table"} = {
3166 type => FT_RSRC, 3376 type => FT_RSRC,
3167 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3377 data => $exp_table,
3378 hash => (Digest::MD5::md5 $exp_table),
3168 }; 3379 };
3169 cf::cede_to_tick; 3380 cf::cede_to_tick;
3170 3381
3171 { 3382 {
3172 my $faces = $facedata->{faceinfo}; 3383 my $faces = $facedata->{faceinfo};
3174 while (my ($face, $info) = each %$faces) { 3385 while (my ($face, $info) = each %$faces) {
3175 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3386 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3176 3387
3177 cf::face::set_visibility $idx, $info->{visibility}; 3388 cf::face::set_visibility $idx, $info->{visibility};
3178 cf::face::set_magicmap $idx, $info->{magicmap}; 3389 cf::face::set_magicmap $idx, $info->{magicmap};
3179 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3180 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3181 3392
3182 cf::cede_to_tick; 3393 cf::cede_to_tick;
3183 } 3394 }
3184 3395
3185 while (my ($face, $info) = each %$faces) { 3396 while (my ($face, $info) = each %$faces) {
3209 3420
3210 cf::anim::invalidate_all; # d'oh 3421 cf::anim::invalidate_all; # d'oh
3211 } 3422 }
3212 3423
3213 { 3424 {
3214 # TODO: for gcfclient pleasure, we should give resources
3215 # that gcfclient doesn't grok a >10000 face index.
3216 my $res = $facedata->{resource}; 3425 my $res = $facedata->{resource};
3217 3426
3218 while (my ($name, $info) = each %$res) { 3427 while (my ($name, $info) = each %$res) {
3219 if (defined $info->{type}) { 3428 if (defined $info->{type}) {
3220 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3429 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3221 my $data;
3222 3430
3223 if ($info->{type} & 1) { 3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3224 # prepend meta info
3225
3226 my $meta = $enc->encode ({
3227 name => $name,
3228 %{ $info->{meta} || {} },
3229 });
3230
3231 $data = pack "(w/a*)*", $meta, $info->{data};
3232 } else {
3233 $data = $info->{data};
3234 }
3235
3236 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3237 cf::face::set_type $idx, $info->{type}; 3432 cf::face::set_type $idx, $info->{type};
3238 } else { 3433 } else {
3239 $RESOURCE{$name} = $info; 3434 $RESOURCE{$name} = $info;
3240 } 3435 }
3241 3436
3324 reload_treasures; 3519 reload_treasures;
3325 3520
3326 warn "finished reloading resource files\n"; 3521 warn "finished reloading resource files\n";
3327} 3522}
3328 3523
3329sub init {
3330 my $guard = freeze_mainloop;
3331
3332 evthread_start IO::AIO::poll_fileno;
3333
3334 reload_resources;
3335}
3336
3337sub reload_config { 3524sub reload_config {
3525 warn "reloading config file...\n";
3526
3338 open my $fh, "<:utf8", "$CONFDIR/config" 3527 open my $fh, "<:utf8", "$CONFDIR/config"
3339 or return; 3528 or return;
3340 3529
3341 local $/; 3530 local $/;
3342 *CFG = YAML::Load <$fh>; 3531 *CFG = YAML::XS::Load scalar <$fh>;
3343 3532
3344 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3345 3534
3346 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3347 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3348 3537
3349 if (exists $CFG{mlockall}) { 3538 if (exists $CFG{mlockall}) {
3351 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3352 and die "WARNING: m(un)lockall failed: $!\n"; 3541 and die "WARNING: m(un)lockall failed: $!\n";
3353 }; 3542 };
3354 warn $@ if $@; 3543 warn $@ if $@;
3355 } 3544 }
3545
3546 warn "finished reloading resource files\n";
3547}
3548
3549sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!";
3552 flock $fh, &Fcntl::LOCK_EX
3553 or die "$PIDFILE: flock: $!";
3554 $fh
3555}
3556
3557# make sure only one server instance is running at any one time
3558sub atomic {
3559 my $fh = pidfile;
3560
3561 my $pid = <$fh>;
3562 kill 9, $pid if $pid > 0;
3563
3564 seek $fh, 0, 0;
3565 print $fh $$;
3566}
3567
3568sub main_loop {
3569 warn "EV::loop starting\n";
3570 if (1) {
3571 EV::loop;
3572 }
3573 warn "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP;
3356} 3575}
3357 3576
3358sub main { 3577sub main {
3578 cf::init_globals; # initialise logging
3579
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586
3359 # we must not ever block the main coroutine 3587 # we must not ever block the main coroutine
3360 local $Coro::idle = sub { 3588 local $Coro::idle = sub {
3361 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3589 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3362 (async { 3590 (async {
3363 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3591 $Coro::current->{desc} = "IDLE BUG HANDLER";
3364 EV::loop EV::LOOP_ONESHOT; 3592 EV::loop EV::LOOP_ONESHOT;
3365 })->prio (Coro::PRIO_MAX); 3593 })->prio (Coro::PRIO_MAX);
3366 }; 3594 };
3367 3595
3368 { 3596 evthread_start IO::AIO::poll_fileno;
3369 my $guard = freeze_mainloop; 3597
3598 cf::sync_job {
3599 cf::init_experience;
3600 cf::init_anim;
3601 cf::init_attackmess;
3602 cf::init_dynamic;
3603
3604 cf::load_settings;
3605 cf::load_materials;
3606
3607 reload_resources;
3370 reload_config; 3608 reload_config;
3371 db_init; 3609 db_init;
3610
3611 cf::init_uuid;
3612 cf::init_signals;
3613 cf::init_skills;
3614
3615 cf::init_beforeplay;
3616
3617 atomic;
3618
3372 load_extensions; 3619 load_extensions;
3373 3620
3374 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3621 utime time, time, $RUNTIMEFILE;
3622
3623 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX ();
3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626
3627 (pop @POST_INIT)->(0) while @POST_INIT;
3375 } 3628 };
3376 3629
3377 EV::loop; 3630 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n";
3632
3633 main_loop;
3378} 3634}
3379 3635
3380############################################################################# 3636#############################################################################
3381# initialisation and cleanup 3637# initialisation and cleanup
3382 3638
3383# install some emergency cleanup handlers 3639# install some emergency cleanup handlers
3384BEGIN { 3640BEGIN {
3385 our %SIGWATCHER = (); 3641 our %SIGWATCHER = ();
3386 for my $signal (qw(INT HUP TERM)) { 3642 for my $signal (qw(INT HUP TERM)) {
3387 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3643 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3388 cf::cleanup "SIG$signal"; 3644 cf::cleanup "SIG$signal";
3389 }; 3645 };
3390 } 3646 }
3391} 3647}
3392 3648
3393sub write_runtime_sync { 3649sub write_runtime_sync {
3394 my $runtime = "$LOCALDIR/runtime"; 3650 my $t0 = AE::time;
3395 3651
3396 # first touch the runtime file to show we are still running: 3652 # first touch the runtime file to show we are still running:
3397 # the fsync below can take a very very long time. 3653 # the fsync below can take a very very long time.
3398 3654
3399 IO::AIO::aio_utime $runtime, undef, undef; 3655 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3400 3656
3401 my $guard = cf::lock_acquire "write_runtime"; 3657 my $guard = cf::lock_acquire "write_runtime";
3402 3658
3403 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3659 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3404 or return; 3660 or return;
3405 3661
3406 my $value = $cf::RUNTIME + 90 + 10; 3662 my $value = $cf::RUNTIME + 90 + 10;
3407 # 10 is the runtime save interval, for a monotonic clock 3663 # 10 is the runtime save interval, for a monotonic clock
3408 # 60 allows for the watchdog to kill the server. 3664 # 60 allows for the watchdog to kill the server.
3418 aio_utime $fh, undef, undef; 3674 aio_utime $fh, undef, undef;
3419 3675
3420 close $fh 3676 close $fh
3421 or return; 3677 or return;
3422 3678
3423 aio_rename "$runtime~", $runtime 3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3424 and return; 3680 and return;
3425 3681
3426 warn "runtime file written.\n"; 3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3427 3683
3428 1 3684 1
3429} 3685}
3430 3686
3431our $uuid_lock; 3687our $uuid_lock;
3440 my $uuid = "$LOCALDIR/uuid"; 3696 my $uuid = "$LOCALDIR/uuid";
3441 3697
3442 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3698 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3443 or return; 3699 or return;
3444 3700
3445 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3701 my $value = uuid_seq uuid_cur;
3702
3703 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n";
3705 return;
3706 }
3707
3708 my $value = uuid_str $value + $uuid_skip;
3446 $uuid_skip = 0; 3709 $uuid_skip = 0;
3447 3710
3448 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3711 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3449 and return; 3712 and return;
3450 3713
3472} 3735}
3473 3736
3474sub emergency_save() { 3737sub emergency_save() {
3475 my $freeze_guard = cf::freeze_mainloop; 3738 my $freeze_guard = cf::freeze_mainloop;
3476 3739
3477 warn "enter emergency perl save\n"; 3740 warn "emergency_perl_save: enter\n";
3478 3741
3479 cf::sync_job { 3742 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747
3480 # use a peculiar iteration method to avoid tripping on perl 3748 # use a peculiar iteration method to avoid tripping on perl
3481 # refcount bugs in for. also avoids problems with players 3749 # refcount bugs in for. also avoids problems with players
3482 # and maps saved/destroyed asynchronously. 3750 # and maps saved/destroyed asynchronously.
3483 warn "begin emergency player save\n"; 3751 warn "emergency_perl_save: begin player save\n";
3484 for my $login (keys %cf::PLAYER) { 3752 for my $login (keys %cf::PLAYER) {
3485 my $pl = $cf::PLAYER{$login} or next; 3753 my $pl = $cf::PLAYER{$login} or next;
3486 $pl->valid or next; 3754 $pl->valid or next;
3487 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3488 $pl->save; 3756 $pl->save;
3489 } 3757 }
3490 warn "end emergency player save\n"; 3758 warn "emergency_perl_save: end player save\n";
3491 3759
3492 warn "begin emergency map save\n"; 3760 warn "emergency_perl_save: begin map save\n";
3493 for my $path (keys %cf::MAP) { 3761 for my $path (keys %cf::MAP) {
3494 my $map = $cf::MAP{$path} or next; 3762 my $map = $cf::MAP{$path} or next;
3495 $map->valid or next; 3763 $map->valid or next;
3496 $map->save; 3764 $map->save;
3497 } 3765 }
3498 warn "end emergency map save\n"; 3766 warn "emergency_perl_save: end map save\n";
3499 3767
3500 warn "begin emergency database checkpoint\n"; 3768 warn "emergency_perl_save: begin database checkpoint\n";
3501 BDB::db_env_txn_checkpoint $DB_ENV; 3769 BDB::db_env_txn_checkpoint $DB_ENV;
3502 warn "end emergency database checkpoint\n"; 3770 warn "emergency_perl_save: end database checkpoint\n";
3503 3771
3504 warn "begin write uuid\n"; 3772 warn "emergency_perl_save: begin write uuid\n";
3505 write_uuid_sync 1; 3773 write_uuid_sync 1;
3506 warn "end write uuid\n"; 3774 warn "emergency_perl_save: end write uuid\n";
3507 }; 3775 };
3508 3776
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3509 warn "leave emergency perl save\n"; 3782 warn "emergency_perl_save: leave\n";
3510} 3783}
3511 3784
3512sub post_cleanup { 3785sub post_cleanup {
3513 my ($make_core) = @_; 3786 my ($make_core) = @_;
3514 3787
3515 warn Carp::longmess "post_cleanup backtrace" 3788 warn Carp::longmess "post_cleanup backtrace"
3516 if $make_core; 3789 if $make_core;
3790
3791 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$;
3517} 3793}
3518 3794
3519# a safer delete_package, copied from Symbol 3795# a safer delete_package, copied from Symbol
3520sub clear_package($) { 3796sub clear_package($) {
3521 my $pkg = shift; 3797 my $pkg = shift;
3537 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3813 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3538 for my $name (keys %$leaf_symtab) { 3814 for my $name (keys %$leaf_symtab) {
3539 _gv_clear *{"$pkg$name"}; 3815 _gv_clear *{"$pkg$name"};
3540# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3816# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3541 } 3817 }
3542 warn "cleared package #$pkg\n";#d#
3543} 3818}
3544
3545our $RELOAD; # how many times to reload
3546 3819
3547sub do_reload_perl() { 3820sub do_reload_perl() {
3548 # can/must only be called in main 3821 # can/must only be called in main
3549 if ($Coro::current != $Coro::main) { 3822 if (in_main) {
3550 warn "can only reload from main coroutine"; 3823 warn "can only reload from main coroutine";
3551 return; 3824 return;
3552 } 3825 }
3553 3826
3554 return if $RELOAD++; 3827 return if $RELOAD++;
3828
3829 my $t1 = AE::time;
3555 3830
3556 while ($RELOAD) { 3831 while ($RELOAD) {
3557 warn "reloading..."; 3832 warn "reloading...";
3558 3833
3559 warn "entering sync_job"; 3834 warn "entering sync_job";
3620 clear_package "safe::$_" 3895 clear_package "safe::$_"
3621 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3622 3897
3623 warn "unloading cf.pm \"a bit\""; 3898 warn "unloading cf.pm \"a bit\"";
3624 delete $INC{"cf.pm"}; 3899 delete $INC{"cf.pm"};
3625 delete $INC{"cf/pod.pm"}; 3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3626 3901
3627 # don't, removes xs symbols, too, 3902 # don't, removes xs symbols, too,
3628 # and global variables created in xs 3903 # and global variables created in xs
3629 #clear_package __PACKAGE__; 3904 #clear_package __PACKAGE__;
3630 3905
3631 warn "unload completed, starting to reload now"; 3906 warn "unload completed, starting to reload now";
3632 3907
3633 warn "reloading cf.pm"; 3908 warn "reloading cf.pm";
3634 require cf; 3909 require cf;
3635 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3910 cf::_connect_to_perl_1;
3636 3911
3637 warn "loading config and database again"; 3912 warn "loading config and database again";
3638 cf::reload_config; 3913 cf::reload_config;
3639 3914
3640 warn "loading extensions"; 3915 warn "loading extensions";
3641 cf::load_extensions; 3916 cf::load_extensions;
3642 3917
3918 if ($REATTACH_ON_RELOAD) {
3643 warn "reattaching attachments to objects/players"; 3919 warn "reattaching attachments to objects/players";
3644 _global_reattach; # objects, sockets 3920 _global_reattach; # objects, sockets
3645 warn "reattaching attachments to maps"; 3921 warn "reattaching attachments to maps";
3646 reattach $_ for values %MAP; 3922 reattach $_ for values %MAP;
3647 warn "reattaching attachments to players"; 3923 warn "reattaching attachments to players";
3648 reattach $_ for values %PLAYER; 3924 reattach $_ for values %PLAYER;
3925 }
3926
3927 warn "running post_init jobs";
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3649 3929
3650 warn "leaving sync_job"; 3930 warn "leaving sync_job";
3651 3931
3652 1 3932 1
3653 } or do { 3933 } or do {
3656 }; 3936 };
3657 3937
3658 warn "reloaded"; 3938 warn "reloaded";
3659 --$RELOAD; 3939 --$RELOAD;
3660 } 3940 }
3941
3942 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n";
3661}; 3944};
3662 3945
3663our $RELOAD_WATCHER; # used only during reload 3946our $RELOAD_WATCHER; # used only during reload
3664 3947
3665sub reload_perl() { 3948sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3949 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3950 # coro crashes during coro_state_free->destroy here.
3668 3951
3952 $RELOAD_WATCHER ||= cf::async {
3953 Coro::AIO::aio_wait cache_extensions;
3954
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3955 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3956 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3957 undef $RELOAD_WATCHER;
3958 };
3672 }; 3959 };
3673} 3960}
3674 3961
3675register_command "reload" => sub { 3962register_command "reload" => sub {
3676 my ($who, $arg) = @_; 3963 my ($who, $arg) = @_;
3690 3977
3691our @WAIT_FOR_TICK; 3978our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3979our @WAIT_FOR_TICK_BEGIN;
3693 3980
3694sub wait_for_tick { 3981sub wait_for_tick {
3695 return if tick_inhibit || $Coro::current == $Coro::main; 3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3696 3983
3697 my $signal = new Coro::Signal; 3984 my $signal = new Coro::Signal;
3698 push @WAIT_FOR_TICK, $signal; 3985 push @WAIT_FOR_TICK, $signal;
3699 $signal->wait; 3986 $signal->wait;
3700} 3987}
3701 3988
3702sub wait_for_tick_begin { 3989sub wait_for_tick_begin {
3703 return if tick_inhibit || $Coro::current == $Coro::main; 3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3704 3991
3705 my $signal = new Coro::Signal; 3992 my $signal = new Coro::Signal;
3706 push @WAIT_FOR_TICK_BEGIN, $signal; 3993 push @WAIT_FOR_TICK_BEGIN, $signal;
3707 $signal->wait; 3994 $signal->wait;
3708} 3995}
3713 unless ++$bug_warning > 10; 4000 unless ++$bug_warning > 10;
3714 return; 4001 return;
3715 } 4002 }
3716 4003
3717 cf::server_tick; # one server iteration 4004 cf::server_tick; # one server iteration
4005
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3718 4007
3719 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4008 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3720 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3721 Coro::async_pool { 4010 Coro::async_pool {
3722 $Coro::current->{desc} = "runtime saver"; 4011 $Coro::current->{desc} = "runtime saver";
3745} 4034}
3746 4035
3747{ 4036{
3748 # configure BDB 4037 # configure BDB
3749 4038
3750 BDB::min_parallel 8; 4039 BDB::min_parallel 16;
3751 BDB::max_poll_reqs $TICK * 0.1; 4040 BDB::max_poll_reqs $TICK * 0.1;
3752 $AnyEvent::BDB::WATCHER->priority (1); 4041 $AnyEvent::BDB::WATCHER->priority (1);
3753 4042
3754 unless ($DB_ENV) { 4043 unless ($DB_ENV) {
3755 $DB_ENV = BDB::db_env_create; 4044 $DB_ENV = BDB::db_env_create;
3802 $msg =~ s/\n//; 4091 $msg =~ s/\n//;
3803 4092
3804 # limit the # of concurrent backtraces 4093 # limit the # of concurrent backtraces
3805 if ($_log_backtrace < 2) { 4094 if ($_log_backtrace < 2) {
3806 ++$_log_backtrace; 4095 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg;
3807 async { 4097 async {
3808 $Coro::current->{desc} = "abt $msg"; 4098 $Coro::current->{desc} = "abt $msg";
3809 4099
3810 my @bt = fork_call { 4100 my @bt = fork_call {
3811 @addr = map { sprintf "%x", $_ } @addr; 4101 @addr = map { sprintf "%x", $_ } @addr;
3822 } 4112 }
3823 4113
3824 @funcs 4114 @funcs
3825 }; 4115 };
3826 4116
3827 LOG llevInfo, "[ABT] $msg\n"; 4117 LOG llevInfo, "[ABT] $perl_bt\n";
4118 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3828 LOG llevInfo, "[ABT] $_\n" for @bt; 4119 LOG llevInfo, "[ABT] $_\n" for @bt;
3829 --$_log_backtrace; 4120 --$_log_backtrace;
3830 }; 4121 };
3831 } else { 4122 } else {
3832 LOG llevInfo, "[ABT] $msg\n"; 4123 LOG llevInfo, "[ABT] $msg\n";
3833 LOG llevInfo, "[ABT] [suppressed]\n"; 4124 LOG llevInfo, "[ABT] [suppressed]\n";
3834 } 4125 }
3835} 4126}
3836 4127
3837# load additional modules 4128# load additional modules
3838use cf::pod; 4129require "cf/$_.pm" for @EXTRA_MODULES;
4130cf::_connect_to_perl_2;
3839 4131
3840END { cf::emergency_save } 4132END { cf::emergency_save }
3841 4133
38421 41341
3843 4135

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines