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.424 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.521 by root, Fri Apr 16 23:28:42 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines