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.522 by root, Sat Apr 17 02:22:14 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
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728 1807
1729 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1809 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1867 1946
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1948 "$UNIQUEDIR/$path"
1870} 1949}
1871 1950
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 { 1951sub decay_objects {
1882 my ($self) = @_; 1952 my ($self) = @_;
1883 1953
1884 return if $self->{deny_reset}; 1954 return if $self->{deny_reset};
1885 1955
1967sub find { 2037sub find {
1968 my ($path, $origin) = @_; 2038 my ($path, $origin) = @_;
1969 2039
1970 $path = normalise $path, $origin && $origin->path; 2040 $path = normalise $path, $origin && $origin->path;
1971 2041
1972 cf::lock_wait "map_data:$path";#d#remove 2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2044
1975 $cf::MAP{$path} || do { 2045 $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 2046 my $map = new_from_path cf::map $path
1980 or return; 2047 or return;
1981 2048
1982 $map->{last_save} = $cf::RUNTIME; 2049 $map->{last_save} = $cf::RUNTIME;
1983 2050
1995 2062
1996 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
1997 } 2064 }
1998} 2065}
1999 2066
2000sub pre_load { } 2067sub pre_load { }
2001sub post_load { } 2068#sub post_load { } # XS
2002 2069
2003sub load { 2070sub load {
2004 my ($self) = @_; 2071 my ($self) = @_;
2005 2072
2006 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
2051 unless ($self->{deny_activate}) { 2118 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2119 $self->decay_objects;
2053 $self->fix_auto_apply; 2120 $self->fix_auto_apply;
2054 $self->update_buttons; 2121 $self->update_buttons;
2055 cf::cede_to_tick; 2122 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2123 $self->activate;
2059 } 2124 }
2060 2125
2061 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
2065 } 2130 }
2066 2131
2067 $self->post_load; 2132 $self->post_load;
2068} 2133}
2069 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
2070sub customise_for { 2138sub customise_for {
2071 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2072 2140
2073 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2142 if $self->per_player;
2151 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2152 2220
2153 () 2221 ()
2154} 2222}
2155 2223
2224# common code, used by both ->save and ->swapout
2156sub save { 2225sub _save {
2157 my ($self) = @_; 2226 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2227
2161 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2162 2229
2163 return unless $self->dirty; 2230 return unless $self->dirty;
2164 2231
2184 } else { 2251 } else {
2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2186 } 2253 }
2187} 2254}
2188 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2189sub swap_out { 2264sub swap_out {
2190 my ($self) = @_; 2265 my ($self) = @_;
2191 2266
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2268
2197 return if $self->players;
2198 return if $self->in_memory != cf::MAP_ACTIVE; 2269 return if $self->in_memory != cf::MAP_ACTIVE;
2199 return if $self->{deny_save}; 2270 return if $self->{deny_save};
2271 return if $self->players;
2200 2272
2201 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2202
2203 $self->deactivate; 2274 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2205 $self->clear; 2282 $self->clear;
2206} 2283}
2207 2284
2208sub reset_at { 2285sub reset_at {
2209 my ($self) = @_; 2286 my ($self) = @_;
2228 2305
2229 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230 2307
2231 return if $self->players; 2308 return if $self->players;
2232 2309
2233 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2234 2311
2235 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2236 2313
2237 # need to save uniques path 2314 # need to save uniques path
2238 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
2329 : normalise $_ 2406 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2408 ]
2332} 2409}
2333 2410
2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2442
2334=back 2443=back
2335 2444
2336=head3 cf::object 2445=head3 cf::object
2337 2446
2338=cut 2447=cut
2403 2512
2404our $SAY_CHANNEL = { 2513our $SAY_CHANNEL = {
2405 id => "say", 2514 id => "say",
2406 title => "Map", 2515 title => "Map",
2407 reply => "say ", 2516 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2517 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2409}; 2518};
2410 2519
2411our $CHAT_CHANNEL = { 2520our $CHAT_CHANNEL = {
2412 id => "chat", 2521 id => "chat",
2413 title => "Chat", 2522 title => "Chat",
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2616
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2510 2619
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2621}
2513 2622
2514sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2516 2625
2533 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2535 2644
2536 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2539 2648
2540 $map->load; 2649 $map->load;
2541 $map->load_neighbours; 2650 $map->load_neighbours;
2542 2651
2543 return unless $self->contr->active; 2652 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2653
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2655 $self->enter_map ($map, $x, $y);
2656
2657 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive;
2549} 2659}
2550 2660
2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2552 2662
2553Moves the player to the given map-path and coordinates by first freezing 2663Moves the player to the given map-path and coordinates by first freezing
2741 2851
2742 utf8::encode $text; 2852 utf8::encode $text;
2743 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2744} 2854}
2745 2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2879}
2880
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 2882
2748Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send 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 2884client 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 2885the message, with C<log> being the default. If C<$color> is negative, suppress
2752 2887
2753=cut 2888=cut
2754 2889
2755# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2757 "c/identify" => { 2898 "c/identify" => {
2758 id => "infobox", 2899 id => "infobox",
2759 title => "Identify", 2900 title => "Identify",
2760 reply => undef, 2901 reply => undef,
2761 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
2763 "c/examine" => { 2904 "c/examine" => {
2764 id => "infobox", 2905 id => "infobox",
2765 title => "Examine", 2906 title => "Examine",
2766 reply => undef, 2907 reply => undef,
2767 tooltip => "Signs and other items you examined", 2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2768 }, 2915 },
2769 "c/book" => { 2916 "c/book" => {
2770 id => "infobox", 2917 id => "infobox",
2771 title => "Book", 2918 title => "Book",
2772 reply => undef, 2919 reply => undef,
2788 id => "infobox", 2935 id => "infobox",
2789 title => "Body Parts", 2936 title => "Body Parts",
2790 reply => undef, 2937 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 2938 tooltip => "Shows which body parts you posess and are available",
2792 }, 2939 },
2940 "c/statistics" => {
2941 id => "infobox",
2942 title => "Statistics",
2943 reply => undef,
2944 tooltip => "Shows your primary statistics",
2945 },
2793 "c/skills" => { 2946 "c/skills" => {
2794 id => "infobox", 2947 id => "infobox",
2795 title => "Skills", 2948 title => "Skills",
2796 reply => undef, 2949 reply => undef,
2797 tooltip => "Shows your experience per skill and item power", 2950 tooltip => "Shows your experience per skill and item power",
2951 },
2952 "c/shopitems" => {
2953 id => "infobox",
2954 title => "Shop Items",
2955 reply => undef,
2956 tooltip => "Shows the items currently for sale in this shop",
2957 },
2958 "c/resistances" => {
2959 id => "infobox",
2960 title => "Resistances",
2961 reply => undef,
2962 tooltip => "Shows your resistances",
2963 },
2964 "c/pets" => {
2965 id => "infobox",
2966 title => "Pets",
2967 reply => undef,
2968 tooltip => "Shows information abotu your pets/a specific pet",
2969 },
2970 "c/perceiveself" => {
2971 id => "infobox",
2972 title => "Perceive Self",
2973 reply => undef,
2974 tooltip => "You gained detailed knowledge about yourself",
2798 }, 2975 },
2799 "c/uptime" => { 2976 "c/uptime" => {
2800 id => "infobox", 2977 id => "infobox",
2801 title => "Uptime", 2978 title => "Uptime",
2802 reply => undef, 2979 reply => undef,
2812 id => "party", 2989 id => "party",
2813 title => "Party", 2990 title => "Party",
2814 reply => "gsay ", 2991 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 2992 tooltip => "Messages and chat related to your party",
2816 }, 2993 },
2994 "c/death" => {
2995 id => "death",
2996 title => "Death",
2997 reply => undef,
2998 tooltip => "Reason for and more info about your most recent death",
2999 },
3000 "c/say" => $SAY_CHANNEL,
3001 "c/chat" => $CHAT_CHANNEL,
2817); 3002);
2818 3003
2819sub cf::client::send_msg { 3004sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3005 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3006
2826 3011
2827 # check predefined channels, for the benefit of C 3012 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3013 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3014 $channel = $CHANNEL{$channel};
2830 3015
2831 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3017 $channel = $channel->{id};
2835 3018
2836 } elsif (ref $channel) { 3019 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3020 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3021 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3022 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3023 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3024 }
2843 3025
2844 $channel = $channel->{id}; 3026 $channel = $channel->{id};
2845 } 3027 }
2846 3028
2847 return unless @extra || length $msg; 3029 return unless @extra || length $msg;
2848 3030
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3031 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3032 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3033 if $color & cf::NDI_DEF;
2853 3034
2854 my $pkt = "msg " 3035 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3036 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3038 );
2858 3039
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); 3040 $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} 3041}
2896 3042
2897=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2898 3044
2899Sends an ext event to the client. 3045Sends an ext event to the client.
2902 3048
2903sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2905 3051
2906 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3057 }
2912} 3058}
2913 3059
2914=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2915 3061
2919 3065
2920sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2922 3068
2923 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3072 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3075 }
2930} 3076}
2931 3077
2932=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2933 3079
3034 3180
3035 $coro 3181 $coro
3036} 3182}
3037 3183
3038cf::client->attach ( 3184cf::client->attach (
3039 on_destroy => sub { 3185 on_client_destroy => sub {
3040 my ($ns) = @_; 3186 my ($ns) = @_;
3041 3187
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3189 },
3044); 3190);
3060our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3061 3207
3062$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3063 3209
3064$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3067 sort time 3213 sort time
3068)); 3214));
3069 3215
3070# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3220The following functions and methods are available within a safe environment:
3075 3221
3076 cf::object 3222 cf::object
3077 contr pay_amount pay_player map x y force_find force_add destroy 3223 contr pay_amount pay_player map x y force_find force_add destroy
3078 insert remove name archname title slaying race decrease split 3224 insert remove name archname title slaying race decrease split
3225 value
3079 3226
3080 cf::object::player 3227 cf::object::player
3081 player 3228 player
3082 3229
3083 cf::player 3230 cf::player
3089=cut 3236=cut
3090 3237
3091for ( 3238for (
3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3239 ["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 3240 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3241 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3242 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3243 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3244 ["cf::map" => qw(trigger)],
3098) { 3245) {
3099 no strict 'refs'; 3246 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3247 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3119 3266
3120 my $qcode = $code; 3267 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3123 3270
3271 %vars = (_dummy => 0) unless %vars;
3272
3273 my @res;
3124 local $_; 3274 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3275
3127 my $eval = 3276 my $eval =
3128 "do {\n" 3277 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3280 . $code
3132 . "\n}" 3281 . "\n}"
3133 ; 3282 ;
3134 3283
3284 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
3138 3293
3139 if ($@) { 3294 if ($@) {
3140 warn "$@"; 3295 warn "$@";
3141 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
3161=cut 3316=cut
3162 3317
3163sub register_script_function { 3318sub register_script_function {
3164 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3165 3320
3166 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3168} 3323}
3169 3324
3170=back 3325=back
3171 3326
3172=cut 3327=cut
3193 3348
3194 $facedata->{version} == 2 3349 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3351
3197 # patch in the exptable 3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3198 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC, 3355 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3201 }; 3358 };
3202 cf::cede_to_tick; 3359 cf::cede_to_tick;
3203 3360
3204 { 3361 {
3205 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
3207 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3366
3210 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3214 3371
3215 cf::cede_to_tick; 3372 cf::cede_to_tick;
3216 } 3373 }
3217 3374
3218 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
3242 3399
3243 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3244 } 3401 }
3245 3402
3246 { 3403 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3250 3405
3251 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) { 3407 if (defined $info->{type}) {
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3409
3256 if ($info->{type} & 1) { 3410 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}; 3411 cf::face::set_type $idx, $info->{type};
3271 } else { 3412 } else {
3272 $RESOURCE{$name} = $info; 3413 $RESOURCE{$name} = $info;
3273 } 3414 }
3274 3415
3358 3499
3359 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3360} 3501}
3361 3502
3362sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3364 or return; 3507 or return;
3365 3508
3366 local $/; 3509 local $/;
3367 *CFG = YAML::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3368 3511
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3370 3513
3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $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}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3376 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3377 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3378 }; 3521 };
3379 warn $@ if $@; 3522 warn $@ if $@;
3380 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3381} 3526}
3382 3527
3383sub pidfile() { 3528sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!"; 3530 or die "$PIDFILE: $!";
3397 3542
3398 seek $fh, 0, 0; 3543 seek $fh, 0, 0;
3399 print $fh $$; 3544 print $fh $$;
3400} 3545}
3401 3546
3547sub main_loop {
3548 warn "EV::loop starting\n";
3549 if (1) {
3550 EV::loop;
3551 }
3552 warn "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP;
3554}
3555
3402sub main { 3556sub main {
3403 cf::init_globals; # initialise logging 3557 cf::init_globals; # initialise logging
3404 3558
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3562 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 3563
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3565
3418 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
3425 }; 3573 };
3426 3574
3427 evthread_start IO::AIO::poll_fileno; 3575 evthread_start IO::AIO::poll_fileno;
3428 3576
3429 cf::sync_job { 3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3430 reload_resources; 3586 reload_resources;
3431 reload_config; 3587 reload_config;
3432 db_init; 3588 db_init;
3433 3589
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3590 cf::init_uuid;
3437 cf::init_signals; 3591 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3592 cf::init_skills;
3440 3593
3441 cf::init_beforeplay; 3594 cf::init_beforeplay;
3442 3595
3443 atomic; 3596 atomic;
3445 load_extensions; 3598 load_extensions;
3446 3599
3447 utime time, time, $RUNTIMEFILE; 3600 utime time, time, $RUNTIMEFILE;
3448 3601
3449 # no (long-running) fork's whatsoever before this point(!) 3602 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX ();
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451 3605
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3606 (pop @POST_INIT)->(0) while @POST_INIT;
3453 }; 3607 };
3454 3608
3455 EV::loop; 3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3611
3612 main_loop;
3456} 3613}
3457 3614
3458############################################################################# 3615#############################################################################
3459# initialisation and cleanup 3616# initialisation and cleanup
3460 3617
3461# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3462BEGIN { 3619BEGIN {
3463 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3467 }; 3624 };
3468 } 3625 }
3469} 3626}
3470 3627
3471sub write_runtime_sync { 3628sub write_runtime_sync {
3629 my $t0 = AE::time;
3630
3472 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3474 3633
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3635
3477 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3478 3637
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3639 or return;
3481 3640
3482 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
3497 or return; 3656 or return;
3498 3657
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3659 and return;
3501 3660
3502 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3662
3504 1 3663 1
3505} 3664}
3506 3665
3507our $uuid_lock; 3666our $uuid_lock;
3555} 3714}
3556 3715
3557sub emergency_save() { 3716sub emergency_save() {
3558 my $freeze_guard = cf::freeze_mainloop; 3717 my $freeze_guard = cf::freeze_mainloop;
3559 3718
3560 warn "enter emergency perl save\n"; 3719 warn "emergency_perl_save: enter\n";
3561 3720
3562 cf::sync_job { 3721 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726
3563 # use a peculiar iteration method to avoid tripping on perl 3727 # use a peculiar iteration method to avoid tripping on perl
3564 # refcount bugs in for. also avoids problems with players 3728 # refcount bugs in for. also avoids problems with players
3565 # and maps saved/destroyed asynchronously. 3729 # and maps saved/destroyed asynchronously.
3566 warn "begin emergency player save\n"; 3730 warn "emergency_perl_save: begin player save\n";
3567 for my $login (keys %cf::PLAYER) { 3731 for my $login (keys %cf::PLAYER) {
3568 my $pl = $cf::PLAYER{$login} or next; 3732 my $pl = $cf::PLAYER{$login} or next;
3569 $pl->valid or next; 3733 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3571 $pl->save; 3735 $pl->save;
3572 } 3736 }
3573 warn "end emergency player save\n"; 3737 warn "emergency_perl_save: end player save\n";
3574 3738
3575 warn "begin emergency map save\n"; 3739 warn "emergency_perl_save: begin map save\n";
3576 for my $path (keys %cf::MAP) { 3740 for my $path (keys %cf::MAP) {
3577 my $map = $cf::MAP{$path} or next; 3741 my $map = $cf::MAP{$path} or next;
3578 $map->valid or next; 3742 $map->valid or next;
3579 $map->save; 3743 $map->save;
3580 } 3744 }
3581 warn "end emergency map save\n"; 3745 warn "emergency_perl_save: end map save\n";
3582 3746
3583 warn "begin emergency database checkpoint\n"; 3747 warn "emergency_perl_save: begin database checkpoint\n";
3584 BDB::db_env_txn_checkpoint $DB_ENV; 3748 BDB::db_env_txn_checkpoint $DB_ENV;
3585 warn "end emergency database checkpoint\n"; 3749 warn "emergency_perl_save: end database checkpoint\n";
3586 3750
3587 warn "begin write uuid\n"; 3751 warn "emergency_perl_save: begin write uuid\n";
3588 write_uuid_sync 1; 3752 write_uuid_sync 1;
3589 warn "end write uuid\n"; 3753 warn "emergency_perl_save: end write uuid\n";
3590 }; 3754 };
3591 3755
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3592 warn "leave emergency perl save\n"; 3761 warn "emergency_perl_save: leave\n";
3593} 3762}
3594 3763
3595sub post_cleanup { 3764sub post_cleanup {
3596 my ($make_core) = @_; 3765 my ($make_core) = @_;
3597 3766
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) { 3793 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"}; 3794 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 } 3796 }
3628 warn "cleared package $pkg\n";#d#
3629} 3797}
3630 3798
3631sub do_reload_perl() { 3799sub do_reload_perl() {
3632 # can/must only be called in main 3800 # can/must only be called in main
3633 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3634 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3635 return; 3803 return;
3636 } 3804 }
3637 3805
3638 return if $RELOAD++; 3806 return if $RELOAD++;
3807
3808 my $t1 = AE::time;
3639 3809
3640 while ($RELOAD) { 3810 while ($RELOAD) {
3641 warn "reloading..."; 3811 warn "reloading...";
3642 3812
3643 warn "entering sync_job"; 3813 warn "entering sync_job";
3704 clear_package "safe::$_" 3874 clear_package "safe::$_"
3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3706 3876
3707 warn "unloading cf.pm \"a bit\""; 3877 warn "unloading cf.pm \"a bit\"";
3708 delete $INC{"cf.pm"}; 3878 delete $INC{"cf.pm"};
3709 delete $INC{"cf/pod.pm"}; 3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3710 3880
3711 # don't, removes xs symbols, too, 3881 # don't, removes xs symbols, too,
3712 # and global variables created in xs 3882 # and global variables created in xs
3713 #clear_package __PACKAGE__; 3883 #clear_package __PACKAGE__;
3714 3884
3715 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3716 3886
3717 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3718 require cf; 3888 require cf;
3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3720 3890
3721 warn "loading config and database again"; 3891 warn "loading config and database again";
3722 cf::reload_config; 3892 cf::reload_config;
3723 3893
3724 warn "loading extensions"; 3894 warn "loading extensions";
3725 cf::load_extensions; 3895 cf::load_extensions;
3726 3896
3897 if ($REATTACH_ON_RELOAD) {
3727 warn "reattaching attachments to objects/players"; 3898 warn "reattaching attachments to objects/players";
3728 _global_reattach; # objects, sockets 3899 _global_reattach; # objects, sockets
3729 warn "reattaching attachments to maps"; 3900 warn "reattaching attachments to maps";
3730 reattach $_ for values %MAP; 3901 reattach $_ for values %MAP;
3731 warn "reattaching attachments to players"; 3902 warn "reattaching attachments to players";
3732 reattach $_ for values %PLAYER; 3903 reattach $_ for values %PLAYER;
3904 }
3733 3905
3734 warn "running post_load"; 3906 warn "running post_init jobs";
3735 (pop @POST_INIT)->(1) while @POST_INIT; 3907 (pop @POST_INIT)->(1) while @POST_INIT;
3736 3908
3737 warn "leaving sync_job"; 3909 warn "leaving sync_job";
3738 3910
3739 1 3911 1
3743 }; 3915 };
3744 3916
3745 warn "reloaded"; 3917 warn "reloaded";
3746 --$RELOAD; 3918 --$RELOAD;
3747 } 3919 }
3920
3921 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n";
3748}; 3923};
3749 3924
3750our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3751 3926
3752sub reload_perl() { 3927sub reload_perl() {
3753 # doing reload synchronously and two reloads happen back-to-back, 3928 # doing reload synchronously and two reloads happen back-to-back,
3754 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3755 3930
3931 $RELOAD_WATCHER ||= cf::async {
3932 Coro::AIO::aio_wait cache_extensions;
3933
3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3757 do_reload_perl; 3935 do_reload_perl;
3758 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3937 };
3759 }; 3938 };
3760} 3939}
3761 3940
3762register_command "reload" => sub { 3941register_command "reload" => sub {
3763 my ($who, $arg) = @_; 3942 my ($who, $arg) = @_;
3777 3956
3778our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3779our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3780 3959
3781sub wait_for_tick { 3960sub wait_for_tick {
3782 return if tick_inhibit || $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3783 3962
3784 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3785 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3786 $signal->wait; 3965 $signal->wait;
3787} 3966}
3788 3967
3789sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3790 return if tick_inhibit || $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3791 3970
3792 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3793 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3794 $signal->wait; 3973 $signal->wait;
3795} 3974}
3800 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3801 return; 3980 return;
3802 } 3981 }
3803 3982
3804 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3984
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3805 3986
3806 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3808 Coro::async_pool { 3989 Coro::async_pool {
3809 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
3832} 4013}
3833 4014
3834{ 4015{
3835 # configure BDB 4016 # configure BDB
3836 4017
3837 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3838 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3839 $AnyEvent::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3840 4021
3841 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3842 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
3922 LOG llevInfo, "[ABT] [suppressed]\n"; 4103 LOG llevInfo, "[ABT] [suppressed]\n";
3923 } 4104 }
3924} 4105}
3925 4106
3926# load additional modules 4107# load additional modules
3927use cf::pod; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3928 4110
3929END { cf::emergency_save } 4111END { cf::emergency_save }
3930 4112
39311 41131
3932 4114

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines