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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
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
… …
107our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 110
110our %RESOURCE; 111our %RESOURCE;
111 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 118our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
116 120
117our $BDB_DEADLOCK_WATCHER; 121our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 122our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 123our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 124our $DB_ENV;
121 125
122our @EXTRA_MODULES = qw(pod mapscript); 126our @EXTRA_MODULES = qw(pod match mapscript);
123 127
124our %CFG; 128our %CFG;
125 129
126our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 131our $RUNTIME;
… …
161 165
162our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
163 167
164sub cf::map::normalise; 168sub cf::map::normalise;
165 169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
166############################################################################# 174#############################################################################
167 175
168%REFLECT = (); 176%REFLECT = ();
169for (@REFLECT) { 177for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 178 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 179 $REFLECT{$reflect->{class}} = $reflect;
172} 180}
173 181
174# this is decidedly evil 182# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 184
177############################################################################# 185#############################################################################
178 186
179=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
180 188
… …
227returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
228per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
229 237
230=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
231 239
232This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call. 242that call.
235 243
236=item %cf::REFLECT 244=item %cf::REFLECT
237 245
… …
257$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
259 267
260 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
261 269
262 if ($Coro::current == $Coro::main) {#d# 270 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 272 return;#d#
265 }#d# 273 }#d#
266 274
267 # kill coroutine otherwise 275 # kill coroutine otherwise
… …
288)) { 296)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 298}
291 299
292$EV::DIED = sub { 300$EV::DIED = sub {
293 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
294}; 302};
295 303
296############################################################################# 304#############################################################################
297 305
298=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
395} 403}
396 404
397=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
398 406
399Like EV::periodic, but randomly selects a starting point so that the actions 407Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer. 408get spread over time.
401 409
402=cut 410=cut
403 411
404sub periodic($$) { 412sub periodic($$) {
405 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
422 430
423=cut 431=cut
424 432
425our @SLOT_QUEUE; 433our @SLOT_QUEUE;
426our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
427 436
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
431 440
432 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
433 443
434 while () { 444 while () {
435 next_job: 445 next_job:
446
436 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 448
438 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 453 $job->[2]->send;
442 Coro::cede; 454 Coro::cede;
443 goto next_job; 455 goto next_job;
444 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 458 }
446 } 459 }
447 460
448 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait; 464 $signal->wait;
452 } else { 465 } else {
466 $busy = 0;
453 Coro::schedule; 467 Coro::schedule;
454 } 468 }
455 } 469 }
456}; 470};
457 471
458sub get_slot($;$$) { 472sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
460 474
461 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
462 476
463 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
464 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
465 480
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
495 510
496sub sync_job(&) { 511sub sync_job(&) {
497 my ($job) = @_; 512 my ($job) = @_;
498 513
499 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
500 my $time = EV::time; 515 my $time = AE::time;
501 516
502 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
504 519
505 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
522 } else { 537 } else {
523 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
524 } 539 }
525 } 540 }
526 541
527 my $time = EV::time - $time; 542 my $time = AE::time - $time;
528 543
529 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
530 545
531 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
532 } else { 547 } else {
… …
576 reset_signals; 591 reset_signals;
577 &$cb 592 &$cb
578 }, @args; 593 }, @args;
579 594
580 wantarray ? @res : $res[-1] 595 wantarray ? @res : $res[-1]
596}
597
598sub objinfo {
599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
581} 607}
582 608
583=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
584 610
585=cut 611=cut
… …
1302} 1328}
1303 1329
1304use File::Glob (); 1330use File::Glob ();
1305 1331
1306cf::player->attach ( 1332cf::player->attach (
1307 on_command => sub { 1333 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1309 1335
1310 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1311 or return; 1337 or return;
1312 1338
… …
1391 . "\n};\n1"; 1417 . "\n};\n1";
1392 1418
1393 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1394 } 1420 }
1395 1421
1422 my $pass = 0;
1396 my %done; 1423 my %done;
1397 while (%todo) { 1424 while (%todo) {
1398 my $progress; 1425 my $progress;
1399 1426
1427 ++$pass;
1428
1429 ext:
1400 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1432 next ext
1403 unless exists $done{$_}; 1433 unless exists $done{$_};
1404 } 1434 }
1405 1435
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1437
1408 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1442
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1444 if exists $v->{meta}{mandatory};
1416 1445
1417 warn $msg; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1447 delete $todo{$k};
1448 } else {
1449 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1418 } 1455 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1456 }
1424 1457
1425 skip: 1458 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1428 } 1466 }
1429 }; 1467 };
1430} 1468}
1431 1469
1432############################################################################# 1470#############################################################################
… …
1516 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1517 } 1555 }
1518 } 1556 }
1519} 1557}
1520 1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1571
1521sub save($) { 1572sub save($) {
1522 my ($pl) = @_; 1573 my ($pl) = @_;
1523 1574
1524 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1525 1576
… …
1530 1581
1531 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1533 1584
1534 cf::get_slot 0.01; 1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1589
1536 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1591 cf::cede_to_tick;
1538} 1592}
1539 1593
… …
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1807
1754 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1809 $self->_create_random_map (
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2008 2062
2009 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
2010 } 2064 }
2011} 2065}
2012 2066
2013sub pre_load { } 2067sub pre_load { }
2014sub post_load { } 2068#sub post_load { } # XS
2015 2069
2016sub load { 2070sub load {
2017 my ($self) = @_; 2071 my ($self) = @_;
2018 2072
2019 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 } 2130 }
2077 2131
2078 $self->post_load; 2132 $self->post_load;
2079} 2133}
2080 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
2081sub customise_for { 2138sub customise_for {
2082 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2083 2140
2084 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2142 if $self->per_player;
… …
2162 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2163 2220
2164 () 2221 ()
2165} 2222}
2166 2223
2224# common code, used by both ->save and ->swapout
2167sub save { 2225sub _save {
2168 my ($self) = @_; 2226 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2227
2172 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2173 2229
2174 return unless $self->dirty; 2230 return unless $self->dirty;
2175 2231
… …
2195 } else { 2251 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2253 }
2198} 2254}
2199 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2200sub swap_out { 2264sub swap_out {
2201 my ($self) = @_; 2265 my ($self) = @_;
2202 2266
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2268
2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2269 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2270 return if $self->{deny_save};
2271 return if $self->players;
2211 2272
2212 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2213
2214 $self->deactivate; 2274 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2216 $self->clear; 2282 $self->clear;
2217} 2283}
2218 2284
2219sub reset_at { 2285sub reset_at {
2220 my ($self) = @_; 2286 my ($self) = @_;
… …
2340 : normalise $_ 2406 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2408 ]
2343} 2409}
2344 2410
2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2442
2345=back 2443=back
2346 2444
2347=head3 cf::object 2445=head3 cf::object
2348 2446
2349=cut 2447=cut
… …
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2616
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2521 2619
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2621}
2524 2622
2525sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2527 2625
… …
2544 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2546 2644
2547 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2550 2648
2551 $map->load; 2649 $map->load;
2552 $map->load_neighbours; 2650 $map->load_neighbours;
2553 2651
2554 return unless $self->contr->active; 2652 return unless $self->contr->active;
… …
2753 2851
2754 utf8::encode $text; 2852 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2756} 2854}
2757 2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2879}
2880
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2882
2760Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send a drawinfo or msg packet to the client, formatting the msg for the
2761client if neccessary. C<$type> should be a string identifying the type of 2884client if neccessary. C<$type> should be a string identifying the type of
2762the message, with C<log> being the default. If C<$color> is negative, suppress 2885the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2764 2887
2765=cut 2888=cut
2766 2889
2767# non-persistent channels (usually the info channel) 2890# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2769 "c/identify" => { 2898 "c/identify" => {
2770 id => "infobox", 2899 id => "infobox",
2771 title => "Identify", 2900 title => "Identify",
2772 reply => undef, 2901 reply => undef,
2773 tooltip => "Items recently identified", 2902 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2904 "c/examine" => {
2776 id => "infobox", 2905 id => "infobox",
2777 title => "Examine", 2906 title => "Examine",
2778 reply => undef, 2907 reply => undef,
2779 tooltip => "Signs and other items you examined", 2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 2915 },
2781 "c/book" => { 2916 "c/book" => {
2782 id => "infobox", 2917 id => "infobox",
2783 title => "Book", 2918 title => "Book",
2784 reply => undef, 2919 reply => undef,
… …
2900 my $pkt = "msg " 3035 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3036 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3038 );
2904 3039
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3040 $self->send_big_packet ($pkt);
2916} 3041}
2917 3042
2918=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2919 3044
2920Sends an ext event to the client. 3045Sends an ext event to the client.
… …
2923 3048
2924sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2926 3051
2927 if ($self->extcmd == 2) { 3052 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3057 }
2933} 3058}
2934 3059
2935=item $client->ext_reply ($msgid, @msg) 3060=item $client->ext_reply ($msgid, @msg)
2936 3061
… …
2940 3065
2941sub cf::client::ext_reply($$@) { 3066sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3067 my ($self, $id, @msg) = @_;
2943 3068
2944 if ($self->extcmd == 2) { 3069 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3071 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3072 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3073 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3075 }
2951} 3076}
2952 3077
2953=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2954 3079
… …
3055 3180
3056 $coro 3181 $coro
3057} 3182}
3058 3183
3059cf::client->attach ( 3184cf::client->attach (
3060 on_destroy => sub { 3185 on_client_destroy => sub {
3061 my ($ns) = @_; 3186 my ($ns) = @_;
3062 3187
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3189 },
3065); 3190);
… …
3081our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3082 3207
3083$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3084 3209
3085$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3088 sort time 3213 sort time
3089)); 3214));
3090 3215
3091# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3145 3270
3146 %vars = (_dummy => 0) unless %vars; 3271 %vars = (_dummy => 0) unless %vars;
3147 3272
3273 my @res;
3148 local $_; 3274 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3275
3151 my $eval = 3276 my $eval =
3152 "do {\n" 3277 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3280 . $code
3156 . "\n}" 3281 . "\n}"
3157 ; 3282 ;
3158 3283
3284 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
3162 3293
3163 if ($@) { 3294 if ($@) {
3164 warn "$@"; 3295 warn "$@";
3165 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
… …
3185=cut 3316=cut
3186 3317
3187sub register_script_function { 3318sub register_script_function {
3188 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3189 3320
3190 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3192} 3323}
3193 3324
3194=back 3325=back
3195 3326
3196=cut 3327=cut
… …
3217 3348
3218 $facedata->{version} == 2 3349 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3351
3221 # patch in the exptable 3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3355 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3358 };
3226 cf::cede_to_tick; 3359 cf::cede_to_tick;
3227 3360
3228 { 3361 {
3229 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3366
3234 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3371
3239 cf::cede_to_tick; 3372 cf::cede_to_tick;
3240 } 3373 }
3241 3374
3242 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
… …
3266 3399
3267 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
3268 } 3401 }
3269 3402
3270 { 3403 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
3274 3405
3275 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3407 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3409
3280 if ($info->{type} & 1) { 3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3411 cf::face::set_type $idx, $info->{type};
3295 } else { 3412 } else {
3296 $RESOURCE{$name} = $info; 3413 $RESOURCE{$name} = $info;
3297 } 3414 }
3298 3415
… …
3382 3499
3383 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
3384} 3501}
3385 3502
3386sub reload_config { 3503sub reload_config {
3504 warn "reloading config file...\n";
3505
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
3388 or return; 3507 or return;
3389 3508
3390 local $/; 3509 local $/;
3391 *CFG = YAML::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
3392 3511
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3394 3513
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3400 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3401 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
3402 }; 3521 };
3403 warn $@ if $@; 3522 warn $@ if $@;
3404 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3405} 3526}
3406 3527
3407sub pidfile() { 3528sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!"; 3530 or die "$PIDFILE: $!";
… …
3437 3558
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447 3563
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3565
3450 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
… …
3457 }; 3573 };
3458 3574
3459 evthread_start IO::AIO::poll_fileno; 3575 evthread_start IO::AIO::poll_fileno;
3460 3576
3461 cf::sync_job { 3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3462 reload_resources; 3586 reload_resources;
3463 reload_config; 3587 reload_config;
3464 db_init; 3588 db_init;
3465 3589
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3590 cf::init_uuid;
3469 cf::init_signals; 3591 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3592 cf::init_skills;
3472 3593
3473 cf::init_beforeplay; 3594 cf::init_beforeplay;
3474 3595
3475 atomic; 3596 atomic;
… …
3482 use POSIX (); 3603 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3605
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3606 (pop @POST_INIT)->(0) while @POST_INIT;
3486 }; 3607 };
3608
3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3487 3611
3488 main_loop; 3612 main_loop;
3489} 3613}
3490 3614
3491############################################################################# 3615#############################################################################
… …
3493 3617
3494# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3495BEGIN { 3619BEGIN {
3496 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3500 }; 3624 };
3501 } 3625 }
3502} 3626}
3503 3627
3504sub write_runtime_sync { 3628sub write_runtime_sync {
3629 my $t0 = AE::time;
3630
3505 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3507 3633
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3635
3510 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3511 3637
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3639 or return;
3514 3640
3515 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
… …
3530 or return; 3656 or return;
3531 3657
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3659 and return;
3534 3660
3535 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3662
3537 1 3663 1
3538} 3664}
3539 3665
3540our $uuid_lock; 3666our $uuid_lock;
… …
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3793 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3794 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3796 }
3671 warn "cleared package $pkg\n";#d#
3672} 3797}
3673 3798
3674sub do_reload_perl() { 3799sub do_reload_perl() {
3675 # can/must only be called in main 3800 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3677 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3678 return; 3803 return;
3679 } 3804 }
3680 3805
3681 return if $RELOAD++; 3806 return if $RELOAD++;
3682 3807
3683 my $t1 = EV::time; 3808 my $t1 = AE::time;
3684 3809
3685 while ($RELOAD) { 3810 while ($RELOAD) {
3686 warn "reloading..."; 3811 warn "reloading...";
3687 3812
3688 warn "entering sync_job"; 3813 warn "entering sync_job";
… …
3759 3884
3760 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3761 3886
3762 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3763 require cf; 3888 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3765 3890
3766 warn "loading config and database again"; 3891 warn "loading config and database again";
3767 cf::reload_config; 3892 cf::reload_config;
3768 3893
3769 warn "loading extensions"; 3894 warn "loading extensions";
… …
3791 3916
3792 warn "reloaded"; 3917 warn "reloaded";
3793 --$RELOAD; 3918 --$RELOAD;
3794 } 3919 }
3795 3920
3796 $t1 = EV::time - $t1; 3921 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 3922 warn "reload completed in ${t1}s\n";
3798}; 3923};
3799 3924
3800our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3801 3926
… …
3804 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3805 3930
3806 $RELOAD_WATCHER ||= cf::async { 3931 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 3932 Coro::AIO::aio_wait cache_extensions;
3808 3933
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 3935 do_reload_perl;
3811 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3812 }; 3937 };
3813 }; 3938 };
3814} 3939}
… …
3831 3956
3832our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3834 3959
3835sub wait_for_tick { 3960sub wait_for_tick {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 3962
3838 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 3965 $signal->wait;
3841} 3966}
3842 3967
3843sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 3970
3846 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 3973 $signal->wait;
3849} 3974}
… …
3854 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3855 return; 3980 return;
3856 } 3981 }
3857 3982
3858 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3984
3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3859 3986
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 3989 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
… …
3886} 4013}
3887 4014
3888{ 4015{
3889 # configure BDB 4016 # configure BDB
3890 4017
3891 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3894 4021
3895 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
… …
3977 } 4104 }
3978} 4105}
3979 4106
3980# load additional modules 4107# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3982 4110
3983END { cf::emergency_save } 4111END { cf::emergency_save }
3984 4112
39851 41131
3986 4114

Diff Legend

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