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.435 by root, Thu May 29 03:33:20 2008 UTC vs.
Revision 1.529 by root, Wed Apr 28 11:28:22 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; 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 = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
96 118
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 121our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
101 123
102our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 127our $DB_ENV;
106 128
129our @EXTRA_MODULES = qw(pod match mapscript);
130
107our %CFG; 131our %CFG;
108 132
109our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 134our $RUNTIME;
111our $NOW; 135our $NOW;
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 146our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
124 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
125binmode STDOUT; 154binmode STDOUT;
126binmode STDERR; 155binmode STDERR;
127 156
128# read virtual server time, if available 157# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
133} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
134 165
135mkdir $_ 166mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 168
138our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
139 170
140sub 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::"} };
141 187
142############################################################################# 188#############################################################################
143 189
144=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
145 191
192returns 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
193per 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.
194 240
195=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
196 242
197This array contains the results of the last C<invoke ()> call. When 243This 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 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 245that call.
200 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
201=back 253=back
202 254
203=cut 255=cut
204 256
205BEGIN { 257$Coro::State::WARNHOOK = sub {
206 *CORE::GLOBAL::warn = sub {
207 my $msg = join "", @_; 258 my $msg = join "", @_;
208 259
209 $msg .= "\n" 260 $msg .= "\n"
210 unless $msg =~ /\n$/; 261 unless $msg =~ /\n$/;
211 262
212 $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;
213 264
214 LOG llevError, $msg; 265 LOG llevError, $msg;
215 }; 266};
216}
217 267
218$Coro::State::DIEHOOK = sub { 268$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 269 return unless $^S eq 0; # "eq", not "=="
220 270
221 if ($Coro::current == $Coro::main) {#d# 271 warn Carp::longmess $_[0];
272
273 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 274 warn "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 275 return;#d#
224 }#d# 276 }#d#
225 277
226 # kill coroutine otherwise 278 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 279 Coro::terminate
229}; 280};
230
231$SIG{__DIE__} = sub { }; #d#?
232 281
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 282@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 283@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 284@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 285@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 292for my $pkg (qw(
244 cf::global cf::attachable 293 cf::global cf::attachable
245 cf::object cf::object::player 294 cf::object cf::object::player
246 cf::client cf::player 295 cf::client cf::player
247 cf::arch cf::living 296 cf::arch cf::living
297 cf::map cf::mapspace
248 cf::map cf::party cf::region 298 cf::party cf::region
249)) { 299)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 301}
253 302
254$EV::DIED = sub { 303$EV::DIED = sub {
255 warn "error in event callback: @_"; 304 Carp::cluck "error in event callback: @_";
256}; 305};
257 306
258############################################################################# 307#############################################################################
259 308
260=head2 UTILITY FUNCTIONS 309=head2 UTILITY FUNCTIONS
297our $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
298 347
299sub encode_json($) { $json_coder->encode ($_[0]) } 348sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 349sub decode_json($) { $json_coder->decode ($_[0]) }
301 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
302=item cf::lock_wait $string 365=item cf::lock_wait $string
303 366
304Wait until the given lock is available. See cf::lock_acquire. 367Wait until the given lock is available. See cf::lock_acquire.
305 368
306=item my $lock = cf::lock_acquire $string 369=item my $lock = cf::lock_acquire $string
307 370
308Wait 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
309a 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,
310for example when the coroutine gets canceled), the lock is automatically 373for example when the coroutine gets canceled), the lock is automatically
311returned. 374returned.
312 375
313Locks 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
314deadlocked coro. 377deadlocked coro.
320 383
321Return 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.
322 385
323=cut 386=cut
324 387
325our %LOCK; 388our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 389
328sub lock_wait($) { 390sub lock_wait($) {
329 my ($key) = @_; 391 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 392}
342 393
343sub lock_acquire($) { 394sub lock_acquire($) {
344 my ($key) = @_; 395 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 396}
358 397
359sub lock_active($) { 398sub lock_active($) {
360 my ($key) = @_; 399 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 400}
364 401
365sub freeze_mainloop { 402sub freeze_mainloop {
366 tick_inhibit_inc; 403 tick_inhibit_inc;
367 404
368 Coro::guard \&tick_inhibit_dec; 405 &Guard::guard (\&tick_inhibit_dec);
369} 406}
370 407
371=item cf::periodic $interval, $cb 408=item cf::periodic $interval, $cb
372 409
373Like 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
374get spread over timer. 411get spread over time.
375 412
376=cut 413=cut
377 414
378sub periodic($$) { 415sub periodic($$) {
379 my ($interval, $cb) = @_; 416 my ($interval, $cb) = @_;
396 433
397=cut 434=cut
398 435
399our @SLOT_QUEUE; 436our @SLOT_QUEUE;
400our $SLOT_QUEUE; 437our $SLOT_QUEUE;
438our $SLOT_DECAY = 0.9;
401 439
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 440$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 441$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 442 $Coro::current->desc ("timeslot manager");
405 443
406 my $signal = new Coro::Signal; 444 my $signal = new Coro::Signal;
445 my $busy;
407 446
408 while () { 447 while () {
409 next_job: 448 next_job:
449
410 my $avail = cf::till_tick; 450 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 451
412 for (0 .. $#SLOT_QUEUE) { 452 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 453 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 455 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 456 $job->[2]->send;
416 Coro::cede; 457 Coro::cede;
417 goto next_job; 458 goto next_job;
418 } 459 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 461 }
420 } 462 }
421 463
422 if (@SLOT_QUEUE) { 464 if (@SLOT_QUEUE) {
423 # 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
424 push @cf::WAIT_FOR_TICK, $signal; 466 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait; 467 $signal->wait;
426 } else { 468 } else {
469 $busy = 0;
427 Coro::schedule; 470 Coro::schedule;
428 } 471 }
429 } 472 }
430}; 473};
431 474
432sub get_slot($;$$) { 475sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 476 return if tick_inhibit || $Coro::current == $Coro::main;
434 477
435 my ($time, $pri, $name) = @_; 478 my ($time, $pri, $name) = @_;
436 479
437 $time = $TICK * .6 if $time > $TICK * .6; 480 $time = clamp $time, 0.01, $TICK * .6;
481
438 my $sig = new Coro::Signal; 482 my $sig = new Coro::Signal;
439 483
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 484 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 485 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 486 $SLOT_QUEUE->ready;
469 513
470sub sync_job(&) { 514sub sync_job(&) {
471 my ($job) = @_; 515 my ($job) = @_;
472 516
473 if ($Coro::current == $Coro::main) { 517 if ($Coro::current == $Coro::main) {
474 my $time = EV::time; 518 my $time = AE::time;
475 519
476 # this is the main coro, too bad, we have to block 520 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 521 # till the operation succeeds, freezing the server :/
478 522
479 LOG llevError, Carp::longmess "sync job";#d# 523 LOG llevError, Carp::longmess "sync job";#d#
496 } else { 540 } else {
497 EV::loop EV::LOOP_ONESHOT; 541 EV::loop EV::LOOP_ONESHOT;
498 } 542 }
499 } 543 }
500 544
501 my $time = EV::time - $time; 545 my $time = AE::time - $time;
502 546
503 $TICK_START += $time; # do not account sync jobs to server load 547 $TICK_START += $time; # do not account sync jobs to server load
504 548
505 wantarray ? @res : $res[0] 549 wantarray ? @res : $res[0]
506 } else { 550 } else {
550 reset_signals; 594 reset_signals;
551 &$cb 595 &$cb
552 }, @args; 596 }, @args;
553 597
554 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 )
555} 610}
556 611
557=item $coin = coin_from_name $name 612=item $coin = coin_from_name $name
558 613
559=cut 614=cut
725 780
726############################################################################# 781#############################################################################
727 782
728=head2 ATTACHABLE OBJECTS 783=head2 ATTACHABLE OBJECTS
729 784
730Many 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
731attach callbacks/event handlers (a collection of which is called an "attachment") 786attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 787to it. All such attachable objects support the following methods.
733 788
734In 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>
735C<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
785=item cf::CLASS::attachment $name, ... 840=item cf::CLASS::attachment $name, ...
786 841
787Register an attachment by C<$name> through which attachable objects of the 842Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 843given CLASS can refer to this attachment.
789 844
790Some classes such as crossfire maps and objects can specify attachments 845Some classes such as deliantra maps and objects can specify attachments
791that 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.
792 847
793These calls expect any number of the following handler/hook descriptions: 848These calls expect any number of the following handler/hook descriptions:
794 849
795=over 4 850=over 4
1086 1141
1087sub reattach { 1142sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1143 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1144 my ($obj) = @_;
1090 1145
1146 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1147 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1148
1093 my $registry = $obj->registry; 1149 my $registry = $obj->registry;
1094 1150
1095 @$registry = (); 1151 @$registry = ();
1096 1152
1139 1195
1140 sync_job { 1196 sync_job {
1141 if (length $$rdata) { 1197 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename); 1198 utf8::decode (my $decname = $filename);
1143 warn sprintf "saving %s (%d,%d)\n", 1199 warn sprintf "saving %s (%d,%d)\n",
1144 $decname, length $$rdata, scalar @$objs; 1200 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO;
1145 1202
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1204 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 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 }
1150 aio_close $fh; 1210 aio_close $fh;
1151 1211
1152 if (@$objs) { 1212 if (@$objs) {
1153 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) {
1154 aio_chmod $fh, SAVE_MODE; 1214 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1215 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1216 aio_write $fh, 0, (length $data), $data, 0;
1157 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 }
1158 aio_close $fh; 1221 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1222 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1223 }
1161 } else { 1224 } else {
1162 aio_unlink "$filename.pst"; 1225 aio_unlink "$filename.pst";
1163 } 1226 }
1164 1227
1165 aio_rename "$filename~", $filename; 1228 aio_rename "$filename~", $filename;
1229
1230 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1232 } else {
1167 warn "FATAL: $filename~: $!\n"; 1233 warn "unable to save objects: $filename~: $!\n";
1168 } 1234 }
1169 } else { 1235 } else {
1170 aio_unlink $filename; 1236 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1237 aio_unlink "$filename.pst";
1172 } 1238 }
1197 $av = $st->{objs}; 1263 $av = $st->{objs};
1198 } 1264 }
1199 1265
1200 utf8::decode (my $decname = $filename); 1266 utf8::decode (my $decname = $filename);
1201 warn sprintf "loading %s (%d,%d)\n", 1267 warn sprintf "loading %s (%d,%d)\n",
1202 $decname, length $data, scalar @{$av || []}; 1268 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO;
1203 1270
1204 ($data, $av) 1271 ($data, $av)
1205} 1272}
1206 1273
1207=head2 COMMAND CALLBACKS 1274=head2 COMMAND CALLBACKS
1263 my ($name, $cb) = @_; 1330 my ($name, $cb) = @_;
1264 1331
1265 $EXTICMD{$name} = $cb; 1332 $EXTICMD{$name} = $cb;
1266} 1333}
1267 1334
1335use File::Glob ();
1336
1268cf::player->attach ( 1337cf::player->attach (
1269 on_command => sub { 1338 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1339 my ($pl, $name, $params) = @_;
1271 1340
1272 my $cb = $COMMAND{$name} 1341 my $cb = $COMMAND{$name}
1273 or return; 1342 or return;
1274 1343
1304 1373
1305 cf::override; 1374 cf::override;
1306 }, 1375 },
1307); 1376);
1308 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
1309sub load_extensions { 1391sub load_extensions {
1310 cf::sync_job { 1392 cf::sync_job {
1311 my %todo; 1393 my %todo;
1312 1394
1313 for my $path (<$LIBDIR/*.ext>) { 1395 for my $path (<$LIBDIR/*.ext>) {
1332 1414
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1417
1336 $ext{source} = 1418 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1338 . "#line 1 \"$path\"\n{\n" 1420 . "#line 1 \"$path\"\n{\n"
1339 . $source 1421 . $source
1340 . "\n};\n1"; 1422 . "\n};\n1";
1341 1423
1342 $todo{$base} = \%ext; 1424 $todo{$base} = \%ext;
1343 } 1425 }
1344 1426
1427 my $pass = 0;
1345 my %done; 1428 my %done;
1346 while (%todo) { 1429 while (%todo) {
1347 my $progress; 1430 my $progress;
1348 1431
1432 ++$pass;
1433
1434 ext:
1349 while (my ($k, $v) = each %todo) { 1435 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1436 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1437 next ext
1352 unless exists $done{$_}; 1438 unless exists $done{$_};
1353 } 1439 }
1354 1440
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1442
1357 unless (eval $v->{source}) { 1443 my $active = eval $v->{source};
1444
1445 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1446 warn "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1447
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1448 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1449 if exists $v->{meta}{mandatory};
1365 1450
1366 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;
1367 } 1460 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1461 }
1373 1462
1374 skip: 1463 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1464 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 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 }
1377 } 1471 }
1378 }; 1472 };
1379} 1473}
1380 1474
1381############################################################################# 1475#############################################################################
1382 1476
1383=back 1477=back
1384 1478
1385=head2 CORE EXTENSIONS 1479=head2 CORE EXTENSIONS
1386 1480
1387Functions and methods that extend core crossfire objects. 1481Functions and methods that extend core deliantra objects.
1388 1482
1389=cut 1483=cut
1390 1484
1391package cf::player; 1485package cf::player;
1392 1486
1435 1529
1436sub exists($) { 1530sub exists($) {
1437 my ($login) = @_; 1531 my ($login) = @_;
1438 1532
1439 $cf::PLAYER{$login} 1533 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1534 or !aio_stat path $login
1441} 1535}
1442 1536
1443sub find($) { 1537sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1538 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1539 my $login = $_[0];
1465 $cf::PLAYER{$login} = $pl 1559 $cf::PLAYER{$login} = $pl
1466 } 1560 }
1467 } 1561 }
1468} 1562}
1469 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
1470sub save($) { 1577sub save($) {
1471 my ($pl) = @_; 1578 my ($pl) = @_;
1472 1579
1473 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1474 1581
1479 1586
1480 aio_mkdir playerdir $pl, 0770; 1587 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1588 $pl->{last_save} = $cf::RUNTIME;
1482 1589
1483 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];
1484 1594
1485 $pl->save_pl ($path); 1595 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1596 cf::cede_to_tick;
1487} 1597}
1488 1598
1520 my ($pl) = @_; 1630 my ($pl) = @_;
1521 1631
1522 my $name = $pl->ob->name; 1632 my $name = $pl->ob->name;
1523 1633
1524 $pl->{deny_save} = 1; 1634 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1636
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1528 $pl->deactivate; 1638 $pl->deactivate;
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1531 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1640 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1532 $pl->ns->destroy if $pl->ns; 1641 $pl->ns->destroy if $pl->ns;
1533 1642
1534 my $path = playerdir $pl; 1643 my $path = playerdir $pl;
1535 my $temp = "$path~$cf::RUNTIME~deleting~"; 1644 my $temp = "$path~$cf::RUNTIME~deleting~";
1590 \@logins 1699 \@logins
1591} 1700}
1592 1701
1593=item $player->maps 1702=item $player->maps
1594 1703
1704=item cf::player::maps $login
1705
1595Returns an arrayref of map paths that are private for this 1706Returns an arrayref of map paths that are private for this
1596player. May block. 1707player. May block.
1597 1708
1598=cut 1709=cut
1599 1710
1616 } 1727 }
1617 1728
1618 \@paths 1729 \@paths
1619} 1730}
1620 1731
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1732=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1733
1623Expand crossfire pod fragments into protocol xml. 1734Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713 1735
1714=item $player->ext_reply ($msgid, @msg) 1736=item $player->ext_reply ($msgid, @msg)
1715 1737
1716Sends an ext reply to the player. 1738Sends an ext reply to the player.
1717 1739
1749 1771
1750=cut 1772=cut
1751 1773
1752sub find_by_path($) { 1774sub find_by_path($) {
1753 my ($path) = @_; 1775 my ($path) = @_;
1776
1777 $path =~ s/^~[^\/]*//; # skip ~login
1754 1778
1755 my ($match, $specificity); 1779 my ($match, $specificity);
1756 1780
1757 for my $region (list) { 1781 for my $region (list) {
1758 if ($region->{match} && $path =~ $region->{match}) { 1782 if ($region->{match} && $path =~ $region->{match}) {
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1814 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 1815
1792 # mit "rum" bekleckern, nicht 1816 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 1817 $self->_create_random_map (
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map}, 1821 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize}, 1822 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1822 1846
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 1848}
1825 1849
1826# also paths starting with '/' 1850# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1851$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 1852
1829sub thawer_merge { 1853sub thawer_merge {
1830 my ($self, $merge) = @_; 1854 my ($self, $merge) = @_;
1831 1855
1832 # we have to keep some variables in memory intact 1856 # we have to keep some variables in memory intact
1930 1954
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1955 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 1956 "$UNIQUEDIR/$path"
1933} 1957}
1934 1958
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 1959sub decay_objects {
1945 my ($self) = @_; 1960 my ($self) = @_;
1946 1961
1947 return if $self->{deny_reset}; 1962 return if $self->{deny_reset};
1948 1963
2030sub find { 2045sub find {
2031 my ($path, $origin) = @_; 2046 my ($path, $origin) = @_;
2032 2047
2033 $path = normalise $path, $origin && $origin->path; 2048 $path = normalise $path, $origin && $origin->path;
2034 2049
2035 cf::lock_wait "map_data:$path";#d#remove 2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2051 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2052
2038 $cf::MAP{$path} || do { 2053 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2054 my $map = new_from_path cf::map $path
2043 or return; 2055 or return;
2044 2056
2045 $map->{last_save} = $cf::RUNTIME; 2057 $map->{last_save} = $cf::RUNTIME;
2046 2058
2058 2070
2059 $cf::MAP{$path} = $map 2071 $cf::MAP{$path} = $map
2060 } 2072 }
2061} 2073}
2062 2074
2063sub pre_load { } 2075sub pre_load { }
2064sub post_load { } 2076#sub post_load { } # XS
2065 2077
2066sub load { 2078sub load {
2067 my ($self) = @_; 2079 my ($self) = @_;
2068 2080
2069 local $self->{deny_reset} = 1; # loading can take a long time 2081 local $self->{deny_reset} = 1; # loading can take a long time
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2098 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2099 $f->skip_block;
2088 $self->_load_objects ($f) 2100 $self->_load_objects ($f)
2089 or return; 2101 or return;
2090 2102
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2103 $self->post_load_original
2092 if delete $self->{load_original}; 2104 if delete $self->{load_original};
2093 2105
2094 if (my $uniq = $self->uniq_path) { 2106 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2107 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2108 unless (aio_stat $uniq) {
2114 unless ($self->{deny_activate}) { 2126 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2127 $self->decay_objects;
2116 $self->fix_auto_apply; 2128 $self->fix_auto_apply;
2117 $self->update_buttons; 2129 $self->update_buttons;
2118 cf::cede_to_tick; 2130 cf::cede_to_tick;
2119 $self->set_darkness_map;
2120 cf::cede_to_tick;
2121 $self->activate; 2131 $self->activate;
2122 } 2132 }
2123 2133
2124 $self->{last_save} = $cf::RUNTIME; 2134 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2135 $self->last_access ($cf::RUNTIME);
2128 } 2138 }
2129 2139
2130 $self->post_load; 2140 $self->post_load;
2131} 2141}
2132 2142
2143# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath
2133sub customise_for { 2146sub customise_for {
2134 my ($self, $ob) = @_; 2147 my ($self, $ob) = @_;
2135 2148
2136 return find "~" . $ob->name . "/" . $self->{path} 2149 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2150 if $self->per_player;
2153 or next; 2166 or next;
2154 $neigh = find $neigh, $map 2167 $neigh = find $neigh, $map
2155 or next; 2168 or next;
2156 $neigh->load; 2169 $neigh->load;
2157 2170
2171 # now find the diagonal neighbours
2158 push @neigh, 2172 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 } 2175 }
2162 2176
2214 $MAP_PREFETCHER->prio (6); 2228 $MAP_PREFETCHER->prio (6);
2215 2229
2216 () 2230 ()
2217} 2231}
2218 2232
2233# common code, used by both ->save and ->swapout
2219sub save { 2234sub _save {
2220 my ($self) = @_; 2235 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2236
2224 $self->{last_save} = $cf::RUNTIME; 2237 $self->{last_save} = $cf::RUNTIME;
2225 2238
2226 return unless $self->dirty; 2239 return unless $self->dirty;
2227 2240
2247 } else { 2260 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2261 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2262 }
2250} 2263}
2251 2264
2265sub save {
2266 my ($self) = @_;
2267
2268 my $lock = cf::lock_acquire "map_data:$self->{path}";
2269
2270 $self->_save;
2271}
2272
2252sub swap_out { 2273sub swap_out {
2253 my ($self) = @_; 2274 my ($self) = @_;
2254 2275
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2277
2260 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2278 return if $self->in_memory != cf::MAP_ACTIVE;
2262 return if $self->{deny_save}; 2279 return if $self->{deny_save};
2280 return if $self->players;
2263 2281
2282 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP;
2264 $self->in_memory (cf::MAP_SWAPPED); 2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # then atomically save
2288 $self->_save;
2289
2290 # then free the map
2291 $self->clear;
2292}
2293
2294sub reset_at {
2295 my ($self) = @_;
2296
2297 # TODO: safety, remove and allow resettable per-player maps
2298 return 1e99 if $self->{deny_reset};
2299
2300 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2301 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2302
2303 $time + $to
2304}
2305
2306sub should_reset {
2307 my ($self) = @_;
2308
2309 $self->reset_at <= $cf::RUNTIME
2310}
2311
2312sub reset {
2313 my ($self) = @_;
2314
2315 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316
2317 return if $self->players;
2318
2319 warn "resetting map ", $self->path, "\n";
2320
2321 $self->in_memory (cf::MAP_SWAPPED);
2322
2323 # need to save uniques path
2324 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326
2327 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2328 if $uniq;
2329 }
2330
2331 delete $cf::MAP{$self->path};
2265 2332
2266 $self->deactivate; 2333 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2334 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2335 $self->clear;
2269}
2270
2271sub reset_at {
2272 my ($self) = @_;
2273
2274 # TODO: safety, remove and allow resettable per-player maps
2275 return 1e99 if $self->{deny_reset};
2276
2277 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2278 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2279
2280 $time + $to
2281}
2282
2283sub should_reset {
2284 my ($self) = @_;
2285
2286 $self->reset_at <= $cf::RUNTIME
2287}
2288
2289sub reset {
2290 my ($self) = @_;
2291
2292 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293
2294 return if $self->players;
2295
2296 warn "resetting map ", $self->path;
2297
2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # need to save uniques path
2301 unless ($self->{deny_save}) {
2302 my $uniq = $self->uniq_path; utf8::encode $uniq;
2303
2304 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2305 if $uniq;
2306 }
2307
2308 delete $cf::MAP{$self->path};
2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2312 $self->clear;
2313 2336
2314 $self->unlink_save; 2337 $self->unlink_save;
2315 $self->destroy; 2338 $self->destroy;
2316} 2339}
2317 2340
2325 2348
2326 delete $cf::MAP{$self->path}; 2349 delete $cf::MAP{$self->path};
2327 2350
2328 $self->unlink_save; 2351 $self->unlink_save;
2329 2352
2330 bless $self, "cf::map"; 2353 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2354 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2355 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2356 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2357 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2358
2392 : normalise $_ 2415 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2416 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2417 ]
2395} 2418}
2396 2419
2420=item cf::map::static_maps
2421
2422Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2423file in the shared directory excluding F</styles> and F</editor>). May
2424block.
2425
2426=cut
2427
2428sub static_maps() {
2429 my @dirs = "";
2430 my @maps;
2431
2432 while (@dirs) {
2433 my $dir = shift @dirs;
2434
2435 next if $dir eq "/styles" || $dir eq "/editor";
2436
2437 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2438 or return;
2439
2440 for (@$files) {
2441 s/\.map$// or next;
2442 utf8::decode $_;
2443 push @maps, "$dir/$_";
2444 }
2445
2446 push @dirs, map "$dir/$_", @$dirs;
2447 }
2448
2449 \@maps
2450}
2451
2397=back 2452=back
2398 2453
2399=head3 cf::object 2454=head3 cf::object
2400 2455
2401=cut 2456=cut
2466 2521
2467our $SAY_CHANNEL = { 2522our $SAY_CHANNEL = {
2468 id => "say", 2523 id => "say",
2469 title => "Map", 2524 title => "Map",
2470 reply => "say ", 2525 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2526 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2527};
2473 2528
2474our $CHAT_CHANNEL = { 2529our $CHAT_CHANNEL = {
2475 id => "chat", 2530 id => "chat",
2476 title => "Chat", 2531 title => "Chat",
2531 2586
2532=item $player_object->enter_link 2587=item $player_object->enter_link
2533 2588
2534Freezes the player and moves him/her to a special map (C<{link}>). 2589Freezes the player and moves him/her to a special map (C<{link}>).
2535 2590
2536The player should be reasonably safe there for short amounts of time. You 2591The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2592for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2593though, as the player cannot control the character while it is on the link
2594map.
2538 2595
2539Will never block. 2596Will never block.
2540 2597
2541=item $player_object->leave_link ($map, $x, $y) 2598=item $player_object->leave_link ($map, $x, $y)
2542 2599
2562sub cf::object::player::enter_link { 2619sub cf::object::player::enter_link {
2563 my ($self) = @_; 2620 my ($self) = @_;
2564 2621
2565 $self->deactivate_recursive; 2622 $self->deactivate_recursive;
2566 2623
2624 ++$self->{_link_recursion};
2625
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2626 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2627
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2628 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2629 if $self->map && $self->map->{path} ne "{link}";
2571 2630
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2631 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2632}
2574 2633
2575sub cf::object::player::leave_link { 2634sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2635 my ($self, $map, $x, $y) = @_;
2577 2636
2594 ($x, $y) = (-1, -1) 2653 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2654 unless (defined $x) && (defined $y);
2596 2655
2597 # use -1 or undef as default coordinates, not 0, 0 2656 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2657 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2658 if $x <= 0 && $y <= 0;
2600 2659
2601 $map->load; 2660 $map->load;
2602 $map->load_neighbours; 2661 $map->load_neighbours;
2603 2662
2604 return unless $self->contr->active; 2663 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2664
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2666 if ($self->enter_map ($map, $x, $y)) {
2609} 2667 # entering was successful
2668 delete $self->{_link_recursion};
2669 # only activate afterwards, to support waiting in hooks
2670 $self->activate_recursive;
2671 }
2610 2672
2673}
2674
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2675=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2612 2676
2613Moves the player to the given map-path and coordinates by first freezing 2677Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2678her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2679that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2680the new (success) or old (failed) map position. In either case, $done will
2617be called at the end of this process. 2681be called at the end of this process.
2618 2682
2683Note that $check will be called with a potentially non-loaded map, so if
2684it needs a loaded map it has to call C<< ->load >>.
2685
2619=cut 2686=cut
2620 2687
2621our $GOTOGEN; 2688our $GOTOGEN;
2622 2689
2623sub cf::object::player::goto { 2690sub cf::object::player::goto {
2624 my ($self, $path, $x, $y, $check, $done) = @_; 2691 my ($self, $path, $x, $y, $check, $done) = @_;
2692
2693 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 }
2625 2698
2626 # do generation counting so two concurrent goto's will be executed in-order 2699 # do generation counting so two concurrent goto's will be executed in-order
2627 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2700 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2628 2701
2629 $self->enter_link; 2702 $self->enter_link;
2653 my $map = eval { 2726 my $map = eval {
2654 my $map = defined $path ? cf::map::find $path : undef; 2727 my $map = defined $path ? cf::map::find $path : undef;
2655 2728
2656 if ($map) { 2729 if ($map) {
2657 $map = $map->customise_for ($self); 2730 $map = $map->customise_for ($self);
2658 $map = $check->($map) if $check && $map; 2731 $map = $check->($map, $x, $y, $self) if $check && $map;
2659 } else { 2732 } else {
2660 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2733 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2661 } 2734 }
2662 2735
2663 $map 2736 $map
2671 if ($gen == $self->{_goto_generation}) { 2744 if ($gen == $self->{_goto_generation}) {
2672 delete $self->{_goto_generation}; 2745 delete $self->{_goto_generation};
2673 $self->leave_link ($map, $x, $y); 2746 $self->leave_link ($map, $x, $y);
2674 } 2747 }
2675 2748
2676 $done->() if $done; 2749 $done->($self) if $done;
2677 })->prio (1); 2750 })->prio (1);
2678} 2751}
2679 2752
2680=item $player_object->enter_exit ($exit_object) 2753=item $player_object->enter_exit ($exit_object)
2681 2754
2769 $self->contr->savebed ($map, $x, $y) 2842 $self->contr->savebed ($map, $x, $y)
2770 if $exit->flag (cf::FLAG_DAMNED); 2843 if $exit->flag (cf::FLAG_DAMNED);
2771 2844
2772 1 2845 1
2773 }) { 2846 }) {
2774 $self->message ("Something went wrong deep within the crossfire server. " 2847 $self->message ("Something went wrong deep within the deliantra server. "
2775 . "I'll try to bring you back to the map you were before. " 2848 . "I'll try to bring you back to the map you were before. "
2776 . "Please report this to the dungeon master!", 2849 . "Please report this to the dungeon master!",
2777 cf::NDI_UNIQUE | cf::NDI_RED); 2850 cf::NDI_UNIQUE | cf::NDI_RED);
2778 2851
2779 warn "ERROR in enter_exit: $@"; 2852 warn "ERROR in enter_exit: $@";
2796sub cf::client::send_drawinfo { 2869sub cf::client::send_drawinfo {
2797 my ($self, $text, $flags) = @_; 2870 my ($self, $text, $flags) = @_;
2798 2871
2799 utf8::encode $text; 2872 utf8::encode $text;
2800 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2874}
2875
2876=item $client->send_big_packet ($pkt)
2877
2878Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required.
2880
2881=cut
2882
2883our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2884
2885sub cf::client::send_big_packet {
2886 my ($self, $pkt) = @_;
2887
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt);
2801} 2899}
2802 2900
2803=item $client->send_msg ($channel, $msg, $color, [extra...]) 2901=item $client->send_msg ($channel, $msg, $color, [extra...])
2804 2902
2805Send a drawinfo or msg packet to the client, formatting the msg for the 2903Send a drawinfo or msg packet to the client, formatting the msg for the
2809 2907
2810=cut 2908=cut
2811 2909
2812# non-persistent channels (usually the info channel) 2910# non-persistent channels (usually the info channel)
2813our %CHANNEL = ( 2911our %CHANNEL = (
2912 "c/motd" => {
2913 id => "infobox",
2914 title => "MOTD",
2915 reply => undef,
2916 tooltip => "The message of the day",
2917 },
2814 "c/identify" => { 2918 "c/identify" => {
2815 id => "infobox", 2919 id => "infobox",
2816 title => "Identify", 2920 title => "Identify",
2817 reply => undef, 2921 reply => undef,
2818 tooltip => "Items recently identified", 2922 tooltip => "Items recently identified",
2820 "c/examine" => { 2924 "c/examine" => {
2821 id => "infobox", 2925 id => "infobox",
2822 title => "Examine", 2926 title => "Examine",
2823 reply => undef, 2927 reply => undef,
2824 tooltip => "Signs and other items you examined", 2928 tooltip => "Signs and other items you examined",
2929 },
2930 "c/shopinfo" => {
2931 id => "infobox",
2932 title => "Shop Info",
2933 reply => undef,
2934 tooltip => "What your bargaining skill tells you about the shop",
2825 }, 2935 },
2826 "c/book" => { 2936 "c/book" => {
2827 id => "infobox", 2937 id => "infobox",
2828 title => "Book", 2938 title => "Book",
2829 reply => undef, 2939 reply => undef,
2845 id => "infobox", 2955 id => "infobox",
2846 title => "Body Parts", 2956 title => "Body Parts",
2847 reply => undef, 2957 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available", 2958 tooltip => "Shows which body parts you posess and are available",
2849 }, 2959 },
2960 "c/statistics" => {
2961 id => "infobox",
2962 title => "Statistics",
2963 reply => undef,
2964 tooltip => "Shows your primary statistics",
2965 },
2966 "c/skills" => {
2967 id => "infobox",
2968 title => "Skills",
2969 reply => undef,
2970 tooltip => "Shows your experience per skill and item power",
2971 },
2972 "c/shopitems" => {
2973 id => "infobox",
2974 title => "Shop Items",
2975 reply => undef,
2976 tooltip => "Shows the items currently for sale in this shop",
2977 },
2978 "c/resistances" => {
2979 id => "infobox",
2980 title => "Resistances",
2981 reply => undef,
2982 tooltip => "Shows your resistances",
2983 },
2984 "c/pets" => {
2985 id => "infobox",
2986 title => "Pets",
2987 reply => undef,
2988 tooltip => "Shows information abotu your pets/a specific pet",
2989 },
2990 "c/perceiveself" => {
2991 id => "infobox",
2992 title => "Perceive Self",
2993 reply => undef,
2994 tooltip => "You gained detailed knowledge about yourself",
2995 },
2850 "c/uptime" => { 2996 "c/uptime" => {
2851 id => "infobox", 2997 id => "infobox",
2852 title => "Uptime", 2998 title => "Uptime",
2853 reply => undef, 2999 reply => undef,
2854 tooltip => "How long the server has been running since last restart", 3000 tooltip => "How long the server has been running since last restart",
2863 id => "party", 3009 id => "party",
2864 title => "Party", 3010 title => "Party",
2865 reply => "gsay ", 3011 reply => "gsay ",
2866 tooltip => "Messages and chat related to your party", 3012 tooltip => "Messages and chat related to your party",
2867 }, 3013 },
3014 "c/death" => {
3015 id => "death",
3016 title => "Death",
3017 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death",
3019 },
3020 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL,
2868); 3022);
2869 3023
2870sub cf::client::send_msg { 3024sub cf::client::send_msg {
2871 my ($self, $channel, $msg, $color, @extra) = @_; 3025 my ($self, $channel, $msg, $color, @extra) = @_;
2872 3026
2873 $msg = $self->pl->expand_cfpod ($msg); 3027 $msg = $self->pl->expand_cfpod ($msg)
3028 unless $color & cf::NDI_VERBATIM;
2874 3029
2875 $color &= cf::NDI_CLIENT_MASK; # just in case... 3030 $color &= cf::NDI_CLIENT_MASK; # just in case...
2876 3031
2877 # check predefined channels, for the benefit of C 3032 # check predefined channels, for the benefit of C
2878 if ($CHANNEL{$channel}) { 3033 if ($CHANNEL{$channel}) {
2879 $channel = $CHANNEL{$channel}; 3034 $channel = $CHANNEL{$channel};
2880 3035
2881 $self->ext_msg (channel_info => $channel) 3036 $self->ext_msg (channel_info => $channel);
2882 if $self->can_msg;
2883
2884 $channel = $channel->{id}; 3037 $channel = $channel->{id};
2885 3038
2886 } elsif (ref $channel) { 3039 } elsif (ref $channel) {
2887 # send meta info to client, if not yet sent 3040 # send meta info to client, if not yet sent
2888 unless (exists $self->{channel}{$channel->{id}}) { 3041 unless (exists $self->{channel}{$channel->{id}}) {
2889 $self->{channel}{$channel->{id}} = $channel; 3042 $self->{channel}{$channel->{id}} = $channel;
2890 $self->ext_msg (channel_info => $channel) 3043 $self->ext_msg (channel_info => $channel);
2891 if $self->can_msg;
2892 } 3044 }
2893 3045
2894 $channel = $channel->{id}; 3046 $channel = $channel->{id};
2895 } 3047 }
2896 3048
2897 return unless @extra || length $msg; 3049 return unless @extra || length $msg;
2898 3050
2899 if ($self->can_msg) {
2900 # default colour, mask it out 3051 # default colour, mask it out
2901 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3052 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2902 if $color & cf::NDI_DEF; 3053 if $color & cf::NDI_DEF;
2903 3054
2904 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3055 my $pkt = "msg "
3056 . $self->{json_coder}->encode (
2905 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3057 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2906 } else { 3058 );
2907 if ($color >= 0) {
2908 # replace some tags by gcfclient-compatible ones
2909 for ($msg) {
2910 1 while
2911 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2912 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2913 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2914 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2915 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2916 }
2917 3059
2918 $color &= cf::NDI_COLOR_MASK; 3060 $self->send_big_packet ($pkt);
2919
2920 utf8::encode $msg;
2921
2922 if (0 && $msg =~ /\[/) {
2923 # COMMAND/INFO
2924 $self->send_packet ("drawextinfo $color 10 8 $msg")
2925 } else {
2926 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2927 $self->send_packet ("drawinfo $color $msg")
2928 }
2929 }
2930 }
2931} 3061}
2932 3062
2933=item $client->ext_msg ($type, @msg) 3063=item $client->ext_msg ($type, @msg)
2934 3064
2935Sends an ext event to the client. 3065Sends an ext event to the client.
2938 3068
2939sub cf::client::ext_msg($$@) { 3069sub cf::client::ext_msg($$@) {
2940 my ($self, $type, @msg) = @_; 3070 my ($self, $type, @msg) = @_;
2941 3071
2942 if ($self->extcmd == 2) { 3072 if ($self->extcmd == 2) {
2943 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2944 } elsif ($self->extcmd == 1) { # TODO: remove 3074 } elsif ($self->extcmd == 1) { # TODO: remove
2945 push @msg, msgtype => "event_$type"; 3075 push @msg, msgtype => "event_$type";
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3077 }
2948} 3078}
2949 3079
2950=item $client->ext_reply ($msgid, @msg) 3080=item $client->ext_reply ($msgid, @msg)
2951 3081
2955 3085
2956sub cf::client::ext_reply($$@) { 3086sub cf::client::ext_reply($$@) {
2957 my ($self, $id, @msg) = @_; 3087 my ($self, $id, @msg) = @_;
2958 3088
2959 if ($self->extcmd == 2) { 3089 if ($self->extcmd == 2) {
2960 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2961 } elsif ($self->extcmd == 1) { 3091 } elsif ($self->extcmd == 1) {
2962 #TODO: version 1, remove 3092 #TODO: version 1, remove
2963 unshift @msg, msgtype => "reply", msgid => $id; 3093 unshift @msg, msgtype => "reply", msgid => $id;
2964 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2965 } 3095 }
2966} 3096}
2967 3097
2968=item $success = $client->query ($flags, "text", \&cb) 3098=item $success = $client->query ($flags, "text", \&cb)
2969 3099
3070 3200
3071 $coro 3201 $coro
3072} 3202}
3073 3203
3074cf::client->attach ( 3204cf::client->attach (
3075 on_destroy => sub { 3205 on_client_destroy => sub {
3076 my ($ns) = @_; 3206 my ($ns) = @_;
3077 3207
3078 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3208 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3079 }, 3209 },
3080); 3210);
3096our $safe_hole = new Safe::Hole; 3226our $safe_hole = new Safe::Hole;
3097 3227
3098$SIG{FPE} = 'IGNORE'; 3228$SIG{FPE} = 'IGNORE';
3099 3229
3100$safe->permit_only (Opcode::opset qw( 3230$safe->permit_only (Opcode::opset qw(
3101 :base_core :base_mem :base_orig :base_math 3231 :base_core :base_mem :base_orig :base_math :base_loop
3102 grepstart grepwhile mapstart mapwhile 3232 grepstart grepwhile mapstart mapwhile
3103 sort time 3233 sort time
3104)); 3234));
3105 3235
3106# here we export the classes and methods available to script code 3236# here we export the classes and methods available to script code
3110The following functions and methods are available within a safe environment: 3240The following functions and methods are available within a safe environment:
3111 3241
3112 cf::object 3242 cf::object
3113 contr pay_amount pay_player map x y force_find force_add destroy 3243 contr pay_amount pay_player map x y force_find force_add destroy
3114 insert remove name archname title slaying race decrease split 3244 insert remove name archname title slaying race decrease split
3245 value
3115 3246
3116 cf::object::player 3247 cf::object::player
3117 player 3248 player
3118 3249
3119 cf::player 3250 cf::player
3125=cut 3256=cut
3126 3257
3127for ( 3258for (
3128 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3259 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3129 insert remove inv nrof name archname title slaying race 3260 insert remove inv nrof name archname title slaying race
3130 decrease split destroy)], 3261 decrease split destroy change_exp value msg lore send_msg)],
3131 ["cf::object::player" => qw(player)], 3262 ["cf::object::player" => qw(player)],
3132 ["cf::player" => qw(peaceful)], 3263 ["cf::player" => qw(peaceful send_msg)],
3133 ["cf::map" => qw(trigger)], 3264 ["cf::map" => qw(trigger)],
3134) { 3265) {
3135 no strict 'refs'; 3266 no strict 'refs';
3136 my ($pkg, @funs) = @$_; 3267 my ($pkg, @funs) = @$_;
3137 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3155 3286
3156 my $qcode = $code; 3287 my $qcode = $code;
3157 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3288 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3158 $qcode =~ s/\n/\\n/g; 3289 $qcode =~ s/\n/\\n/g;
3159 3290
3291 %vars = (_dummy => 0) unless %vars;
3292
3293 my @res;
3160 local $_; 3294 local $_;
3161 local @safe::cf::_safe_eval_args = values %vars;
3162 3295
3163 my $eval = 3296 my $eval =
3164 "do {\n" 3297 "do {\n"
3165 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3298 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3166 . "#line 0 \"{$qcode}\"\n" 3299 . "#line 0 \"{$qcode}\"\n"
3167 . $code 3300 . $code
3168 . "\n}" 3301 . "\n}"
3169 ; 3302 ;
3170 3303
3304 if ($CFG{safe_eval}) {
3171 sub_generation_inc; 3305 sub_generation_inc;
3306 local @safe::cf::_safe_eval_args = values %vars;
3172 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3307 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3173 sub_generation_inc; 3308 sub_generation_inc;
3309 } else {
3310 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval;
3312 }
3174 3313
3175 if ($@) { 3314 if ($@) {
3176 warn "$@"; 3315 warn "$@";
3177 warn "while executing safe code '$code'\n"; 3316 warn "while executing safe code '$code'\n";
3178 warn "with arguments " . (join " ", %vars) . "\n"; 3317 warn "with arguments " . (join " ", %vars) . "\n";
3197=cut 3336=cut
3198 3337
3199sub register_script_function { 3338sub register_script_function {
3200 my ($fun, $cb) = @_; 3339 my ($fun, $cb) = @_;
3201 3340
3202 no strict 'refs'; 3341 $fun = "safe::$fun" if $CFG{safe_eval};
3203 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3342 *$fun = $safe_hole->wrap ($cb);
3204} 3343}
3205 3344
3206=back 3345=back
3207 3346
3208=cut 3347=cut
3229 3368
3230 $facedata->{version} == 2 3369 $facedata->{version} == 2
3231 or cf::cleanup "$path: version mismatch, cannot proceed."; 3370 or cf::cleanup "$path: version mismatch, cannot proceed.";
3232 3371
3233 # patch in the exptable 3372 # patch in the exptable
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3234 $facedata->{resource}{"res/exp_table"} = { 3374 $facedata->{resource}{"res/exp_table"} = {
3235 type => FT_RSRC, 3375 type => FT_RSRC,
3236 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3376 data => $exp_table,
3377 hash => (Digest::MD5::md5 $exp_table),
3237 }; 3378 };
3238 cf::cede_to_tick; 3379 cf::cede_to_tick;
3239 3380
3240 { 3381 {
3241 my $faces = $facedata->{faceinfo}; 3382 my $faces = $facedata->{faceinfo};
3243 while (my ($face, $info) = each %$faces) { 3384 while (my ($face, $info) = each %$faces) {
3244 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3385 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3245 3386
3246 cf::face::set_visibility $idx, $info->{visibility}; 3387 cf::face::set_visibility $idx, $info->{visibility};
3247 cf::face::set_magicmap $idx, $info->{magicmap}; 3388 cf::face::set_magicmap $idx, $info->{magicmap};
3248 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3249 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3250 3391
3251 cf::cede_to_tick; 3392 cf::cede_to_tick;
3252 } 3393 }
3253 3394
3254 while (my ($face, $info) = each %$faces) { 3395 while (my ($face, $info) = each %$faces) {
3278 3419
3279 cf::anim::invalidate_all; # d'oh 3420 cf::anim::invalidate_all; # d'oh
3280 } 3421 }
3281 3422
3282 { 3423 {
3283 # TODO: for gcfclient pleasure, we should give resources
3284 # that gcfclient doesn't grok a >10000 face index.
3285 my $res = $facedata->{resource}; 3424 my $res = $facedata->{resource};
3286 3425
3287 while (my ($name, $info) = each %$res) { 3426 while (my ($name, $info) = each %$res) {
3288 if (defined $info->{type}) { 3427 if (defined $info->{type}) {
3289 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3428 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3290 my $data;
3291 3429
3292 if ($info->{type} & 1) { 3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3293 # prepend meta info
3294
3295 my $meta = $enc->encode ({
3296 name => $name,
3297 %{ $info->{meta} || {} },
3298 });
3299
3300 $data = pack "(w/a*)*", $meta, $info->{data};
3301 } else {
3302 $data = $info->{data};
3303 }
3304
3305 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3306 cf::face::set_type $idx, $info->{type}; 3431 cf::face::set_type $idx, $info->{type};
3307 } else { 3432 } else {
3308 $RESOURCE{$name} = $info; 3433 $RESOURCE{$name} = $info;
3309 } 3434 }
3310 3435
3393 reload_treasures; 3518 reload_treasures;
3394 3519
3395 warn "finished reloading resource files\n"; 3520 warn "finished reloading resource files\n";
3396} 3521}
3397 3522
3398sub init {
3399 my $guard = freeze_mainloop;
3400
3401 evthread_start IO::AIO::poll_fileno;
3402
3403 reload_resources;
3404}
3405
3406sub reload_config { 3523sub reload_config {
3524 warn "reloading config file...\n";
3525
3407 open my $fh, "<:utf8", "$CONFDIR/config" 3526 open my $fh, "<:utf8", "$CONFDIR/config"
3408 or return; 3527 or return;
3409 3528
3410 local $/; 3529 local $/;
3411 *CFG = YAML::Load <$fh>; 3530 *CFG = YAML::XS::Load scalar <$fh>;
3412 3531
3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3414 3533
3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3534 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3535 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3417 3536
3418 if (exists $CFG{mlockall}) { 3537 if (exists $CFG{mlockall}) {
3420 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3421 and die "WARNING: m(un)lockall failed: $!\n"; 3540 and die "WARNING: m(un)lockall failed: $!\n";
3422 }; 3541 };
3423 warn $@ if $@; 3542 warn $@ if $@;
3424 } 3543 }
3544
3545 warn "finished reloading resource files\n";
3546}
3547
3548sub pidfile() {
3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550 or die "$PIDFILE: $!";
3551 flock $fh, &Fcntl::LOCK_EX
3552 or die "$PIDFILE: flock: $!";
3553 $fh
3554}
3555
3556# make sure only one server instance is running at any one time
3557sub atomic {
3558 my $fh = pidfile;
3559
3560 my $pid = <$fh>;
3561 kill 9, $pid if $pid > 0;
3562
3563 seek $fh, 0, 0;
3564 print $fh $$;
3565}
3566
3567sub main_loop {
3568 warn "EV::loop starting\n";
3569 if (1) {
3570 EV::loop;
3571 }
3572 warn "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP;
3425} 3574}
3426 3575
3427sub main { 3576sub main {
3577 cf::init_globals; # initialise logging
3578
3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583
3584 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3585
3428 # we must not ever block the main coroutine 3586 # we must not ever block the main coroutine
3429 local $Coro::idle = sub { 3587 local $Coro::idle = sub {
3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3588 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3431 (async { 3589 (async {
3432 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3590 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT; 3591 EV::loop EV::LOOP_ONESHOT;
3434 })->prio (Coro::PRIO_MAX); 3592 })->prio (Coro::PRIO_MAX);
3435 }; 3593 };
3436 3594
3437 { 3595 evthread_start IO::AIO::poll_fileno;
3438 my $guard = freeze_mainloop; 3596
3597 cf::sync_job {
3598 cf::init_experience;
3599 cf::init_anim;
3600 cf::init_attackmess;
3601 cf::init_dynamic;
3602
3603 cf::load_settings;
3604 cf::load_materials;
3605
3606 reload_resources;
3439 reload_config; 3607 reload_config;
3440 db_init; 3608 db_init;
3609
3610 cf::init_uuid;
3611 cf::init_signals;
3612 cf::init_skills;
3613
3614 cf::init_beforeplay;
3615
3616 atomic;
3617
3441 load_extensions; 3618 load_extensions;
3442 3619
3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3620 utime time, time, $RUNTIMEFILE;
3621
3622 # no (long-running) fork's whatsoever before this point(!)
3623 use POSIX ();
3624 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3625
3626 (pop @POST_INIT)->(0) while @POST_INIT;
3444 } 3627 };
3445 3628
3446 EV::loop; 3629 cf::object::thawer::errors_are_fatal 0;
3630 warn "parse errors in files are no longer fatal from this point on.\n";
3631
3632 main_loop;
3447} 3633}
3448 3634
3449############################################################################# 3635#############################################################################
3450# initialisation and cleanup 3636# initialisation and cleanup
3451 3637
3452# install some emergency cleanup handlers 3638# install some emergency cleanup handlers
3453BEGIN { 3639BEGIN {
3454 our %SIGWATCHER = (); 3640 our %SIGWATCHER = ();
3455 for my $signal (qw(INT HUP TERM)) { 3641 for my $signal (qw(INT HUP TERM)) {
3456 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3642 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3457 cf::cleanup "SIG$signal"; 3643 cf::cleanup "SIG$signal";
3458 }; 3644 };
3459 } 3645 }
3460} 3646}
3461 3647
3462sub write_runtime_sync { 3648sub write_runtime_sync {
3463 my $runtime = "$LOCALDIR/runtime"; 3649 my $t0 = AE::time;
3464 3650
3465 # first touch the runtime file to show we are still running: 3651 # first touch the runtime file to show we are still running:
3466 # the fsync below can take a very very long time. 3652 # the fsync below can take a very very long time.
3467 3653
3468 IO::AIO::aio_utime $runtime, undef, undef; 3654 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3469 3655
3470 my $guard = cf::lock_acquire "write_runtime"; 3656 my $guard = cf::lock_acquire "write_runtime";
3471 3657
3472 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3658 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3473 or return; 3659 or return;
3474 3660
3475 my $value = $cf::RUNTIME + 90 + 10; 3661 my $value = $cf::RUNTIME + 90 + 10;
3476 # 10 is the runtime save interval, for a monotonic clock 3662 # 10 is the runtime save interval, for a monotonic clock
3477 # 60 allows for the watchdog to kill the server. 3663 # 60 allows for the watchdog to kill the server.
3487 aio_utime $fh, undef, undef; 3673 aio_utime $fh, undef, undef;
3488 3674
3489 close $fh 3675 close $fh
3490 or return; 3676 or return;
3491 3677
3492 aio_rename "$runtime~", $runtime 3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3493 and return; 3679 and return;
3494 3680
3495 warn "runtime file written.\n"; 3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3496 3682
3497 1 3683 1
3498} 3684}
3499 3685
3500our $uuid_lock; 3686our $uuid_lock;
3509 my $uuid = "$LOCALDIR/uuid"; 3695 my $uuid = "$LOCALDIR/uuid";
3510 3696
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3697 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return; 3698 or return;
3513 3699
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3700 my $value = uuid_seq uuid_cur;
3701
3702 unless ($value) {
3703 warn "cowardly refusing to write zero uuid value!\n";
3704 return;
3705 }
3706
3707 my $value = uuid_str $value + $uuid_skip;
3515 $uuid_skip = 0; 3708 $uuid_skip = 0;
3516 3709
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3710 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return; 3711 and return;
3519 3712
3541} 3734}
3542 3735
3543sub emergency_save() { 3736sub emergency_save() {
3544 my $freeze_guard = cf::freeze_mainloop; 3737 my $freeze_guard = cf::freeze_mainloop;
3545 3738
3546 warn "enter emergency perl save\n"; 3739 warn "emergency_perl_save: enter\n";
3547 3740
3548 cf::sync_job { 3741 cf::sync_job {
3742 # this is a trade-off: we want to be very quick here, so
3743 # save all maps without fsync, and later call a global sync
3744 # (which in turn might be very very slow)
3745 local $USE_FSYNC = 0;
3746
3549 # use a peculiar iteration method to avoid tripping on perl 3747 # use a peculiar iteration method to avoid tripping on perl
3550 # refcount bugs in for. also avoids problems with players 3748 # refcount bugs in for. also avoids problems with players
3551 # and maps saved/destroyed asynchronously. 3749 # and maps saved/destroyed asynchronously.
3552 warn "begin emergency player save\n"; 3750 warn "emergency_perl_save: begin player save\n";
3553 for my $login (keys %cf::PLAYER) { 3751 for my $login (keys %cf::PLAYER) {
3554 my $pl = $cf::PLAYER{$login} or next; 3752 my $pl = $cf::PLAYER{$login} or next;
3555 $pl->valid or next; 3753 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3754 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3557 $pl->save; 3755 $pl->save;
3558 } 3756 }
3559 warn "end emergency player save\n"; 3757 warn "emergency_perl_save: end player save\n";
3560 3758
3561 warn "begin emergency map save\n"; 3759 warn "emergency_perl_save: begin map save\n";
3562 for my $path (keys %cf::MAP) { 3760 for my $path (keys %cf::MAP) {
3563 my $map = $cf::MAP{$path} or next; 3761 my $map = $cf::MAP{$path} or next;
3564 $map->valid or next; 3762 $map->valid or next;
3565 $map->save; 3763 $map->save;
3566 } 3764 }
3567 warn "end emergency map save\n"; 3765 warn "emergency_perl_save: end map save\n";
3568 3766
3569 warn "begin emergency database checkpoint\n"; 3767 warn "emergency_perl_save: begin database checkpoint\n";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3768 BDB::db_env_txn_checkpoint $DB_ENV;
3571 warn "end emergency database checkpoint\n"; 3769 warn "emergency_perl_save: end database checkpoint\n";
3572 3770
3573 warn "begin write uuid\n"; 3771 warn "emergency_perl_save: begin write uuid\n";
3574 write_uuid_sync 1; 3772 write_uuid_sync 1;
3575 warn "end write uuid\n"; 3773 warn "emergency_perl_save: end write uuid\n";
3576 }; 3774 };
3577 3775
3776 warn "emergency_perl_save: starting sync()\n";
3777 IO::AIO::aio_sync sub {
3778 warn "emergency_perl_save: finished sync()\n";
3779 };
3780
3578 warn "leave emergency perl save\n"; 3781 warn "emergency_perl_save: leave\n";
3579} 3782}
3580 3783
3581sub post_cleanup { 3784sub post_cleanup {
3582 my ($make_core) = @_; 3785 my ($make_core) = @_;
3583 3786
3584 warn Carp::longmess "post_cleanup backtrace" 3787 warn Carp::longmess "post_cleanup backtrace"
3585 if $make_core; 3788 if $make_core;
3789
3790 my $fh = pidfile;
3791 unlink $PIDFILE if <$fh> == $$;
3792}
3793
3794# a safer delete_package, copied from Symbol
3795sub clear_package($) {
3796 my $pkg = shift;
3797
3798 # expand to full symbol table name if needed
3799 unless ($pkg =~ /^main::.*::$/) {
3800 $pkg = "main$pkg" if $pkg =~ /^::/;
3801 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3802 $pkg .= '::' unless $pkg =~ /::$/;
3803 }
3804
3805 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3806 my $stem_symtab = *{$stem}{HASH};
3807
3808 defined $stem_symtab and exists $stem_symtab->{$leaf}
3809 or return;
3810
3811 # clear all symbols
3812 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3813 for my $name (keys %$leaf_symtab) {
3814 _gv_clear *{"$pkg$name"};
3815# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3816 }
3586} 3817}
3587 3818
3588sub do_reload_perl() { 3819sub do_reload_perl() {
3589 # can/must only be called in main 3820 # can/must only be called in main
3590 if ($Coro::current != $Coro::main) { 3821 if (in_main) {
3591 warn "can only reload from main coroutine"; 3822 warn "can only reload from main coroutine";
3592 return; 3823 return;
3593 } 3824 }
3594 3825
3826 return if $RELOAD++;
3827
3828 my $t1 = AE::time;
3829
3830 while ($RELOAD) {
3595 warn "reloading..."; 3831 warn "reloading...";
3596 3832
3597 warn "entering sync_job"; 3833 warn "entering sync_job";
3598 3834
3599 cf::sync_job { 3835 cf::sync_job {
3600 cf::write_runtime_sync; # external watchdog should not bark 3836 cf::write_runtime_sync; # external watchdog should not bark
3601 cf::emergency_save; 3837 cf::emergency_save;
3602 cf::write_runtime_sync; # external watchdog should not bark 3838 cf::write_runtime_sync; # external watchdog should not bark
3603 3839
3604 warn "syncing database to disk"; 3840 warn "syncing database to disk";
3605 BDB::db_env_txn_checkpoint $DB_ENV; 3841 BDB::db_env_txn_checkpoint $DB_ENV;
3606 3842
3607 # if anything goes wrong in here, we should simply crash as we already saved 3843 # if anything goes wrong in here, we should simply crash as we already saved
3608 3844
3609 warn "flushing outstanding aio requests"; 3845 warn "flushing outstanding aio requests";
3610 for (;;) {
3611 BDB::flush;
3612 IO::AIO::flush;
3613 Coro::cede_notself;
3614 last unless IO::AIO::nreqs || BDB::nreqs; 3846 while (IO::AIO::nreqs || BDB::nreqs) {
3615 warn "iterate..."; 3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 ++$RELOAD;
3619
3620 warn "cancelling all extension coros";
3621 $_->cancel for values %EXT_CORO;
3622 %EXT_CORO = ();
3623
3624 warn "removing commands";
3625 %COMMAND = ();
3626
3627 warn "removing ext/exti commands";
3628 %EXTCMD = ();
3629 %EXTICMD = ();
3630
3631 warn "unloading/nuking all extensions";
3632 for my $pkg (@EXTS) {
3633 warn "... unloading $pkg";
3634
3635 if (my $cb = $pkg->can ("unload")) {
3636 eval {
3637 $cb->($pkg);
3638 1
3639 } or warn "$pkg unloaded, but with errors: $@";
3640 } 3848 }
3641 3849
3642 warn "... nuking $pkg"; 3850 warn "cancelling all extension coros";
3643 Symbol::delete_package $pkg; 3851 $_->cancel for values %EXT_CORO;
3644 } 3852 %EXT_CORO = ();
3645 3853
3646 warn "unloading all perl modules loaded from $LIBDIR"; 3854 warn "removing commands";
3647 while (my ($k, $v) = each %INC) { 3855 %COMMAND = ();
3648 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3649 3856
3857 warn "removing ext/exti commands";
3858 %EXTCMD = ();
3859 %EXTICMD = ();
3860
3861 warn "unloading/nuking all extensions";
3862 for my $pkg (@EXTS) {
3650 warn "... unloading $k"; 3863 warn "... unloading $pkg";
3651 delete $INC{$k};
3652 3864
3653 $k =~ s/\.pm$//;
3654 $k =~ s/\//::/g;
3655
3656 if (my $cb = $k->can ("unload_module")) { 3865 if (my $cb = $pkg->can ("unload")) {
3866 eval {
3657 $cb->(); 3867 $cb->($pkg);
3868 1
3869 } or warn "$pkg unloaded, but with errors: $@";
3870 }
3871
3872 warn "... clearing $pkg";
3873 clear_package $pkg;
3658 } 3874 }
3659 3875
3660 Symbol::delete_package $k; 3876 warn "unloading all perl modules loaded from $LIBDIR";
3877 while (my ($k, $v) = each %INC) {
3878 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879
3880 warn "... unloading $k";
3881 delete $INC{$k};
3882
3883 $k =~ s/\.pm$//;
3884 $k =~ s/\//::/g;
3885
3886 if (my $cb = $k->can ("unload_module")) {
3887 $cb->();
3888 }
3889
3890 clear_package $k;
3661 } 3891 }
3662 3892
3663 warn "getting rid of safe::, as good as possible"; 3893 warn "getting rid of safe::, as good as possible";
3664 Symbol::delete_package "safe::$_" 3894 clear_package "safe::$_"
3665 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3895 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3666 3896
3667 warn "unloading cf.pm \"a bit\""; 3897 warn "unloading cf.pm \"a bit\"";
3668 delete $INC{"cf.pm"}; 3898 delete $INC{"cf.pm"};
3669 delete $INC{"cf/pod.pm"}; 3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3670 3900
3671 # don't, removes xs symbols, too, 3901 # don't, removes xs symbols, too,
3672 # and global variables created in xs 3902 # and global variables created in xs
3673 #Symbol::delete_package __PACKAGE__; 3903 #clear_package __PACKAGE__;
3674 3904
3675 warn "unload completed, starting to reload now"; 3905 warn "unload completed, starting to reload now";
3676 3906
3677 warn "reloading cf.pm"; 3907 warn "reloading cf.pm";
3678 require cf; 3908 require cf;
3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3909 cf::_connect_to_perl_1;
3680 3910
3681 warn "loading config and database again"; 3911 warn "loading config and database again";
3682 cf::reload_config; 3912 cf::reload_config;
3683 3913
3684 warn "loading extensions"; 3914 warn "loading extensions";
3685 cf::load_extensions; 3915 cf::load_extensions;
3686 3916
3917 if ($REATTACH_ON_RELOAD) {
3687 warn "reattaching attachments to objects/players"; 3918 warn "reattaching attachments to objects/players";
3688 _global_reattach; # objects, sockets 3919 _global_reattach; # objects, sockets
3689 warn "reattaching attachments to maps"; 3920 warn "reattaching attachments to maps";
3690 reattach $_ for values %MAP; 3921 reattach $_ for values %MAP;
3691 warn "reattaching attachments to players"; 3922 warn "reattaching attachments to players";
3692 reattach $_ for values %PLAYER; 3923 reattach $_ for values %PLAYER;
3924 }
3693 3925
3926 warn "running post_init jobs";
3927 (pop @POST_INIT)->(1) while @POST_INIT;
3928
3694 warn "leaving sync_job"; 3929 warn "leaving sync_job";
3695 3930
3696 1 3931 1
3697 } or do { 3932 } or do {
3698 warn $@; 3933 warn $@;
3699 cf::cleanup "error while reloading, exiting."; 3934 cf::cleanup "error while reloading, exiting.";
3700 }; 3935 };
3701 3936
3702 warn "reloaded"; 3937 warn "reloaded";
3938 --$RELOAD;
3939 }
3940
3941 $t1 = AE::time - $t1;
3942 warn "reload completed in ${t1}s\n";
3703}; 3943};
3704 3944
3705our $RELOAD_WATCHER; # used only during reload 3945our $RELOAD_WATCHER; # used only during reload
3706 3946
3707sub reload_perl() { 3947sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 3948 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 3949 # coro crashes during coro_state_free->destroy here.
3710 3950
3951 $RELOAD_WATCHER ||= cf::async {
3952 Coro::AIO::aio_wait cache_extensions;
3953
3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3954 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 3955 do_reload_perl;
3713 undef $RELOAD_WATCHER; 3956 undef $RELOAD_WATCHER;
3957 };
3714 }; 3958 };
3715} 3959}
3716 3960
3717register_command "reload" => sub { 3961register_command "reload" => sub {
3718 my ($who, $arg) = @_; 3962 my ($who, $arg) = @_;
3732 3976
3733our @WAIT_FOR_TICK; 3977our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN; 3978our @WAIT_FOR_TICK_BEGIN;
3735 3979
3736sub wait_for_tick { 3980sub wait_for_tick {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3738 3982
3739 my $signal = new Coro::Signal; 3983 my $signal = new Coro::Signal;
3740 push @WAIT_FOR_TICK, $signal; 3984 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait; 3985 $signal->wait;
3742} 3986}
3743 3987
3744sub wait_for_tick_begin { 3988sub wait_for_tick_begin {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3990
3747 my $signal = new Coro::Signal; 3991 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 3992 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 3993 $signal->wait;
3750} 3994}
3755 unless ++$bug_warning > 10; 3999 unless ++$bug_warning > 10;
3756 return; 4000 return;
3757 } 4001 }
3758 4002
3759 cf::server_tick; # one server iteration 4003 cf::server_tick; # one server iteration
4004
4005 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760 4006
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4007 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4008 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4009 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4010 $Coro::current->{desc} = "runtime saver";
3787} 4033}
3788 4034
3789{ 4035{
3790 # configure BDB 4036 # configure BDB
3791 4037
3792 BDB::min_parallel 8; 4038 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4039 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4040 $AnyEvent::BDB::WATCHER->priority (1);
3795 4041
3796 unless ($DB_ENV) { 4042 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4043 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4044 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 | BDB::LOG_AUTOREMOVE, 1); 4045 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4046 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4047 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4048 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3802 4049
3803 cf::sync_job { 4050 cf::sync_job {
3804 eval { 4051 eval {
3843 $msg =~ s/\n//; 4090 $msg =~ s/\n//;
3844 4091
3845 # limit the # of concurrent backtraces 4092 # limit the # of concurrent backtraces
3846 if ($_log_backtrace < 2) { 4093 if ($_log_backtrace < 2) {
3847 ++$_log_backtrace; 4094 ++$_log_backtrace;
4095 my $perl_bt = Carp::longmess $msg;
3848 async { 4096 async {
3849 $Coro::current->{desc} = "abt $msg"; 4097 $Coro::current->{desc} = "abt $msg";
3850 4098
3851 my @bt = fork_call { 4099 my @bt = fork_call {
3852 @addr = map { sprintf "%x", $_ } @addr; 4100 @addr = map { sprintf "%x", $_ } @addr;
3863 } 4111 }
3864 4112
3865 @funcs 4113 @funcs
3866 }; 4114 };
3867 4115
3868 LOG llevInfo, "[ABT] $msg\n"; 4116 LOG llevInfo, "[ABT] $perl_bt\n";
4117 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3869 LOG llevInfo, "[ABT] $_\n" for @bt; 4118 LOG llevInfo, "[ABT] $_\n" for @bt;
3870 --$_log_backtrace; 4119 --$_log_backtrace;
3871 }; 4120 };
3872 } else { 4121 } else {
3873 LOG llevInfo, "[ABT] $msg\n"; 4122 LOG llevInfo, "[ABT] $msg\n";
3874 LOG llevInfo, "[ABT] [suppressed]\n"; 4123 LOG llevInfo, "[ABT] [suppressed]\n";
3875 } 4124 }
3876} 4125}
3877 4126
3878# load additional modules 4127# load additional modules
3879use cf::pod; 4128require "cf/$_.pm" for @EXTRA_MODULES;
4129cf::_connect_to_perl_2;
3880 4130
3881END { cf::emergency_save } 4131END { cf::emergency_save }
3882 4132
38831 41331
3884 4134

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines