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.455 by root, Sat Sep 27 08:17:40 2008 UTC vs.
Revision 1.526 by root, Wed Apr 21 05:48:35 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
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# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
74 80
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %RESOURCE; 111our %RESOURCE;
104 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 118our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
109 120
110our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 124our $DB_ENV;
114 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
115our %CFG; 128our %CFG;
116 129
117our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 131our $RUNTIME;
119our $NOW; 132our $NOW;
129our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 143our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
132 145
133our @POST_INIT; 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 :)
134 150
135binmode STDOUT; 151binmode STDOUT;
136binmode STDERR; 152binmode STDERR;
137 153
138# read virtual server time, if available 154# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
143} 159}
144 160
161eval "sub TICK() { $TICK } 1" or die;
162
145mkdir $_ 163mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 165
148our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
149 167
150sub 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::"} };
151 184
152############################################################################# 185#############################################################################
153 186
154=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
155 188
202returns 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
203per 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.
204 237
205=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
206 239
207This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 242that call.
210 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
211=back 250=back
212 251
213=cut 252=cut
214 253
215BEGIN { 254$Coro::State::WARNHOOK = sub {
216 *CORE::GLOBAL::warn = sub {
217 my $msg = join "", @_; 255 my $msg = join "", @_;
218 256
219 $msg .= "\n" 257 $msg .= "\n"
220 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
221 259
222 $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;
223 261
224 LOG llevError, $msg; 262 LOG llevError, $msg;
225 }; 263};
226}
227 264
228$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
230 267
231 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 272 return;#d#
234 }#d# 273 }#d#
235 274
236 # kill coroutine otherwise 275 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 276 Coro::terminate
239}; 277};
240
241$SIG{__DIE__} = sub { }; #d#?
242 278
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 296)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 298}
263 299
264$EV::DIED = sub { 300$EV::DIED = sub {
265 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
266}; 302};
267 303
268############################################################################# 304#############################################################################
269 305
270=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
328Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
329 365
330=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
331 367
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
335returned. 371returned.
336 372
337Locks 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
338deadlocked coro. 374deadlocked coro.
344 380
345Return 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.
346 382
347=cut 383=cut
348 384
349our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 386
352sub lock_wait($) { 387sub lock_wait($) {
353 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 389}
367 390
368sub lock_acquire($) { 391sub lock_acquire($) {
369 my ($key) = @_; 392 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 393}
383 394
384sub lock_active($) { 395sub lock_active($) {
385 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 397}
389 398
390sub freeze_mainloop { 399sub freeze_mainloop {
391 tick_inhibit_inc; 400 tick_inhibit_inc;
392 401
393 Coro::guard \&tick_inhibit_dec; 402 &Guard::guard (\&tick_inhibit_dec);
394} 403}
395 404
396=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
397 406
398Like 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
399get spread over timer. 408get spread over time.
400 409
401=cut 410=cut
402 411
403sub periodic($$) { 412sub periodic($$) {
404 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
421 430
422=cut 431=cut
423 432
424our @SLOT_QUEUE; 433our @SLOT_QUEUE;
425our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
426 436
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
430 440
431 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
432 443
433 while () { 444 while () {
434 next_job: 445 next_job:
446
435 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 448
437 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 453 $job->[2]->send;
441 Coro::cede; 454 Coro::cede;
442 goto next_job; 455 goto next_job;
443 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 458 }
445 } 459 }
446 460
447 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
448 # 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
449 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
450 $signal->wait; 464 $signal->wait;
451 } else { 465 } else {
466 $busy = 0;
452 Coro::schedule; 467 Coro::schedule;
453 } 468 }
454 } 469 }
455}; 470};
456 471
457sub get_slot($;$$) { 472sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
459 474
460 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
461 476
462 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
463 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
464 480
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
494 510
495sub sync_job(&) { 511sub sync_job(&) {
496 my ($job) = @_; 512 my ($job) = @_;
497 513
498 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
499 my $time = EV::time; 515 my $time = AE::time;
500 516
501 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
503 519
504 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
521 } else { 537 } else {
522 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
523 } 539 }
524 } 540 }
525 541
526 my $time = EV::time - $time; 542 my $time = AE::time - $time;
527 543
528 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
529 545
530 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
531 } else { 547 } else {
575 reset_signals; 591 reset_signals;
576 &$cb 592 &$cb
577 }, @args; 593 }, @args;
578 594
579 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 )
580} 607}
581 608
582=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
583 610
584=cut 611=cut
1170 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1171 1198
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1206 aio_close $fh;
1177 1207
1178 if (@$objs) { 1208 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1217 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1219 }
1187 } else { 1220 } else {
1188 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1189 } 1222 }
1190 1223
1191 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1228 } else {
1193 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1194 } 1230 }
1195 } else { 1231 } else {
1196 aio_unlink $filename; 1232 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1198 } 1234 }
1289 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1290 1326
1291 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1292} 1328}
1293 1329
1330use File::Glob ();
1331
1294cf::player->attach ( 1332cf::player->attach (
1295 on_command => sub { 1333 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1297 1335
1298 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1299 or return; 1337 or return;
1300 1338
1330 1368
1331 cf::override; 1369 cf::override;
1332 }, 1370 },
1333); 1371);
1334 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
1335sub load_extensions { 1386sub load_extensions {
1336 cf::sync_job { 1387 cf::sync_job {
1337 my %todo; 1388 my %todo;
1338 1389
1339 for my $path (<$LIBDIR/*.ext>) { 1390 for my $path (<$LIBDIR/*.ext>) {
1366 . "\n};\n1"; 1417 . "\n};\n1";
1367 1418
1368 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1369 } 1420 }
1370 1421
1422 my $pass = 0;
1371 my %done; 1423 my %done;
1372 while (%todo) { 1424 while (%todo) {
1373 my $progress; 1425 my $progress;
1374 1426
1427 ++$pass;
1428
1429 ext:
1375 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1432 next ext
1378 unless exists $done{$_}; 1433 unless exists $done{$_};
1379 } 1434 }
1380 1435
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1437
1383 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1442
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1444 if exists $v->{meta}{mandatory};
1391 1445
1392 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;
1393 } 1455 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1456 }
1399 1457
1400 skip: 1458 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1466 }
1404 }; 1467 };
1405} 1468}
1406 1469
1407############################################################################# 1470#############################################################################
1491 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1492 } 1555 }
1493 } 1556 }
1494} 1557}
1495 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
1496sub save($) { 1572sub save($) {
1497 my ($pl) = @_; 1573 my ($pl) = @_;
1498 1574
1499 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1500 1576
1505 1581
1506 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1508 1584
1509 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];
1510 1589
1511 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1591 cf::cede_to_tick;
1513} 1592}
1514 1593
1616 \@logins 1695 \@logins
1617} 1696}
1618 1697
1619=item $player->maps 1698=item $player->maps
1620 1699
1700=item cf::player::maps $login
1701
1621Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1622player. May block. 1703player. May block.
1623 1704
1624=cut 1705=cut
1625 1706
1687=cut 1768=cut
1688 1769
1689sub find_by_path($) { 1770sub find_by_path($) {
1690 my ($path) = @_; 1771 my ($path) = @_;
1691 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1692 my ($match, $specificity); 1775 my ($match, $specificity);
1693 1776
1694 for my $region (list) { 1777 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1696 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
1727 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
1728 1811
1729 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1813 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1759 1842
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 1844}
1762 1845
1763# also paths starting with '/' 1846# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 1848
1766sub thawer_merge { 1849sub thawer_merge {
1767 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1768 1851
1769 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
1867 1950
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1870} 1953}
1871 1954
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 1955sub decay_objects {
1882 my ($self) = @_; 1956 my ($self) = @_;
1883 1957
1884 return if $self->{deny_reset}; 1958 return if $self->{deny_reset};
1885 1959
1967sub find { 2041sub find {
1968 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1969 2043
1970 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1971 2045
1972 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2048
1975 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1980 or return; 2051 or return;
1981 2052
1982 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1983 2054
1995 2066
1996 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1997 } 2068 }
1998} 2069}
1999 2070
2000sub pre_load { } 2071sub pre_load { }
2001sub post_load { } 2072#sub post_load { } # XS
2002 2073
2003sub load { 2074sub load {
2004 my ($self) = @_; 2075 my ($self) = @_;
2005 2076
2006 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2051 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2123 $self->decay_objects;
2053 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2054 $self->update_buttons; 2125 $self->update_buttons;
2055 cf::cede_to_tick; 2126 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2127 $self->activate;
2059 } 2128 }
2060 2129
2061 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2065 } 2134 }
2066 2135
2067 $self->post_load; 2136 $self->post_load;
2068} 2137}
2069 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
2070sub customise_for { 2142sub customise_for {
2071 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2072 2144
2073 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2146 if $self->per_player;
2151 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2152 2224
2153 () 2225 ()
2154} 2226}
2155 2227
2228# common code, used by both ->save and ->swapout
2156sub save { 2229sub _save {
2157 my ($self) = @_; 2230 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2231
2161 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2162 2233
2163 return unless $self->dirty; 2234 return unless $self->dirty;
2164 2235
2184 } else { 2255 } else {
2185 $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);
2186 } 2257 }
2187} 2258}
2188 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2189sub swap_out { 2268sub swap_out {
2190 my ($self) = @_; 2269 my ($self) = @_;
2191 2270
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2272
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2200 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2201 $self->in_memory (cf::MAP_SWAPPED); 2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2286 $self->clear;
2287}
2288
2289sub reset_at {
2290 my ($self) = @_;
2291
2292 # TODO: safety, remove and allow resettable per-player maps
2293 return 1e99 if $self->{deny_reset};
2294
2295 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2296 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2297
2298 $time + $to
2299}
2300
2301sub should_reset {
2302 my ($self) = @_;
2303
2304 $self->reset_at <= $cf::RUNTIME
2305}
2306
2307sub reset {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 return if $self->players;
2313
2314 warn "resetting map ", $self->path, "\n";
2315
2316 $self->in_memory (cf::MAP_SWAPPED);
2317
2318 # need to save uniques path
2319 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321
2322 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2323 if $uniq;
2324 }
2325
2326 delete $cf::MAP{$self->path};
2202 2327
2203 $self->deactivate; 2328 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2329 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2330 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2331
2251 $self->unlink_save; 2332 $self->unlink_save;
2252 $self->destroy; 2333 $self->destroy;
2253} 2334}
2254 2335
2262 2343
2263 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2264 2345
2265 $self->unlink_save; 2346 $self->unlink_save;
2266 2347
2267 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2353
2329 : normalise $_ 2410 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2412 ]
2332} 2413}
2333 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
2334=back 2447=back
2335 2448
2336=head3 cf::object 2449=head3 cf::object
2337 2450
2338=cut 2451=cut
2403 2516
2404our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2405 id => "say", 2518 id => "say",
2406 title => "Map", 2519 title => "Map",
2407 reply => "say ", 2520 reply => "say ",
2408 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.",
2409}; 2522};
2410 2523
2411our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2412 id => "chat", 2525 id => "chat",
2413 title => "Chat", 2526 title => "Chat",
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2620
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2510 2623
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2625}
2513 2626
2514sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2516 2629
2533 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2535 2648
2536 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2539 2652
2540 $map->load; 2653 $map->load;
2541 $map->load_neighbours; 2654 $map->load_neighbours;
2542 2655
2543 return unless $self->contr->active; 2656 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2657
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $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;
2663# unless exists $self->{_link_pos}; # maybe we re in-flight again
2549} 2664}
2550 2665
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2666=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2667
2553Moves the player to the given map-path and coordinates by first freezing 2668Moves the player to the given map-path and coordinates by first freezing
2741 2856
2742 utf8::encode $text; 2857 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2858 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2744} 2859}
2745 2860
2861=item $client->send_big_packet ($pkt)
2862
2863Like C<send_packet>, but tries to compress large packets, and fragments
2864them as required.
2865
2866=cut
2867
2868our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2869
2870sub cf::client::send_big_packet {
2871 my ($self, $pkt) = @_;
2872
2873 # try lzf for large packets
2874 $pkt = "lzf " . Compress::LZF::compress $pkt
2875 if 1024 <= length $pkt and $self->{can_lzf};
2876
2877 # split very large packets
2878 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2879 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2880 $pkt = "frag";
2881 }
2882
2883 $self->send_packet ($pkt);
2884}
2885
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2886=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2887
2748Send a drawinfo or msg packet to the client, formatting the msg for the 2888Send a drawinfo or msg packet to the client, formatting the msg for the
2749client if neccessary. C<$type> should be a string identifying the type of 2889client if neccessary. C<$type> should be a string identifying the type of
2750the message, with C<log> being the default. If C<$color> is negative, suppress 2890the message, with C<log> being the default. If C<$color> is negative, suppress
2752 2892
2753=cut 2893=cut
2754 2894
2755# non-persistent channels (usually the info channel) 2895# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2896our %CHANNEL = (
2897 "c/motd" => {
2898 id => "infobox",
2899 title => "MOTD",
2900 reply => undef,
2901 tooltip => "The message of the day",
2902 },
2757 "c/identify" => { 2903 "c/identify" => {
2758 id => "infobox", 2904 id => "infobox",
2759 title => "Identify", 2905 title => "Identify",
2760 reply => undef, 2906 reply => undef,
2761 tooltip => "Items recently identified", 2907 tooltip => "Items recently identified",
2763 "c/examine" => { 2909 "c/examine" => {
2764 id => "infobox", 2910 id => "infobox",
2765 title => "Examine", 2911 title => "Examine",
2766 reply => undef, 2912 reply => undef,
2767 tooltip => "Signs and other items you examined", 2913 tooltip => "Signs and other items you examined",
2914 },
2915 "c/shopinfo" => {
2916 id => "infobox",
2917 title => "Shop Info",
2918 reply => undef,
2919 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 2920 },
2769 "c/book" => { 2921 "c/book" => {
2770 id => "infobox", 2922 id => "infobox",
2771 title => "Book", 2923 title => "Book",
2772 reply => undef, 2924 reply => undef,
2788 id => "infobox", 2940 id => "infobox",
2789 title => "Body Parts", 2941 title => "Body Parts",
2790 reply => undef, 2942 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2943 tooltip => "Shows which body parts you posess and are available",
2792 }, 2944 },
2945 "c/statistics" => {
2946 id => "infobox",
2947 title => "Statistics",
2948 reply => undef,
2949 tooltip => "Shows your primary statistics",
2950 },
2793 "c/skills" => { 2951 "c/skills" => {
2794 id => "infobox", 2952 id => "infobox",
2795 title => "Skills", 2953 title => "Skills",
2796 reply => undef, 2954 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2955 tooltip => "Shows your experience per skill and item power",
2956 },
2957 "c/shopitems" => {
2958 id => "infobox",
2959 title => "Shop Items",
2960 reply => undef,
2961 tooltip => "Shows the items currently for sale in this shop",
2962 },
2963 "c/resistances" => {
2964 id => "infobox",
2965 title => "Resistances",
2966 reply => undef,
2967 tooltip => "Shows your resistances",
2968 },
2969 "c/pets" => {
2970 id => "infobox",
2971 title => "Pets",
2972 reply => undef,
2973 tooltip => "Shows information abotu your pets/a specific pet",
2974 },
2975 "c/perceiveself" => {
2976 id => "infobox",
2977 title => "Perceive Self",
2978 reply => undef,
2979 tooltip => "You gained detailed knowledge about yourself",
2798 }, 2980 },
2799 "c/uptime" => { 2981 "c/uptime" => {
2800 id => "infobox", 2982 id => "infobox",
2801 title => "Uptime", 2983 title => "Uptime",
2802 reply => undef, 2984 reply => undef,
2812 id => "party", 2994 id => "party",
2813 title => "Party", 2995 title => "Party",
2814 reply => "gsay ", 2996 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2997 tooltip => "Messages and chat related to your party",
2816 }, 2998 },
2999 "c/death" => {
3000 id => "death",
3001 title => "Death",
3002 reply => undef,
3003 tooltip => "Reason for and more info about your most recent death",
3004 },
3005 "c/say" => $SAY_CHANNEL,
3006 "c/chat" => $CHAT_CHANNEL,
2817); 3007);
2818 3008
2819sub cf::client::send_msg { 3009sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3010 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3011
2826 3016
2827 # check predefined channels, for the benefit of C 3017 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3018 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3019 $channel = $CHANNEL{$channel};
2830 3020
2831 $self->ext_msg (channel_info => $channel) 3021 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3022 $channel = $channel->{id};
2835 3023
2836 } elsif (ref $channel) { 3024 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3025 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3026 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3027 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3028 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3029 }
2843 3030
2844 $channel = $channel->{id}; 3031 $channel = $channel->{id};
2845 } 3032 }
2846 3033
2847 return unless @extra || length $msg; 3034 return unless @extra || length $msg;
2848 3035
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3036 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3037 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3038 if $color & cf::NDI_DEF;
2853 3039
2854 my $pkt = "msg " 3040 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3041 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3042 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3043 );
2858 3044
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3045 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3046}
2896 3047
2897=item $client->ext_msg ($type, @msg) 3048=item $client->ext_msg ($type, @msg)
2898 3049
2899Sends an ext event to the client. 3050Sends an ext event to the client.
2902 3053
2903sub cf::client::ext_msg($$@) { 3054sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3055 my ($self, $type, @msg) = @_;
2905 3056
2906 if ($self->extcmd == 2) { 3057 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3059 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3060 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3062 }
2912} 3063}
2913 3064
2914=item $client->ext_reply ($msgid, @msg) 3065=item $client->ext_reply ($msgid, @msg)
2915 3066
2919 3070
2920sub cf::client::ext_reply($$@) { 3071sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3072 my ($self, $id, @msg) = @_;
2922 3073
2923 if ($self->extcmd == 2) { 3074 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3076 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3077 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3078 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3080 }
2930} 3081}
2931 3082
2932=item $success = $client->query ($flags, "text", \&cb) 3083=item $success = $client->query ($flags, "text", \&cb)
2933 3084
3034 3185
3035 $coro 3186 $coro
3036} 3187}
3037 3188
3038cf::client->attach ( 3189cf::client->attach (
3039 on_destroy => sub { 3190 on_client_destroy => sub {
3040 my ($ns) = @_; 3191 my ($ns) = @_;
3041 3192
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3193 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3194 },
3044); 3195);
3060our $safe_hole = new Safe::Hole; 3211our $safe_hole = new Safe::Hole;
3061 3212
3062$SIG{FPE} = 'IGNORE'; 3213$SIG{FPE} = 'IGNORE';
3063 3214
3064$safe->permit_only (Opcode::opset qw( 3215$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3216 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3217 grepstart grepwhile mapstart mapwhile
3067 sort time 3218 sort time
3068)); 3219));
3069 3220
3070# here we export the classes and methods available to script code 3221# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3225The following functions and methods are available within a safe environment:
3075 3226
3076 cf::object 3227 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3228 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3229 insert remove name archname title slaying race decrease split
3230 value
3079 3231
3080 cf::object::player 3232 cf::object::player
3081 player 3233 player
3082 3234
3083 cf::player 3235 cf::player
3089=cut 3241=cut
3090 3242
3091for ( 3243for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3244 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3093 insert remove inv nrof name archname title slaying race 3245 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3246 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3247 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3248 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3249 ["cf::map" => qw(trigger)],
3098) { 3250) {
3099 no strict 'refs'; 3251 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3252 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3119 3271
3120 my $qcode = $code; 3272 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3273 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3274 $qcode =~ s/\n/\\n/g;
3123 3275
3276 %vars = (_dummy => 0) unless %vars;
3277
3278 my @res;
3124 local $_; 3279 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3280
3127 my $eval = 3281 my $eval =
3128 "do {\n" 3282 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3283 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3284 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3285 . $code
3132 . "\n}" 3286 . "\n}"
3133 ; 3287 ;
3134 3288
3289 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3290 sub_generation_inc;
3291 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3292 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3293 sub_generation_inc;
3294 } else {
3295 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval;
3297 }
3138 3298
3139 if ($@) { 3299 if ($@) {
3140 warn "$@"; 3300 warn "$@";
3141 warn "while executing safe code '$code'\n"; 3301 warn "while executing safe code '$code'\n";
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3302 warn "with arguments " . (join " ", %vars) . "\n";
3161=cut 3321=cut
3162 3322
3163sub register_script_function { 3323sub register_script_function {
3164 my ($fun, $cb) = @_; 3324 my ($fun, $cb) = @_;
3165 3325
3166 no strict 'refs'; 3326 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3327 *$fun = $safe_hole->wrap ($cb);
3168} 3328}
3169 3329
3170=back 3330=back
3171 3331
3172=cut 3332=cut
3193 3353
3194 $facedata->{version} == 2 3354 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3355 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3356
3197 # patch in the exptable 3357 # patch in the exptable
3358 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3359 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3360 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3361 data => $exp_table,
3362 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3363 };
3202 cf::cede_to_tick; 3364 cf::cede_to_tick;
3203 3365
3204 { 3366 {
3205 my $faces = $facedata->{faceinfo}; 3367 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3369 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3370 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3371
3210 cf::face::set_visibility $idx, $info->{visibility}; 3372 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3373 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3376
3215 cf::cede_to_tick; 3377 cf::cede_to_tick;
3216 } 3378 }
3217 3379
3218 while (my ($face, $info) = each %$faces) { 3380 while (my ($face, $info) = each %$faces) {
3242 3404
3243 cf::anim::invalidate_all; # d'oh 3405 cf::anim::invalidate_all; # d'oh
3244 } 3406 }
3245 3407
3246 { 3408 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3409 my $res = $facedata->{resource};
3250 3410
3251 while (my ($name, $info) = each %$res) { 3411 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3412 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3413 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3414
3256 if ($info->{type} & 1) { 3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type}; 3416 cf::face::set_type $idx, $info->{type};
3271 } else { 3417 } else {
3272 $RESOURCE{$name} = $info; 3418 $RESOURCE{$name} = $info;
3273 } 3419 }
3274 3420
3358 3504
3359 warn "finished reloading resource files\n"; 3505 warn "finished reloading resource files\n";
3360} 3506}
3361 3507
3362sub reload_config { 3508sub reload_config {
3509 warn "reloading config file...\n";
3510
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3511 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3512 or return;
3365 3513
3366 local $/; 3514 local $/;
3367 *CFG = YAML::Load <$fh>; 3515 *CFG = YAML::XS::Load scalar <$fh>;
3368 3516
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3370 3518
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3525 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3526 };
3379 warn $@ if $@; 3527 warn $@ if $@;
3380 } 3528 }
3529
3530 warn "finished reloading resource files\n";
3381} 3531}
3382 3532
3383sub pidfile() { 3533sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3535 or die "$PIDFILE: $!";
3397 3547
3398 seek $fh, 0, 0; 3548 seek $fh, 0, 0;
3399 print $fh $$; 3549 print $fh $$;
3400} 3550}
3401 3551
3552sub main_loop {
3553 warn "EV::loop starting\n";
3554 if (1) {
3555 EV::loop;
3556 }
3557 warn "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP;
3559}
3560
3402sub main { 3561sub main {
3403 cf::init_globals; # initialise logging 3562 cf::init_globals; # initialise logging
3404 3563
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415 3568
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3570
3418 # we must not ever block the main coroutine 3571 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3572 local $Coro::idle = sub {
3425 }; 3578 };
3426 3579
3427 evthread_start IO::AIO::poll_fileno; 3580 evthread_start IO::AIO::poll_fileno;
3428 3581
3429 cf::sync_job { 3582 cf::sync_job {
3583 cf::init_experience;
3584 cf::init_anim;
3585 cf::init_attackmess;
3586 cf::init_dynamic;
3587
3588 cf::load_settings;
3589 cf::load_materials;
3590
3430 reload_resources; 3591 reload_resources;
3431 reload_config; 3592 reload_config;
3432 db_init; 3593 db_init;
3433 3594
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3595 cf::init_uuid;
3437 cf::init_signals; 3596 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3597 cf::init_skills;
3440 3598
3441 cf::init_beforeplay; 3599 cf::init_beforeplay;
3442 3600
3443 atomic; 3601 atomic;
3445 load_extensions; 3603 load_extensions;
3446 3604
3447 utime time, time, $RUNTIMEFILE; 3605 utime time, time, $RUNTIMEFILE;
3448 3606
3449 # no (long-running) fork's whatsoever before this point(!) 3607 # no (long-running) fork's whatsoever before this point(!)
3608 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3610
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3611 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3612 };
3454 3613
3455 EV::loop; 3614 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n";
3616
3617 main_loop;
3456} 3618}
3457 3619
3458############################################################################# 3620#############################################################################
3459# initialisation and cleanup 3621# initialisation and cleanup
3460 3622
3461# install some emergency cleanup handlers 3623# install some emergency cleanup handlers
3462BEGIN { 3624BEGIN {
3463 our %SIGWATCHER = (); 3625 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3626 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3627 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3628 cf::cleanup "SIG$signal";
3467 }; 3629 };
3468 } 3630 }
3469} 3631}
3470 3632
3471sub write_runtime_sync { 3633sub write_runtime_sync {
3634 my $t0 = AE::time;
3635
3472 # first touch the runtime file to show we are still running: 3636 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3637 # the fsync below can take a very very long time.
3474 3638
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3639 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3640
3477 my $guard = cf::lock_acquire "write_runtime"; 3641 my $guard = cf::lock_acquire "write_runtime";
3478 3642
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3643 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3644 or return;
3481 3645
3482 my $value = $cf::RUNTIME + 90 + 10; 3646 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3647 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3648 # 60 allows for the watchdog to kill the server.
3497 or return; 3661 or return;
3498 3662
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3664 and return;
3501 3665
3502 warn "runtime file written.\n"; 3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3667
3504 1 3668 1
3505} 3669}
3506 3670
3507our $uuid_lock; 3671our $uuid_lock;
3555} 3719}
3556 3720
3557sub emergency_save() { 3721sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3722 my $freeze_guard = cf::freeze_mainloop;
3559 3723
3560 warn "enter emergency perl save\n"; 3724 warn "emergency_perl_save: enter\n";
3561 3725
3562 cf::sync_job { 3726 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731
3563 # use a peculiar iteration method to avoid tripping on perl 3732 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3733 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3734 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3735 warn "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3736 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3737 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3738 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3740 $pl->save;
3572 } 3741 }
3573 warn "end emergency player save\n"; 3742 warn "emergency_perl_save: end player save\n";
3574 3743
3575 warn "begin emergency map save\n"; 3744 warn "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3745 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3746 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3747 $map->valid or next;
3579 $map->save; 3748 $map->save;
3580 } 3749 }
3581 warn "end emergency map save\n"; 3750 warn "emergency_perl_save: end map save\n";
3582 3751
3583 warn "begin emergency database checkpoint\n"; 3752 warn "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3753 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3754 warn "emergency_perl_save: end database checkpoint\n";
3586 3755
3587 warn "begin write uuid\n"; 3756 warn "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3757 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3758 warn "emergency_perl_save: end write uuid\n";
3590 }; 3759 };
3591 3760
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3592 warn "leave emergency perl save\n"; 3766 warn "emergency_perl_save: leave\n";
3593} 3767}
3594 3768
3595sub post_cleanup { 3769sub post_cleanup {
3596 my ($make_core) = @_; 3770 my ($make_core) = @_;
3597 3771
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3797 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3798 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3799 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3800# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3801 }
3628 warn "cleared package $pkg\n";#d#
3629} 3802}
3630 3803
3631sub do_reload_perl() { 3804sub do_reload_perl() {
3632 # can/must only be called in main 3805 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3806 if (in_main) {
3634 warn "can only reload from main coroutine"; 3807 warn "can only reload from main coroutine";
3635 return; 3808 return;
3636 } 3809 }
3637 3810
3638 return if $RELOAD++; 3811 return if $RELOAD++;
3812
3813 my $t1 = AE::time;
3639 3814
3640 while ($RELOAD) { 3815 while ($RELOAD) {
3641 warn "reloading..."; 3816 warn "reloading...";
3642 3817
3643 warn "entering sync_job"; 3818 warn "entering sync_job";
3704 clear_package "safe::$_" 3879 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3881
3707 warn "unloading cf.pm \"a bit\""; 3882 warn "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3883 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3885
3711 # don't, removes xs symbols, too, 3886 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3887 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3888 #clear_package __PACKAGE__;
3714 3889
3715 warn "unload completed, starting to reload now"; 3890 warn "unload completed, starting to reload now";
3716 3891
3717 warn "reloading cf.pm"; 3892 warn "reloading cf.pm";
3718 require cf; 3893 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3894 cf::_connect_to_perl_1;
3720 3895
3721 warn "loading config and database again"; 3896 warn "loading config and database again";
3722 cf::reload_config; 3897 cf::reload_config;
3723 3898
3724 warn "loading extensions"; 3899 warn "loading extensions";
3725 cf::load_extensions; 3900 cf::load_extensions;
3726 3901
3902 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3903 warn "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3904 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3905 warn "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3906 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3907 warn "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3908 reattach $_ for values %PLAYER;
3909 }
3733 3910
3734 warn "running post_load"; 3911 warn "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3912 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3913
3737 warn "leaving sync_job"; 3914 warn "leaving sync_job";
3738 3915
3739 1 3916 1
3743 }; 3920 };
3744 3921
3745 warn "reloaded"; 3922 warn "reloaded";
3746 --$RELOAD; 3923 --$RELOAD;
3747 } 3924 }
3925
3926 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n";
3748}; 3928};
3749 3929
3750our $RELOAD_WATCHER; # used only during reload 3930our $RELOAD_WATCHER; # used only during reload
3751 3931
3752sub reload_perl() { 3932sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3933 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3934 # coro crashes during coro_state_free->destroy here.
3755 3935
3936 $RELOAD_WATCHER ||= cf::async {
3937 Coro::AIO::aio_wait cache_extensions;
3938
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3939 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 3940 do_reload_perl;
3758 undef $RELOAD_WATCHER; 3941 undef $RELOAD_WATCHER;
3942 };
3759 }; 3943 };
3760} 3944}
3761 3945
3762register_command "reload" => sub { 3946register_command "reload" => sub {
3763 my ($who, $arg) = @_; 3947 my ($who, $arg) = @_;
3777 3961
3778our @WAIT_FOR_TICK; 3962our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN; 3963our @WAIT_FOR_TICK_BEGIN;
3780 3964
3781sub wait_for_tick { 3965sub wait_for_tick {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783 3967
3784 my $signal = new Coro::Signal; 3968 my $signal = new Coro::Signal;
3785 push @WAIT_FOR_TICK, $signal; 3969 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait; 3970 $signal->wait;
3787} 3971}
3788 3972
3789sub wait_for_tick_begin { 3973sub wait_for_tick_begin {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791 3975
3792 my $signal = new Coro::Signal; 3976 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 3977 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 3978 $signal->wait;
3795} 3979}
3800 unless ++$bug_warning > 10; 3984 unless ++$bug_warning > 10;
3801 return; 3985 return;
3802 } 3986 }
3803 3987
3804 cf::server_tick; # one server iteration 3988 cf::server_tick; # one server iteration
3989
3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3805 3991
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3992 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808 Coro::async_pool { 3994 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 3995 $Coro::current->{desc} = "runtime saver";
3832} 4018}
3833 4019
3834{ 4020{
3835 # configure BDB 4021 # configure BDB
3836 4022
3837 BDB::min_parallel 8; 4023 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 4024 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 4025 $AnyEvent::BDB::WATCHER->priority (1);
3840 4026
3841 unless ($DB_ENV) { 4027 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 4028 $DB_ENV = BDB::db_env_create;
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4108 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 4109 }
3924} 4110}
3925 4111
3926# load additional modules 4112# load additional modules
3927use cf::pod; 4113require "cf/$_.pm" for @EXTRA_MODULES;
4114cf::_connect_to_perl_2;
3928 4115
3929END { cf::emergency_save } 4116END { cf::emergency_save }
3930 4117
39311 41181
3932 4119

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines