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.474 by root, Thu Jul 16 21:42:56 2009 UTC vs.
Revision 1.517 by root, Thu Apr 15 06:07:51 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;
… …
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;
… …
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
… …
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
… …
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %RESOURCE; 111our %RESOURCE;
109 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 118our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
114 120
115our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 124our $DB_ENV;
119 125
120our @EXTRA_MODULES = qw(pod mapscript); 126our @EXTRA_MODULES = qw(pod match mapscript);
121 127
122our %CFG; 128our %CFG;
123 129
124our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 131our $RUNTIME;
… …
161 167
162sub cf::map::normalise; 168sub cf::map::normalise;
163 169
164############################################################################# 170#############################################################################
165 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::"} };
180
181#############################################################################
182
166=head2 GLOBAL VARIABLES 183=head2 GLOBAL VARIABLES
167 184
168=over 4 185=over 4
169 186
170=item $cf::UPTIME 187=item $cf::UPTIME
… …
214returns 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
215per 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.
216 233
217=item @cf::INVOKE_RESULTS 234=item @cf::INVOKE_RESULTS
218 235
219This array contains the results of the last C<invoke ()> call. When 236This array contains the results of the last C<invoke ()> call. When
220C<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
221that call. 238that call.
222 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
223=back 246=back
224 247
225=cut 248=cut
226 249
227BEGIN { 250$Coro::State::WARNHOOK = sub {
228 *CORE::GLOBAL::warn = sub {
229 my $msg = join "", @_; 251 my $msg = join "", @_;
230 252
231 $msg .= "\n" 253 $msg .= "\n"
232 unless $msg =~ /\n$/; 254 unless $msg =~ /\n$/;
233 255
234 $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;
235 257
236 LOG llevError, $msg; 258 LOG llevError, $msg;
237 }; 259};
238}
239 260
240$Coro::State::DIEHOOK = sub { 261$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "==" 262 return unless $^S eq 0; # "eq", not "=="
263
264 warn Carp::longmess $_[0];
242 265
243 if ($Coro::current == $Coro::main) {#d# 266 if ($Coro::current == $Coro::main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 267 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 268 return;#d#
246 }#d# 269 }#d#
247 270
248 # kill coroutine otherwise 271 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate 272 Coro::terminate
251}; 273};
252
253$SIG{__DIE__} = sub { }; #d#?
254 274
255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 275@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 276@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 277@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 278@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
272)) { 292)) {
273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 293 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
274} 294}
275 295
276$EV::DIED = sub { 296$EV::DIED = sub {
277 warn "error in event callback: @_"; 297 Carp::cluck "error in event callback: @_";
278}; 298};
279 299
280############################################################################# 300#############################################################################
281 301
282=head2 UTILITY FUNCTIONS 302=head2 UTILITY FUNCTIONS
… …
379} 399}
380 400
381=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
382 402
383Like 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
384get spread over timer. 404get spread over time.
385 405
386=cut 406=cut
387 407
388sub periodic($$) { 408sub periodic($$) {
389 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
… …
406 426
407=cut 427=cut
408 428
409our @SLOT_QUEUE; 429our @SLOT_QUEUE;
410our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
411 432
412$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
413$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
415 436
416 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
417 439
418 while () { 440 while () {
419 next_job: 441 next_job:
442
420 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
421 if ($avail > 0.01) { 444
422 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
423 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
424 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
425 $job->[2]->send; 449 $job->[2]->send;
426 Coro::cede; 450 Coro::cede;
427 goto next_job; 451 goto next_job;
428 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
429 } 454 }
430 } 455 }
431 456
432 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
433 # 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
434 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
435 $signal->wait; 460 $signal->wait;
436 } else { 461 } else {
462 $busy = 0;
437 Coro::schedule; 463 Coro::schedule;
438 } 464 }
439 } 465 }
440}; 466};
441 467
442sub get_slot($;$$) { 468sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
444 470
445 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
446 472
447 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
448 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
449 476
450 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
451 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
452 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
479 506
480sub sync_job(&) { 507sub sync_job(&) {
481 my ($job) = @_; 508 my ($job) = @_;
482 509
483 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
484 my $time = EV::time; 511 my $time = AE::time;
485 512
486 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
487 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
488 515
489 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
506 } else { 533 } else {
507 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
508 } 535 }
509 } 536 }
510 537
511 my $time = EV::time - $time; 538 my $time = AE::time - $time;
512 539
513 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
514 541
515 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
516 } else { 543 } else {
… …
560 reset_signals; 587 reset_signals;
561 &$cb 588 &$cb
562 }, @args; 589 }, @args;
563 590
564 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 )
565} 603}
566 604
567=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
568 606
569=cut 607=cut
… …
1286} 1324}
1287 1325
1288use File::Glob (); 1326use File::Glob ();
1289 1327
1290cf::player->attach ( 1328cf::player->attach (
1291 on_command => sub { 1329 on_unknown_command => sub {
1292 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1293 1331
1294 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1295 or return; 1333 or return;
1296 1334
… …
1375 . "\n};\n1"; 1413 . "\n};\n1";
1376 1414
1377 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1378 } 1416 }
1379 1417
1418 my $pass = 0;
1380 my %done; 1419 my %done;
1381 while (%todo) { 1420 while (%todo) {
1382 my $progress; 1421 my $progress;
1383 1422
1423 ++$pass;
1424
1425 ext:
1384 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1385 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1386 goto skip 1428 next ext
1387 unless exists $done{$_}; 1429 unless exists $done{$_};
1388 } 1430 }
1389 1431
1390 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1391 1433
1392 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1393 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1394 : "$v->{base}: extension inactive.\n";
1395 1438
1396 if (exists $v->{meta}{mandatory}) {
1397 warn $msg;
1398 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1399 } 1440 if exists $v->{meta}{mandatory};
1400 1441 } else {
1401 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;
1402 } 1448 }
1403
1404 $done{$k} = delete $todo{$k};
1405 push @EXTS, $v->{pkg};
1406 $progress = 1;
1407 } 1449 }
1408 1450
1409 skip: 1451 unless ($progress) {
1410 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1411 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 }
1412 } 1459 }
1413 }; 1460 };
1414} 1461}
1415 1462
1416############################################################################# 1463#############################################################################
… …
1500 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1501 } 1548 }
1502 } 1549 }
1503} 1550}
1504 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
1505sub save($) { 1565sub save($) {
1506 my ($pl) = @_; 1566 my ($pl) = @_;
1507 1567
1508 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1509 1569
… …
1514 1574
1515 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1516 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1517 1577
1518 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];
1519 1582
1520 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1521 cf::cede_to_tick; 1584 cf::cede_to_tick;
1522} 1585}
1523 1586
… …
1736 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
1737 1800
1738 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1739 $self->_create_random_map ( 1802 $self->_create_random_map (
1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1743 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1744 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1745 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1746 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1992 2055
1993 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
1994 } 2057 }
1995} 2058}
1996 2059
1997sub pre_load { } 2060sub pre_load { }
1998sub post_load { } 2061#sub post_load { } # XS
1999 2062
2000sub load { 2063sub load {
2001 my ($self) = @_; 2064 my ($self) = @_;
2002 2065
2003 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
… …
2060 } 2123 }
2061 2124
2062 $self->post_load; 2125 $self->post_load;
2063} 2126}
2064 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
2065sub customise_for { 2131sub customise_for {
2066 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2067 2133
2068 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2069 if $self->per_player; 2135 if $self->per_player;
… …
2223 2289
2224 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2225 2291
2226 return if $self->players; 2292 return if $self->players;
2227 2293
2228 warn "resetting map ", $self->path; 2294 warn "resetting map ", $self->path, "\n";
2229 2295
2230 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2231 2297
2232 # need to save uniques path 2298 # need to save uniques path
2233 unless ($self->{deny_save}) { 2299 unless ($self->{deny_save}) {
… …
2324 : normalise $_ 2390 : normalise $_
2325 } @{ aio_readdir $UNIQUEDIR or [] } 2391 } @{ aio_readdir $UNIQUEDIR or [] }
2326 ] 2392 ]
2327} 2393}
2328 2394
2395=item cf::map::static_maps
2396
2397Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2398file in the shared directory excluding F</styles> and F</editor>). May
2399block.
2400
2401=cut
2402
2403sub static_maps() {
2404 my @dirs = "";
2405 my @maps;
2406
2407 while (@dirs) {
2408 my $dir = shift @dirs;
2409
2410 next if $dir eq "/styles" || $dir eq "/editor";
2411
2412 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2413 or return;
2414
2415 for (@$files) {
2416 s/\.map$// or next;
2417 utf8::decode $_;
2418 push @maps, "$dir/$_";
2419 }
2420
2421 push @dirs, map "$dir/$_", @$dirs;
2422 }
2423
2424 \@maps
2425}
2426
2329=back 2427=back
2330 2428
2331=head3 cf::object 2429=head3 cf::object
2332 2430
2333=cut 2431=cut
… …
2528 ($x, $y) = (-1, -1) 2626 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2627 unless (defined $x) && (defined $y);
2530 2628
2531 # use -1 or undef as default coordinates, not 0, 0 2629 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2630 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2631 if $x <= 0 && $y <= 0;
2534 2632
2535 $map->load; 2633 $map->load;
2536 $map->load_neighbours; 2634 $map->load_neighbours;
2537 2635
2538 return unless $self->contr->active; 2636 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2540 $self->activate_recursive;
2541 2637
2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2543 $self->enter_map ($map, $x, $y); 2639 $self->enter_map ($map, $x, $y);
2640
2641 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive;
2544} 2643}
2545 2644
2546=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2547 2646
2548Moves the player to the given map-path and coordinates by first freezing 2647Moves the player to the given map-path and coordinates by first freezing
… …
2736 2835
2737 utf8::encode $text; 2836 utf8::encode $text;
2738 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2837 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2739} 2838}
2740 2839
2840=item $client->send_big_packet ($pkt)
2841
2842Like C<send_packet>, but tries to compress large packets, and fragments
2843them as required.
2844
2845=cut
2846
2847our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2848
2849sub cf::client::send_big_packet {
2850 my ($self, $pkt) = @_;
2851
2852 # try lzf for large packets
2853 $pkt = "lzf " . Compress::LZF::compress $pkt
2854 if 1024 <= length $pkt and $self->{can_lzf};
2855
2856 # split very large packets
2857 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2858 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2859 $pkt = "frag";
2860 }
2861
2862 $self->send_packet ($pkt);
2863}
2864
2741=item $client->send_msg ($channel, $msg, $color, [extra...]) 2865=item $client->send_msg ($channel, $msg, $color, [extra...])
2742 2866
2743Send a drawinfo or msg packet to the client, formatting the msg for the 2867Send a drawinfo or msg packet to the client, formatting the msg for the
2744client if neccessary. C<$type> should be a string identifying the type of 2868client if neccessary. C<$type> should be a string identifying the type of
2745the message, with C<log> being the default. If C<$color> is negative, suppress 2869the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2747 2871
2748=cut 2872=cut
2749 2873
2750# non-persistent channels (usually the info channel) 2874# non-persistent channels (usually the info channel)
2751our %CHANNEL = ( 2875our %CHANNEL = (
2876 "c/motd" => {
2877 id => "infobox",
2878 title => "MOTD",
2879 reply => undef,
2880 tooltip => "The message of the day",
2881 },
2752 "c/identify" => { 2882 "c/identify" => {
2753 id => "infobox", 2883 id => "infobox",
2754 title => "Identify", 2884 title => "Identify",
2755 reply => undef, 2885 reply => undef,
2756 tooltip => "Items recently identified", 2886 tooltip => "Items recently identified",
… …
2758 "c/examine" => { 2888 "c/examine" => {
2759 id => "infobox", 2889 id => "infobox",
2760 title => "Examine", 2890 title => "Examine",
2761 reply => undef, 2891 reply => undef,
2762 tooltip => "Signs and other items you examined", 2892 tooltip => "Signs and other items you examined",
2893 },
2894 "c/shopinfo" => {
2895 id => "infobox",
2896 title => "Shop Info",
2897 reply => undef,
2898 tooltip => "What your bargaining skill tells you about the shop",
2763 }, 2899 },
2764 "c/book" => { 2900 "c/book" => {
2765 id => "infobox", 2901 id => "infobox",
2766 title => "Book", 2902 title => "Book",
2767 reply => undef, 2903 reply => undef,
… …
2883 my $pkt = "msg " 3019 my $pkt = "msg "
2884 . $self->{json_coder}->encode ( 3020 . $self->{json_coder}->encode (
2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3021 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2886 ); 3022 );
2887 3023
2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2891
2892 # split very large packets
2893 if (8192 < length $pkt and $self->{can_lzf}) {
2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2895 $pkt = "frag";
2896 }
2897
2898 $self->send_packet ($pkt); 3024 $self->send_big_packet ($pkt);
2899} 3025}
2900 3026
2901=item $client->ext_msg ($type, @msg) 3027=item $client->ext_msg ($type, @msg)
2902 3028
2903Sends an ext event to the client. 3029Sends an ext event to the client.
… …
2906 3032
2907sub cf::client::ext_msg($$@) { 3033sub cf::client::ext_msg($$@) {
2908 my ($self, $type, @msg) = @_; 3034 my ($self, $type, @msg) = @_;
2909 3035
2910 if ($self->extcmd == 2) { 3036 if ($self->extcmd == 2) {
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3037 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2912 } elsif ($self->extcmd == 1) { # TODO: remove 3038 } elsif ($self->extcmd == 1) { # TODO: remove
2913 push @msg, msgtype => "event_$type"; 3039 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 } 3041 }
2916} 3042}
2917 3043
2918=item $client->ext_reply ($msgid, @msg) 3044=item $client->ext_reply ($msgid, @msg)
2919 3045
… …
2923 3049
2924sub cf::client::ext_reply($$@) { 3050sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_; 3051 my ($self, $id, @msg) = @_;
2926 3052
2927 if ($self->extcmd == 2) { 3053 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3054 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) { 3055 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove 3056 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id; 3057 unshift @msg, msgtype => "reply", msgid => $id;
2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933 } 3059 }
2934} 3060}
2935 3061
2936=item $success = $client->query ($flags, "text", \&cb) 3062=item $success = $client->query ($flags, "text", \&cb)
2937 3063
… …
3038 3164
3039 $coro 3165 $coro
3040} 3166}
3041 3167
3042cf::client->attach ( 3168cf::client->attach (
3043 on_destroy => sub { 3169 on_client_destroy => sub {
3044 my ($ns) = @_; 3170 my ($ns) = @_;
3045 3171
3046 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3172 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3047 }, 3173 },
3048); 3174);
… …
3064our $safe_hole = new Safe::Hole; 3190our $safe_hole = new Safe::Hole;
3065 3191
3066$SIG{FPE} = 'IGNORE'; 3192$SIG{FPE} = 'IGNORE';
3067 3193
3068$safe->permit_only (Opcode::opset qw( 3194$safe->permit_only (Opcode::opset qw(
3069 :base_core :base_mem :base_orig :base_math 3195 :base_core :base_mem :base_orig :base_math :base_loop
3070 grepstart grepwhile mapstart mapwhile 3196 grepstart grepwhile mapstart mapwhile
3071 sort time 3197 sort time
3072)); 3198));
3073 3199
3074# here we export the classes and methods available to script code 3200# here we export the classes and methods available to script code
… …
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3252 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3253 $qcode =~ s/\n/\\n/g;
3128 3254
3129 %vars = (_dummy => 0) unless %vars; 3255 %vars = (_dummy => 0) unless %vars;
3130 3256
3257 my @res;
3131 local $_; 3258 local $_;
3132 local @safe::cf::_safe_eval_args = values %vars;
3133 3259
3134 my $eval = 3260 my $eval =
3135 "do {\n" 3261 "do {\n"
3136 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3262 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3137 . "#line 0 \"{$qcode}\"\n" 3263 . "#line 0 \"{$qcode}\"\n"
3138 . $code 3264 . $code
3139 . "\n}" 3265 . "\n}"
3140 ; 3266 ;
3141 3267
3268 if ($CFG{safe_eval}) {
3142 sub_generation_inc; 3269 sub_generation_inc;
3270 local @safe::cf::_safe_eval_args = values %vars;
3143 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3271 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3144 sub_generation_inc; 3272 sub_generation_inc;
3273 } else {
3274 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval;
3276 }
3145 3277
3146 if ($@) { 3278 if ($@) {
3147 warn "$@"; 3279 warn "$@";
3148 warn "while executing safe code '$code'\n"; 3280 warn "while executing safe code '$code'\n";
3149 warn "with arguments " . (join " ", %vars) . "\n"; 3281 warn "with arguments " . (join " ", %vars) . "\n";
… …
3168=cut 3300=cut
3169 3301
3170sub register_script_function { 3302sub register_script_function {
3171 my ($fun, $cb) = @_; 3303 my ($fun, $cb) = @_;
3172 3304
3173 no strict 'refs'; 3305 $fun = "safe::$fun" if $CFG{safe_eval};
3174 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3306 *$fun = $safe_hole->wrap ($cb);
3175} 3307}
3176 3308
3177=back 3309=back
3178 3310
3179=cut 3311=cut
… …
3200 3332
3201 $facedata->{version} == 2 3333 $facedata->{version} == 2
3202 or cf::cleanup "$path: version mismatch, cannot proceed."; 3334 or cf::cleanup "$path: version mismatch, cannot proceed.";
3203 3335
3204 # patch in the exptable 3336 # patch in the exptable
3337 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3205 $facedata->{resource}{"res/exp_table"} = { 3338 $facedata->{resource}{"res/exp_table"} = {
3206 type => FT_RSRC, 3339 type => FT_RSRC,
3207 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3340 data => $exp_table,
3341 hash => (Digest::MD5::md5 $exp_table),
3208 }; 3342 };
3209 cf::cede_to_tick; 3343 cf::cede_to_tick;
3210 3344
3211 { 3345 {
3212 my $faces = $facedata->{faceinfo}; 3346 my $faces = $facedata->{faceinfo};
… …
3214 while (my ($face, $info) = each %$faces) { 3348 while (my ($face, $info) = each %$faces) {
3215 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3349 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216 3350
3217 cf::face::set_visibility $idx, $info->{visibility}; 3351 cf::face::set_visibility $idx, $info->{visibility};
3218 cf::face::set_magicmap $idx, $info->{magicmap}; 3352 cf::face::set_magicmap $idx, $info->{magicmap};
3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3221 3355
3222 cf::cede_to_tick; 3356 cf::cede_to_tick;
3223 } 3357 }
3224 3358
3225 while (my ($face, $info) = each %$faces) { 3359 while (my ($face, $info) = each %$faces) {
… …
3249 3383
3250 cf::anim::invalidate_all; # d'oh 3384 cf::anim::invalidate_all; # d'oh
3251 } 3385 }
3252 3386
3253 { 3387 {
3254 # TODO: for gcfclient pleasure, we should give resources
3255 # that gcfclient doesn't grok a >10000 face index.
3256 my $res = $facedata->{resource}; 3388 my $res = $facedata->{resource};
3257 3389
3258 while (my ($name, $info) = each %$res) { 3390 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) { 3391 if (defined $info->{type}) {
3260 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3392 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
3262 3393
3263 if ($info->{type} & 1) { 3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3264 # prepend meta info
3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type}; 3395 cf::face::set_type $idx, $info->{type};
3278 } else { 3396 } else {
3279 $RESOURCE{$name} = $info; 3397 $RESOURCE{$name} = $info;
3280 } 3398 }
3281 3399
… …
3365 3483
3366 warn "finished reloading resource files\n"; 3484 warn "finished reloading resource files\n";
3367} 3485}
3368 3486
3369sub reload_config { 3487sub reload_config {
3488 warn "reloading config file...\n";
3489
3370 open my $fh, "<:utf8", "$CONFDIR/config" 3490 open my $fh, "<:utf8", "$CONFDIR/config"
3371 or return; 3491 or return;
3372 3492
3373 local $/; 3493 local $/;
3374 *CFG = YAML::Load <$fh>; 3494 *CFG = YAML::XS::Load scalar <$fh>;
3375 3495
3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3377 3497
3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3383 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3384 and die "WARNING: m(un)lockall failed: $!\n"; 3504 and die "WARNING: m(un)lockall failed: $!\n";
3385 }; 3505 };
3386 warn $@ if $@; 3506 warn $@ if $@;
3387 } 3507 }
3508
3509 warn "finished reloading resource files\n";
3388} 3510}
3389 3511
3390sub pidfile() { 3512sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!"; 3514 or die "$PIDFILE: $!";
… …
3420 3542
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430 3547
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432 3549
3433 # we must not ever block the main coroutine 3550 # we must not ever block the main coroutine
3434 local $Coro::idle = sub { 3551 local $Coro::idle = sub {
… …
3440 }; 3557 };
3441 3558
3442 evthread_start IO::AIO::poll_fileno; 3559 evthread_start IO::AIO::poll_fileno;
3443 3560
3444 cf::sync_job { 3561 cf::sync_job {
3562 cf::init_experience;
3563 cf::init_anim;
3564 cf::init_attackmess;
3565 cf::init_dynamic;
3566
3567 cf::load_settings;
3568 cf::load_materials;
3569
3445 reload_resources; 3570 reload_resources;
3446 reload_config; 3571 reload_config;
3447 db_init; 3572 db_init;
3448 3573
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid; 3574 cf::init_uuid;
3452 cf::init_signals; 3575 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills; 3576 cf::init_skills;
3455 3577
3456 cf::init_beforeplay; 3578 cf::init_beforeplay;
3457 3579
3458 atomic; 3580 atomic;
… …
3460 load_extensions; 3582 load_extensions;
3461 3583
3462 utime time, time, $RUNTIMEFILE; 3584 utime time, time, $RUNTIMEFILE;
3463 3585
3464 # no (long-running) fork's whatsoever before this point(!) 3586 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX ();
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466 3589
3467 (pop @POST_INIT)->(0) while @POST_INIT; 3590 (pop @POST_INIT)->(0) while @POST_INIT;
3468 }; 3591 };
3592
3593 cf::object::thawer::errors_are_fatal 0;
3594 warn "parse errors in files are no longer fatal from this point on.\n";
3469 3595
3470 main_loop; 3596 main_loop;
3471} 3597}
3472 3598
3473############################################################################# 3599#############################################################################
… …
3475 3601
3476# install some emergency cleanup handlers 3602# install some emergency cleanup handlers
3477BEGIN { 3603BEGIN {
3478 our %SIGWATCHER = (); 3604 our %SIGWATCHER = ();
3479 for my $signal (qw(INT HUP TERM)) { 3605 for my $signal (qw(INT HUP TERM)) {
3480 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3606 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3481 cf::cleanup "SIG$signal"; 3607 cf::cleanup "SIG$signal";
3482 }; 3608 };
3483 } 3609 }
3484} 3610}
3485 3611
3486sub write_runtime_sync { 3612sub write_runtime_sync {
3613 my $t0 = AE::time;
3614
3487 # first touch the runtime file to show we are still running: 3615 # first touch the runtime file to show we are still running:
3488 # the fsync below can take a very very long time. 3616 # the fsync below can take a very very long time.
3489 3617
3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3618 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3491 3619
3492 my $guard = cf::lock_acquire "write_runtime"; 3620 my $guard = cf::lock_acquire "write_runtime";
3493 3621
3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3622 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3495 or return; 3623 or return;
3496 3624
3497 my $value = $cf::RUNTIME + 90 + 10; 3625 my $value = $cf::RUNTIME + 90 + 10;
3498 # 10 is the runtime save interval, for a monotonic clock 3626 # 10 is the runtime save interval, for a monotonic clock
3499 # 60 allows for the watchdog to kill the server. 3627 # 60 allows for the watchdog to kill the server.
… …
3512 or return; 3640 or return;
3513 3641
3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3642 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3515 and return; 3643 and return;
3516 3644
3517 warn "runtime file written.\n"; 3645 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3518 3646
3519 1 3647 1
3520} 3648}
3521 3649
3522our $uuid_lock; 3650our $uuid_lock;
… …
3660 return; 3788 return;
3661 } 3789 }
3662 3790
3663 return if $RELOAD++; 3791 return if $RELOAD++;
3664 3792
3665 my $t1 = EV::time; 3793 my $t1 = AE::time;
3666 3794
3667 while ($RELOAD) { 3795 while ($RELOAD) {
3668 warn "reloading..."; 3796 warn "reloading...";
3669 3797
3670 warn "entering sync_job"; 3798 warn "entering sync_job";
… …
3741 3869
3742 warn "unload completed, starting to reload now"; 3870 warn "unload completed, starting to reload now";
3743 3871
3744 warn "reloading cf.pm"; 3872 warn "reloading cf.pm";
3745 require cf; 3873 require cf;
3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3874 cf::_connect_to_perl_1;
3747 3875
3748 warn "loading config and database again"; 3876 warn "loading config and database again";
3749 cf::reload_config; 3877 cf::reload_config;
3750 3878
3751 warn "loading extensions"; 3879 warn "loading extensions";
… …
3773 3901
3774 warn "reloaded"; 3902 warn "reloaded";
3775 --$RELOAD; 3903 --$RELOAD;
3776 } 3904 }
3777 3905
3778 $t1 = EV::time - $t1; 3906 $t1 = AE::time - $t1;
3779 warn "reload completed in ${t1}s\n"; 3907 warn "reload completed in ${t1}s\n";
3780}; 3908};
3781 3909
3782our $RELOAD_WATCHER; # used only during reload 3910our $RELOAD_WATCHER; # used only during reload
3783 3911
… …
3786 # coro crashes during coro_state_free->destroy here. 3914 # coro crashes during coro_state_free->destroy here.
3787 3915
3788 $RELOAD_WATCHER ||= cf::async { 3916 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions; 3917 Coro::AIO::aio_wait cache_extensions;
3790 3918
3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3919 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3792 do_reload_perl; 3920 do_reload_perl;
3793 undef $RELOAD_WATCHER; 3921 undef $RELOAD_WATCHER;
3794 }; 3922 };
3795 }; 3923 };
3796} 3924}
… …
3813 3941
3814our @WAIT_FOR_TICK; 3942our @WAIT_FOR_TICK;
3815our @WAIT_FOR_TICK_BEGIN; 3943our @WAIT_FOR_TICK_BEGIN;
3816 3944
3817sub wait_for_tick { 3945sub wait_for_tick {
3818 return if tick_inhibit || $Coro::current == $Coro::main; 3946 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3819 3947
3820 my $signal = new Coro::Signal; 3948 my $signal = new Coro::Signal;
3821 push @WAIT_FOR_TICK, $signal; 3949 push @WAIT_FOR_TICK, $signal;
3822 $signal->wait; 3950 $signal->wait;
3823} 3951}
3824 3952
3825sub wait_for_tick_begin { 3953sub wait_for_tick_begin {
3826 return if tick_inhibit || $Coro::current == $Coro::main; 3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3827 3955
3828 my $signal = new Coro::Signal; 3956 my $signal = new Coro::Signal;
3829 push @WAIT_FOR_TICK_BEGIN, $signal; 3957 push @WAIT_FOR_TICK_BEGIN, $signal;
3830 $signal->wait; 3958 $signal->wait;
3831} 3959}
… …
3836 unless ++$bug_warning > 10; 3964 unless ++$bug_warning > 10;
3837 return; 3965 return;
3838 } 3966 }
3839 3967
3840 cf::server_tick; # one server iteration 3968 cf::server_tick; # one server iteration
3969
3970 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3841 3971
3842 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3972 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3973 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3844 Coro::async_pool { 3974 Coro::async_pool {
3845 $Coro::current->{desc} = "runtime saver"; 3975 $Coro::current->{desc} = "runtime saver";
… …
3868} 3998}
3869 3999
3870{ 4000{
3871 # configure BDB 4001 # configure BDB
3872 4002
3873 BDB::min_parallel 8; 4003 BDB::min_parallel 16;
3874 BDB::max_poll_reqs $TICK * 0.1; 4004 BDB::max_poll_reqs $TICK * 0.1;
3875 $AnyEvent::BDB::WATCHER->priority (1); 4005 $AnyEvent::BDB::WATCHER->priority (1);
3876 4006
3877 unless ($DB_ENV) { 4007 unless ($DB_ENV) {
3878 $DB_ENV = BDB::db_env_create; 4008 $DB_ENV = BDB::db_env_create;
… …
3959 } 4089 }
3960} 4090}
3961 4091
3962# load additional modules 4092# load additional modules
3963require "cf/$_.pm" for @EXTRA_MODULES; 4093require "cf/$_.pm" for @EXTRA_MODULES;
4094cf::_connect_to_perl_2;
3964 4095
3965END { cf::emergency_save } 4096END { cf::emergency_save }
3966 4097
39671 40981
3968 4099

Diff Legend

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