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.518 by root, Fri Apr 16 02:21:26 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
170#############################################################################
171
172%REFLECT = ();
173for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_;
175 $REFLECT{$reflect->{class}} = $reflect;
176}
177
178# this is decidedly evil
179$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
154 180
155############################################################################# 181#############################################################################
156 182
157=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
158 184
… …
205returns directly I<after> the tick processing (and consequently, can only wake one process 231returns directly I<after> the tick processing (and consequently, can only wake one process
206per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 232per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
207 233
208=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
209 235
210This array contains the results of the last C<invoke ()> call. When 236This 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 237C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
212that call. 238that call.
213 239
240=item %cf::REFLECT
241
242Contains, for each (C++) class name, a hash reference with information
243about object members (methods, scalars, arrays and flags) and other
244metadata, which is useful for introspection.
245
214=back 246=back
215 247
216=cut 248=cut
217 249
218BEGIN { 250$Coro::State::WARNHOOK = sub {
219 *CORE::GLOBAL::warn = sub {
220 my $msg = join "", @_; 251 my $msg = join "", @_;
221 252
222 $msg .= "\n" 253 $msg .= "\n"
223 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
224 255
225 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 256 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
226 257
227 LOG llevError, $msg; 258 LOG llevError, $msg;
228 }; 259};
229}
230 260
231$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
232 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
233 265
234 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
235 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
236 return;#d# 268 return;#d#
237 }#d# 269 }#d#
238 270
239 # kill coroutine otherwise 271 # kill coroutine otherwise
240 warn Carp::longmess $_[0];
241 Coro::terminate 272 Coro::terminate
242}; 273};
243
244$SIG{__DIE__} = sub { }; #d#?
245 274
246@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
247@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
248@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
249@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
263)) { 292)) {
264 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
265} 294}
266 295
267$EV::DIED = sub { 296$EV::DIED = sub {
268 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
269}; 298};
270 299
271############################################################################# 300#############################################################################
272 301
273=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
347 376
348Return true if the lock is currently active, i.e. somebody has locked it. 377Return true if the lock is currently active, i.e. somebody has locked it.
349 378
350=cut 379=cut
351 380
352our %LOCK; 381our $LOCKS = new Coro::SemaphoreSet;
353our %LOCKER;#d#
354 382
355sub lock_wait($) { 383sub lock_wait($) {
356 my ($key) = @_; 384 $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} 385}
370 386
371sub lock_acquire($) { 387sub lock_acquire($) {
372 my ($key) = @_; 388 $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} 389}
386 390
387sub lock_active($) { 391sub lock_active($) {
388 my ($key) = @_; 392 $LOCKS->count ($_[0]) < 1
389
390 ! ! $LOCK{$key}
391} 393}
392 394
393sub freeze_mainloop { 395sub freeze_mainloop {
394 tick_inhibit_inc; 396 tick_inhibit_inc;
395 397
… …
397} 399}
398 400
399=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
400 402
401Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer. 404get spread over time.
403 405
404=cut 406=cut
405 407
406sub periodic($$) { 408sub periodic($$) {
407 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
… …
424 426
425=cut 427=cut
426 428
427our @SLOT_QUEUE; 429our @SLOT_QUEUE;
428our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
429 432
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
433 436
434 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
435 439
436 while () { 440 while () {
437 next_job: 441 next_job:
442
438 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 444
440 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 449 $job->[2]->send;
444 Coro::cede; 450 Coro::cede;
445 goto next_job; 451 goto next_job;
446 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 454 }
448 } 455 }
449 456
450 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 460 $signal->wait;
454 } else { 461 } else {
462 $busy = 0;
455 Coro::schedule; 463 Coro::schedule;
456 } 464 }
457 } 465 }
458}; 466};
459 467
460sub get_slot($;$$) { 468sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
462 470
463 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
464 472
465 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
466 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
467 476
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
497 506
498sub sync_job(&) { 507sub sync_job(&) {
499 my ($job) = @_; 508 my ($job) = @_;
500 509
501 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
502 my $time = EV::time; 511 my $time = AE::time;
503 512
504 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
506 515
507 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
524 } else { 533 } else {
525 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
526 } 535 }
527 } 536 }
528 537
529 my $time = EV::time - $time; 538 my $time = AE::time - $time;
530 539
531 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
532 541
533 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
534 } else { 543 } else {
… …
578 reset_signals; 587 reset_signals;
579 &$cb 588 &$cb
580 }, @args; 589 }, @args;
581 590
582 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
583} 603}
584 604
585=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
586 606
587=cut 607=cut
… …
1173 $decname, length $$rdata, scalar @$objs; 1193 $decname, length $$rdata, scalar @$objs;
1174 1194
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1196 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 aio_fsync $fh if $cf::USE_FSYNC; 1198 if ($cf::USE_FSYNC) {
1199 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1200 aio_fsync $fh;
1201 }
1179 aio_close $fh; 1202 aio_close $fh;
1180 1203
1181 if (@$objs) { 1204 if (@$objs) {
1182 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1205 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1183 aio_chmod $fh, SAVE_MODE; 1206 aio_chmod $fh, SAVE_MODE;
1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1207 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1185 aio_write $fh, 0, (length $data), $data, 0; 1208 aio_write $fh, 0, (length $data), $data, 0;
1186 aio_fsync $fh if $cf::USE_FSYNC; 1209 if ($cf::USE_FSYNC) {
1210 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1211 aio_fsync $fh;
1212 }
1187 aio_close $fh; 1213 aio_close $fh;
1188 aio_rename "$filename.pst~", "$filename.pst"; 1214 aio_rename "$filename.pst~", "$filename.pst";
1189 } 1215 }
1190 } else { 1216 } else {
1191 aio_unlink "$filename.pst"; 1217 aio_unlink "$filename.pst";
… …
1194 aio_rename "$filename~", $filename; 1220 aio_rename "$filename~", $filename;
1195 1221
1196 $filename =~ s%/[^/]+$%%; 1222 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC; 1223 aio_pathsync $filename if $cf::USE_FSYNC;
1198 } else { 1224 } else {
1199 warn "FATAL: $filename~: $!\n"; 1225 warn "unable to save objects: $filename~: $!\n";
1200 } 1226 }
1201 } else { 1227 } else {
1202 aio_unlink $filename; 1228 aio_unlink $filename;
1203 aio_unlink "$filename.pst"; 1229 aio_unlink "$filename.pst";
1204 } 1230 }
… …
1298} 1324}
1299 1325
1300use File::Glob (); 1326use File::Glob ();
1301 1327
1302cf::player->attach ( 1328cf::player->attach (
1303 on_command => sub { 1329 on_unknown_command => sub {
1304 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1305 1331
1306 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1307 or return; 1333 or return;
1308 1334
… …
1342 1368
1343# "readahead" all extensions 1369# "readahead" all extensions
1344sub cache_extensions { 1370sub cache_extensions {
1345 my $grp = IO::AIO::aio_group; 1371 my $grp = IO::AIO::aio_group;
1346 1372
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1373 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1348 for (grep /\.ext$/, @{$_[0]}) { 1374 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1375 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 } 1376 }
1351 }; 1377 };
1352 1378
… …
1387 . "\n};\n1"; 1413 . "\n};\n1";
1388 1414
1389 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1390 } 1416 }
1391 1417
1418 my $pass = 0;
1392 my %done; 1419 my %done;
1393 while (%todo) { 1420 while (%todo) {
1394 my $progress; 1421 my $progress;
1395 1422
1423 ++$pass;
1424
1425 ext:
1396 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1397 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1398 goto skip 1428 next ext
1399 unless exists $done{$_}; 1429 unless exists $done{$_};
1400 } 1430 }
1401 1431
1402 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1403 1433
1404 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1405 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1406 : "$v->{base}: extension inactive.\n";
1407 1438
1408 if (exists $v->{meta}{mandatory}) {
1409 warn $msg;
1410 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1411 } 1440 if exists $v->{meta}{mandatory};
1412 1441 } else {
1413 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1414 } 1448 }
1415
1416 $done{$k} = delete $todo{$k};
1417 push @EXTS, $v->{pkg};
1418 $progress = 1;
1419 } 1449 }
1420 1450
1421 skip: 1451 unless ($progress) {
1422 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1423 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1424 } 1459 }
1425 }; 1460 };
1426} 1461}
1427 1462
1428############################################################################# 1463#############################################################################
… …
1512 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1513 } 1548 }
1514 } 1549 }
1515} 1550}
1516 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1517sub save($) { 1565sub save($) {
1518 my ($pl) = @_; 1566 my ($pl) = @_;
1519 1567
1520 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1521 1569
… …
1526 1574
1527 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1528 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1529 1577
1530 cf::get_slot 0.01; 1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1531 1582
1532 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1533 cf::cede_to_tick; 1584 cf::cede_to_tick;
1534} 1585}
1535 1586
… …
1748 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1749 1800
1750 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1751 $self->_create_random_map ( 1802 $self->_create_random_map (
1752 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1753 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1754 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1755 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1756 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1757 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1758 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1888 1939
1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1940 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1890 "$UNIQUEDIR/$path" 1941 "$UNIQUEDIR/$path"
1891} 1942}
1892 1943
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 { 1944sub decay_objects {
1903 my ($self) = @_; 1945 my ($self) = @_;
1904 1946
1905 return if $self->{deny_reset}; 1947 return if $self->{deny_reset};
1906 1948
… …
1988sub find { 2030sub find {
1989 my ($path, $origin) = @_; 2031 my ($path, $origin) = @_;
1990 2032
1991 $path = normalise $path, $origin && $origin->path; 2033 $path = normalise $path, $origin && $origin->path;
1992 2034
1993 cf::lock_wait "map_data:$path";#d#remove 2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1994 cf::lock_wait "map_find:$path"; 2036 my $guard2 = cf::lock_acquire "map_find:$path";
1995 2037
1996 $cf::MAP{$path} || do { 2038 $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 2039 my $map = new_from_path cf::map $path
2001 or return; 2040 or return;
2002 2041
2003 $map->{last_save} = $cf::RUNTIME; 2042 $map->{last_save} = $cf::RUNTIME;
2004 2043
… …
2016 2055
2017 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
2018 } 2057 }
2019} 2058}
2020 2059
2021sub pre_load { } 2060sub pre_load { }
2022sub post_load { } 2061#sub post_load { } # XS
2023 2062
2024sub load { 2063sub load {
2025 my ($self) = @_; 2064 my ($self) = @_;
2026 2065
2027 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
… …
2072 unless ($self->{deny_activate}) { 2111 unless ($self->{deny_activate}) {
2073 $self->decay_objects; 2112 $self->decay_objects;
2074 $self->fix_auto_apply; 2113 $self->fix_auto_apply;
2075 $self->update_buttons; 2114 $self->update_buttons;
2076 cf::cede_to_tick; 2115 cf::cede_to_tick;
2077 $self->set_darkness_map;
2078 cf::cede_to_tick;
2079 $self->activate; 2116 $self->activate;
2080 } 2117 }
2081 2118
2082 $self->{last_save} = $cf::RUNTIME; 2119 $self->{last_save} = $cf::RUNTIME;
2083 $self->last_access ($cf::RUNTIME); 2120 $self->last_access ($cf::RUNTIME);
… …
2086 } 2123 }
2087 2124
2088 $self->post_load; 2125 $self->post_load;
2089} 2126}
2090 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2091sub customise_for { 2131sub customise_for {
2092 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2093 2133
2094 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2095 if $self->per_player; 2135 if $self->per_player;
… …
2172 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2173 2213
2174 () 2214 ()
2175} 2215}
2176 2216
2217# common code, used by both ->save and ->swapout
2177sub save { 2218sub _save {
2178 my ($self) = @_; 2219 my ($self) = @_;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2220
2182 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2183 2222
2184 return unless $self->dirty; 2223 return unless $self->dirty;
2185 2224
… …
2205 } else { 2244 } else {
2206 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2207 } 2246 }
2208} 2247}
2209 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2210sub swap_out { 2257sub swap_out {
2211 my ($self) = @_; 2258 my ($self) = @_;
2212 2259
2213 # save first because save cedes
2214 $self->save;
2215
2216 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2217 2261
2218 return if $self->players;
2219 return if $self->in_memory != cf::MAP_ACTIVE; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2220 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2264 return if $self->players;
2221 2265
2222 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2223
2224 $self->deactivate; 2267 $self->deactivate;
2225 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2226 $self->clear; 2275 $self->clear;
2227} 2276}
2228 2277
2229sub reset_at { 2278sub reset_at {
2230 my ($self) = @_; 2279 my ($self) = @_;
… …
2249 2298
2250 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2299 my $lock = cf::lock_acquire "map_data:$self->{path}";
2251 2300
2252 return if $self->players; 2301 return if $self->players;
2253 2302
2254 warn "resetting map ", $self->path; 2303 warn "resetting map ", $self->path, "\n";
2255 2304
2256 $self->in_memory (cf::MAP_SWAPPED); 2305 $self->in_memory (cf::MAP_SWAPPED);
2257 2306
2258 # need to save uniques path 2307 # need to save uniques path
2259 unless ($self->{deny_save}) { 2308 unless ($self->{deny_save}) {
… …
2350 : normalise $_ 2399 : normalise $_
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2400 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2401 ]
2353} 2402}
2354 2403
2404=item cf::map::static_maps
2405
2406Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2407file in the shared directory excluding F</styles> and F</editor>). May
2408block.
2409
2410=cut
2411
2412sub static_maps() {
2413 my @dirs = "";
2414 my @maps;
2415
2416 while (@dirs) {
2417 my $dir = shift @dirs;
2418
2419 next if $dir eq "/styles" || $dir eq "/editor";
2420
2421 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2422 or return;
2423
2424 for (@$files) {
2425 s/\.map$// or next;
2426 utf8::decode $_;
2427 push @maps, "$dir/$_";
2428 }
2429
2430 push @dirs, map "$dir/$_", @$dirs;
2431 }
2432
2433 \@maps
2434}
2435
2355=back 2436=back
2356 2437
2357=head3 cf::object 2438=head3 cf::object
2358 2439
2359=cut 2440=cut
… …
2424 2505
2425our $SAY_CHANNEL = { 2506our $SAY_CHANNEL = {
2426 id => "say", 2507 id => "say",
2427 title => "Map", 2508 title => "Map",
2428 reply => "say ", 2509 reply => "say ",
2429 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2510 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2430}; 2511};
2431 2512
2432our $CHAT_CHANNEL = { 2513our $CHAT_CHANNEL = {
2433 id => "chat", 2514 id => "chat",
2434 title => "Chat", 2515 title => "Chat",
… …
2554 ($x, $y) = (-1, -1) 2635 ($x, $y) = (-1, -1)
2555 unless (defined $x) && (defined $y); 2636 unless (defined $x) && (defined $y);
2556 2637
2557 # use -1 or undef as default coordinates, not 0, 0 2638 # use -1 or undef as default coordinates, not 0, 0
2558 ($x, $y) = ($map->enter_x, $map->enter_y) 2639 ($x, $y) = ($map->enter_x, $map->enter_y)
2559 if $x <=0 && $y <= 0; 2640 if $x <= 0 && $y <= 0;
2560 2641
2561 $map->load; 2642 $map->load;
2562 $map->load_neighbours; 2643 $map->load_neighbours;
2563 2644
2564 return unless $self->contr->active; 2645 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2566 $self->activate_recursive;
2567 2646
2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2647 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2569 $self->enter_map ($map, $x, $y); 2648 $self->enter_map ($map, $x, $y);
2649
2650 # only activate afterwards, to support waiting in hooks
2651 $self->activate_recursive;
2570} 2652}
2571 2653
2572=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2654=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2573 2655
2574Moves the player to the given map-path and coordinates by first freezing 2656Moves the player to the given map-path and coordinates by first freezing
… …
2762 2844
2763 utf8::encode $text; 2845 utf8::encode $text;
2764 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2846 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2765} 2847}
2766 2848
2849=item $client->send_big_packet ($pkt)
2850
2851Like C<send_packet>, but tries to compress large packets, and fragments
2852them as required.
2853
2854=cut
2855
2856our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2857
2858sub cf::client::send_big_packet {
2859 my ($self, $pkt) = @_;
2860
2861 # try lzf for large packets
2862 $pkt = "lzf " . Compress::LZF::compress $pkt
2863 if 1024 <= length $pkt and $self->{can_lzf};
2864
2865 # split very large packets
2866 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2867 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2868 $pkt = "frag";
2869 }
2870
2871 $self->send_packet ($pkt);
2872}
2873
2767=item $client->send_msg ($channel, $msg, $color, [extra...]) 2874=item $client->send_msg ($channel, $msg, $color, [extra...])
2768 2875
2769Send a drawinfo or msg packet to the client, formatting the msg for the 2876Send 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 2877client 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 2878the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2773 2880
2774=cut 2881=cut
2775 2882
2776# non-persistent channels (usually the info channel) 2883# non-persistent channels (usually the info channel)
2777our %CHANNEL = ( 2884our %CHANNEL = (
2885 "c/motd" => {
2886 id => "infobox",
2887 title => "MOTD",
2888 reply => undef,
2889 tooltip => "The message of the day",
2890 },
2778 "c/identify" => { 2891 "c/identify" => {
2779 id => "infobox", 2892 id => "infobox",
2780 title => "Identify", 2893 title => "Identify",
2781 reply => undef, 2894 reply => undef,
2782 tooltip => "Items recently identified", 2895 tooltip => "Items recently identified",
… …
2784 "c/examine" => { 2897 "c/examine" => {
2785 id => "infobox", 2898 id => "infobox",
2786 title => "Examine", 2899 title => "Examine",
2787 reply => undef, 2900 reply => undef,
2788 tooltip => "Signs and other items you examined", 2901 tooltip => "Signs and other items you examined",
2902 },
2903 "c/shopinfo" => {
2904 id => "infobox",
2905 title => "Shop Info",
2906 reply => undef,
2907 tooltip => "What your bargaining skill tells you about the shop",
2789 }, 2908 },
2790 "c/book" => { 2909 "c/book" => {
2791 id => "infobox", 2910 id => "infobox",
2792 title => "Book", 2911 title => "Book",
2793 reply => undef, 2912 reply => undef,
… …
2809 id => "infobox", 2928 id => "infobox",
2810 title => "Body Parts", 2929 title => "Body Parts",
2811 reply => undef, 2930 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2931 tooltip => "Shows which body parts you posess and are available",
2813 }, 2932 },
2933 "c/statistics" => {
2934 id => "infobox",
2935 title => "Statistics",
2936 reply => undef,
2937 tooltip => "Shows your primary statistics",
2938 },
2814 "c/skills" => { 2939 "c/skills" => {
2815 id => "infobox", 2940 id => "infobox",
2816 title => "Skills", 2941 title => "Skills",
2817 reply => undef, 2942 reply => undef,
2818 tooltip => "Shows your experience per skill and item power", 2943 tooltip => "Shows your experience per skill and item power",
2944 },
2945 "c/shopitems" => {
2946 id => "infobox",
2947 title => "Shop Items",
2948 reply => undef,
2949 tooltip => "Shows the items currently for sale in this shop",
2950 },
2951 "c/resistances" => {
2952 id => "infobox",
2953 title => "Resistances",
2954 reply => undef,
2955 tooltip => "Shows your resistances",
2956 },
2957 "c/pets" => {
2958 id => "infobox",
2959 title => "Pets",
2960 reply => undef,
2961 tooltip => "Shows information abotu your pets/a specific pet",
2962 },
2963 "c/perceiveself" => {
2964 id => "infobox",
2965 title => "Perceive Self",
2966 reply => undef,
2967 tooltip => "You gained detailed knowledge about yourself",
2819 }, 2968 },
2820 "c/uptime" => { 2969 "c/uptime" => {
2821 id => "infobox", 2970 id => "infobox",
2822 title => "Uptime", 2971 title => "Uptime",
2823 reply => undef, 2972 reply => undef,
… …
2833 id => "party", 2982 id => "party",
2834 title => "Party", 2983 title => "Party",
2835 reply => "gsay ", 2984 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party", 2985 tooltip => "Messages and chat related to your party",
2837 }, 2986 },
2987 "c/death" => {
2988 id => "death",
2989 title => "Death",
2990 reply => undef,
2991 tooltip => "Reason for and more info about your most recent death",
2992 },
2993 "c/say" => $SAY_CHANNEL,
2994 "c/chat" => $CHAT_CHANNEL,
2838); 2995);
2839 2996
2840sub cf::client::send_msg { 2997sub cf::client::send_msg {
2841 my ($self, $channel, $msg, $color, @extra) = @_; 2998 my ($self, $channel, $msg, $color, @extra) = @_;
2842 2999
… …
2847 3004
2848 # check predefined channels, for the benefit of C 3005 # check predefined channels, for the benefit of C
2849 if ($CHANNEL{$channel}) { 3006 if ($CHANNEL{$channel}) {
2850 $channel = $CHANNEL{$channel}; 3007 $channel = $CHANNEL{$channel};
2851 3008
2852 $self->ext_msg (channel_info => $channel) 3009 $self->ext_msg (channel_info => $channel);
2853 if $self->can_msg;
2854
2855 $channel = $channel->{id}; 3010 $channel = $channel->{id};
2856 3011
2857 } elsif (ref $channel) { 3012 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent 3013 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) { 3014 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel; 3015 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel) 3016 $self->ext_msg (channel_info => $channel);
2862 if $self->can_msg;
2863 } 3017 }
2864 3018
2865 $channel = $channel->{id}; 3019 $channel = $channel->{id};
2866 } 3020 }
2867 3021
2868 return unless @extra || length $msg; 3022 return unless @extra || length $msg;
2869 3023
2870 if ($self->can_msg) {
2871 # default colour, mask it out 3024 # default colour, mask it out
2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3025 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2873 if $color & cf::NDI_DEF; 3026 if $color & cf::NDI_DEF;
2874 3027
2875 my $pkt = "msg " 3028 my $pkt = "msg "
2876 . $self->{json_coder}->encode ( 3029 . $self->{json_coder}->encode (
2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3030 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 ); 3031 );
2879 3032
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); 3033 $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} 3034}
2917 3035
2918=item $client->ext_msg ($type, @msg) 3036=item $client->ext_msg ($type, @msg)
2919 3037
2920Sends an ext event to the client. 3038Sends an ext event to the client.
… …
2923 3041
2924sub cf::client::ext_msg($$@) { 3042sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3043 my ($self, $type, @msg) = @_;
2926 3044
2927 if ($self->extcmd == 2) { 3045 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3046 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3047 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3048 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3049 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3050 }
2933} 3051}
2934 3052
2935=item $client->ext_reply ($msgid, @msg) 3053=item $client->ext_reply ($msgid, @msg)
2936 3054
… …
2940 3058
2941sub cf::client::ext_reply($$@) { 3059sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3060 my ($self, $id, @msg) = @_;
2943 3061
2944 if ($self->extcmd == 2) { 3062 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3063 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3064 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3065 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3066 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3067 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3068 }
2951} 3069}
2952 3070
2953=item $success = $client->query ($flags, "text", \&cb) 3071=item $success = $client->query ($flags, "text", \&cb)
2954 3072
… …
3055 3173
3056 $coro 3174 $coro
3057} 3175}
3058 3176
3059cf::client->attach ( 3177cf::client->attach (
3060 on_destroy => sub { 3178 on_client_destroy => sub {
3061 my ($ns) = @_; 3179 my ($ns) = @_;
3062 3180
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3182 },
3065); 3183);
… …
3081our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3082 3200
3083$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3084 3202
3085$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3088 sort time 3206 sort time
3089)); 3207));
3090 3208
3091# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
… …
3095The following functions and methods are available within a safe environment: 3213The following functions and methods are available within a safe environment:
3096 3214
3097 cf::object 3215 cf::object
3098 contr pay_amount pay_player map x y force_find force_add destroy 3216 contr pay_amount pay_player map x y force_find force_add destroy
3099 insert remove name archname title slaying race decrease split 3217 insert remove name archname title slaying race decrease split
3218 value
3100 3219
3101 cf::object::player 3220 cf::object::player
3102 player 3221 player
3103 3222
3104 cf::player 3223 cf::player
… …
3110=cut 3229=cut
3111 3230
3112for ( 3231for (
3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3232 ["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 3233 insert remove inv nrof name archname title slaying race
3115 decrease split destroy change_exp)], 3234 decrease split destroy change_exp value msg lore send_msg)],
3116 ["cf::object::player" => qw(player)], 3235 ["cf::object::player" => qw(player)],
3117 ["cf::player" => qw(peaceful)], 3236 ["cf::player" => qw(peaceful send_msg)],
3118 ["cf::map" => qw(trigger)], 3237 ["cf::map" => qw(trigger)],
3119) { 3238) {
3120 no strict 'refs'; 3239 no strict 'refs';
3121 my ($pkg, @funs) = @$_; 3240 my ($pkg, @funs) = @$_;
3122 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3140 3259
3141 my $qcode = $code; 3260 my $qcode = $code;
3142 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3143 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3144 3263
3264 %vars = (_dummy => 0) unless %vars;
3265
3266 my @res;
3145 local $_; 3267 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3268
3148 my $eval = 3269 my $eval =
3149 "do {\n" 3270 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3273 . $code
3153 . "\n}" 3274 . "\n}"
3154 ; 3275 ;
3155 3276
3277 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3159 3286
3160 if ($@) { 3287 if ($@) {
3161 warn "$@"; 3288 warn "$@";
3162 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
… …
3182=cut 3309=cut
3183 3310
3184sub register_script_function { 3311sub register_script_function {
3185 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3186 3313
3187 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3189} 3316}
3190 3317
3191=back 3318=back
3192 3319
3193=cut 3320=cut
… …
3214 3341
3215 $facedata->{version} == 2 3342 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3217 3344
3218 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3219 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC, 3348 type => FT_RSRC,
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3222 }; 3351 };
3223 cf::cede_to_tick; 3352 cf::cede_to_tick;
3224 3353
3225 { 3354 {
3226 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
… …
3228 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3359
3231 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3235 3364
3236 cf::cede_to_tick; 3365 cf::cede_to_tick;
3237 } 3366 }
3238 3367
3239 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
… …
3263 3392
3264 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3265 } 3394 }
3266 3395
3267 { 3396 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3271 3398
3272 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3400 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3402
3277 if ($info->{type} & 1) { 3403 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}; 3404 cf::face::set_type $idx, $info->{type};
3292 } else { 3405 } else {
3293 $RESOURCE{$name} = $info; 3406 $RESOURCE{$name} = $info;
3294 } 3407 }
3295 3408
… …
3379 3492
3380 warn "finished reloading resource files\n"; 3493 warn "finished reloading resource files\n";
3381} 3494}
3382 3495
3383sub reload_config { 3496sub reload_config {
3497 warn "reloading config file...\n";
3498
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3499 open my $fh, "<:utf8", "$CONFDIR/config"
3385 or return; 3500 or return;
3386 3501
3387 local $/; 3502 local $/;
3388 *CFG = YAML::Load <$fh>; 3503 *CFG = YAML::XS::Load scalar <$fh>;
3389 3504
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3505 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3391 3506
3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3507 $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}; 3508 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3397 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3512 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3398 and die "WARNING: m(un)lockall failed: $!\n"; 3513 and die "WARNING: m(un)lockall failed: $!\n";
3399 }; 3514 };
3400 warn $@ if $@; 3515 warn $@ if $@;
3401 } 3516 }
3517
3518 warn "finished reloading resource files\n";
3402} 3519}
3403 3520
3404sub pidfile() { 3521sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3522 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!"; 3523 or die "$PIDFILE: $!";
… …
3418 3535
3419 seek $fh, 0, 0; 3536 seek $fh, 0, 0;
3420 print $fh $$; 3537 print $fh $$;
3421} 3538}
3422 3539
3540sub main_loop {
3541 warn "EV::loop starting\n";
3542 if (1) {
3543 EV::loop;
3544 }
3545 warn "EV::loop returned\n";
3546 goto &main_loop unless $REALLY_UNLOOP;
3547}
3548
3423sub main { 3549sub main {
3424 cf::init_globals; # initialise logging 3550 cf::init_globals; # initialise logging
3425 3551
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3428 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3429 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3555 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 3556
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438 3558
3439 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3440 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
… …
3446 }; 3566 };
3447 3567
3448 evthread_start IO::AIO::poll_fileno; 3568 evthread_start IO::AIO::poll_fileno;
3449 3569
3450 cf::sync_job { 3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3451 reload_resources; 3579 reload_resources;
3452 reload_config; 3580 reload_config;
3453 db_init; 3581 db_init;
3454 3582
3455 cf::load_settings;
3456 cf::load_materials;
3457 cf::init_uuid; 3583 cf::init_uuid;
3458 cf::init_signals; 3584 cf::init_signals;
3459 cf::init_commands;
3460 cf::init_skills; 3585 cf::init_skills;
3461 3586
3462 cf::init_beforeplay; 3587 cf::init_beforeplay;
3463 3588
3464 atomic; 3589 atomic;
… …
3466 load_extensions; 3591 load_extensions;
3467 3592
3468 utime time, time, $RUNTIMEFILE; 3593 utime time, time, $RUNTIMEFILE;
3469 3594
3470 # no (long-running) fork's whatsoever before this point(!) 3595 # no (long-running) fork's whatsoever before this point(!)
3596 use POSIX ();
3471 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3472 3598
3473 (pop @POST_INIT)->(0) while @POST_INIT; 3599 (pop @POST_INIT)->(0) while @POST_INIT;
3474 }; 3600 };
3475 3601
3476 EV::loop; 3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3604
3605 main_loop;
3477} 3606}
3478 3607
3479############################################################################# 3608#############################################################################
3480# initialisation and cleanup 3609# initialisation and cleanup
3481 3610
3482# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3483BEGIN { 3612BEGIN {
3484 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3485 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3486 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3487 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3488 }; 3617 };
3489 } 3618 }
3490} 3619}
3491 3620
3492sub write_runtime_sync { 3621sub write_runtime_sync {
3622 my $t0 = AE::time;
3623
3493 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3494 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3495 3626
3496 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3497 3628
3498 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3499 3630
3500 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3501 or return; 3632 or return;
3502 3633
3503 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3504 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3505 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
… …
3518 or return; 3649 or return;
3519 3650
3520 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3521 and return; 3652 and return;
3522 3653
3523 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3524 3655
3525 1 3656 1
3526} 3657}
3527 3658
3528our $uuid_lock; 3659our $uuid_lock;
… …
3666 return; 3797 return;
3667 } 3798 }
3668 3799
3669 return if $RELOAD++; 3800 return if $RELOAD++;
3670 3801
3671 my $t1 = EV::time; 3802 my $t1 = AE::time;
3672 3803
3673 while ($RELOAD) { 3804 while ($RELOAD) {
3674 warn "reloading..."; 3805 warn "reloading...";
3675 3806
3676 warn "entering sync_job"; 3807 warn "entering sync_job";
… …
3737 clear_package "safe::$_" 3868 clear_package "safe::$_"
3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3869 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3739 3870
3740 warn "unloading cf.pm \"a bit\""; 3871 warn "unloading cf.pm \"a bit\"";
3741 delete $INC{"cf.pm"}; 3872 delete $INC{"cf.pm"};
3742 delete $INC{"cf/pod.pm"}; 3873 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3743 3874
3744 # don't, removes xs symbols, too, 3875 # don't, removes xs symbols, too,
3745 # and global variables created in xs 3876 # and global variables created in xs
3746 #clear_package __PACKAGE__; 3877 #clear_package __PACKAGE__;
3747 3878
3748 warn "unload completed, starting to reload now"; 3879 warn "unload completed, starting to reload now";
3749 3880
3750 warn "reloading cf.pm"; 3881 warn "reloading cf.pm";
3751 require cf; 3882 require cf;
3752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3883 cf::_connect_to_perl_1;
3753 3884
3754 warn "loading config and database again"; 3885 warn "loading config and database again";
3755 cf::reload_config; 3886 cf::reload_config;
3756 3887
3757 warn "loading extensions"; 3888 warn "loading extensions";
… …
3779 3910
3780 warn "reloaded"; 3911 warn "reloaded";
3781 --$RELOAD; 3912 --$RELOAD;
3782 } 3913 }
3783 3914
3784 $t1 = EV::time - $t1; 3915 $t1 = AE::time - $t1;
3785 warn "reload completed in ${t1}s\n"; 3916 warn "reload completed in ${t1}s\n";
3786}; 3917};
3787 3918
3788our $RELOAD_WATCHER; # used only during reload 3919our $RELOAD_WATCHER; # used only during reload
3789 3920
… …
3792 # coro crashes during coro_state_free->destroy here. 3923 # coro crashes during coro_state_free->destroy here.
3793 3924
3794 $RELOAD_WATCHER ||= cf::async { 3925 $RELOAD_WATCHER ||= cf::async {
3795 Coro::AIO::aio_wait cache_extensions; 3926 Coro::AIO::aio_wait cache_extensions;
3796 3927
3797 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3928 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3798 do_reload_perl; 3929 do_reload_perl;
3799 undef $RELOAD_WATCHER; 3930 undef $RELOAD_WATCHER;
3800 }; 3931 };
3801 }; 3932 };
3802} 3933}
… …
3819 3950
3820our @WAIT_FOR_TICK; 3951our @WAIT_FOR_TICK;
3821our @WAIT_FOR_TICK_BEGIN; 3952our @WAIT_FOR_TICK_BEGIN;
3822 3953
3823sub wait_for_tick { 3954sub wait_for_tick {
3824 return if tick_inhibit || $Coro::current == $Coro::main; 3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3825 3956
3826 my $signal = new Coro::Signal; 3957 my $signal = new Coro::Signal;
3827 push @WAIT_FOR_TICK, $signal; 3958 push @WAIT_FOR_TICK, $signal;
3828 $signal->wait; 3959 $signal->wait;
3829} 3960}
3830 3961
3831sub wait_for_tick_begin { 3962sub wait_for_tick_begin {
3832 return if tick_inhibit || $Coro::current == $Coro::main; 3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3833 3964
3834 my $signal = new Coro::Signal; 3965 my $signal = new Coro::Signal;
3835 push @WAIT_FOR_TICK_BEGIN, $signal; 3966 push @WAIT_FOR_TICK_BEGIN, $signal;
3836 $signal->wait; 3967 $signal->wait;
3837} 3968}
… …
3842 unless ++$bug_warning > 10; 3973 unless ++$bug_warning > 10;
3843 return; 3974 return;
3844 } 3975 }
3845 3976
3846 cf::server_tick; # one server iteration 3977 cf::server_tick; # one server iteration
3978
3979 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3847 3980
3848 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3981 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3849 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3850 Coro::async_pool { 3983 Coro::async_pool {
3851 $Coro::current->{desc} = "runtime saver"; 3984 $Coro::current->{desc} = "runtime saver";
… …
3874} 4007}
3875 4008
3876{ 4009{
3877 # configure BDB 4010 # configure BDB
3878 4011
3879 BDB::min_parallel 8; 4012 BDB::min_parallel 16;
3880 BDB::max_poll_reqs $TICK * 0.1; 4013 BDB::max_poll_reqs $TICK * 0.1;
3881 $AnyEvent::BDB::WATCHER->priority (1); 4014 $AnyEvent::BDB::WATCHER->priority (1);
3882 4015
3883 unless ($DB_ENV) { 4016 unless ($DB_ENV) {
3884 $DB_ENV = BDB::db_env_create; 4017 $DB_ENV = BDB::db_env_create;
… …
3964 LOG llevInfo, "[ABT] [suppressed]\n"; 4097 LOG llevInfo, "[ABT] [suppressed]\n";
3965 } 4098 }
3966} 4099}
3967 4100
3968# load additional modules 4101# load additional modules
3969use cf::pod; 4102require "cf/$_.pm" for @EXTRA_MODULES;
4103cf::_connect_to_perl_2;
3970 4104
3971END { cf::emergency_save } 4105END { cf::emergency_save }
3972 4106
39731 41071
3974 4108

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines