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.494 by root, Mon Oct 26 05:18:00 2009 UTC vs.
Revision 1.518 by root, Fri Apr 16 02:21:26 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 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.
… …
53use Coro::Util (); 53use Coro::Util ();
54 54
55use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
56use BDB (); 56use BDB ();
57use Data::Dumper; 57use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 58use Fcntl;
60use YAML::XS (); 59use YAML::XS ();
61use IO::AIO (); 60use IO::AIO ();
62use Time::HiRes; 61use Time::HiRes;
63use Compress::LZF; 62use Compress::LZF;
… …
109our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 110
112our %RESOURCE; 111our %RESOURCE;
113 112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
115
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 118our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 119our $USE_FSYNC = 1; # use fsync to write maps - default on
118 120
… …
397} 399}
398 400
399=item cf::periodic $interval, $cb 401=item cf::periodic $interval, $cb
400 402
401Like EV::periodic, but randomly selects a starting point so that the actions 403Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer. 404get spread over time.
403 405
404=cut 406=cut
405 407
406sub periodic($$) { 408sub periodic($$) {
407 my ($interval, $cb) = @_; 409 my ($interval, $cb) = @_;
… …
424 426
425=cut 427=cut
426 428
427our @SLOT_QUEUE; 429our @SLOT_QUEUE;
428our $SLOT_QUEUE; 430our $SLOT_QUEUE;
431our $SLOT_DECAY = 0.9;
429 432
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 433$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 434$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 435 $Coro::current->desc ("timeslot manager");
433 436
434 my $signal = new Coro::Signal; 437 my $signal = new Coro::Signal;
438 my $busy;
435 439
436 while () { 440 while () {
437 next_job: 441 next_job:
442
438 my $avail = cf::till_tick; 443 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 444
440 for (0 .. $#SLOT_QUEUE) { 445 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 446 if ($SLOT_QUEUE[$_][0] <= $avail) {
447 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 448 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 449 $job->[2]->send;
444 Coro::cede; 450 Coro::cede;
445 goto next_job; 451 goto next_job;
446 } 452 } else {
453 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 454 }
448 } 455 }
449 456
450 if (@SLOT_QUEUE) { 457 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 458 # we do not use wait_for_tick() as it returns immediately when tick is inactive
452 push @cf::WAIT_FOR_TICK, $signal; 459 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait; 460 $signal->wait;
454 } else { 461 } else {
462 $busy = 0;
455 Coro::schedule; 463 Coro::schedule;
456 } 464 }
457 } 465 }
458}; 466};
459 467
460sub get_slot($;$$) { 468sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 469 return if tick_inhibit || $Coro::current == $Coro::main;
462 470
463 my ($time, $pri, $name) = @_; 471 my ($time, $pri, $name) = @_;
464 472
465 $time = $TICK * .6 if $time > $TICK * .6; 473 $time = clamp $time, 0.01, $TICK * .6;
474
466 my $sig = new Coro::Signal; 475 my $sig = new Coro::Signal;
467 476
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 477 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 478 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 479 $SLOT_QUEUE->ready;
… …
497 506
498sub sync_job(&) { 507sub sync_job(&) {
499 my ($job) = @_; 508 my ($job) = @_;
500 509
501 if ($Coro::current == $Coro::main) { 510 if ($Coro::current == $Coro::main) {
502 my $time = EV::time; 511 my $time = AE::time;
503 512
504 # this is the main coro, too bad, we have to block 513 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 514 # till the operation succeeds, freezing the server :/
506 515
507 LOG llevError, Carp::longmess "sync job";#d# 516 LOG llevError, Carp::longmess "sync job";#d#
… …
524 } else { 533 } else {
525 EV::loop EV::LOOP_ONESHOT; 534 EV::loop EV::LOOP_ONESHOT;
526 } 535 }
527 } 536 }
528 537
529 my $time = EV::time - $time; 538 my $time = AE::time - $time;
530 539
531 $TICK_START += $time; # do not account sync jobs to server load 540 $TICK_START += $time; # do not account sync jobs to server load
532 541
533 wantarray ? @res : $res[0] 542 wantarray ? @res : $res[0]
534 } else { 543 } else {
… …
578 reset_signals; 587 reset_signals;
579 &$cb 588 &$cb
580 }, @args; 589 }, @args;
581 590
582 wantarray ? @res : $res[-1] 591 wantarray ? @res : $res[-1]
592}
593
594sub objinfo {
595 (
596 "counter value" => cf::object::object_count,
597 "objects created" => cf::object::create_count,
598 "objects destroyed" => cf::object::destroy_count,
599 "freelist size" => cf::object::free_count,
600 "allocated objects" => cf::object::objects_size,
601 "active objects" => cf::object::actives_size,
602 )
583} 603}
584 604
585=item $coin = coin_from_name $name 605=item $coin = coin_from_name $name
586 606
587=cut 607=cut
… …
1304} 1324}
1305 1325
1306use File::Glob (); 1326use File::Glob ();
1307 1327
1308cf::player->attach ( 1328cf::player->attach (
1309 on_command => sub { 1329 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1330 my ($pl, $name, $params) = @_;
1311 1331
1312 my $cb = $COMMAND{$name} 1332 my $cb = $COMMAND{$name}
1313 or return; 1333 or return;
1314 1334
… …
1393 . "\n};\n1"; 1413 . "\n};\n1";
1394 1414
1395 $todo{$base} = \%ext; 1415 $todo{$base} = \%ext;
1396 } 1416 }
1397 1417
1418 my $pass = 0;
1398 my %done; 1419 my %done;
1399 while (%todo) { 1420 while (%todo) {
1400 my $progress; 1421 my $progress;
1401 1422
1423 ++$pass;
1424
1425 ext:
1402 while (my ($k, $v) = each %todo) { 1426 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1427 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1428 next ext
1405 unless exists $done{$_}; 1429 unless exists $done{$_};
1406 } 1430 }
1407 1431
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1433
1410 unless (eval $v->{source}) { 1434 my $active = eval $v->{source};
1435
1436 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1437 warn "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1438
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1439 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1440 if exists $v->{meta}{mandatory};
1418 1441 } else {
1419 warn $msg; 1442 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg};
1444 $progress = 1;
1445
1446 warn "$v->{base}: extension inactive.\n"
1447 unless $active;
1420 } 1448 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1449 }
1426 1450
1427 skip: 1451 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1452 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1453
1454 while (my ($k, $v) = each %todo) {
1455 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456 if exists $v->{meta}{mandatory};
1457 }
1458 }
1430 } 1459 }
1431 }; 1460 };
1432} 1461}
1433 1462
1434############################################################################# 1463#############################################################################
… …
1518 $cf::PLAYER{$login} = $pl 1547 $cf::PLAYER{$login} = $pl
1519 } 1548 }
1520 } 1549 }
1521} 1550}
1522 1551
1552cf::player->attach (
1553 on_load => sub {
1554 my ($pl, $path) = @_;
1555
1556 # restore slots saved in save, below
1557 my $slots = delete $pl->{_slots};
1558
1559 $pl->ob->current_weapon ($slots->[0]);
1560 $pl->combat_ob ($slots->[1]);
1561 $pl->ranged_ob ($slots->[2]);
1562 },
1563);
1564
1523sub save($) { 1565sub save($) {
1524 my ($pl) = @_; 1566 my ($pl) = @_;
1525 1567
1526 return if $pl->{deny_save}; 1568 return if $pl->{deny_save};
1527 1569
… …
1532 1574
1533 aio_mkdir playerdir $pl, 0770; 1575 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1576 $pl->{last_save} = $cf::RUNTIME;
1535 1577
1536 cf::get_slot 0.01; 1578 cf::get_slot 0.01;
1579
1580 # save slots, to be restored later
1581 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1582
1538 $pl->save_pl ($path); 1583 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1584 cf::cede_to_tick;
1540} 1585}
1541 1586
… …
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 1800
1756 # mit "rum" bekleckern, nicht 1801 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 1802 $self->_create_random_map (
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map}, 1806 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize}, 1807 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2010 2055
2011 $cf::MAP{$path} = $map 2056 $cf::MAP{$path} = $map
2012 } 2057 }
2013} 2058}
2014 2059
2015sub pre_load { } 2060sub pre_load { }
2016sub post_load { } 2061#sub post_load { } # XS
2017 2062
2018sub load { 2063sub load {
2019 my ($self) = @_; 2064 my ($self) = @_;
2020 2065
2021 local $self->{deny_reset} = 1; # loading can take a long time 2066 local $self->{deny_reset} = 1; # loading can take a long time
… …
2078 } 2123 }
2079 2124
2080 $self->post_load; 2125 $self->post_load;
2081} 2126}
2082 2127
2128# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath
2083sub customise_for { 2131sub customise_for {
2084 my ($self, $ob) = @_; 2132 my ($self, $ob) = @_;
2085 2133
2086 return find "~" . $ob->name . "/" . $self->{path} 2134 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2135 if $self->per_player;
… …
2164 $MAP_PREFETCHER->prio (6); 2212 $MAP_PREFETCHER->prio (6);
2165 2213
2166 () 2214 ()
2167} 2215}
2168 2216
2217# common code, used by both ->save and ->swapout
2169sub save { 2218sub _save {
2170 my ($self) = @_; 2219 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2220
2174 $self->{last_save} = $cf::RUNTIME; 2221 $self->{last_save} = $cf::RUNTIME;
2175 2222
2176 return unless $self->dirty; 2223 return unless $self->dirty;
2177 2224
… …
2197 } else { 2244 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2245 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2246 }
2200} 2247}
2201 2248
2249sub save {
2250 my ($self) = @_;
2251
2252 my $lock = cf::lock_acquire "map_data:$self->{path}";
2253
2254 $self->_save;
2255}
2256
2202sub swap_out { 2257sub swap_out {
2203 my ($self) = @_; 2258 my ($self) = @_;
2204 2259
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2261
2210 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2262 return if $self->in_memory != cf::MAP_ACTIVE;
2212 return if $self->{deny_save}; 2263 return if $self->{deny_save};
2264 return if $self->players;
2213 2265
2214 $self->in_memory (cf::MAP_SWAPPED); 2266 # first deactivate the map and "unlink" it from the core
2215
2216 $self->deactivate; 2267 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 # then atomically save
2272 $self->_save;
2273
2274 # then free the map
2218 $self->clear; 2275 $self->clear;
2219} 2276}
2220 2277
2221sub reset_at { 2278sub reset_at {
2222 my ($self) = @_; 2279 my ($self) = @_;
… …
3116 3173
3117 $coro 3174 $coro
3118} 3175}
3119 3176
3120cf::client->attach ( 3177cf::client->attach (
3121 on_destroy => sub { 3178 on_client_destroy => sub {
3122 my ($ns) = @_; 3179 my ($ns) = @_;
3123 3180
3124 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3181 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3125 }, 3182 },
3126); 3183);
… …
3142our $safe_hole = new Safe::Hole; 3199our $safe_hole = new Safe::Hole;
3143 3200
3144$SIG{FPE} = 'IGNORE'; 3201$SIG{FPE} = 'IGNORE';
3145 3202
3146$safe->permit_only (Opcode::opset qw( 3203$safe->permit_only (Opcode::opset qw(
3147 :base_core :base_mem :base_orig :base_math 3204 :base_core :base_mem :base_orig :base_math :base_loop
3148 grepstart grepwhile mapstart mapwhile 3205 grepstart grepwhile mapstart mapwhile
3149 sort time 3206 sort time
3150)); 3207));
3151 3208
3152# here we export the classes and methods available to script code 3209# here we export the classes and methods available to script code
… …
3204 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3261 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3205 $qcode =~ s/\n/\\n/g; 3262 $qcode =~ s/\n/\\n/g;
3206 3263
3207 %vars = (_dummy => 0) unless %vars; 3264 %vars = (_dummy => 0) unless %vars;
3208 3265
3266 my @res;
3209 local $_; 3267 local $_;
3210 local @safe::cf::_safe_eval_args = values %vars;
3211 3268
3212 my $eval = 3269 my $eval =
3213 "do {\n" 3270 "do {\n"
3214 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3271 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3215 . "#line 0 \"{$qcode}\"\n" 3272 . "#line 0 \"{$qcode}\"\n"
3216 . $code 3273 . $code
3217 . "\n}" 3274 . "\n}"
3218 ; 3275 ;
3219 3276
3277 if ($CFG{safe_eval}) {
3220 sub_generation_inc; 3278 sub_generation_inc;
3279 local @safe::cf::_safe_eval_args = values %vars;
3221 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3280 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3222 sub_generation_inc; 3281 sub_generation_inc;
3282 } else {
3283 local @cf::_safe_eval_args = values %vars;
3284 @res = wantarray ? eval eval : scalar eval $eval;
3285 }
3223 3286
3224 if ($@) { 3287 if ($@) {
3225 warn "$@"; 3288 warn "$@";
3226 warn "while executing safe code '$code'\n"; 3289 warn "while executing safe code '$code'\n";
3227 warn "with arguments " . (join " ", %vars) . "\n"; 3290 warn "with arguments " . (join " ", %vars) . "\n";
… …
3246=cut 3309=cut
3247 3310
3248sub register_script_function { 3311sub register_script_function {
3249 my ($fun, $cb) = @_; 3312 my ($fun, $cb) = @_;
3250 3313
3251 no strict 'refs'; 3314 $fun = "safe::$fun" if $CFG{safe_eval};
3252 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3315 *$fun = $safe_hole->wrap ($cb);
3253} 3316}
3254 3317
3255=back 3318=back
3256 3319
3257=cut 3320=cut
… …
3278 3341
3279 $facedata->{version} == 2 3342 $facedata->{version} == 2
3280 or cf::cleanup "$path: version mismatch, cannot proceed."; 3343 or cf::cleanup "$path: version mismatch, cannot proceed.";
3281 3344
3282 # patch in the exptable 3345 # patch in the exptable
3346 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3283 $facedata->{resource}{"res/exp_table"} = { 3347 $facedata->{resource}{"res/exp_table"} = {
3284 type => FT_RSRC, 3348 type => FT_RSRC,
3285 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3349 data => $exp_table,
3350 hash => (Digest::MD5::md5 $exp_table),
3286 }; 3351 };
3287 cf::cede_to_tick; 3352 cf::cede_to_tick;
3288 3353
3289 { 3354 {
3290 my $faces = $facedata->{faceinfo}; 3355 my $faces = $facedata->{faceinfo};
… …
3292 while (my ($face, $info) = each %$faces) { 3357 while (my ($face, $info) = each %$faces) {
3293 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3358 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3294 3359
3295 cf::face::set_visibility $idx, $info->{visibility}; 3360 cf::face::set_visibility $idx, $info->{visibility};
3296 cf::face::set_magicmap $idx, $info->{magicmap}; 3361 cf::face::set_magicmap $idx, $info->{magicmap};
3297 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3362 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3298 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3363 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3299 3364
3300 cf::cede_to_tick; 3365 cf::cede_to_tick;
3301 } 3366 }
3302 3367
3303 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
… …
3327 3392
3328 cf::anim::invalidate_all; # d'oh 3393 cf::anim::invalidate_all; # d'oh
3329 } 3394 }
3330 3395
3331 { 3396 {
3332 # TODO: for gcfclient pleasure, we should give resources
3333 # that gcfclient doesn't grok a >10000 face index.
3334 my $res = $facedata->{resource}; 3397 my $res = $facedata->{resource};
3335 3398
3336 while (my ($name, $info) = each %$res) { 3399 while (my ($name, $info) = each %$res) {
3337 if (defined $info->{type}) { 3400 if (defined $info->{type}) {
3338 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3401 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3339 my $data;
3340 3402
3341 if ($info->{type} & 1) { 3403 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3342 # prepend meta info
3343
3344 my $meta = $enc->encode ({
3345 name => $name,
3346 %{ $info->{meta} || {} },
3347 });
3348
3349 $data = pack "(w/a*)*", $meta, $info->{data};
3350 } else {
3351 $data = $info->{data};
3352 }
3353
3354 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3355 cf::face::set_type $idx, $info->{type}; 3404 cf::face::set_type $idx, $info->{type};
3356 } else { 3405 } else {
3357 $RESOURCE{$name} = $info; 3406 $RESOURCE{$name} = $info;
3358 } 3407 }
3359 3408
… …
3502 3551
3503 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3552 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3504 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3553 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3505 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3554 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3506 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3555 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3507
3508 cf::init_experience;
3509 cf::init_anim;
3510 cf::init_attackmess;
3511 cf::init_dynamic;
3512 3556
3513 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3557 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3514 3558
3515 # we must not ever block the main coroutine 3559 # we must not ever block the main coroutine
3516 local $Coro::idle = sub { 3560 local $Coro::idle = sub {
… …
3522 }; 3566 };
3523 3567
3524 evthread_start IO::AIO::poll_fileno; 3568 evthread_start IO::AIO::poll_fileno;
3525 3569
3526 cf::sync_job { 3570 cf::sync_job {
3571 cf::init_experience;
3572 cf::init_anim;
3573 cf::init_attackmess;
3574 cf::init_dynamic;
3575
3576 cf::load_settings;
3577 cf::load_materials;
3578
3527 reload_resources; 3579 reload_resources;
3528 reload_config; 3580 reload_config;
3529 db_init; 3581 db_init;
3530 3582
3531 cf::load_settings;
3532 cf::load_materials;
3533 cf::init_uuid; 3583 cf::init_uuid;
3534 cf::init_signals; 3584 cf::init_signals;
3535 cf::init_commands;
3536 cf::init_skills; 3585 cf::init_skills;
3537 3586
3538 cf::init_beforeplay; 3587 cf::init_beforeplay;
3539 3588
3540 atomic; 3589 atomic;
… …
3547 use POSIX (); 3596 use POSIX ();
3548 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3597 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3549 3598
3550 (pop @POST_INIT)->(0) while @POST_INIT; 3599 (pop @POST_INIT)->(0) while @POST_INIT;
3551 }; 3600 };
3601
3602 cf::object::thawer::errors_are_fatal 0;
3603 warn "parse errors in files are no longer fatal from this point on.\n";
3552 3604
3553 main_loop; 3605 main_loop;
3554} 3606}
3555 3607
3556############################################################################# 3608#############################################################################
… …
3558 3610
3559# install some emergency cleanup handlers 3611# install some emergency cleanup handlers
3560BEGIN { 3612BEGIN {
3561 our %SIGWATCHER = (); 3613 our %SIGWATCHER = ();
3562 for my $signal (qw(INT HUP TERM)) { 3614 for my $signal (qw(INT HUP TERM)) {
3563 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3615 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3564 cf::cleanup "SIG$signal"; 3616 cf::cleanup "SIG$signal";
3565 }; 3617 };
3566 } 3618 }
3567} 3619}
3568 3620
3569sub write_runtime_sync { 3621sub write_runtime_sync {
3622 my $t0 = AE::time;
3623
3570 # first touch the runtime file to show we are still running: 3624 # first touch the runtime file to show we are still running:
3571 # the fsync below can take a very very long time. 3625 # the fsync below can take a very very long time.
3572 3626
3573 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3627 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3574 3628
3575 my $guard = cf::lock_acquire "write_runtime"; 3629 my $guard = cf::lock_acquire "write_runtime";
3576 3630
3577 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3631 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3578 or return; 3632 or return;
3579 3633
3580 my $value = $cf::RUNTIME + 90 + 10; 3634 my $value = $cf::RUNTIME + 90 + 10;
3581 # 10 is the runtime save interval, for a monotonic clock 3635 # 10 is the runtime save interval, for a monotonic clock
3582 # 60 allows for the watchdog to kill the server. 3636 # 60 allows for the watchdog to kill the server.
… …
3595 or return; 3649 or return;
3596 3650
3597 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3651 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3598 and return; 3652 and return;
3599 3653
3600 warn "runtime file written.\n"; 3654 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3601 3655
3602 1 3656 1
3603} 3657}
3604 3658
3605our $uuid_lock; 3659our $uuid_lock;
… …
3743 return; 3797 return;
3744 } 3798 }
3745 3799
3746 return if $RELOAD++; 3800 return if $RELOAD++;
3747 3801
3748 my $t1 = EV::time; 3802 my $t1 = AE::time;
3749 3803
3750 while ($RELOAD) { 3804 while ($RELOAD) {
3751 warn "reloading..."; 3805 warn "reloading...";
3752 3806
3753 warn "entering sync_job"; 3807 warn "entering sync_job";
… …
3856 3910
3857 warn "reloaded"; 3911 warn "reloaded";
3858 --$RELOAD; 3912 --$RELOAD;
3859 } 3913 }
3860 3914
3861 $t1 = EV::time - $t1; 3915 $t1 = AE::time - $t1;
3862 warn "reload completed in ${t1}s\n"; 3916 warn "reload completed in ${t1}s\n";
3863}; 3917};
3864 3918
3865our $RELOAD_WATCHER; # used only during reload 3919our $RELOAD_WATCHER; # used only during reload
3866 3920
… …
3869 # coro crashes during coro_state_free->destroy here. 3923 # coro crashes during coro_state_free->destroy here.
3870 3924
3871 $RELOAD_WATCHER ||= cf::async { 3925 $RELOAD_WATCHER ||= cf::async {
3872 Coro::AIO::aio_wait cache_extensions; 3926 Coro::AIO::aio_wait cache_extensions;
3873 3927
3874 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3928 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3875 do_reload_perl; 3929 do_reload_perl;
3876 undef $RELOAD_WATCHER; 3930 undef $RELOAD_WATCHER;
3877 }; 3931 };
3878 }; 3932 };
3879} 3933}
… …
3896 3950
3897our @WAIT_FOR_TICK; 3951our @WAIT_FOR_TICK;
3898our @WAIT_FOR_TICK_BEGIN; 3952our @WAIT_FOR_TICK_BEGIN;
3899 3953
3900sub wait_for_tick { 3954sub wait_for_tick {
3901 return if tick_inhibit || $Coro::current == $Coro::main; 3955 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902 3956
3903 my $signal = new Coro::Signal; 3957 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK, $signal; 3958 push @WAIT_FOR_TICK, $signal;
3905 $signal->wait; 3959 $signal->wait;
3906} 3960}
3907 3961
3908sub wait_for_tick_begin { 3962sub wait_for_tick_begin {
3909 return if tick_inhibit || $Coro::current == $Coro::main; 3963 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3910 3964
3911 my $signal = new Coro::Signal; 3965 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK_BEGIN, $signal; 3966 push @WAIT_FOR_TICK_BEGIN, $signal;
3913 $signal->wait; 3967 $signal->wait;
3914} 3968}
… …
3919 unless ++$bug_warning > 10; 3973 unless ++$bug_warning > 10;
3920 return; 3974 return;
3921 } 3975 }
3922 3976
3923 cf::server_tick; # one server iteration 3977 cf::server_tick; # one server iteration
3978
3979 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3924 3980
3925 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3981 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3926 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3982 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3927 Coro::async_pool { 3983 Coro::async_pool {
3928 $Coro::current->{desc} = "runtime saver"; 3984 $Coro::current->{desc} = "runtime saver";
… …
3951} 4007}
3952 4008
3953{ 4009{
3954 # configure BDB 4010 # configure BDB
3955 4011
3956 BDB::min_parallel 8; 4012 BDB::min_parallel 16;
3957 BDB::max_poll_reqs $TICK * 0.1; 4013 BDB::max_poll_reqs $TICK * 0.1;
3958 $AnyEvent::BDB::WATCHER->priority (1); 4014 $AnyEvent::BDB::WATCHER->priority (1);
3959 4015
3960 unless ($DB_ENV) { 4016 unless ($DB_ENV) {
3961 $DB_ENV = BDB::db_env_create; 4017 $DB_ENV = BDB::db_env_create;

Diff Legend

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