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.458 by root, Sat Dec 13 20:34:37 2008 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
26use strict "vars", "subs"; 27use strict qw(vars subs);
27 28
28use Symbol; 29use Symbol;
29use List::Util; 30use List::Util;
30use Socket; 31use Socket;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
41use Coro::EV; 43use Coro::EV;
42use Coro::AnyEvent; 44use Coro::AnyEvent;
43use Coro::Timer; 45use Coro::Timer;
44use Coro::Signal; 46use Coro::Signal;
45use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
46use Coro::AnyEvent; 49use Coro::AnyEvent;
47use Coro::AIO; 50use Coro::AIO;
48use Coro::BDB 1.6; 51use Coro::BDB 1.6;
49use Coro::Storable; 52use Coro::Storable;
50use Coro::Util (); 53use Coro::Util ();
51 54
52use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
53use BDB (); 56use BDB ();
54use Data::Dumper; 57use Data::Dumper;
55use Digest::MD5;
56use Fcntl; 58use Fcntl;
57use YAML (); 59use YAML::XS ();
58use IO::AIO (); 60use IO::AIO ();
59use Time::HiRes; 61use Time::HiRes;
60use Compress::LZF; 62use Compress::LZF;
61use Digest::MD5 (); 63use Digest::MD5 ();
62 64
70$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
71 73
72# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
74Compress::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" };
75 80
76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
77 82
78our %COMMAND = (); 83our %COMMAND = ();
79our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
85our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
86 91
87our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
88our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
89 96
90our $CONFDIR = confdir; 97our $CONFDIR = confdir;
91our $DATADIR = datadir; 98our $DATADIR = datadir;
92our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
93our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
101our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
102our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
103 110
104our %RESOURCE; 111our %RESOURCE;
105 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
108our $NEXT_TICK; 118our $NEXT_TICK;
109our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
110 120
111our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
112our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
113our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
114our $DB_ENV; 124our $DB_ENV;
115 125
126our @EXTRA_MODULES = qw(pod match mapscript);
127
116our %CFG; 128our %CFG;
117 129
118our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
119our $RUNTIME; 131our $RUNTIME;
120our $NOW; 132our $NOW;
131our $JITTER; # average jitter 143our $JITTER; # average jitter
132our $TICK_START; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
133 145
134our @POST_INIT; 146our @POST_INIT;
135 147
136our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
137 150
138binmode STDOUT; 151binmode STDOUT;
139binmode STDERR; 152binmode STDERR;
140 153
141# read virtual server time, if available 154# read virtual server time, if available
143 open my $fh, "<", $RUNTIMEFILE 156 open my $fh, "<", $RUNTIMEFILE
144 or die "unable to read $RUNTIMEFILE file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
145 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
146} 159}
147 160
161eval "sub TICK() { $TICK } 1" or die;
162
148mkdir $_ 163mkdir $_
149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
150 165
151our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
152 167
153sub 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::"} };
154 184
155############################################################################# 185#############################################################################
156 186
157=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
158 188
205returns 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
206per 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.
207 237
208=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
209 239
210This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
211C<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
212that call. 242that call.
213 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
214=back 250=back
215 251
216=cut 252=cut
217 253
218BEGIN { 254$Coro::State::WARNHOOK = sub {
219 *CORE::GLOBAL::warn = sub {
220 my $msg = join "", @_; 255 my $msg = join "", @_;
221 256
222 $msg .= "\n" 257 $msg .= "\n"
223 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
224 259
225 $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;
226 261
227 LOG llevError, $msg; 262 LOG llevError, $msg;
228 }; 263};
229}
230 264
231$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
232 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
233 267
234 if ($Coro::current == $Coro::main) {#d# 268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
235 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
236 return;#d# 272 return;#d#
237 }#d# 273 }#d#
238 274
239 # kill coroutine otherwise 275 # kill coroutine otherwise
240 warn Carp::longmess $_[0];
241 Coro::terminate 276 Coro::terminate
242}; 277};
243
244$SIG{__DIE__} = sub { }; #d#?
245 278
246@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
247@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
248@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
249@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
263)) { 296)) {
264 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
265} 298}
266 299
267$EV::DIED = sub { 300$EV::DIED = sub {
268 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
269}; 302};
270 303
271############################################################################# 304#############################################################################
272 305
273=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
347 380
348Return 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.
349 382
350=cut 383=cut
351 384
352our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
353our %LOCKER;#d#
354 386
355sub lock_wait($) { 387sub lock_wait($) {
356 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
357
358 if ($LOCKER{$key} == $Coro::current) {#d#
359 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
360 return;#d#
361 }#d#
362
363 # wait for lock, if any
364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
366 push @{ $LOCK{$key} }, $Coro::current;
367 Coro::schedule;
368 }
369} 389}
370 390
371sub lock_acquire($) { 391sub lock_acquire($) {
372 my ($key) = @_; 392 $LOCKS->guard ($_[0])
373
374 # wait, to be sure we are not locked
375 lock_wait $key;
376
377 $LOCK{$key} = [];
378 $LOCKER{$key} = $Coro::current;#d#
379
380 Guard::guard {
381 delete $LOCKER{$key};#d#
382 # wake up all waiters, to be on the safe side
383 $_->ready for @{ delete $LOCK{$key} };
384 }
385} 393}
386 394
387sub lock_active($) { 395sub lock_active($) {
388 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
389
390 ! ! $LOCK{$key}
391} 397}
392 398
393sub freeze_mainloop { 399sub freeze_mainloop {
394 tick_inhibit_inc; 400 tick_inhibit_inc;
395 401
397} 403}
398 404
399=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
400 406
401Like 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
402get spread over timer. 408get spread over time.
403 409
404=cut 410=cut
405 411
406sub periodic($$) { 412sub periodic($$) {
407 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
424 430
425=cut 431=cut
426 432
427our @SLOT_QUEUE; 433our @SLOT_QUEUE;
428our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
429 436
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
433 440
434 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
435 443
436 while () { 444 while () {
437 next_job: 445 next_job:
446
438 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 448
440 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 453 $job->[2]->send;
444 Coro::cede; 454 Coro::cede;
445 goto next_job; 455 goto next_job;
446 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 458 }
448 } 459 }
449 460
450 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
451 # 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
452 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 464 $signal->wait;
454 } else { 465 } else {
466 $busy = 0;
455 Coro::schedule; 467 Coro::schedule;
456 } 468 }
457 } 469 }
458}; 470};
459 471
460sub get_slot($;$$) { 472sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
462 474
463 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
464 476
465 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
466 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
467 480
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
497 510
498sub sync_job(&) { 511sub sync_job(&) {
499 my ($job) = @_; 512 my ($job) = @_;
500 513
501 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
502 my $time = EV::time; 515 my $time = AE::time;
503 516
504 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
506 519
507 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
524 } else { 537 } else {
525 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
526 } 539 }
527 } 540 }
528 541
529 my $time = EV::time - $time; 542 my $time = AE::time - $time;
530 543
531 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
532 545
533 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
534 } else { 547 } else {
578 reset_signals; 591 reset_signals;
579 &$cb 592 &$cb
580 }, @args; 593 }, @args;
581 594
582 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 )
583} 607}
584 608
585=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
586 610
587=cut 611=cut
1173 $decname, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1174 1198
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1200 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 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 }
1179 aio_close $fh; 1206 aio_close $fh;
1180 1207
1181 if (@$objs) { 1208 if (@$objs) {
1182 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) {
1183 aio_chmod $fh, SAVE_MODE; 1210 aio_chmod $fh, SAVE_MODE;
1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1185 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1186 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 }
1187 aio_close $fh; 1217 aio_close $fh;
1188 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1189 } 1219 }
1190 } else { 1220 } else {
1191 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1194 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1195 1225
1196 $filename =~ s%/[^/]+$%%; 1226 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC; 1227 aio_pathsync $filename if $cf::USE_FSYNC;
1198 } else { 1228 } else {
1199 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1200 } 1230 }
1201 } else { 1231 } else {
1202 aio_unlink $filename; 1232 aio_unlink $filename;
1203 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1204 } 1234 }
1298} 1328}
1299 1329
1300use File::Glob (); 1330use File::Glob ();
1301 1331
1302cf::player->attach ( 1332cf::player->attach (
1303 on_command => sub { 1333 on_unknown_command => sub {
1304 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1305 1335
1306 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1307 or return; 1337 or return;
1308 1338
1342 1372
1343# "readahead" all extensions 1373# "readahead" all extensions
1344sub cache_extensions { 1374sub cache_extensions {
1345 my $grp = IO::AIO::aio_group; 1375 my $grp = IO::AIO::aio_group;
1346 1376
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1348 for (grep /\.ext$/, @{$_[0]}) { 1378 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 } 1380 }
1351 }; 1381 };
1352 1382
1387 . "\n};\n1"; 1417 . "\n};\n1";
1388 1418
1389 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1390 } 1420 }
1391 1421
1422 my $pass = 0;
1392 my %done; 1423 my %done;
1393 while (%todo) { 1424 while (%todo) {
1394 my $progress; 1425 my $progress;
1395 1426
1427 ++$pass;
1428
1429 ext:
1396 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1397 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1398 goto skip 1432 next ext
1399 unless exists $done{$_}; 1433 unless exists $done{$_};
1400 } 1434 }
1401 1435
1402 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1403 1437
1404 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1405 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1406 : "$v->{base}: extension inactive.\n";
1407 1442
1408 if (exists $v->{meta}{mandatory}) {
1409 warn $msg;
1410 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1411 } 1444 if exists $v->{meta}{mandatory};
1412 1445
1413 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;
1414 } 1455 }
1415
1416 $done{$k} = delete $todo{$k};
1417 push @EXTS, $v->{pkg};
1418 $progress = 1;
1419 } 1456 }
1420 1457
1421 skip: 1458 unless ($progress) {
1422 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1423 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 }
1424 } 1466 }
1425 }; 1467 };
1426} 1468}
1427 1469
1428############################################################################# 1470#############################################################################
1512 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1513 } 1555 }
1514 } 1556 }
1515} 1557}
1516 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
1517sub save($) { 1572sub save($) {
1518 my ($pl) = @_; 1573 my ($pl) = @_;
1519 1574
1520 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1521 1576
1526 1581
1527 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1528 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1529 1584
1530 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];
1531 1589
1532 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1533 cf::cede_to_tick; 1591 cf::cede_to_tick;
1534} 1592}
1535 1593
1637 \@logins 1695 \@logins
1638} 1696}
1639 1697
1640=item $player->maps 1698=item $player->maps
1641 1699
1700=item cf::player::maps $login
1701
1642Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1643player. May block. 1703player. May block.
1644 1704
1645=cut 1705=cut
1646 1706
1708=cut 1768=cut
1709 1769
1710sub find_by_path($) { 1770sub find_by_path($) {
1711 my ($path) = @_; 1771 my ($path) = @_;
1712 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1713 my ($match, $specificity); 1775 my ($match, $specificity);
1714 1776
1715 for my $region (list) { 1777 for my $region (list) {
1716 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1717 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
1748 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
1749 1811
1750 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1751 $self->_create_random_map ( 1813 $self->_create_random_map (
1752 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1753 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1754 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1755 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1756 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1757 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1758 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1888 1950
1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1890 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1891} 1953}
1892 1954
1893# and all this just because we cannot iterate over
1894# all maps in C++...
1895sub change_all_map_light {
1896 my ($change) = @_;
1897
1898 $_->change_map_light ($change)
1899 for grep $_->outdoor, values %cf::MAP;
1900}
1901
1902sub decay_objects { 1955sub decay_objects {
1903 my ($self) = @_; 1956 my ($self) = @_;
1904 1957
1905 return if $self->{deny_reset}; 1958 return if $self->{deny_reset};
1906 1959
1988sub find { 2041sub find {
1989 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1990 2043
1991 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1992 2045
1993 cf::lock_wait "map_data:$path";#d#remove 2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1994 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1995 2048
1996 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1997 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1998 my $guard2 = cf::lock_acquire "map_find:$path";
1999
2000 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
2001 or return; 2051 or return;
2002 2052
2003 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
2004 2054
2016 2066
2017 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2018 } 2068 }
2019} 2069}
2020 2070
2021sub pre_load { } 2071sub pre_load { }
2022sub post_load { } 2072#sub post_load { } # XS
2023 2073
2024sub load { 2074sub load {
2025 my ($self) = @_; 2075 my ($self) = @_;
2026 2076
2027 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
2072 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2123 $self->decay_objects;
2074 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
2075 $self->update_buttons; 2125 $self->update_buttons;
2076 cf::cede_to_tick; 2126 cf::cede_to_tick;
2077 $self->set_darkness_map;
2078 cf::cede_to_tick;
2079 $self->activate; 2127 $self->activate;
2080 } 2128 }
2081 2129
2082 $self->{last_save} = $cf::RUNTIME; 2130 $self->{last_save} = $cf::RUNTIME;
2083 $self->last_access ($cf::RUNTIME); 2131 $self->last_access ($cf::RUNTIME);
2086 } 2134 }
2087 2135
2088 $self->post_load; 2136 $self->post_load;
2089} 2137}
2090 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
2091sub customise_for { 2142sub customise_for {
2092 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2093 2144
2094 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2095 if $self->per_player; 2146 if $self->per_player;
2172 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2173 2224
2174 () 2225 ()
2175} 2226}
2176 2227
2228# common code, used by both ->save and ->swapout
2177sub save { 2229sub _save {
2178 my ($self) = @_; 2230 my ($self) = @_;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2231
2182 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2183 2233
2184 return unless $self->dirty; 2234 return unless $self->dirty;
2185 2235
2205 } else { 2255 } else {
2206 $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);
2207 } 2257 }
2208} 2258}
2209 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2210sub swap_out { 2268sub swap_out {
2211 my ($self) = @_; 2269 my ($self) = @_;
2212 2270
2213 # save first because save cedes
2214 $self->save;
2215
2216 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2217 2272
2218 return if $self->players;
2219 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2220 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2221 2276
2222 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2223
2224 $self->deactivate; 2278 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2226 $self->clear; 2286 $self->clear;
2227} 2287}
2228 2288
2229sub reset_at { 2289sub reset_at {
2230 my ($self) = @_; 2290 my ($self) = @_;
2249 2309
2250 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2251 2311
2252 return if $self->players; 2312 return if $self->players;
2253 2313
2254 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2255 2315
2256 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2257 2317
2258 # need to save uniques path 2318 # need to save uniques path
2259 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
2350 : normalise $_ 2410 : normalise $_
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2412 ]
2353} 2413}
2354 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
2355=back 2447=back
2356 2448
2357=head3 cf::object 2449=head3 cf::object
2358 2450
2359=cut 2451=cut
2424 2516
2425our $SAY_CHANNEL = { 2517our $SAY_CHANNEL = {
2426 id => "say", 2518 id => "say",
2427 title => "Map", 2519 title => "Map",
2428 reply => "say ", 2520 reply => "say ",
2429 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.",
2430}; 2522};
2431 2523
2432our $CHAT_CHANNEL = { 2524our $CHAT_CHANNEL = {
2433 id => "chat", 2525 id => "chat",
2434 title => "Chat", 2526 title => "Chat",
2527 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2528 2620
2529 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2530 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2531 2623
2532 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2533} 2625}
2534 2626
2535sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2536 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2537 2629
2554 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2555 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2556 2648
2557 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2558 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2559 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2560 2652
2561 $map->load; 2653 $map->load;
2562 $map->load_neighbours; 2654 $map->load_neighbours;
2563 2655
2564 return unless $self->contr->active; 2656 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2566 $self->activate_recursive;
2567 2657
2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2569 $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;
2570} 2663}
2571 2664
2572=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2573 2666
2574Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2762 2855
2763 utf8::encode $text; 2856 utf8::encode $text;
2764 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2765} 2858}
2766 2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2883}
2884
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2886
2769Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2770client if neccessary. C<$type> should be a string identifying the type of 2888client if neccessary. C<$type> should be a string identifying the type of
2771the message, with C<log> being the default. If C<$color> is negative, suppress 2889the message, with C<log> being the default. If C<$color> is negative, suppress
2773 2891
2774=cut 2892=cut
2775 2893
2776# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2778 "c/identify" => { 2902 "c/identify" => {
2779 id => "infobox", 2903 id => "infobox",
2780 title => "Identify", 2904 title => "Identify",
2781 reply => undef, 2905 reply => undef,
2782 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
2784 "c/examine" => { 2908 "c/examine" => {
2785 id => "infobox", 2909 id => "infobox",
2786 title => "Examine", 2910 title => "Examine",
2787 reply => undef, 2911 reply => undef,
2788 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2789 }, 2919 },
2790 "c/book" => { 2920 "c/book" => {
2791 id => "infobox", 2921 id => "infobox",
2792 title => "Book", 2922 title => "Book",
2793 reply => undef, 2923 reply => undef,
2809 id => "infobox", 2939 id => "infobox",
2810 title => "Body Parts", 2940 title => "Body Parts",
2811 reply => undef, 2941 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2942 tooltip => "Shows which body parts you posess and are available",
2813 }, 2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2814 "c/skills" => { 2950 "c/skills" => {
2815 id => "infobox", 2951 id => "infobox",
2816 title => "Skills", 2952 title => "Skills",
2817 reply => undef, 2953 reply => undef,
2818 tooltip => "Shows your experience per skill and item power", 2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2819 }, 2979 },
2820 "c/uptime" => { 2980 "c/uptime" => {
2821 id => "infobox", 2981 id => "infobox",
2822 title => "Uptime", 2982 title => "Uptime",
2823 reply => undef, 2983 reply => undef,
2833 id => "party", 2993 id => "party",
2834 title => "Party", 2994 title => "Party",
2835 reply => "gsay ", 2995 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party", 2996 tooltip => "Messages and chat related to your party",
2837 }, 2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
2838); 3006);
2839 3007
2840sub cf::client::send_msg { 3008sub cf::client::send_msg {
2841 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2842 3010
2847 3015
2848 # check predefined channels, for the benefit of C 3016 # check predefined channels, for the benefit of C
2849 if ($CHANNEL{$channel}) { 3017 if ($CHANNEL{$channel}) {
2850 $channel = $CHANNEL{$channel}; 3018 $channel = $CHANNEL{$channel};
2851 3019
2852 $self->ext_msg (channel_info => $channel) 3020 $self->ext_msg (channel_info => $channel);
2853 if $self->can_msg;
2854
2855 $channel = $channel->{id}; 3021 $channel = $channel->{id};
2856 3022
2857 } elsif (ref $channel) { 3023 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel) 3027 $self->ext_msg (channel_info => $channel);
2862 if $self->can_msg;
2863 } 3028 }
2864 3029
2865 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2866 } 3031 }
2867 3032
2868 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2869 3034
2870 if ($self->can_msg) {
2871 # default colour, mask it out 3035 # default colour, mask it out
2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2873 if $color & cf::NDI_DEF; 3037 if $color & cf::NDI_DEF;
2874 3038
2875 my $pkt = "msg " 3039 my $pkt = "msg "
2876 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 ); 3042 );
2879 3043
2880 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf};
2883
2884 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag";
2888 }
2889
2890 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2891 } else {
2892 if ($color >= 0) {
2893 # replace some tags by gcfclient-compatible ones
2894 for ($msg) {
2895 1 while
2896 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2897 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2898 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2899 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2900 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2901 }
2902
2903 $color &= cf::NDI_COLOR_MASK;
2904
2905 utf8::encode $msg;
2906
2907 if (0 && $msg =~ /\[/) {
2908 # COMMAND/INFO
2909 $self->send_packet ("drawextinfo $color 10 8 $msg")
2910 } else {
2911 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2912 $self->send_packet ("drawinfo $color $msg")
2913 }
2914 }
2915 }
2916} 3045}
2917 3046
2918=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2919 3048
2920Sends an ext event to the client. 3049Sends an ext event to the client.
2923 3052
2924sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2926 3055
2927 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3061 }
2933} 3062}
2934 3063
2935=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2936 3065
2940 3069
2941sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2943 3072
2944 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3076 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3079 }
2951} 3080}
2952 3081
2953=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2954 3083
3055 3184
3056 $coro 3185 $coro
3057} 3186}
3058 3187
3059cf::client->attach ( 3188cf::client->attach (
3060 on_destroy => sub { 3189 on_client_destroy => sub {
3061 my ($ns) = @_; 3190 my ($ns) = @_;
3062 3191
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3193 },
3065); 3194);
3081our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3082 3211
3083$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3084 3213
3085$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3088 sort time 3217 sort time
3089)); 3218));
3090 3219
3091# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
3095The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
3096 3225
3097 cf::object 3226 cf::object
3098 contr pay_amount pay_player map x y force_find force_add destroy 3227 contr pay_amount pay_player map x y force_find force_add destroy
3099 insert remove name archname title slaying race decrease split 3228 insert remove name archname title slaying race decrease split
3229 value
3100 3230
3101 cf::object::player 3231 cf::object::player
3102 player 3232 player
3103 3233
3104 cf::player 3234 cf::player
3110=cut 3240=cut
3111 3241
3112for ( 3242for (
3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3114 insert remove inv nrof name archname title slaying race 3244 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)], 3245 decrease split destroy change_exp value msg lore send_msg)],
3116 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
3117 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
3118 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
3119) { 3249) {
3120 no strict 'refs'; 3250 no strict 'refs';
3121 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
3122 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3140 3270
3141 my $qcode = $code; 3271 my $qcode = $code;
3142 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3143 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3144 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
3145 local $_; 3278 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3279
3148 my $eval = 3280 my $eval =
3149 "do {\n" 3281 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3284 . $code
3153 . "\n}" 3285 . "\n}"
3154 ; 3286 ;
3155 3287
3288 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3159 3297
3160 if ($@) { 3298 if ($@) {
3161 warn "$@"; 3299 warn "$@";
3162 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
3182=cut 3320=cut
3183 3321
3184sub register_script_function { 3322sub register_script_function {
3185 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3186 3324
3187 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3189} 3327}
3190 3328
3191=back 3329=back
3192 3330
3193=cut 3331=cut
3214 3352
3215 $facedata->{version} == 2 3353 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3217 3355
3218 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3219 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC, 3359 type => FT_RSRC,
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3222 }; 3362 };
3223 cf::cede_to_tick; 3363 cf::cede_to_tick;
3224 3364
3225 { 3365 {
3226 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
3228 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3370
3231 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3235 3375
3236 cf::cede_to_tick; 3376 cf::cede_to_tick;
3237 } 3377 }
3238 3378
3239 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
3263 3403
3264 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3265 } 3405 }
3266 3406
3267 { 3407 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3271 3409
3272 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3413
3277 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3292 } else { 3416 } else {
3293 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3294 } 3418 }
3295 3419
3379 3503
3380 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3381} 3505}
3382 3506
3383sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3385 or return; 3511 or return;
3386 3512
3387 local $/; 3513 local $/;
3388 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3389 3515
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3391 3517
3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3393 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3398 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3399 }; 3525 };
3400 warn $@ if $@; 3526 warn $@ if $@;
3401 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3402} 3530}
3403 3531
3404sub pidfile() { 3532sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
3418 3546
3419 seek $fh, 0, 0; 3547 seek $fh, 0, 0;
3420 print $fh $$; 3548 print $fh $$;
3421} 3549}
3422 3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
3558}
3559
3423sub main { 3560sub main {
3424 cf::init_globals; # initialise logging 3561 cf::init_globals; # initialise logging
3425 3562
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3428 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3429 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3430
3431 cf::init_experience;
3432 cf::init_anim;
3433 cf::init_attackmess;
3434 cf::init_dynamic;
3435 cf::init_block;
3436 3567
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438 3569
3439 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3440 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
3446 }; 3577 };
3447 3578
3448 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3449 3580
3450 cf::sync_job { 3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3451 reload_resources; 3590 reload_resources;
3452 reload_config; 3591 reload_config;
3453 db_init; 3592 db_init;
3454 3593
3455 cf::load_settings;
3456 cf::load_materials;
3457 cf::init_uuid; 3594 cf::init_uuid;
3458 cf::init_signals; 3595 cf::init_signals;
3459 cf::init_commands;
3460 cf::init_skills; 3596 cf::init_skills;
3461 3597
3462 cf::init_beforeplay; 3598 cf::init_beforeplay;
3463 3599
3464 atomic; 3600 atomic;
3466 load_extensions; 3602 load_extensions;
3467 3603
3468 utime time, time, $RUNTIMEFILE; 3604 utime time, time, $RUNTIMEFILE;
3469 3605
3470 # no (long-running) fork's whatsoever before this point(!) 3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3471 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3472 3609
3473 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3474 }; 3611 };
3475 3612
3476 EV::loop; 3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
3477} 3617}
3478 3618
3479############################################################################# 3619#############################################################################
3480# initialisation and cleanup 3620# initialisation and cleanup
3481 3621
3482# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3483BEGIN { 3623BEGIN {
3484 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3485 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3486 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3487 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3488 }; 3628 };
3489 } 3629 }
3490} 3630}
3491 3631
3492sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3493 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3494 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3495 3637
3496 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3497 3639
3498 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3499 3641
3500 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3501 or return; 3643 or return;
3502 3644
3503 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3504 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3505 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
3518 or return; 3660 or return;
3519 3661
3520 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3521 and return; 3663 and return;
3522 3664
3523 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3524 3666
3525 1 3667 1
3526} 3668}
3527 3669
3528our $uuid_lock; 3670our $uuid_lock;
3654 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3655 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3656 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3657# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3658 } 3800 }
3659 warn "cleared package $pkg\n";#d#
3660} 3801}
3661 3802
3662sub do_reload_perl() { 3803sub do_reload_perl() {
3663 # can/must only be called in main 3804 # can/must only be called in main
3664 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3665 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3666 return; 3807 return;
3667 } 3808 }
3668 3809
3669 return if $RELOAD++; 3810 return if $RELOAD++;
3670 3811
3671 my $t1 = EV::time; 3812 my $t1 = AE::time;
3672 3813
3673 while ($RELOAD) { 3814 while ($RELOAD) {
3674 warn "reloading..."; 3815 warn "reloading...";
3675 3816
3676 warn "entering sync_job"; 3817 warn "entering sync_job";
3737 clear_package "safe::$_" 3878 clear_package "safe::$_"
3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3739 3880
3740 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3741 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3742 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3743 3884
3744 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3745 # and global variables created in xs 3886 # and global variables created in xs
3746 #clear_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3747 3888
3748 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3749 3890
3750 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3751 require cf; 3892 require cf;
3752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3753 3894
3754 warn "loading config and database again"; 3895 warn "loading config and database again";
3755 cf::reload_config; 3896 cf::reload_config;
3756 3897
3757 warn "loading extensions"; 3898 warn "loading extensions";
3779 3920
3780 warn "reloaded"; 3921 warn "reloaded";
3781 --$RELOAD; 3922 --$RELOAD;
3782 } 3923 }
3783 3924
3784 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3785 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3786}; 3927};
3787 3928
3788our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3789 3930
3792 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3793 3934
3794 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3795 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3796 3937
3797 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3798 do_reload_perl; 3939 do_reload_perl;
3799 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3800 }; 3941 };
3801 }; 3942 };
3802} 3943}
3819 3960
3820our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3821our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3822 3963
3823sub wait_for_tick { 3964sub wait_for_tick {
3824 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3825 3966
3826 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3827 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3828 $signal->wait; 3969 $signal->wait;
3829} 3970}
3830 3971
3831sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3832 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3833 3974
3834 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3835 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3836 $signal->wait; 3977 $signal->wait;
3837} 3978}
3842 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3843 return; 3984 return;
3844 } 3985 }
3845 3986
3846 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3847 3990
3848 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3849 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3850 Coro::async_pool { 3993 Coro::async_pool {
3851 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
3874} 4017}
3875 4018
3876{ 4019{
3877 # configure BDB 4020 # configure BDB
3878 4021
3879 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3880 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3881 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3882 4025
3883 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3884 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
3964 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3965 } 4108 }
3966} 4109}
3967 4110
3968# load additional modules 4111# load additional modules
3969use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3970 4114
3971END { cf::emergency_save } 4115END { cf::emergency_save }
3972 4116
39731 41171
3974 4118

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines