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.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.520 by root, Fri Apr 16 02:37:50 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; 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 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
39use Coro::AnyEvent; 44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
43use Coro::AnyEvent; 49use Coro::AnyEvent;
44use Coro::AIO; 50use Coro::AIO;
45use Coro::BDB 1.6; 51use Coro::BDB 1.6;
46use Coro::Storable; 52use Coro::Storable;
47use Coro::Util (); 53use Coro::Util ();
48 54
49use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
50use BDB (); 56use BDB ();
51use Data::Dumper; 57use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 58use Fcntl;
54use YAML (); 59use YAML::XS ();
55use IO::AIO (); 60use IO::AIO ();
56use Time::HiRes; 61use Time::HiRes;
57use Compress::LZF; 62use Compress::LZF;
58use Digest::MD5 (); 63use Digest::MD5 ();
59 64
61 66
62# configure various modules to our taste 67# configure various modules to our taste
63# 68#
64$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 77
68$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" };
69 80
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
71 82
72our %COMMAND = (); 83our %COMMAND = ();
73our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
76our %EXTCMD = (); 87our %EXTCMD = ();
77our %EXTICMD = (); 88our %EXTICMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
80 91
81our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
83 96
84our $CONFDIR = confdir; 97our $CONFDIR = confdir;
85our $DATADIR = datadir; 98our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
89our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
95our %RESOURCE; 111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
96 115
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 118our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
101 120
102our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 124our $DB_ENV;
106 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
107our %CFG; 128our %CFG;
108 129
109our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 131our $RUNTIME;
111our $NOW; 132our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 143our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
124 145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
150
125binmode STDOUT; 151binmode STDOUT;
126binmode STDERR; 152binmode STDERR;
127 153
128# read virtual server time, if available 154# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
133} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
134 162
135mkdir $_ 163mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 165
138our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
139 167
140sub cf::map::normalise; 168sub cf::map::normalise;
169
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
141 180
142############################################################################# 181#############################################################################
143 182
144=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
145 184
192returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
194 233
195=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
196 235
197This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 238that call.
200 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
201=back 246=back
202 247
203=cut 248=cut
204 249
205BEGIN { 250$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 251 my $msg = join "", @_;
208 252
209 $msg .= "\n" 253 $msg .= "\n"
210 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
211 255
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 257
214 LOG llevError, $msg; 258 LOG llevError, $msg;
215 }; 259};
216}
217 260
218$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
220 265
221 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 268 return;#d#
224 }#d# 269 }#d#
225 270
226 # kill coroutine otherwise 271 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 272 Coro::terminate
229}; 273};
230
231$SIG{__DIE__} = sub { }; #d#?
232 274
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
246 cf::client cf::player 288 cf::client cf::player
247 cf::arch cf::living 289 cf::arch cf::living
248 cf::map cf::mapspace 290 cf::map cf::mapspace
249 cf::party cf::region 291 cf::party cf::region
250)) { 292)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 294}
254 295
255$EV::DIED = sub { 296$EV::DIED = sub {
256 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
257}; 298};
258 299
259############################################################################# 300#############################################################################
260 301
261=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
298our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 339our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
299 340
300sub encode_json($) { $json_coder->encode ($_[0]) } 341sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 342sub decode_json($) { $json_coder->decode ($_[0]) }
302 343
344=item cf::post_init { BLOCK }
345
346Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again.
348
349The cdoeblock will have a single boolean argument to indicate whether this
350is a reload or not.
351
352=cut
353
354sub post_init(&) {
355 push @POST_INIT, shift;
356}
357
303=item cf::lock_wait $string 358=item cf::lock_wait $string
304 359
305Wait until the given lock is available. See cf::lock_acquire. 360Wait until the given lock is available. See cf::lock_acquire.
306 361
307=item my $lock = cf::lock_acquire $string 362=item my $lock = cf::lock_acquire $string
308 363
309Wait until the given lock is available and then acquires it and returns 364Wait until the given lock is available and then acquires it and returns
310a Coro::guard object. If the guard object gets destroyed (goes out of scope, 365a L<Guard> object. If the guard object gets destroyed (goes out of scope,
311for example when the coroutine gets canceled), the lock is automatically 366for example when the coroutine gets canceled), the lock is automatically
312returned. 367returned.
313 368
314Locks are *not* recursive, locking from the same coro twice results in a 369Locks are *not* recursive, locking from the same coro twice results in a
315deadlocked coro. 370deadlocked coro.
321 376
322Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
323 378
324=cut 379=cut
325 380
326our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
327our %LOCKER;#d#
328 382
329sub lock_wait($) { 383sub lock_wait($) {
330 my ($key) = @_; 384 $LOCKS->wait ($_[0]);
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
336
337 # wait for lock, if any
338 while ($LOCK{$key}) {
339 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule;
341 }
342} 385}
343 386
344sub lock_acquire($) { 387sub lock_acquire($) {
345 my ($key) = @_; 388 $LOCKS->guard ($_[0])
346
347 # wait, to be sure we are not locked
348 lock_wait $key;
349
350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
352
353 Coro::guard {
354 delete $LOCKER{$key};#d#
355 # wake up all waiters, to be on the safe side
356 $_->ready for @{ delete $LOCK{$key} };
357 }
358} 389}
359 390
360sub lock_active($) { 391sub lock_active($) {
361 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
362
363 ! ! $LOCK{$key}
364} 393}
365 394
366sub freeze_mainloop { 395sub freeze_mainloop {
367 tick_inhibit_inc; 396 tick_inhibit_inc;
368 397
369 Coro::guard \&tick_inhibit_dec; 398 &Guard::guard (\&tick_inhibit_dec);
370} 399}
371 400
372=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
373 402
374Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
375get spread over timer. 404get spread over time.
376 405
377=cut 406=cut
378 407
379sub periodic($$) { 408sub periodic($$) {
380 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
397 426
398=cut 427=cut
399 428
400our @SLOT_QUEUE; 429our @SLOT_QUEUE;
401our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
402 432
403$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
404$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
406 436
407 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
408 439
409 while () { 440 while () {
410 next_job: 441 next_job:
442
411 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
412 if ($avail > 0.01) { 444
413 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
414 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
415 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
416 $job->[2]->send; 449 $job->[2]->send;
417 Coro::cede; 450 Coro::cede;
418 goto next_job; 451 goto next_job;
419 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
420 } 454 }
421 } 455 }
422 456
423 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
424 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
425 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
426 $signal->wait; 460 $signal->wait;
427 } else { 461 } else {
462 $busy = 0;
428 Coro::schedule; 463 Coro::schedule;
429 } 464 }
430 } 465 }
431}; 466};
432 467
433sub get_slot($;$$) { 468sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
435 470
436 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
437 472
438 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
439 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
440 476
441 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
442 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
443 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
470 506
471sub sync_job(&) { 507sub sync_job(&) {
472 my ($job) = @_; 508 my ($job) = @_;
473 509
474 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
475 my $time = EV::time; 511 my $time = AE::time;
476 512
477 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
478 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
479 515
480 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
497 } else { 533 } else {
498 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
499 } 535 }
500 } 536 }
501 537
502 my $time = EV::time - $time; 538 my $time = AE::time - $time;
503 539
504 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
505 541
506 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
507 } else { 543 } else {
551 reset_signals; 587 reset_signals;
552 &$cb 588 &$cb
553 }, @args; 589 }, @args;
554 590
555 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
556} 603}
557 604
558=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
559 606
560=cut 607=cut
726 773
727############################################################################# 774#############################################################################
728 775
729=head2 ATTACHABLE OBJECTS 776=head2 ATTACHABLE OBJECTS
730 777
731Many objects in crossfire are so-called attachable objects. That means you can 778Many objects in deliantra are so-called attachable objects. That means you can
732attach callbacks/event handlers (a collection of which is called an "attachment") 779attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 780to it. All such attachable objects support the following methods.
734 781
735In the following description, CLASS can be any of C<global>, C<object> 782In the following description, CLASS can be any of C<global>, C<object>
736C<player>, C<client> or C<map> (i.e. the attachable objects in 783C<player>, C<client> or C<map> (i.e. the attachable objects in
786=item cf::CLASS::attachment $name, ... 833=item cf::CLASS::attachment $name, ...
787 834
788Register an attachment by C<$name> through which attachable objects of the 835Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 836given CLASS can refer to this attachment.
790 837
791Some classes such as crossfire maps and objects can specify attachments 838Some classes such as deliantra maps and objects can specify attachments
792that are attached at load/instantiate time, thus the need for a name. 839that are attached at load/instantiate time, thus the need for a name.
793 840
794These calls expect any number of the following handler/hook descriptions: 841These calls expect any number of the following handler/hook descriptions:
795 842
796=over 4 843=over 4
1087 1134
1088sub reattach { 1135sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1136 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1137 my ($obj) = @_;
1091 1138
1139 # no longer needed after getting rid of delete_package?
1092 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1140 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1093 1141
1094 my $registry = $obj->registry; 1142 my $registry = $obj->registry;
1095 1143
1096 @$registry = (); 1144 @$registry = ();
1097 1145
1145 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1146 1194
1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1148 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1150 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 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;
1200 aio_fsync $fh;
1201 }
1151 aio_close $fh; 1202 aio_close $fh;
1152 1203
1153 if (@$objs) { 1204 if (@$objs) {
1154 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1157 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1158 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 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;
1211 aio_fsync $fh;
1212 }
1159 aio_close $fh; 1213 aio_close $fh;
1160 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1161 } 1215 }
1162 } else { 1216 } else {
1163 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
1164 } 1218 }
1165 1219
1166 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1221
1222 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC;
1167 } else { 1224 } else {
1168 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1169 } 1226 }
1170 } else { 1227 } else {
1171 aio_unlink $filename; 1228 aio_unlink $filename;
1172 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1173 } 1230 }
1264 my ($name, $cb) = @_; 1321 my ($name, $cb) = @_;
1265 1322
1266 $EXTICMD{$name} = $cb; 1323 $EXTICMD{$name} = $cb;
1267} 1324}
1268 1325
1326use File::Glob ();
1327
1269cf::player->attach ( 1328cf::player->attach (
1270 on_command => sub { 1329 on_unknown_command => sub {
1271 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1272 1331
1273 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1274 or return; 1333 or return;
1275 1334
1305 1364
1306 cf::override; 1365 cf::override;
1307 }, 1366 },
1308); 1367);
1309 1368
1369# "readahead" all extensions
1370sub cache_extensions {
1371 my $grp = IO::AIO::aio_group;
1372
1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1374 for (grep /\.ext$/, @{$_[0]}) {
1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1376 }
1377 };
1378
1379 $grp
1380}
1381
1310sub load_extensions { 1382sub load_extensions {
1311 cf::sync_job { 1383 cf::sync_job {
1312 my %todo; 1384 my %todo;
1313 1385
1314 for my $path (<$LIBDIR/*.ext>) { 1386 for my $path (<$LIBDIR/*.ext>) {
1333 1405
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1408
1337 $ext{source} = 1409 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1339 . "#line 1 \"$path\"\n{\n" 1411 . "#line 1 \"$path\"\n{\n"
1340 . $source 1412 . $source
1341 . "\n};\n1"; 1413 . "\n};\n1";
1342 1414
1343 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1344 } 1416 }
1345 1417
1418 my $pass = 0;
1346 my %done; 1419 my %done;
1347 while (%todo) { 1420 while (%todo) {
1348 my $progress; 1421 my $progress;
1349 1422
1423 ++$pass;
1424
1425 ext:
1350 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1351 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1352 goto skip 1428 next ext
1353 unless exists $done{$_}; 1429 unless exists $done{$_};
1354 } 1430 }
1355 1431
1356 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1357 1433
1358 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1359 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1360 : "$v->{base}: extension inactive.\n";
1361 1438
1362 if (exists $v->{meta}{mandatory}) {
1363 warn $msg;
1364 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1365 } 1440 if exists $v->{meta}{mandatory};
1366 1441 } else {
1367 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1368 } 1448 }
1369
1370 $done{$k} = delete $todo{$k};
1371 push @EXTS, $v->{pkg};
1372 $progress = 1;
1373 } 1449 }
1374 1450
1375 skip: 1451 unless ($progress) {
1376 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1377 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1378 } 1459 }
1379 }; 1460 };
1380} 1461}
1381 1462
1382############################################################################# 1463#############################################################################
1383 1464
1384=back 1465=back
1385 1466
1386=head2 CORE EXTENSIONS 1467=head2 CORE EXTENSIONS
1387 1468
1388Functions and methods that extend core crossfire objects. 1469Functions and methods that extend core deliantra objects.
1389 1470
1390=cut 1471=cut
1391 1472
1392package cf::player; 1473package cf::player;
1393 1474
1436 1517
1437sub exists($) { 1518sub exists($) {
1438 my ($login) = @_; 1519 my ($login) = @_;
1439 1520
1440 $cf::PLAYER{$login} 1521 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1522 or !aio_stat path $login
1442} 1523}
1443 1524
1444sub find($) { 1525sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1526 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1527 my $login = $_[0];
1466 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1467 } 1548 }
1468 } 1549 }
1469} 1550}
1470 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1471sub save($) { 1565sub save($) {
1472 my ($pl) = @_; 1566 my ($pl) = @_;
1473 1567
1474 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1475 1569
1480 1574
1481 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1482 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1483 1577
1484 cf::get_slot 0.01; 1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1485 1582
1486 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1487 cf::cede_to_tick; 1584 cf::cede_to_tick;
1488} 1585}
1489 1586
1521 my ($pl) = @_; 1618 my ($pl) = @_;
1522 1619
1523 my $name = $pl->ob->name; 1620 my $name = $pl->ob->name;
1524 1621
1525 $pl->{deny_save} = 1; 1622 $pl->{deny_save} = 1;
1526 $pl->password ("*"); # this should lock out the player until we nuked the dir 1623 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1527 1624
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1529 $pl->deactivate; 1626 $pl->deactivate;
1530 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1627 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1531 $pl->ob->check_score; 1628 $pl->ob->check_score;
1617 } 1714 }
1618 1715
1619 \@paths 1716 \@paths
1620} 1717}
1621 1718
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1719=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1720
1624Expand crossfire pod fragments into protocol xml. 1721Expand deliantra pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714 1722
1715=item $player->ext_reply ($msgid, @msg) 1723=item $player->ext_reply ($msgid, @msg)
1716 1724
1717Sends an ext reply to the player. 1725Sends an ext reply to the player.
1718 1726
1791 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1792 1800
1793 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1794 $self->_create_random_map ( 1802 $self->_create_random_map (
1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1798 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1799 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1800 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1801 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1931 1939
1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1933 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1934} 1942}
1935 1943
1936# and all this just because we cannot iterate over
1937# all maps in C++...
1938sub change_all_map_light {
1939 my ($change) = @_;
1940
1941 $_->change_map_light ($change)
1942 for grep $_->outdoor, values %cf::MAP;
1943}
1944
1945sub decay_objects { 1944sub decay_objects {
1946 my ($self) = @_; 1945 my ($self) = @_;
1947 1946
1948 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1949 1948
2031sub find { 2030sub find {
2032 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
2033 2032
2034 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
2035 2034
2036 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2037 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2037
2039 $cf::MAP{$path} || do { 2038 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
2043 my $map = new_from_path cf::map $path 2039 my $map = new_from_path cf::map $path
2044 or return; 2040 or return;
2045 2041
2046 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
2047 2043
2059 2055
2060 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
2061 } 2057 }
2062} 2058}
2063 2059
2064sub pre_load { } 2060sub pre_load { }
2065sub post_load { } 2061#sub post_load { } # XS
2066 2062
2067sub load { 2063sub load {
2068 my ($self) = @_; 2064 my ($self) = @_;
2069 2065
2070 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
2115 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2116 $self->decay_objects; 2112 $self->decay_objects;
2117 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2118 $self->update_buttons; 2114 $self->update_buttons;
2119 cf::cede_to_tick; 2115 cf::cede_to_tick;
2120 $self->set_darkness_map;
2121 cf::cede_to_tick;
2122 $self->activate; 2116 $self->activate;
2123 } 2117 }
2124 2118
2125 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2126 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
2129 } 2123 }
2130 2124
2131 $self->post_load; 2125 $self->post_load;
2132} 2126}
2133 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2134sub customise_for { 2131sub customise_for {
2135 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2136 2133
2137 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2138 if $self->per_player; 2135 if $self->per_player;
2215 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2216 2213
2217 () 2214 ()
2218} 2215}
2219 2216
2217# common code, used by both ->save and ->swapout
2220sub save { 2218sub _save {
2221 my ($self) = @_; 2219 my ($self) = @_;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2220
2225 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2226 2222
2227 return unless $self->dirty; 2223 return unless $self->dirty;
2228 2224
2248 } else { 2244 } else {
2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2250 } 2246 }
2251} 2247}
2252 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2253sub swap_out { 2257sub swap_out {
2254 my ($self) = @_; 2258 my ($self) = @_;
2255 2259
2256 # save first because save cedes
2257 $self->save;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260 2261
2261 return if $self->players;
2262 return if $self->in_memory != cf::MAP_ACTIVE; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2263 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2264 return if $self->players;
2264 2265
2265 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2266
2267 $self->deactivate; 2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2269 $self->clear; 2275 $self->clear;
2270} 2276}
2271 2277
2272sub reset_at { 2278sub reset_at {
2273 my ($self) = @_; 2279 my ($self) = @_;
2292 2298
2293 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294 2300
2295 return if $self->players; 2301 return if $self->players;
2296 2302
2297 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2298 2304
2299 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2300 2306
2301 # need to save uniques path 2307 # need to save uniques path
2302 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
2393 : normalise $_ 2399 : normalise $_
2394 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2395 ] 2401 ]
2396} 2402}
2397 2403
2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2435
2398=back 2436=back
2399 2437
2400=head3 cf::object 2438=head3 cf::object
2401 2439
2402=cut 2440=cut
2467 2505
2468our $SAY_CHANNEL = { 2506our $SAY_CHANNEL = {
2469 id => "say", 2507 id => "say",
2470 title => "Map", 2508 title => "Map",
2471 reply => "say ", 2509 reply => "say ",
2472 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2510 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2473}; 2511};
2474 2512
2475our $CHAT_CHANNEL = { 2513our $CHAT_CHANNEL = {
2476 id => "chat", 2514 id => "chat",
2477 title => "Chat", 2515 title => "Chat",
2532 2570
2533=item $player_object->enter_link 2571=item $player_object->enter_link
2534 2572
2535Freezes the player and moves him/her to a special map (C<{link}>). 2573Freezes the player and moves him/her to a special map (C<{link}>).
2536 2574
2537The player should be reasonably safe there for short amounts of time. You 2575The player should be reasonably safe there for short amounts of time (e.g.
2538I<MUST> call C<leave_link> as soon as possible, though. 2576for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577though, as the palyer cannot control the character while it is on the link
2578map.
2539 2579
2540Will never block. 2580Will never block.
2541 2581
2542=item $player_object->leave_link ($map, $x, $y) 2582=item $player_object->leave_link ($map, $x, $y)
2543 2583
2568 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2608 return if UNIVERSAL::isa $self->map, "ext::map_link";
2569 2609
2570 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2610 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2571 if $self->map && $self->map->{path} ne "{link}"; 2611 if $self->map && $self->map->{path} ne "{link}";
2572 2612
2573 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2613 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2574} 2614}
2575 2615
2576sub cf::object::player::leave_link { 2616sub cf::object::player::leave_link {
2577 my ($self, $map, $x, $y) = @_; 2617 my ($self, $map, $x, $y) = @_;
2578 2618
2595 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2596 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2597 2637
2598 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2599 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2600 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2601 2641
2602 $map->load; 2642 $map->load;
2603 $map->load_neighbours; 2643 $map->load_neighbours;
2604 2644
2605 return unless $self->contr->active; 2645 return unless $self->contr->active;
2606 $self->activate_recursive;
2607 2646
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2610} 2652}
2611 2653
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2613 2655
2614Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
2773 $self->contr->savebed ($map, $x, $y) 2815 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 2816 if $exit->flag (cf::FLAG_DAMNED);
2775 2817
2776 1 2818 1
2777 }) { 2819 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 2820 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2821 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2822 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2823 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2824
2783 warn "ERROR in enter_exit: $@"; 2825 warn "ERROR in enter_exit: $@";
2800sub cf::client::send_drawinfo { 2842sub cf::client::send_drawinfo {
2801 my ($self, $text, $flags) = @_; 2843 my ($self, $text, $flags) = @_;
2802 2844
2803 utf8::encode $text; 2845 utf8::encode $text;
2804 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2847}
2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2805} 2872}
2806 2873
2807=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2808 2875
2809Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send a drawinfo or msg packet to the client, formatting the msg for the
2813 2880
2814=cut 2881=cut
2815 2882
2816# non-persistent channels (usually the info channel) 2883# non-persistent channels (usually the info channel)
2817our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2818 "c/identify" => { 2891 "c/identify" => {
2819 id => "infobox", 2892 id => "infobox",
2820 title => "Identify", 2893 title => "Identify",
2821 reply => undef, 2894 reply => undef,
2822 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
2824 "c/examine" => { 2897 "c/examine" => {
2825 id => "infobox", 2898 id => "infobox",
2826 title => "Examine", 2899 title => "Examine",
2827 reply => undef, 2900 reply => undef,
2828 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2829 }, 2908 },
2830 "c/book" => { 2909 "c/book" => {
2831 id => "infobox", 2910 id => "infobox",
2832 title => "Book", 2911 title => "Book",
2833 reply => undef, 2912 reply => undef,
2849 id => "infobox", 2928 id => "infobox",
2850 title => "Body Parts", 2929 title => "Body Parts",
2851 reply => undef, 2930 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 2931 tooltip => "Shows which body parts you posess and are available",
2853 }, 2932 },
2933 "c/statistics" => {
2934 id => "infobox",
2935 title => "Statistics",
2936 reply => undef,
2937 tooltip => "Shows your primary statistics",
2938 },
2939 "c/skills" => {
2940 id => "infobox",
2941 title => "Skills",
2942 reply => undef,
2943 tooltip => "Shows your experience per skill and item power",
2944 },
2945 "c/shopitems" => {
2946 id => "infobox",
2947 title => "Shop Items",
2948 reply => undef,
2949 tooltip => "Shows the items currently for sale in this shop",
2950 },
2951 "c/resistances" => {
2952 id => "infobox",
2953 title => "Resistances",
2954 reply => undef,
2955 tooltip => "Shows your resistances",
2956 },
2957 "c/pets" => {
2958 id => "infobox",
2959 title => "Pets",
2960 reply => undef,
2961 tooltip => "Shows information abotu your pets/a specific pet",
2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2968 },
2854 "c/uptime" => { 2969 "c/uptime" => {
2855 id => "infobox", 2970 id => "infobox",
2856 title => "Uptime", 2971 title => "Uptime",
2857 reply => undef, 2972 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 2973 tooltip => "How long the server has been running since last restart",
2867 id => "party", 2982 id => "party",
2868 title => "Party", 2983 title => "Party",
2869 reply => "gsay ", 2984 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party", 2985 tooltip => "Messages and chat related to your party",
2871 }, 2986 },
2987 "c/death" => {
2988 id => "death",
2989 title => "Death",
2990 reply => undef,
2991 tooltip => "Reason for and more info about your most recent death",
2992 },
2993 "c/say" => $SAY_CHANNEL,
2994 "c/chat" => $CHAT_CHANNEL,
2872); 2995);
2873 2996
2874sub cf::client::send_msg { 2997sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2876 2999
2877 $msg = $self->pl->expand_cfpod ($msg); 3000 $msg = $self->pl->expand_cfpod ($msg)
3001 unless $color & cf::NDI_VERBATIM;
2878 3002
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 3003 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 3004
2881 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 3006 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel}; 3007 $channel = $CHANNEL{$channel};
2884 3008
2885 $self->ext_msg (channel_info => $channel) 3009 $self->ext_msg (channel_info => $channel);
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2889 3011
2890 } elsif (ref $channel) { 3012 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2895 if $self->can_msg;
2896 } 3017 }
2897 3018
2898 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2899 } 3020 }
2900 3021
2901 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2902 3023
2903 if ($self->can_msg) {
2904 # default colour, mask it out 3024 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2907 3027
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3028 my $pkt = "msg "
3029 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 } else { 3031 );
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921 3032
2922 $color &= cf::NDI_COLOR_MASK; 3033 $self->send_big_packet ($pkt);
2923
2924 utf8::encode $msg;
2925
2926 if (0 && $msg =~ /\[/) {
2927 # COMMAND/INFO
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 }
2935} 3034}
2936 3035
2937=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2938 3037
2939Sends an ext event to the client. 3038Sends an ext event to the client.
2942 3041
2943sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2944 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2945 3044
2946 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2947 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2948 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2949 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3050 }
2952} 3051}
2953 3052
2954=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2955 3054
2959 3058
2960sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2961 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2962 3061
2963 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2964 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2965 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2966 #TODO: version 1, remove 3065 #TODO: version 1, remove
2967 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 } 3068 }
2970} 3069}
2971 3070
2972=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2973 3072
3074 3173
3075 $coro 3174 $coro
3076} 3175}
3077 3176
3078cf::client->attach ( 3177cf::client->attach (
3079 on_destroy => sub { 3178 on_client_destroy => sub {
3080 my ($ns) = @_; 3179 my ($ns) = @_;
3081 3180
3082 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3083 }, 3182 },
3084); 3183);
3100our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3101 3200
3102$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3103 3202
3104$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3105 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3106 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3107 sort time 3206 sort time
3108)); 3207));
3109 3208
3110# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
3114The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
3115 3214
3116 cf::object 3215 cf::object
3117 contr pay_amount pay_player map x y force_find force_add destroy 3216 contr pay_amount pay_player map x y force_find force_add destroy
3118 insert remove name archname title slaying race decrease split 3217 insert remove name archname title slaying race decrease split
3218 value
3119 3219
3120 cf::object::player 3220 cf::object::player
3121 player 3221 player
3122 3222
3123 cf::player 3223 cf::player
3129=cut 3229=cut
3130 3230
3131for ( 3231for (
3132 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3232 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3133 insert remove inv nrof name archname title slaying race 3233 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)], 3234 decrease split destroy change_exp value msg lore send_msg)],
3135 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
3136 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
3137 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
3138) { 3238) {
3139 no strict 'refs'; 3239 no strict 'refs';
3140 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
3141 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3159 3259
3160 my $qcode = $code; 3260 my $qcode = $code;
3161 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3162 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3163 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
3164 local $_; 3267 local $_;
3165 local @safe::cf::_safe_eval_args = values %vars;
3166 3268
3167 my $eval = 3269 my $eval =
3168 "do {\n" 3270 "do {\n"
3169 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3170 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3171 . $code 3273 . $code
3172 . "\n}" 3274 . "\n}"
3173 ; 3275 ;
3174 3276
3277 if ($CFG{safe_eval}) {
3175 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3176 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3177 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3178 3286
3179 if ($@) { 3287 if ($@) {
3180 warn "$@"; 3288 warn "$@";
3181 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3182 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
3201=cut 3309=cut
3202 3310
3203sub register_script_function { 3311sub register_script_function {
3204 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3205 3313
3206 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3207 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3208} 3316}
3209 3317
3210=back 3318=back
3211 3319
3212=cut 3320=cut
3233 3341
3234 $facedata->{version} == 2 3342 $facedata->{version} == 2
3235 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3236 3344
3237 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3238 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3239 type => FT_RSRC, 3348 type => FT_RSRC,
3240 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3241 }; 3351 };
3242 cf::cede_to_tick; 3352 cf::cede_to_tick;
3243 3353
3244 { 3354 {
3245 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
3247 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3248 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249 3359
3250 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3251 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3253 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3254 3364
3255 cf::cede_to_tick; 3365 cf::cede_to_tick;
3256 } 3366 }
3257 3367
3258 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3282 3392
3283 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3284 } 3394 }
3285 3395
3286 { 3396 {
3287 # TODO: for gcfclient pleasure, we should give resources
3288 # that gcfclient doesn't grok a >10000 face index.
3289 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3290 3398
3291 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3292 if (defined $info->{type}) { 3400 if (defined $info->{type}) {
3293 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3294 my $data;
3295 3402
3296 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3297 # prepend meta info
3298
3299 my $meta = $enc->encode ({
3300 name => $name,
3301 %{ $info->{meta} || {} },
3302 });
3303
3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 cf::face::set_type $idx, $info->{type}; 3404 cf::face::set_type $idx, $info->{type};
3311 } else { 3405 } else {
3312 $RESOURCE{$name} = $info; 3406 $RESOURCE{$name} = $info;
3313 } 3407 }
3314 3408
3397 reload_treasures; 3491 reload_treasures;
3398 3492
3399 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3400} 3494}
3401 3495
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408}
3409
3410sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3412 or return; 3500 or return;
3413 3501
3414 local $/; 3502 local $/;
3415 *CFG = YAML::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3416 3504
3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3418 3506
3419 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3420 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3424 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3425 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3426 }; 3514 };
3427 warn $@ if $@; 3515 warn $@ if $@;
3428 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3519}
3520
3521sub pidfile() {
3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523 or die "$PIDFILE: $!";
3524 flock $fh, &Fcntl::LOCK_EX
3525 or die "$PIDFILE: flock: $!";
3526 $fh
3527}
3528
3529# make sure only one server instance is running at any one time
3530sub atomic {
3531 my $fh = pidfile;
3532
3533 my $pid = <$fh>;
3534 kill 9, $pid if $pid > 0;
3535
3536 seek $fh, 0, 0;
3537 print $fh $$;
3538}
3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3429} 3547}
3430 3548
3431sub main { 3549sub main {
3550 cf::init_globals; # initialise logging
3551
3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556
3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558
3432 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
3434 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3561 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3435 (async { 3562 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3563 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3564 EV::loop EV::LOOP_ONESHOT;
3438 })->prio (Coro::PRIO_MAX); 3565 })->prio (Coro::PRIO_MAX);
3439 }; 3566 };
3440 3567
3441 { 3568 evthread_start IO::AIO::poll_fileno;
3442 my $guard = freeze_mainloop; 3569
3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3579 reload_resources;
3443 reload_config; 3580 reload_config;
3444 db_init; 3581 db_init;
3582
3583 cf::init_uuid;
3584 cf::init_signals;
3585 cf::init_skills;
3586
3587 cf::init_beforeplay;
3588
3589 atomic;
3590
3445 load_extensions; 3591 load_extensions;
3446 3592
3447 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3593 utime time, time, $RUNTIMEFILE;
3594
3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598
3599 (pop @POST_INIT)->(0) while @POST_INIT;
3448 } 3600 };
3449 3601
3450 EV::loop; 3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3451} 3606}
3452 3607
3453############################################################################# 3608#############################################################################
3454# initialisation and cleanup 3609# initialisation and cleanup
3455 3610
3456# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3457BEGIN { 3612BEGIN {
3458 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3459 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3460 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3461 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3462 }; 3617 };
3463 } 3618 }
3464} 3619}
3465 3620
3466sub write_runtime_sync { 3621sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime"; 3622 my $t0 = AE::time;
3468 3623
3469 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3471 3626
3472 IO::AIO::aio_utime $runtime, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 3628
3474 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3475 3630
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3477 or return; 3632 or return;
3478 3633
3479 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
3491 aio_utime $fh, undef, undef; 3646 aio_utime $fh, undef, undef;
3492 3647
3493 close $fh 3648 close $fh
3494 or return; 3649 or return;
3495 3650
3496 aio_rename "$runtime~", $runtime 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 3652 and return;
3498 3653
3499 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3500 3655
3501 1 3656 1
3502} 3657}
3503 3658
3504our $uuid_lock; 3659our $uuid_lock;
3513 my $uuid = "$LOCALDIR/uuid"; 3668 my $uuid = "$LOCALDIR/uuid";
3514 3669
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3670 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return; 3671 or return;
3517 3672
3518 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3673 my $value = uuid_seq uuid_cur;
3674
3675 unless ($value) {
3676 warn "cowardly refusing to write zero uuid value!\n";
3677 return;
3678 }
3679
3680 my $value = uuid_str $value + $uuid_skip;
3519 $uuid_skip = 0; 3681 $uuid_skip = 0;
3520 3682
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3683 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return; 3684 and return;
3523 3685
3545} 3707}
3546 3708
3547sub emergency_save() { 3709sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3710 my $freeze_guard = cf::freeze_mainloop;
3549 3711
3550 warn "enter emergency perl save\n"; 3712 warn "emergency_perl_save: enter\n";
3551 3713
3552 cf::sync_job { 3714 cf::sync_job {
3715 # this is a trade-off: we want to be very quick here, so
3716 # save all maps without fsync, and later call a global sync
3717 # (which in turn might be very very slow)
3718 local $USE_FSYNC = 0;
3719
3553 # use a peculiar iteration method to avoid tripping on perl 3720 # use a peculiar iteration method to avoid tripping on perl
3554 # refcount bugs in for. also avoids problems with players 3721 # refcount bugs in for. also avoids problems with players
3555 # and maps saved/destroyed asynchronously. 3722 # and maps saved/destroyed asynchronously.
3556 warn "begin emergency player save\n"; 3723 warn "emergency_perl_save: begin player save\n";
3557 for my $login (keys %cf::PLAYER) { 3724 for my $login (keys %cf::PLAYER) {
3558 my $pl = $cf::PLAYER{$login} or next; 3725 my $pl = $cf::PLAYER{$login} or next;
3559 $pl->valid or next; 3726 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3727 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3561 $pl->save; 3728 $pl->save;
3562 } 3729 }
3563 warn "end emergency player save\n"; 3730 warn "emergency_perl_save: end player save\n";
3564 3731
3565 warn "begin emergency map save\n"; 3732 warn "emergency_perl_save: begin map save\n";
3566 for my $path (keys %cf::MAP) { 3733 for my $path (keys %cf::MAP) {
3567 my $map = $cf::MAP{$path} or next; 3734 my $map = $cf::MAP{$path} or next;
3568 $map->valid or next; 3735 $map->valid or next;
3569 $map->save; 3736 $map->save;
3570 } 3737 }
3571 warn "end emergency map save\n"; 3738 warn "emergency_perl_save: end map save\n";
3572 3739
3573 warn "begin emergency database checkpoint\n"; 3740 warn "emergency_perl_save: begin database checkpoint\n";
3574 BDB::db_env_txn_checkpoint $DB_ENV; 3741 BDB::db_env_txn_checkpoint $DB_ENV;
3575 warn "end emergency database checkpoint\n"; 3742 warn "emergency_perl_save: end database checkpoint\n";
3576 3743
3577 warn "begin write uuid\n"; 3744 warn "emergency_perl_save: begin write uuid\n";
3578 write_uuid_sync 1; 3745 write_uuid_sync 1;
3579 warn "end write uuid\n"; 3746 warn "emergency_perl_save: end write uuid\n";
3580 }; 3747 };
3581 3748
3749 warn "emergency_perl_save: starting sync()\n";
3750 IO::AIO::aio_sync sub {
3751 warn "emergency_perl_save: finished sync()\n";
3752 };
3753
3582 warn "leave emergency perl save\n"; 3754 warn "emergency_perl_save: leave\n";
3583} 3755}
3584 3756
3585sub post_cleanup { 3757sub post_cleanup {
3586 my ($make_core) = @_; 3758 my ($make_core) = @_;
3587 3759
3588 warn Carp::longmess "post_cleanup backtrace" 3760 warn Carp::longmess "post_cleanup backtrace"
3589 if $make_core; 3761 if $make_core;
3762
3763 my $fh = pidfile;
3764 unlink $PIDFILE if <$fh> == $$;
3765}
3766
3767# a safer delete_package, copied from Symbol
3768sub clear_package($) {
3769 my $pkg = shift;
3770
3771 # expand to full symbol table name if needed
3772 unless ($pkg =~ /^main::.*::$/) {
3773 $pkg = "main$pkg" if $pkg =~ /^::/;
3774 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3775 $pkg .= '::' unless $pkg =~ /::$/;
3776 }
3777
3778 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3779 my $stem_symtab = *{$stem}{HASH};
3780
3781 defined $stem_symtab and exists $stem_symtab->{$leaf}
3782 or return;
3783
3784 # clear all symbols
3785 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786 for my $name (keys %$leaf_symtab) {
3787 _gv_clear *{"$pkg$name"};
3788# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789 }
3590} 3790}
3591 3791
3592sub do_reload_perl() { 3792sub do_reload_perl() {
3593 # can/must only be called in main 3793 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 3794 if ($Coro::current != $Coro::main) {
3595 warn "can only reload from main coroutine"; 3795 warn "can only reload from main coroutine";
3596 return; 3796 return;
3597 } 3797 }
3598 3798
3799 return if $RELOAD++;
3800
3801 my $t1 = AE::time;
3802
3803 while ($RELOAD) {
3599 warn "reloading..."; 3804 warn "reloading...";
3600 3805
3601 warn "entering sync_job"; 3806 warn "entering sync_job";
3602 3807
3603 cf::sync_job { 3808 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark 3809 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 3810 cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark 3811 cf::write_runtime_sync; # external watchdog should not bark
3607 3812
3608 warn "syncing database to disk"; 3813 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3814 BDB::db_env_txn_checkpoint $DB_ENV;
3610 3815
3611 # if anything goes wrong in here, we should simply crash as we already saved 3816 # if anything goes wrong in here, we should simply crash as we already saved
3612 3817
3613 warn "flushing outstanding aio requests"; 3818 warn "flushing outstanding aio requests";
3614 for (;;) {
3615 BDB::flush;
3616 IO::AIO::flush;
3617 Coro::cede_notself;
3618 last unless IO::AIO::nreqs || BDB::nreqs; 3819 while (IO::AIO::nreqs || BDB::nreqs) {
3619 warn "iterate..."; 3820 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3620 }
3621
3622 ++$RELOAD;
3623
3624 warn "cancelling all extension coros";
3625 $_->cancel for values %EXT_CORO;
3626 %EXT_CORO = ();
3627
3628 warn "removing commands";
3629 %COMMAND = ();
3630
3631 warn "removing ext/exti commands";
3632 %EXTCMD = ();
3633 %EXTICMD = ();
3634
3635 warn "unloading/nuking all extensions";
3636 for my $pkg (@EXTS) {
3637 warn "... unloading $pkg";
3638
3639 if (my $cb = $pkg->can ("unload")) {
3640 eval {
3641 $cb->($pkg);
3642 1
3643 } or warn "$pkg unloaded, but with errors: $@";
3644 } 3821 }
3645 3822
3646 warn "... nuking $pkg"; 3823 warn "cancelling all extension coros";
3647 Symbol::delete_package $pkg; 3824 $_->cancel for values %EXT_CORO;
3648 } 3825 %EXT_CORO = ();
3649 3826
3650 warn "unloading all perl modules loaded from $LIBDIR"; 3827 warn "removing commands";
3651 while (my ($k, $v) = each %INC) { 3828 %COMMAND = ();
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 3829
3830 warn "removing ext/exti commands";
3831 %EXTCMD = ();
3832 %EXTICMD = ();
3833
3834 warn "unloading/nuking all extensions";
3835 for my $pkg (@EXTS) {
3654 warn "... unloading $k"; 3836 warn "... unloading $pkg";
3655 delete $INC{$k};
3656 3837
3657 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g;
3659
3660 if (my $cb = $k->can ("unload_module")) { 3838 if (my $cb = $pkg->can ("unload")) {
3839 eval {
3661 $cb->(); 3840 $cb->($pkg);
3841 1
3842 } or warn "$pkg unloaded, but with errors: $@";
3843 }
3844
3845 warn "... clearing $pkg";
3846 clear_package $pkg;
3662 } 3847 }
3663 3848
3664 Symbol::delete_package $k; 3849 warn "unloading all perl modules loaded from $LIBDIR";
3850 while (my ($k, $v) = each %INC) {
3851 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3852
3853 warn "... unloading $k";
3854 delete $INC{$k};
3855
3856 $k =~ s/\.pm$//;
3857 $k =~ s/\//::/g;
3858
3859 if (my $cb = $k->can ("unload_module")) {
3860 $cb->();
3861 }
3862
3863 clear_package $k;
3665 } 3864 }
3666 3865
3667 warn "getting rid of safe::, as good as possible"; 3866 warn "getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 3867 clear_package "safe::$_"
3669 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3868 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3670 3869
3671 warn "unloading cf.pm \"a bit\""; 3870 warn "unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 3871 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 3872 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3674 3873
3675 # don't, removes xs symbols, too, 3874 # don't, removes xs symbols, too,
3676 # and global variables created in xs 3875 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 3876 #clear_package __PACKAGE__;
3678 3877
3679 warn "unload completed, starting to reload now"; 3878 warn "unload completed, starting to reload now";
3680 3879
3681 warn "reloading cf.pm"; 3880 warn "reloading cf.pm";
3682 require cf; 3881 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3882 cf::_connect_to_perl_1;
3684 3883
3685 warn "loading config and database again"; 3884 warn "loading config and database again";
3686 cf::reload_config; 3885 cf::reload_config;
3687 3886
3688 warn "loading extensions"; 3887 warn "loading extensions";
3689 cf::load_extensions; 3888 cf::load_extensions;
3690 3889
3890 if ($REATTACH_ON_RELOAD) {
3691 warn "reattaching attachments to objects/players"; 3891 warn "reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 3892 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 3893 warn "reattaching attachments to maps";
3694 reattach $_ for values %MAP; 3894 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 3895 warn "reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 3896 reattach $_ for values %PLAYER;
3897 }
3697 3898
3899 warn "running post_init jobs";
3900 (pop @POST_INIT)->(1) while @POST_INIT;
3901
3698 warn "leaving sync_job"; 3902 warn "leaving sync_job";
3699 3903
3700 1 3904 1
3701 } or do { 3905 } or do {
3702 warn $@; 3906 warn $@;
3703 cf::cleanup "error while reloading, exiting."; 3907 cf::cleanup "error while reloading, exiting.";
3704 }; 3908 };
3705 3909
3706 warn "reloaded"; 3910 warn "reloaded";
3911 --$RELOAD;
3912 }
3913
3914 $t1 = AE::time - $t1;
3915 warn "reload completed in ${t1}s\n";
3707}; 3916};
3708 3917
3709our $RELOAD_WATCHER; # used only during reload 3918our $RELOAD_WATCHER; # used only during reload
3710 3919
3711sub reload_perl() { 3920sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 3921 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 3922 # coro crashes during coro_state_free->destroy here.
3714 3923
3924 $RELOAD_WATCHER ||= cf::async {
3925 Coro::AIO::aio_wait cache_extensions;
3926
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3927 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 3928 do_reload_perl;
3717 undef $RELOAD_WATCHER; 3929 undef $RELOAD_WATCHER;
3930 };
3718 }; 3931 };
3719} 3932}
3720 3933
3721register_command "reload" => sub { 3934register_command "reload" => sub {
3722 my ($who, $arg) = @_; 3935 my ($who, $arg) = @_;
3736 3949
3737our @WAIT_FOR_TICK; 3950our @WAIT_FOR_TICK;
3738our @WAIT_FOR_TICK_BEGIN; 3951our @WAIT_FOR_TICK_BEGIN;
3739 3952
3740sub wait_for_tick { 3953sub wait_for_tick {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3742 3955
3743 my $signal = new Coro::Signal; 3956 my $signal = new Coro::Signal;
3744 push @WAIT_FOR_TICK, $signal; 3957 push @WAIT_FOR_TICK, $signal;
3745 $signal->wait; 3958 $signal->wait;
3746} 3959}
3747 3960
3748sub wait_for_tick_begin { 3961sub wait_for_tick_begin {
3749 return if tick_inhibit || $Coro::current == $Coro::main; 3962 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3750 3963
3751 my $signal = new Coro::Signal; 3964 my $signal = new Coro::Signal;
3752 push @WAIT_FOR_TICK_BEGIN, $signal; 3965 push @WAIT_FOR_TICK_BEGIN, $signal;
3753 $signal->wait; 3966 $signal->wait;
3754} 3967}
3759 unless ++$bug_warning > 10; 3972 unless ++$bug_warning > 10;
3760 return; 3973 return;
3761 } 3974 }
3762 3975
3763 cf::server_tick; # one server iteration 3976 cf::server_tick; # one server iteration
3977
3978 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3764 3979
3765 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3980 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3766 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3981 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3767 Coro::async_pool { 3982 Coro::async_pool {
3768 $Coro::current->{desc} = "runtime saver"; 3983 $Coro::current->{desc} = "runtime saver";
3791} 4006}
3792 4007
3793{ 4008{
3794 # configure BDB 4009 # configure BDB
3795 4010
3796 BDB::min_parallel 8; 4011 BDB::min_parallel 16;
3797 BDB::max_poll_reqs $TICK * 0.1; 4012 BDB::max_poll_reqs $TICK * 0.1;
3798 $AnyEvent::BDB::WATCHER->priority (1); 4013 $AnyEvent::BDB::WATCHER->priority (1);
3799 4014
3800 unless ($DB_ENV) { 4015 unless ($DB_ENV) {
3801 $DB_ENV = BDB::db_env_create; 4016 $DB_ENV = BDB::db_env_create;
3848 $msg =~ s/\n//; 4063 $msg =~ s/\n//;
3849 4064
3850 # limit the # of concurrent backtraces 4065 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 4066 if ($_log_backtrace < 2) {
3852 ++$_log_backtrace; 4067 ++$_log_backtrace;
4068 my $perl_bt = Carp::longmess $msg;
3853 async { 4069 async {
3854 $Coro::current->{desc} = "abt $msg"; 4070 $Coro::current->{desc} = "abt $msg";
3855 4071
3856 my @bt = fork_call { 4072 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 4073 @addr = map { sprintf "%x", $_ } @addr;
3868 } 4084 }
3869 4085
3870 @funcs 4086 @funcs
3871 }; 4087 };
3872 4088
3873 LOG llevInfo, "[ABT] $msg\n"; 4089 LOG llevInfo, "[ABT] $perl_bt\n";
4090 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 4091 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 4092 --$_log_backtrace;
3876 }; 4093 };
3877 } else { 4094 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 4095 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n"; 4096 LOG llevInfo, "[ABT] [suppressed]\n";
3880 } 4097 }
3881} 4098}
3882 4099
3883# load additional modules 4100# load additional modules
3884use cf::pod; 4101require "cf/$_.pm" for @EXTRA_MODULES;
4102cf::_connect_to_perl_2;
3885 4103
3886END { cf::emergency_save } 4104END { cf::emergency_save }
3887 4105
38881 41061
3889 4107

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines