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.479 by root, Thu Oct 8 05:04:27 2009 UTC vs.
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use 5.10.0;
25use utf8; 26use utf8;
… …
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
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
184
174############################################################################# 185#############################################################################
175 186
176=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
177 188
178=over 4 189=over 4
… …
224returns 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
225per 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.
226 237
227=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
228 239
229This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
230C<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
231that call. 242that call.
232 243
233=item %cf::REFLECT 244=item %cf::REFLECT
234 245
235Contains, for each (C++) class name, a hash reference with information 246Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata, 247about object members (methods, scalars, arrays and flags) and other
237which is useful for introspection. 248metadata, which is useful for introspection.
238 249
239=back 250=back
240 251
241=cut 252=cut
242 253
… …
254$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
255 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
256 267
257 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
258 269
259 if ($Coro::current == $Coro::main) {#d# 270 if (in_main) {#d#
260 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
261 return;#d# 272 return;#d#
262 }#d# 273 }#d#
263 274
264 # kill coroutine otherwise 275 # kill coroutine otherwise
… …
285)) { 296)) {
286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
287} 298}
288 299
289$EV::DIED = sub { 300$EV::DIED = sub {
290 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
291}; 302};
292 303
293############################################################################# 304#############################################################################
294 305
295=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
392} 403}
393 404
394=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
395 406
396Like 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
397get spread over timer. 408get spread over time.
398 409
399=cut 410=cut
400 411
401sub periodic($$) { 412sub periodic($$) {
402 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
419 430
420=cut 431=cut
421 432
422our @SLOT_QUEUE; 433our @SLOT_QUEUE;
423our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
424 436
425$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
426$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
427 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
428 440
429 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
430 443
431 while () { 444 while () {
432 next_job: 445 next_job:
446
433 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
434 if ($avail > 0.01) { 448
435 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
436 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
437 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
438 $job->[2]->send; 453 $job->[2]->send;
439 Coro::cede; 454 Coro::cede;
440 goto next_job; 455 goto next_job;
441 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
442 } 458 }
443 } 459 }
444 460
445 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
446 # 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
447 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
448 $signal->wait; 464 $signal->wait;
449 } else { 465 } else {
466 $busy = 0;
450 Coro::schedule; 467 Coro::schedule;
451 } 468 }
452 } 469 }
453}; 470};
454 471
455sub get_slot($;$$) { 472sub get_slot($;$$) {
456 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
457 474
458 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
459 476
460 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
461 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
462 480
463 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
464 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
465 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
492 510
493sub sync_job(&) { 511sub sync_job(&) {
494 my ($job) = @_; 512 my ($job) = @_;
495 513
496 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
497 my $time = EV::time; 515 my $time = AE::time;
498 516
499 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
500 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
501 519
502 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
519 } else { 537 } else {
520 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
521 } 539 }
522 } 540 }
523 541
524 my $time = EV::time - $time; 542 my $time = AE::time - $time;
525 543
526 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
527 545
528 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
529 } else { 547 } else {
… …
573 reset_signals; 591 reset_signals;
574 &$cb 592 &$cb
575 }, @args; 593 }, @args;
576 594
577 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 )
578} 607}
579 608
580=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
581 610
582=cut 611=cut
… …
1299} 1328}
1300 1329
1301use File::Glob (); 1330use File::Glob ();
1302 1331
1303cf::player->attach ( 1332cf::player->attach (
1304 on_command => sub { 1333 on_unknown_command => sub {
1305 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1306 1335
1307 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1308 or return; 1337 or return;
1309 1338
… …
1388 . "\n};\n1"; 1417 . "\n};\n1";
1389 1418
1390 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1391 } 1420 }
1392 1421
1422 my $pass = 0;
1393 my %done; 1423 my %done;
1394 while (%todo) { 1424 while (%todo) {
1395 my $progress; 1425 my $progress;
1396 1426
1427 ++$pass;
1428
1429 ext:
1397 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1398 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1399 goto skip 1432 next ext
1400 unless exists $done{$_}; 1433 unless exists $done{$_};
1401 } 1434 }
1402 1435
1403 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1404 1437
1405 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1406 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1407 : "$v->{base}: extension inactive.\n";
1408 1442
1409 if (exists $v->{meta}{mandatory}) {
1410 warn $msg;
1411 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1412 } 1444 if exists $v->{meta}{mandatory};
1413 1445
1414 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;
1415 } 1455 }
1416
1417 $done{$k} = delete $todo{$k};
1418 push @EXTS, $v->{pkg};
1419 $progress = 1;
1420 } 1456 }
1421 1457
1422 skip: 1458 unless ($progress) {
1423 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1424 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 }
1425 } 1466 }
1426 }; 1467 };
1427} 1468}
1428 1469
1429############################################################################# 1470#############################################################################
… …
1513 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1514 } 1555 }
1515 } 1556 }
1516} 1557}
1517 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
1518sub save($) { 1572sub save($) {
1519 my ($pl) = @_; 1573 my ($pl) = @_;
1520 1574
1521 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1522 1576
… …
1527 1581
1528 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1529 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1530 1584
1531 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];
1532 1589
1533 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1534 cf::cede_to_tick; 1591 cf::cede_to_tick;
1535} 1592}
1536 1593
… …
1638 \@logins 1695 \@logins
1639} 1696}
1640 1697
1641=item $player->maps 1698=item $player->maps
1642 1699
1700=item cf::player::maps $login
1701
1643Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1644player. May block. 1703player. May block.
1645 1704
1646=cut 1705=cut
1647 1706
… …
1709=cut 1768=cut
1710 1769
1711sub find_by_path($) { 1770sub find_by_path($) {
1712 my ($path) = @_; 1771 my ($path) = @_;
1713 1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1774
1714 my ($match, $specificity); 1775 my ($match, $specificity);
1715 1776
1716 for my $region (list) { 1777 for my $region (list) {
1717 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
1718 ($match, $specificity) = ($region, $region->specificity) 1779 ($match, $specificity) = ($region, $region->specificity)
… …
1749 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1750 1811
1751 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1752 $self->_create_random_map ( 1813 $self->_create_random_map (
1753 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1754 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1755 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1756 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1757 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1758 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1759 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2005 2066
2006 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
2007 } 2068 }
2008} 2069}
2009 2070
2010sub pre_load { } 2071sub pre_load { }
2011sub post_load { } 2072#sub post_load { } # XS
2012 2073
2013sub load { 2074sub load {
2014 my ($self) = @_; 2075 my ($self) = @_;
2015 2076
2016 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
… …
2073 } 2134 }
2074 2135
2075 $self->post_load; 2136 $self->post_load;
2076} 2137}
2077 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
2078sub customise_for { 2142sub customise_for {
2079 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
2080 2144
2081 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
2082 if $self->per_player; 2146 if $self->per_player;
… …
2159 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
2160 2224
2161 () 2225 ()
2162} 2226}
2163 2227
2228# common code, used by both ->save and ->swapout
2164sub save { 2229sub _save {
2165 my ($self) = @_; 2230 my ($self) = @_;
2166
2167 my $lock = cf::lock_acquire "map_data:$self->{path}";
2168 2231
2169 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2170 2233
2171 return unless $self->dirty; 2234 return unless $self->dirty;
2172 2235
… …
2192 } else { 2255 } else {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2194 } 2257 }
2195} 2258}
2196 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2197sub swap_out { 2268sub swap_out {
2198 my ($self) = @_; 2269 my ($self) = @_;
2199 2270
2200 # save first because save cedes
2201 $self->save;
2202
2203 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2204 2272
2205 return if $self->players;
2206 return if $self->in_memory != cf::MAP_ACTIVE; 2273 return if $self->in_memory != cf::MAP_ACTIVE;
2207 return if $self->{deny_save}; 2274 return if $self->{deny_save};
2275 return if $self->players;
2208 2276
2209 $self->in_memory (cf::MAP_SWAPPED); 2277 # first deactivate the map and "unlink" it from the core
2210
2211 $self->deactivate; 2278 $self->deactivate;
2212 $_->clear_links_to ($self) for values %cf::MAP; 2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2213 $self->clear; 2286 $self->clear;
2214} 2287}
2215 2288
2216sub reset_at { 2289sub reset_at {
2217 my ($self) = @_; 2290 my ($self) = @_;
… …
2337 : normalise $_ 2410 : normalise $_
2338 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2339 ] 2412 ]
2340} 2413}
2341 2414
2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2446
2342=back 2447=back
2343 2448
2344=head3 cf::object 2449=head3 cf::object
2345 2450
2346=cut 2451=cut
… …
2514 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2515 2620
2516 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2517 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2518 2623
2519 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2520} 2625}
2521 2626
2522sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2523 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2524 2629
… …
2541 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2542 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2543 2648
2544 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2545 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2546 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2547 2652
2548 $map->load; 2653 $map->load;
2549 $map->load_neighbours; 2654 $map->load_neighbours;
2550 2655
2551 return unless $self->contr->active; 2656 return unless $self->contr->active;
… …
2750 2855
2751 utf8::encode $text; 2856 utf8::encode $text;
2752 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2753} 2858}
2754 2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2883}
2884
2755=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2756 2886
2757Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
2758client if neccessary. C<$type> should be a string identifying the type of 2888client if neccessary. C<$type> should be a string identifying the type of
2759the message, with C<log> being the default. If C<$color> is negative, suppress 2889the message, with C<log> being the default. If C<$color> is negative, suppress
… …
2761 2891
2762=cut 2892=cut
2763 2893
2764# non-persistent channels (usually the info channel) 2894# non-persistent channels (usually the info channel)
2765our %CHANNEL = ( 2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2766 "c/identify" => { 2902 "c/identify" => {
2767 id => "infobox", 2903 id => "infobox",
2768 title => "Identify", 2904 title => "Identify",
2769 reply => undef, 2905 reply => undef,
2770 tooltip => "Items recently identified", 2906 tooltip => "Items recently identified",
… …
2772 "c/examine" => { 2908 "c/examine" => {
2773 id => "infobox", 2909 id => "infobox",
2774 title => "Examine", 2910 title => "Examine",
2775 reply => undef, 2911 reply => undef,
2776 tooltip => "Signs and other items you examined", 2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2777 }, 2919 },
2778 "c/book" => { 2920 "c/book" => {
2779 id => "infobox", 2921 id => "infobox",
2780 title => "Book", 2922 title => "Book",
2781 reply => undef, 2923 reply => undef,
… …
2897 my $pkt = "msg " 3039 my $pkt = "msg "
2898 . $self->{json_coder}->encode ( 3040 . $self->{json_coder}->encode (
2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2900 ); 3042 );
2901 3043
2902 # try lzf for large packets
2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2904 if 1024 <= length $pkt and $self->{can_lzf};
2905
2906 # split very large packets
2907 if (8192 < length $pkt and $self->{can_lzf}) {
2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2909 $pkt = "frag";
2910 }
2911
2912 $self->send_packet ($pkt); 3044 $self->send_big_packet ($pkt);
2913} 3045}
2914 3046
2915=item $client->ext_msg ($type, @msg) 3047=item $client->ext_msg ($type, @msg)
2916 3048
2917Sends an ext event to the client. 3049Sends an ext event to the client.
… …
2920 3052
2921sub cf::client::ext_msg($$@) { 3053sub cf::client::ext_msg($$@) {
2922 my ($self, $type, @msg) = @_; 3054 my ($self, $type, @msg) = @_;
2923 3055
2924 if ($self->extcmd == 2) { 3056 if ($self->extcmd == 2) {
2925 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2926 } elsif ($self->extcmd == 1) { # TODO: remove 3058 } elsif ($self->extcmd == 1) { # TODO: remove
2927 push @msg, msgtype => "event_$type"; 3059 push @msg, msgtype => "event_$type";
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3061 }
2930} 3062}
2931 3063
2932=item $client->ext_reply ($msgid, @msg) 3064=item $client->ext_reply ($msgid, @msg)
2933 3065
… …
2937 3069
2938sub cf::client::ext_reply($$@) { 3070sub cf::client::ext_reply($$@) {
2939 my ($self, $id, @msg) = @_; 3071 my ($self, $id, @msg) = @_;
2940 3072
2941 if ($self->extcmd == 2) { 3073 if ($self->extcmd == 2) {
2942 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2943 } elsif ($self->extcmd == 1) { 3075 } elsif ($self->extcmd == 1) {
2944 #TODO: version 1, remove 3076 #TODO: version 1, remove
2945 unshift @msg, msgtype => "reply", msgid => $id; 3077 unshift @msg, msgtype => "reply", msgid => $id;
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2947 } 3079 }
2948} 3080}
2949 3081
2950=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2951 3083
… …
3052 3184
3053 $coro 3185 $coro
3054} 3186}
3055 3187
3056cf::client->attach ( 3188cf::client->attach (
3057 on_destroy => sub { 3189 on_client_destroy => sub {
3058 my ($ns) = @_; 3190 my ($ns) = @_;
3059 3191
3060 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3061 }, 3193 },
3062); 3194);
… …
3078our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
3079 3211
3080$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
3081 3213
3082$safe->permit_only (Opcode::opset qw( 3214$safe->permit_only (Opcode::opset qw(
3083 :base_core :base_mem :base_orig :base_math 3215 :base_core :base_mem :base_orig :base_math :base_loop
3084 grepstart grepwhile mapstart mapwhile 3216 grepstart grepwhile mapstart mapwhile
3085 sort time 3217 sort time
3086)); 3218));
3087 3219
3088# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
… …
3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3141 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
3142 3274
3143 %vars = (_dummy => 0) unless %vars; 3275 %vars = (_dummy => 0) unless %vars;
3144 3276
3277 my @res;
3145 local $_; 3278 local $_;
3146 local @safe::cf::_safe_eval_args = values %vars;
3147 3279
3148 my $eval = 3280 my $eval =
3149 "do {\n" 3281 "do {\n"
3150 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3151 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
3152 . $code 3284 . $code
3153 . "\n}" 3285 . "\n}"
3154 ; 3286 ;
3155 3287
3288 if ($CFG{safe_eval}) {
3156 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
3157 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3158 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
3159 3297
3160 if ($@) { 3298 if ($@) {
3161 warn "$@"; 3299 warn "$@";
3162 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
3163 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
… …
3182=cut 3320=cut
3183 3321
3184sub register_script_function { 3322sub register_script_function {
3185 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
3186 3324
3187 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
3188 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
3189} 3327}
3190 3328
3191=back 3329=back
3192 3330
3193=cut 3331=cut
… …
3214 3352
3215 $facedata->{version} == 2 3353 $facedata->{version} == 2
3216 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
3217 3355
3218 # patch in the exptable 3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3219 $facedata->{resource}{"res/exp_table"} = { 3358 $facedata->{resource}{"res/exp_table"} = {
3220 type => FT_RSRC, 3359 type => FT_RSRC,
3221 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3222 }; 3362 };
3223 cf::cede_to_tick; 3363 cf::cede_to_tick;
3224 3364
3225 { 3365 {
3226 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
… …
3228 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
3229 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3230 3370
3231 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
3232 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
3233 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3234 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3235 3375
3236 cf::cede_to_tick; 3376 cf::cede_to_tick;
3237 } 3377 }
3238 3378
3239 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
… …
3263 3403
3264 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
3265 } 3405 }
3266 3406
3267 { 3407 {
3268 # TODO: for gcfclient pleasure, we should give resources
3269 # that gcfclient doesn't grok a >10000 face index.
3270 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
3271 3409
3272 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
3273 if (defined $info->{type}) { 3411 if (defined $info->{type}) {
3274 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3275 my $data;
3276 3413
3277 if ($info->{type} & 1) { 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3278 # prepend meta info
3279
3280 my $meta = $enc->encode ({
3281 name => $name,
3282 %{ $info->{meta} || {} },
3283 });
3284
3285 $data = pack "(w/a*)*", $meta, $info->{data};
3286 } else {
3287 $data = $info->{data};
3288 }
3289
3290 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3291 cf::face::set_type $idx, $info->{type}; 3415 cf::face::set_type $idx, $info->{type};
3292 } else { 3416 } else {
3293 $RESOURCE{$name} = $info; 3417 $RESOURCE{$name} = $info;
3294 } 3418 }
3295 3419
… …
3379 3503
3380 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
3381} 3505}
3382 3506
3383sub reload_config { 3507sub reload_config {
3508 warn "reloading config file...\n";
3509
3384 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
3385 or return; 3511 or return;
3386 3512
3387 local $/; 3513 local $/;
3388 *CFG = YAML::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
3389 3515
3390 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3391 3517
3392 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3393 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3397 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3398 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
3399 }; 3525 };
3400 warn $@ if $@; 3526 warn $@ if $@;
3401 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3402} 3530}
3403 3531
3404sub pidfile() { 3532sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!"; 3534 or die "$PIDFILE: $!";
… …
3434 3562
3435 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3436 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3437 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3438 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3439
3440 cf::init_experience;
3441 cf::init_anim;
3442 cf::init_attackmess;
3443 cf::init_dynamic;
3444 3567
3445 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3446 3569
3447 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
3448 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
… …
3454 }; 3577 };
3455 3578
3456 evthread_start IO::AIO::poll_fileno; 3579 evthread_start IO::AIO::poll_fileno;
3457 3580
3458 cf::sync_job { 3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3459 reload_resources; 3590 reload_resources;
3460 reload_config; 3591 reload_config;
3461 db_init; 3592 db_init;
3462 3593
3463 cf::load_settings;
3464 cf::load_materials;
3465 cf::init_uuid; 3594 cf::init_uuid;
3466 cf::init_signals; 3595 cf::init_signals;
3467 cf::init_commands;
3468 cf::init_skills; 3596 cf::init_skills;
3469 3597
3470 cf::init_beforeplay; 3598 cf::init_beforeplay;
3471 3599
3472 atomic; 3600 atomic;
… …
3479 use POSIX (); 3607 use POSIX ();
3480 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3481 3609
3482 (pop @POST_INIT)->(0) while @POST_INIT; 3610 (pop @POST_INIT)->(0) while @POST_INIT;
3483 }; 3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3484 3615
3485 main_loop; 3616 main_loop;
3486} 3617}
3487 3618
3488############################################################################# 3619#############################################################################
… …
3490 3621
3491# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
3492BEGIN { 3623BEGIN {
3493 our %SIGWATCHER = (); 3624 our %SIGWATCHER = ();
3494 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
3495 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3496 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
3497 }; 3628 };
3498 } 3629 }
3499} 3630}
3500 3631
3501sub write_runtime_sync { 3632sub write_runtime_sync {
3633 my $t0 = AE::time;
3634
3502 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
3503 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
3504 3637
3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3506 3639
3507 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
3508 3641
3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3510 or return; 3643 or return;
3511 3644
3512 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
3513 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
3514 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3527 or return; 3660 or return;
3528 3661
3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3530 and return; 3663 and return;
3531 3664
3532 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3533 3666
3534 1 3667 1
3535} 3668}
3536 3669
3537our $uuid_lock; 3670our $uuid_lock;
… …
3663 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3664 for my $name (keys %$leaf_symtab) { 3797 for my $name (keys %$leaf_symtab) {
3665 _gv_clear *{"$pkg$name"}; 3798 _gv_clear *{"$pkg$name"};
3666# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3667 } 3800 }
3668 warn "cleared package $pkg\n";#d#
3669} 3801}
3670 3802
3671sub do_reload_perl() { 3803sub do_reload_perl() {
3672 # can/must only be called in main 3804 # can/must only be called in main
3673 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3674 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3675 return; 3807 return;
3676 } 3808 }
3677 3809
3678 return if $RELOAD++; 3810 return if $RELOAD++;
3679 3811
3680 my $t1 = EV::time; 3812 my $t1 = AE::time;
3681 3813
3682 while ($RELOAD) { 3814 while ($RELOAD) {
3683 warn "reloading..."; 3815 warn "reloading...";
3684 3816
3685 warn "entering sync_job"; 3817 warn "entering sync_job";
… …
3756 3888
3757 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3758 3890
3759 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3760 require cf; 3892 require cf;
3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3762 3894
3763 warn "loading config and database again"; 3895 warn "loading config and database again";
3764 cf::reload_config; 3896 cf::reload_config;
3765 3897
3766 warn "loading extensions"; 3898 warn "loading extensions";
… …
3788 3920
3789 warn "reloaded"; 3921 warn "reloaded";
3790 --$RELOAD; 3922 --$RELOAD;
3791 } 3923 }
3792 3924
3793 $t1 = EV::time - $t1; 3925 $t1 = AE::time - $t1;
3794 warn "reload completed in ${t1}s\n"; 3926 warn "reload completed in ${t1}s\n";
3795}; 3927};
3796 3928
3797our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3798 3930
… …
3801 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3802 3934
3803 $RELOAD_WATCHER ||= cf::async { 3935 $RELOAD_WATCHER ||= cf::async {
3804 Coro::AIO::aio_wait cache_extensions; 3936 Coro::AIO::aio_wait cache_extensions;
3805 3937
3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3807 do_reload_perl; 3939 do_reload_perl;
3808 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3809 }; 3941 };
3810 }; 3942 };
3811} 3943}
… …
3828 3960
3829our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3830our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3831 3963
3832sub wait_for_tick { 3964sub wait_for_tick {
3833 return if tick_inhibit || $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3834 3966
3835 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3836 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3837 $signal->wait; 3969 $signal->wait;
3838} 3970}
3839 3971
3840sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3841 return if tick_inhibit || $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3842 3974
3843 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3844 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3845 $signal->wait; 3977 $signal->wait;
3846} 3978}
… …
3851 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3852 return; 3984 return;
3853 } 3985 }
3854 3986
3855 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3988
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3856 3990
3857 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3858 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3859 Coro::async_pool { 3993 Coro::async_pool {
3860 $Coro::current->{desc} = "runtime saver"; 3994 $Coro::current->{desc} = "runtime saver";
… …
3883} 4017}
3884 4018
3885{ 4019{
3886 # configure BDB 4020 # configure BDB
3887 4021
3888 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3889 BDB::max_poll_reqs $TICK * 0.1; 4023 BDB::max_poll_reqs $TICK * 0.1;
3890 $AnyEvent::BDB::WATCHER->priority (1); 4024 $AnyEvent::BDB::WATCHER->priority (1);
3891 4025
3892 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3893 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
… …
3974 } 4108 }
3975} 4109}
3976 4110
3977# load additional modules 4111# load additional modules
3978require "cf/$_.pm" for @EXTRA_MODULES; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3979 4114
3980END { cf::emergency_save } 4115END { cf::emergency_save }
3981 4116
39821 41171
3983 4118

Diff Legend

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