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.448 by root, Fri Sep 19 05:30:23 2008 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
39use Guard ();
37use Coro (); 40use Coro ();
38use Coro::State; 41use Coro::State;
39use Coro::Handle; 42use Coro::Handle;
40use Coro::EV; 43use Coro::EV;
41use Coro::AnyEvent; 44use Coro::AnyEvent;
42use Coro::Timer; 45use Coro::Timer;
43use Coro::Signal; 46use Coro::Signal;
44use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
45use Coro::AnyEvent; 49use Coro::AnyEvent;
46use Coro::AIO; 50use Coro::AIO;
47use Coro::BDB 1.6; 51use Coro::BDB 1.6;
48use Coro::Storable; 52use Coro::Storable;
49use Coro::Util (); 53use Coro::Util ();
50 54
51use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
52use BDB (); 56use BDB ();
53use Data::Dumper; 57use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 58use Fcntl;
56use YAML (); 59use YAML::XS ();
57use IO::AIO (); 60use IO::AIO ();
58use Time::HiRes; 61use Time::HiRes;
59use Compress::LZF; 62use Compress::LZF;
60use Digest::MD5 (); 63use Digest::MD5 ();
61 64
66$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68 71
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70 73
71{ 74# make sure c-lzf reinitialises itself
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
85 Compress::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
86} 77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
87 80
88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
89 82
90our %COMMAND = (); 83our %COMMAND = ();
91our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
94our %EXTCMD = (); 87our %EXTCMD = ();
95our %EXTICMD = (); 88our %EXTICMD = ();
96our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
97our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
98 91
99our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
100our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
101 96
102our $CONFDIR = confdir; 97our $CONFDIR = confdir;
103our $DATADIR = datadir; 98our $DATADIR = datadir;
104our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
105our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
113our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
115 110
116our %RESOURCE; 111our %RESOURCE;
117 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
118our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
120our $NEXT_TICK; 118our $NEXT_TICK;
121our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
122 120
123our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
125our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
126our $DB_ENV; 124our $DB_ENV;
127 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
128our %CFG; 128our %CFG;
129 129
130our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 131our $RUNTIME;
132our $NOW; 132our $NOW;
140 140
141our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
142our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter 143our $JITTER; # average jitter
144our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
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 :)
145 150
146binmode STDOUT; 151binmode STDOUT;
147binmode STDERR; 152binmode STDERR;
148 153
149# read virtual server time, if available 154# read virtual server time, if available
151 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
152 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
153 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
154} 159}
155 160
161eval "sub TICK() { $TICK } 1" or die;
162
156mkdir $_ 163mkdir $_
157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 165
159our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
160 167
161sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
162 184
163############################################################################# 185#############################################################################
164 186
165=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
166 188
213returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
214per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
215 237
216=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
217 239
218This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
219C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
220that call. 242that call.
221 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
222=back 250=back
223 251
224=cut 252=cut
225 253
226BEGIN { 254$Coro::State::WARNHOOK = sub {
227 *CORE::GLOBAL::warn = sub {
228 my $msg = join "", @_; 255 my $msg = join "", @_;
229 256
230 $msg .= "\n" 257 $msg .= "\n"
231 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
232 259
233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
234 261
235 LOG llevError, $msg; 262 LOG llevError, $msg;
236 }; 263};
237}
238 264
239$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
241 267
242 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d# 272 return;#d#
245 }#d# 273 }#d#
246 274
247 # kill coroutine otherwise 275 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate 276 Coro::terminate
250}; 277};
251
252$SIG{__DIE__} = sub { }; #d#?
253 278
254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
271)) { 296)) {
272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
273} 298}
274 299
275$EV::DIED = sub { 300$EV::DIED = sub {
276 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
277}; 302};
278 303
279############################################################################# 304#############################################################################
280 305
281=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
319 344
320sub encode_json($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
321sub decode_json($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
322 347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
361
323=item cf::lock_wait $string 362=item cf::lock_wait $string
324 363
325Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
326 365
327=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
328 367
329Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
330a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
331for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
332returned. 371returned.
333 372
334Locks are *not* recursive, locking from the same coro twice results in a 373Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro. 374deadlocked coro.
341 380
342Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
343 382
344=cut 383=cut
345 384
346our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
347our %LOCKER;#d#
348 386
349sub lock_wait($) { 387sub lock_wait($) {
350 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
356
357 # wait for lock, if any
358 while ($LOCK{$key}) {
359 push @{ $LOCK{$key} }, $Coro::current;
360 Coro::schedule;
361 }
362} 389}
363 390
364sub lock_acquire($) { 391sub lock_acquire($) {
365 my ($key) = @_; 392 $LOCKS->guard ($_[0])
366
367 # wait, to be sure we are not locked
368 lock_wait $key;
369
370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
372
373 Coro::guard {
374 delete $LOCKER{$key};#d#
375 # wake up all waiters, to be on the safe side
376 $_->ready for @{ delete $LOCK{$key} };
377 }
378} 393}
379 394
380sub lock_active($) { 395sub lock_active($) {
381 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
382
383 ! ! $LOCK{$key}
384} 397}
385 398
386sub freeze_mainloop { 399sub freeze_mainloop {
387 tick_inhibit_inc; 400 tick_inhibit_inc;
388 401
389 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
390} 403}
391 404
392=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
393 406
394Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer. 408get spread over time.
396 409
397=cut 410=cut
398 411
399sub periodic($$) { 412sub periodic($$) {
400 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
417 430
418=cut 431=cut
419 432
420our @SLOT_QUEUE; 433our @SLOT_QUEUE;
421our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
422 436
423$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
424$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
426 440
427 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
428 443
429 while () { 444 while () {
430 next_job: 445 next_job:
446
431 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
432 if ($avail > 0.01) { 448
433 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
434 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
435 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
436 $job->[2]->send; 453 $job->[2]->send;
437 Coro::cede; 454 Coro::cede;
438 goto next_job; 455 goto next_job;
439 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
440 } 458 }
441 } 459 }
442 460
443 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
444 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
445 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
446 $signal->wait; 464 $signal->wait;
447 } else { 465 } else {
466 $busy = 0;
448 Coro::schedule; 467 Coro::schedule;
449 } 468 }
450 } 469 }
451}; 470};
452 471
453sub get_slot($;$$) { 472sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
455 474
456 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
457 476
458 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
459 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
460 480
461 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
462 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
463 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
490 510
491sub sync_job(&) { 511sub sync_job(&) {
492 my ($job) = @_; 512 my ($job) = @_;
493 513
494 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
495 my $time = EV::time; 515 my $time = AE::time;
496 516
497 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
498 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
499 519
500 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
517 } else { 537 } else {
518 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
519 } 539 }
520 } 540 }
521 541
522 my $time = EV::time - $time; 542 my $time = AE::time - $time;
523 543
524 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
525 545
526 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
527 } else { 547 } else {
571 reset_signals; 591 reset_signals;
572 &$cb 592 &$cb
573 }, @args; 593 }, @args;
574 594
575 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
576} 607}
577 608
578=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
579 610
580=cut 611=cut
1166 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1167 1198
1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1169 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1171 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1172 aio_close $fh; 1206 aio_close $fh;
1173 1207
1174 if (@$objs) { 1208 if (@$objs) {
1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1178 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1179 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1180 aio_close $fh; 1217 aio_close $fh;
1181 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1182 } 1219 }
1183 } else { 1220 } else {
1184 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1185 } 1222 }
1186 1223
1187 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1188 } else { 1228 } else {
1189 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1190 } 1230 }
1191 } else { 1231 } else {
1192 aio_unlink $filename; 1232 aio_unlink $filename;
1193 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1194 } 1234 }
1285 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1286 1326
1287 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1288} 1328}
1289 1329
1330use File::Glob ();
1331
1290cf::player->attach ( 1332cf::player->attach (
1291 on_command => sub { 1333 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1293 1335
1294 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1295 or return; 1337 or return;
1296 1338
1326 1368
1327 cf::override; 1369 cf::override;
1328 }, 1370 },
1329); 1371);
1330 1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1385
1331sub load_extensions { 1386sub load_extensions {
1332 cf::sync_job { 1387 cf::sync_job {
1333 my %todo; 1388 my %todo;
1334 1389
1335 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1362 . "\n};\n1"; 1417 . "\n};\n1";
1363 1418
1364 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1365 } 1420 }
1366 1421
1422 my $pass = 0;
1367 my %done; 1423 my %done;
1368 while (%todo) { 1424 while (%todo) {
1369 my $progress; 1425 my $progress;
1370 1426
1427 ++$pass;
1428
1429 ext:
1371 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1372 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1373 goto skip 1432 next ext
1374 unless exists $done{$_}; 1433 unless exists $done{$_};
1375 } 1434 }
1376 1435
1377 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1378 1437
1379 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1380 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1381 : "$v->{base}: extension inactive.\n";
1382 1442
1383 if (exists $v->{meta}{mandatory}) {
1384 warn $msg;
1385 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1386 } 1444 if exists $v->{meta}{mandatory};
1387 1445
1388 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1389 } 1455 }
1390
1391 $done{$k} = delete $todo{$k};
1392 push @EXTS, $v->{pkg};
1393 $progress = 1;
1394 } 1456 }
1395 1457
1396 skip: 1458 unless ($progress) {
1397 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1398 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1399 } 1466 }
1400 }; 1467 };
1401} 1468}
1402 1469
1403############################################################################# 1470#############################################################################
1457 1524
1458sub exists($) { 1525sub exists($) {
1459 my ($login) = @_; 1526 my ($login) = @_;
1460 1527
1461 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1462 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1463} 1530}
1464 1531
1465sub find($) { 1532sub find($) {
1466 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1467 my $login = $_[0]; 1534 my $login = $_[0];
1487 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1488 } 1555 }
1489 } 1556 }
1490} 1557}
1491 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1492sub save($) { 1572sub save($) {
1493 my ($pl) = @_; 1573 my ($pl) = @_;
1494 1574
1495 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1496 1576
1501 1581
1502 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1503 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1504 1584
1505 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1506 1589
1507 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1508 cf::cede_to_tick; 1591 cf::cede_to_tick;
1509} 1592}
1510 1593
1612 \@logins 1695 \@logins
1613} 1696}
1614 1697
1615=item $player->maps 1698=item $player->maps
1616 1699
1700=item cf::player::maps $login
1701
1617Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1618player. May block. 1703player. May block.
1619 1704
1620=cut 1705=cut
1621 1706
1683=cut 1768=cut
1684 1769
1685sub find_by_path($) { 1770sub find_by_path($) {
1686 my ($path) = @_; 1771 my ($path) = @_;
1687 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1688 my ($match, $specificity); 1775 my ($match, $specificity);
1689 1776
1690 for my $region (list) { 1777 for my $region (list) {
1691 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1692 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724 1811
1725 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1726 $self->_create_random_map ( 1813 $self->_create_random_map (
1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1730 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1731 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1732 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1733 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1863 1950
1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1865 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1866} 1953}
1867 1954
1868# and all this just because we cannot iterate over
1869# all maps in C++...
1870sub change_all_map_light {
1871 my ($change) = @_;
1872
1873 $_->change_map_light ($change)
1874 for grep $_->outdoor, values %cf::MAP;
1875}
1876
1877sub decay_objects { 1955sub decay_objects {
1878 my ($self) = @_; 1956 my ($self) = @_;
1879 1957
1880 return if $self->{deny_reset}; 1958 return if $self->{deny_reset};
1881 1959
1963sub find { 2041sub find {
1964 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1965 2043
1966 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1967 2045
1968 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2048
1971 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1975 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1976 or return; 2051 or return;
1977 2052
1978 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1979 2054
1991 2066
1992 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1993 } 2068 }
1994} 2069}
1995 2070
1996sub pre_load { } 2071sub pre_load { }
1997sub post_load { } 2072#sub post_load { } # XS
1998 2073
1999sub load { 2074sub load {
2000 my ($self) = @_; 2075 my ($self) = @_;
2001 2076
2002 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2047 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2048 $self->decay_objects; 2123 $self->decay_objects;
2049 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2050 $self->update_buttons; 2125 $self->update_buttons;
2051 cf::cede_to_tick; 2126 cf::cede_to_tick;
2052 $self->set_darkness_map;
2053 cf::cede_to_tick;
2054 $self->activate; 2127 $self->activate;
2055 } 2128 }
2056 2129
2057 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2058 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2061 } 2134 }
2062 2135
2063 $self->post_load; 2136 $self->post_load;
2064} 2137}
2065 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2066sub customise_for { 2142sub customise_for {
2067 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2068 2144
2069 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2070 if $self->per_player; 2146 if $self->per_player;
2147 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2148 2224
2149 () 2225 ()
2150} 2226}
2151 2227
2228# common code, used by both ->save and ->swapout
2152sub save { 2229sub _save {
2153 my ($self) = @_; 2230 my ($self) = @_;
2154
2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
2156 2231
2157 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2158 2233
2159 return unless $self->dirty; 2234 return unless $self->dirty;
2160 2235
2180 } else { 2255 } else {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2182 } 2257 }
2183} 2258}
2184 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2185sub swap_out { 2268sub swap_out {
2186 my ($self) = @_; 2269 my ($self) = @_;
2187 2270
2188 # save first because save cedes
2189 $self->save;
2190
2191 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2192 2272
2193 return if $self->players;
2194 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2195 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2196 2276
2197 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2198
2199 $self->deactivate; 2278 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2201 $self->clear; 2286 $self->clear;
2202} 2287}
2203 2288
2204sub reset_at { 2289sub reset_at {
2205 my ($self) = @_; 2290 my ($self) = @_;
2224 2309
2225 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2226 2311
2227 return if $self->players; 2312 return if $self->players;
2228 2313
2229 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2230 2315
2231 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2232 2317
2233 # need to save uniques path 2318 # need to save uniques path
2234 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
2325 : normalise $_ 2410 : normalise $_
2326 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2327 ] 2412 ]
2328} 2413}
2329 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2330=back 2447=back
2331 2448
2332=head3 cf::object 2449=head3 cf::object
2333 2450
2334=cut 2451=cut
2399 2516
2400our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2401 id => "say", 2518 id => "say",
2402 title => "Map", 2519 title => "Map",
2403 reply => "say ", 2520 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2405}; 2522};
2406 2523
2407our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2408 id => "chat", 2525 id => "chat",
2409 title => "Chat", 2526 title => "Chat",
2502 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2503 2620
2504 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2505 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2506 2623
2507 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2508} 2625}
2509 2626
2510sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2511 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2512 2629
2529 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2530 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2531 2648
2532 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2533 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2534 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2535 2652
2536 $map->load; 2653 $map->load;
2537 $map->load_neighbours; 2654 $map->load_neighbours;
2538 2655
2539 return unless $self->contr->active; 2656 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2541 $self->activate_recursive;
2542 2657
2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2544 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2545} 2663}
2546 2664
2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2548 2666
2549Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2737 2855
2738 utf8::encode $text; 2856 utf8::encode $text;
2739 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2740} 2858}
2741 2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2883}
2884
2742=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2743 2886
2744Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2745client if neccessary. C<$type> should be a string identifying the type of 2888client if neccessary. C<$type> should be a string identifying the type of
2746the message, with C<log> being the default. If C<$color> is negative, suppress 2889the message, with C<log> being the default. If C<$color> is negative, suppress
2748 2891
2749=cut 2892=cut
2750 2893
2751# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2752our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2753 "c/identify" => { 2902 "c/identify" => {
2754 id => "infobox", 2903 id => "infobox",
2755 title => "Identify", 2904 title => "Identify",
2756 reply => undef, 2905 reply => undef,
2757 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2759 "c/examine" => { 2908 "c/examine" => {
2760 id => "infobox", 2909 id => "infobox",
2761 title => "Examine", 2910 title => "Examine",
2762 reply => undef, 2911 reply => undef,
2763 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2764 }, 2919 },
2765 "c/book" => { 2920 "c/book" => {
2766 id => "infobox", 2921 id => "infobox",
2767 title => "Book", 2922 title => "Book",
2768 reply => undef, 2923 reply => undef,
2784 id => "infobox", 2939 id => "infobox",
2785 title => "Body Parts", 2940 title => "Body Parts",
2786 reply => undef, 2941 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2788 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2789 "c/uptime" => { 2980 "c/uptime" => {
2790 id => "infobox", 2981 id => "infobox",
2791 title => "Uptime", 2982 title => "Uptime",
2792 reply => undef, 2983 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2984 tooltip => "How long the server has been running since last restart",
2802 id => "party", 2993 id => "party",
2803 title => "Party", 2994 title => "Party",
2804 reply => "gsay ", 2995 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party", 2996 tooltip => "Messages and chat related to your party",
2806 }, 2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2807); 3006);
2808 3007
2809sub cf::client::send_msg { 3008sub cf::client::send_msg {
2810 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2811 3010
2816 3015
2817 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2820 3019
2821 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2825 3022
2826 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2827 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2828 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2829 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2830 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2831 if $self->can_msg;
2832 } 3028 }
2833 3029
2834 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2835 } 3031 }
2836 3032
2837 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2838 3034
2839 if ($self->can_msg) {
2840 # default colour, mask it out 3035 # default colour, mask it out
2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2842 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2843 3038
2844 my $pkt = "msg " 3039 my $pkt = "msg "
2845 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 ); 3042 );
2848 3043
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2860 } else {
2861 if ($color >= 0) {
2862 # replace some tags by gcfclient-compatible ones
2863 for ($msg) {
2864 1 while
2865 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2866 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2867 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2868 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2869 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2870 }
2871
2872 $color &= cf::NDI_COLOR_MASK;
2873
2874 utf8::encode $msg;
2875
2876 if (0 && $msg =~ /\[/) {
2877 # COMMAND/INFO
2878 $self->send_packet ("drawextinfo $color 10 8 $msg")
2879 } else {
2880 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2881 $self->send_packet ("drawinfo $color $msg")
2882 }
2883 }
2884 }
2885} 3045}
2886 3046
2887=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2888 3048
2889Sends an ext event to the client. 3049Sends an ext event to the client.
2892 3052
2893sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2894 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2895 3055
2896 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2898 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2899 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2901 } 3061 }
2902} 3062}
2903 3063
2904=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2905 3065
2909 3069
2910sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2911 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2912 3072
2913 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2915 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2916 #TODO: version 1, remove 3076 #TODO: version 1, remove
2917 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2919 } 3079 }
2920} 3080}
2921 3081
2922=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2923 3083
3024 3184
3025 $coro 3185 $coro
3026} 3186}
3027 3187
3028cf::client->attach ( 3188cf::client->attach (
3029 on_destroy => sub { 3189 on_client_destroy => sub {
3030 my ($ns) = @_; 3190 my ($ns) = @_;
3031 3191
3032 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3033 }, 3193 },
3034); 3194);
3050our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3051 3211
3052$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3053 3213
3054$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3055 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3056 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3057 sort time 3217 sort time
3058)); 3218));
3059 3219
3060# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
3064The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3065 3225
3066 cf::object 3226 cf::object
3067 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3068 insert remove name archname title slaying race decrease split 3228 insert remove name archname title slaying race decrease split
3229 value
3069 3230
3070 cf::object::player 3231 cf::object::player
3071 player 3232 player
3072 3233
3073 cf::player 3234 cf::player
3079=cut 3240=cut
3080 3241
3081for ( 3242for (
3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3083 insert remove inv nrof name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3084 decrease split destroy change_exp)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3085 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3086 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3087 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3088) { 3249) {
3089 no strict 'refs'; 3250 no strict 'refs';
3090 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3091 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3109 3270
3110 my $qcode = $code; 3271 my $qcode = $code;
3111 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3112 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3113 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3114 local $_; 3278 local $_;
3115 local @safe::cf::_safe_eval_args = values %vars;
3116 3279
3117 my $eval = 3280 my $eval =
3118 "do {\n" 3281 "do {\n"
3119 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3120 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3121 . $code 3284 . $code
3122 . "\n}" 3285 . "\n}"
3123 ; 3286 ;
3124 3287
3288 if ($CFG{safe_eval}) {
3125 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3126 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3127 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3128 3297
3129 if ($@) { 3298 if ($@) {
3130 warn "$@"; 3299 warn "$@";
3131 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3132 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3151=cut 3320=cut
3152 3321
3153sub register_script_function { 3322sub register_script_function {
3154 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3155 3324
3156 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3157 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3158} 3327}
3159 3328
3160=back 3329=back
3161 3330
3162=cut 3331=cut
3183 3352
3184 $facedata->{version} == 2 3353 $facedata->{version} == 2
3185 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3186 3355
3187 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3188 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3189 type => FT_RSRC, 3359 type => FT_RSRC,
3190 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3191 }; 3362 };
3192 cf::cede_to_tick; 3363 cf::cede_to_tick;
3193 3364
3194 { 3365 {
3195 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3197 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3198 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199 3370
3200 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3201 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3204 3375
3205 cf::cede_to_tick; 3376 cf::cede_to_tick;
3206 } 3377 }
3207 3378
3208 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3232 3403
3233 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3234 } 3405 }
3235 3406
3236 { 3407 {
3237 # TODO: for gcfclient pleasure, we should give resources
3238 # that gcfclient doesn't grok a >10000 face index.
3239 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3240 3409
3241 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3243 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3244 my $data;
3245 3413
3246 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3247 # prepend meta info
3248
3249 my $meta = $enc->encode ({
3250 name => $name,
3251 %{ $info->{meta} || {} },
3252 });
3253
3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3261 } else { 3416 } else {
3262 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3263 } 3418 }
3264 3419
3347 reload_treasures; 3502 reload_treasures;
3348 3503
3349 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3350} 3505}
3351 3506
3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3357 reload_resources;
3358}
3359
3360sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3361 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3362 or return; 3511 or return;
3363 3512
3364 local $/; 3513 local $/;
3365 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3366 3515
3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3368 3517
3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3374 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3375 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3376 }; 3525 };
3377 warn $@ if $@; 3526 warn $@ if $@;
3378 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3379} 3530}
3380 3531
3381sub pidfile() { 3532sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
3395 3546
3396 seek $fh, 0, 0; 3547 seek $fh, 0, 0;
3397 print $fh $$; 3548 print $fh $$;
3398} 3549}
3399 3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3558}
3559
3400sub main { 3560sub main {
3401 atomic; 3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 3569
3403 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3404 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3406 (async { 3573 (async {
3407 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT; 3575 EV::loop EV::LOOP_ONESHOT;
3409 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
3410 }; 3577 };
3411 3578
3412 { 3579 evthread_start IO::AIO::poll_fileno;
3413 my $guard = freeze_mainloop; 3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3414 reload_config; 3591 reload_config;
3415 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
3416 load_extensions; 3602 load_extensions;
3417 3603
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE; 3604 utime time, time, $RUNTIMEFILE;
3422 3605
3423 # no (long-running) fork's whatsoever before this point(!) 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425 3609
3426 EV::loop; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3427} 3617}
3428 3618
3429############################################################################# 3619#############################################################################
3430# initialisation and cleanup 3620# initialisation and cleanup
3431 3621
3432# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3433BEGIN { 3623BEGIN {
3434 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3435 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3436 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3437 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3438 }; 3628 };
3439 } 3629 }
3440} 3630}
3441 3631
3442sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3443 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3444 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3445 3637
3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3447 3639
3448 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3449 3641
3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3451 or return; 3643 or return;
3452 3644
3453 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3454 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3455 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3468 or return; 3660 or return;
3469 3661
3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3471 and return; 3663 and return;
3472 3664
3473 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3474 3666
3475 1 3667 1
3476} 3668}
3477 3669
3478our $uuid_lock; 3670our $uuid_lock;
3487 my $uuid = "$LOCALDIR/uuid"; 3679 my $uuid = "$LOCALDIR/uuid";
3488 3680
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return; 3682 or return;
3491 3683
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3493 $uuid_skip = 0; 3692 $uuid_skip = 0;
3494 3693
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return; 3695 and return;
3497 3696
3519} 3718}
3520 3719
3521sub emergency_save() { 3720sub emergency_save() {
3522 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3523 3722
3524 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3525 3724
3526 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3527 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3528 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3529 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3530 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3531 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3532 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3533 $pl->valid or next; 3737 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3535 $pl->save; 3739 $pl->save;
3536 } 3740 }
3537 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3538 3742
3539 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3540 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3541 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3542 $map->valid or next; 3746 $map->valid or next;
3543 $map->save; 3747 $map->save;
3544 } 3748 }
3545 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3546 3750
3547 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3548 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3549 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3550 3754
3551 warn "begin write uuid\n"; 3755 warn "emergency_perl_save: begin write uuid\n";
3552 write_uuid_sync 1; 3756 write_uuid_sync 1;
3553 warn "end write uuid\n"; 3757 warn "emergency_perl_save: end write uuid\n";
3554 }; 3758 };
3555 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3556 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3557} 3766}
3558 3767
3559sub post_cleanup { 3768sub post_cleanup {
3560 my ($make_core) = @_; 3769 my ($make_core) = @_;
3561 3770
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 } 3800 }
3592 warn "cleared package #$pkg\n";#d#
3593} 3801}
3594
3595our $RELOAD; # how many times to reload
3596 3802
3597sub do_reload_perl() { 3803sub do_reload_perl() {
3598 # can/must only be called in main 3804 # can/must only be called in main
3599 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3600 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3601 return; 3807 return;
3602 } 3808 }
3603 3809
3604 return if $RELOAD++; 3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3605 3813
3606 while ($RELOAD) { 3814 while ($RELOAD) {
3607 warn "reloading..."; 3815 warn "reloading...";
3608 3816
3609 warn "entering sync_job"; 3817 warn "entering sync_job";
3670 clear_package "safe::$_" 3878 clear_package "safe::$_"
3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3672 3880
3673 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3674 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3675 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3676 3884
3677 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3678 # and global variables created in xs 3886 # and global variables created in xs
3679 #clear_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3680 3888
3681 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3682 3890
3683 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3684 require cf; 3892 require cf;
3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3686 3894
3687 warn "loading config and database again"; 3895 warn "loading config and database again";
3688 cf::reload_config; 3896 cf::reload_config;
3689 3897
3690 warn "loading extensions"; 3898 warn "loading extensions";
3691 cf::load_extensions; 3899 cf::load_extensions;
3692 3900
3901 if ($REATTACH_ON_RELOAD) {
3693 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3694 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3695 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3696 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3697 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3698 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3699 3912
3700 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3701 3914
3702 1 3915 1
3703 } or do { 3916 } or do {
3706 }; 3919 };
3707 3920
3708 warn "reloaded"; 3921 warn "reloaded";
3709 --$RELOAD; 3922 --$RELOAD;
3710 } 3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3711}; 3927};
3712 3928
3713our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3714 3930
3715sub reload_perl() { 3931sub reload_perl() {
3716 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3717 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3718 3934
3935 $RELOAD_WATCHER ||= cf::async {
3936 Coro::AIO::aio_wait cache_extensions;
3937
3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3720 do_reload_perl; 3939 do_reload_perl;
3721 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3941 };
3722 }; 3942 };
3723} 3943}
3724 3944
3725register_command "reload" => sub { 3945register_command "reload" => sub {
3726 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3740 3960
3741our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3742our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3743 3963
3744sub wait_for_tick { 3964sub wait_for_tick {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3746 3966
3747 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3749 $signal->wait; 3969 $signal->wait;
3750} 3970}
3751 3971
3752sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3753 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3754 3974
3755 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3756 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3757 $signal->wait; 3977 $signal->wait;
3758} 3978}
3763 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3764 return; 3984 return;
3765 } 3985 }
3766 3986
3767 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3768 3990
3769 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3771 Coro::async_pool { 3993 Coro::async_pool {
3772 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3795} 4017}
3796 4018
3797{ 4019{
3798 # configure BDB 4020 # configure BDB
3799 4021
3800 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3801 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3802 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3803 4025
3804 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3805 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3885 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3886 } 4108 }
3887} 4109}
3888 4110
3889# load additional modules 4111# load additional modules
3890use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3891 4114
3892END { cf::emergency_save } 4115END { cf::emergency_save }
3893 4116
38941 41171
3895 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines