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.497 by root, Fri Dec 18 03:49:46 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 it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
… …
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE;
112 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 118our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
117 120
… …
162 165
163our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
164 167
165sub cf::map::normalise; 168sub cf::map::normalise;
166 169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
167############################################################################# 174#############################################################################
168 175
169%REFLECT = (); 176%REFLECT = ();
170for (@REFLECT) { 177for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 178 my $reflect = JSON::XS::decode_json $_;
… …
258$Coro::State::DIEHOOK = sub { 265$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 266 return unless $^S eq 0; # "eq", not "=="
260 267
261 warn Carp::longmess $_[0]; 268 warn Carp::longmess $_[0];
262 269
263 if ($Coro::current == $Coro::main) {#d# 270 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 272 return;#d#
266 }#d# 273 }#d#
267 274
268 # kill coroutine otherwise 275 # kill coroutine otherwise
… …
396} 403}
397 404
398=item cf::periodic $interval, $cb 405=item cf::periodic $interval, $cb
399 406
400Like 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
401get spread over timer. 408get spread over time.
402 409
403=cut 410=cut
404 411
405sub periodic($$) { 412sub periodic($$) {
406 my ($interval, $cb) = @_; 413 my ($interval, $cb) = @_;
… …
423 430
424=cut 431=cut
425 432
426our @SLOT_QUEUE; 433our @SLOT_QUEUE;
427our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
428 436
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 439 $Coro::current->desc ("timeslot manager");
432 440
433 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
434 443
435 while () { 444 while () {
436 next_job: 445 next_job:
446
437 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 448
439 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 453 $job->[2]->send;
443 Coro::cede; 454 Coro::cede;
444 goto next_job; 455 goto next_job;
445 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 458 }
447 } 459 }
448 460
449 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
450 # 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
451 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 464 $signal->wait;
453 } else { 465 } else {
466 $busy = 0;
454 Coro::schedule; 467 Coro::schedule;
455 } 468 }
456 } 469 }
457}; 470};
458 471
459sub get_slot($;$$) { 472sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 473 return if tick_inhibit || $Coro::current == $Coro::main;
461 474
462 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
463 476
464 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
465 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
466 480
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
496 510
497sub sync_job(&) { 511sub sync_job(&) {
498 my ($job) = @_; 512 my ($job) = @_;
499 513
500 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
501 my $time = EV::time; 515 my $time = AE::time;
502 516
503 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
505 519
506 LOG llevError, Carp::longmess "sync job";#d# 520 LOG llevError, Carp::longmess "sync job";#d#
… …
523 } else { 537 } else {
524 EV::loop EV::LOOP_ONESHOT; 538 EV::loop EV::LOOP_ONESHOT;
525 } 539 }
526 } 540 }
527 541
528 my $time = EV::time - $time; 542 my $time = AE::time - $time;
529 543
530 $TICK_START += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
531 545
532 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
533 } else { 547 } else {
… …
577 reset_signals; 591 reset_signals;
578 &$cb 592 &$cb
579 }, @args; 593 }, @args;
580 594
581 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 )
582} 607}
583 608
584=item $coin = coin_from_name $name 609=item $coin = coin_from_name $name
585 610
586=cut 611=cut
… …
1303} 1328}
1304 1329
1305use File::Glob (); 1330use File::Glob ();
1306 1331
1307cf::player->attach ( 1332cf::player->attach (
1308 on_command => sub { 1333 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1310 1335
1311 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1312 or return; 1337 or return;
1313 1338
… …
1392 . "\n};\n1"; 1417 . "\n};\n1";
1393 1418
1394 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1395 } 1420 }
1396 1421
1422 my $pass = 0;
1397 my %done; 1423 my %done;
1398 while (%todo) { 1424 while (%todo) {
1399 my $progress; 1425 my $progress;
1400 1426
1427 ++$pass;
1428
1429 ext:
1401 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1432 next ext
1404 unless exists $done{$_}; 1433 unless exists $done{$_};
1405 } 1434 }
1406 1435
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1437
1409 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1442
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1444 if exists $v->{meta}{mandatory};
1417 1445
1418 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;
1419 } 1455 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1456 }
1425 1457
1426 skip: 1458 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 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 }
1429 } 1466 }
1430 }; 1467 };
1431} 1468}
1432 1469
1433############################################################################# 1470#############################################################################
… …
1517 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1518 } 1555 }
1519 } 1556 }
1520} 1557}
1521 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
1522sub save($) { 1572sub save($) {
1523 my ($pl) = @_; 1573 my ($pl) = @_;
1524 1574
1525 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
1526 1576
… …
1531 1581
1532 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1534 1584
1535 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];
1536 1589
1537 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1591 cf::cede_to_tick;
1539} 1592}
1540 1593
… …
1753 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
1754 1807
1755 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1809 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2009 2062
2010 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
2011 } 2064 }
2012} 2065}
2013 2066
2014sub pre_load { } 2067sub pre_load { }
2015sub post_load { } 2068#sub post_load { } # XS
2016 2069
2017sub load { 2070sub load {
2018 my ($self) = @_; 2071 my ($self) = @_;
2019 2072
2020 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 } 2130 }
2078 2131
2079 $self->post_load; 2132 $self->post_load;
2080} 2133}
2081 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
2082sub customise_for { 2138sub customise_for {
2083 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
2084 2140
2085 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2142 if $self->per_player;
… …
2163 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2164 2220
2165 () 2221 ()
2166} 2222}
2167 2223
2224# common code, used by both ->save and ->swapout
2168sub save { 2225sub _save {
2169 my ($self) = @_; 2226 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2227
2173 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2174 2229
2175 return unless $self->dirty; 2230 return unless $self->dirty;
2176 2231
… …
2196 } else { 2251 } else {
2197 $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);
2198 } 2253 }
2199} 2254}
2200 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2201sub swap_out { 2264sub swap_out {
2202 my ($self) = @_; 2265 my ($self) = @_;
2203 2266
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2268
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2269 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2270 return if $self->{deny_save};
2271 return if $self->players;
2212 2272
2213 $self->in_memory (cf::MAP_SWAPPED); 2273 # first deactivate the map and "unlink" it from the core
2214
2215 $self->deactivate; 2274 $self->deactivate;
2216 $_->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
2217 $self->clear; 2282 $self->clear;
2218} 2283}
2219 2284
2220sub reset_at { 2285sub reset_at {
2221 my ($self) = @_; 2286 my ($self) = @_;
… …
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2616
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2554 2619
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2621}
2557 2622
2558sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2560 2625
… …
3115 3180
3116 $coro 3181 $coro
3117} 3182}
3118 3183
3119cf::client->attach ( 3184cf::client->attach (
3120 on_destroy => sub { 3185 on_client_destroy => sub {
3121 my ($ns) = @_; 3186 my ($ns) = @_;
3122 3187
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3189 },
3125); 3190);
… …
3141our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
3142 3207
3143$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
3144 3209
3145$safe->permit_only (Opcode::opset qw( 3210$safe->permit_only (Opcode::opset qw(
3146 :base_core :base_mem :base_orig :base_math 3211 :base_core :base_mem :base_orig :base_math :base_loop
3147 grepstart grepwhile mapstart mapwhile 3212 grepstart grepwhile mapstart mapwhile
3148 sort time 3213 sort time
3149)); 3214));
3150 3215
3151# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
… …
3203 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3204 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
3205 3270
3206 %vars = (_dummy => 0) unless %vars; 3271 %vars = (_dummy => 0) unless %vars;
3207 3272
3273 my @res;
3208 local $_; 3274 local $_;
3209 local @safe::cf::_safe_eval_args = values %vars;
3210 3275
3211 my $eval = 3276 my $eval =
3212 "do {\n" 3277 "do {\n"
3213 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3214 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
3215 . $code 3280 . $code
3216 . "\n}" 3281 . "\n}"
3217 ; 3282 ;
3218 3283
3284 if ($CFG{safe_eval}) {
3219 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
3220 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3221 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 }
3222 3293
3223 if ($@) { 3294 if ($@) {
3224 warn "$@"; 3295 warn "$@";
3225 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
3226 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
… …
3245=cut 3316=cut
3246 3317
3247sub register_script_function { 3318sub register_script_function {
3248 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
3249 3320
3250 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
3251 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
3252} 3323}
3253 3324
3254=back 3325=back
3255 3326
3256=cut 3327=cut
… …
3277 3348
3278 $facedata->{version} == 2 3349 $facedata->{version} == 2
3279 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
3280 3351
3281 # 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]);
3282 $facedata->{resource}{"res/exp_table"} = { 3354 $facedata->{resource}{"res/exp_table"} = {
3283 type => FT_RSRC, 3355 type => FT_RSRC,
3284 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),
3285 }; 3358 };
3286 cf::cede_to_tick; 3359 cf::cede_to_tick;
3287 3360
3288 { 3361 {
3289 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
… …
3485 3558
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 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.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495 3563
3496 $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
3497 3565
3498 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3499 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
… …
3505 }; 3573 };
3506 3574
3507 evthread_start IO::AIO::poll_fileno; 3575 evthread_start IO::AIO::poll_fileno;
3508 3576
3509 cf::sync_job { 3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3510 cf::load_settings; 3583 cf::load_settings;
3511 cf::load_materials; 3584 cf::load_materials;
3512 3585
3513 reload_resources; 3586 reload_resources;
3514 reload_config; 3587 reload_config;
3515 db_init; 3588 db_init;
3516 3589
3517 cf::init_uuid; 3590 cf::init_uuid;
3518 cf::init_signals; 3591 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills; 3592 cf::init_skills;
3521 3593
3522 cf::init_beforeplay; 3594 cf::init_beforeplay;
3523 3595
3524 atomic; 3596 atomic;
… …
3531 use POSIX (); 3603 use POSIX ();
3532 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};
3533 3605
3534 (pop @POST_INIT)->(0) while @POST_INIT; 3606 (pop @POST_INIT)->(0) while @POST_INIT;
3535 }; 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";
3536 3611
3537 main_loop; 3612 main_loop;
3538} 3613}
3539 3614
3540############################################################################# 3615#############################################################################
… …
3542 3617
3543# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3544BEGIN { 3619BEGIN {
3545 our %SIGWATCHER = (); 3620 our %SIGWATCHER = ();
3546 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3547 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3548 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3549 }; 3624 };
3550 } 3625 }
3551} 3626}
3552 3627
3553sub write_runtime_sync { 3628sub write_runtime_sync {
3629 my $t0 = AE::time;
3630
3554 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3555 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3556 3633
3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3558 3635
3559 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3560 3637
3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3562 or return; 3639 or return;
3563 3640
3564 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3565 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3566 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
… …
3579 or return; 3656 or return;
3580 3657
3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3582 and return; 3659 and return;
3583 3660
3584 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3585 3662
3586 1 3663 1
3587} 3664}
3588 3665
3589our $uuid_lock; 3666our $uuid_lock;
… …
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) { 3793 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"}; 3794 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 } 3796 }
3720 warn "cleared package $pkg\n";#d#
3721} 3797}
3722 3798
3723sub do_reload_perl() { 3799sub do_reload_perl() {
3724 # can/must only be called in main 3800 # can/must only be called in main
3725 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3726 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3727 return; 3803 return;
3728 } 3804 }
3729 3805
3730 return if $RELOAD++; 3806 return if $RELOAD++;
3731 3807
3732 my $t1 = EV::time; 3808 my $t1 = AE::time;
3733 3809
3734 while ($RELOAD) { 3810 while ($RELOAD) {
3735 warn "reloading..."; 3811 warn "reloading...";
3736 3812
3737 warn "entering sync_job"; 3813 warn "entering sync_job";
… …
3840 3916
3841 warn "reloaded"; 3917 warn "reloaded";
3842 --$RELOAD; 3918 --$RELOAD;
3843 } 3919 }
3844 3920
3845 $t1 = EV::time - $t1; 3921 $t1 = AE::time - $t1;
3846 warn "reload completed in ${t1}s\n"; 3922 warn "reload completed in ${t1}s\n";
3847}; 3923};
3848 3924
3849our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3850 3926
… …
3853 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3854 3930
3855 $RELOAD_WATCHER ||= cf::async { 3931 $RELOAD_WATCHER ||= cf::async {
3856 Coro::AIO::aio_wait cache_extensions; 3932 Coro::AIO::aio_wait cache_extensions;
3857 3933
3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3859 do_reload_perl; 3935 do_reload_perl;
3860 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3861 }; 3937 };
3862 }; 3938 };
3863} 3939}
… …
3903 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3904 return; 3980 return;
3905 } 3981 }
3906 3982
3907 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#
3908 3986
3909 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3910 $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.;
3911 Coro::async_pool { 3989 Coro::async_pool {
3912 $Coro::current->{desc} = "runtime saver"; 3990 $Coro::current->{desc} = "runtime saver";
… …
3935} 4013}
3936 4014
3937{ 4015{
3938 # configure BDB 4016 # configure BDB
3939 4017
3940 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3941 BDB::max_poll_reqs $TICK * 0.1; 4019 BDB::max_poll_reqs $TICK * 0.1;
3942 $AnyEvent::BDB::WATCHER->priority (1); 4020 $AnyEvent::BDB::WATCHER->priority (1);
3943 4021
3944 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3945 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;

Diff Legend

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