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.501 by root, Sat Jan 16 23:27:21 2010 UTC vs.
Revision 1.510 by root, Tue Apr 6 22:59:28 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.
… …
423 423
424=cut 424=cut
425 425
426our @SLOT_QUEUE; 426our @SLOT_QUEUE;
427our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
428 429
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
432 433
433 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
434 436
435 while () { 437 while () {
436 next_job: 438 next_job:
439
437 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 441
439 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 446 $job->[2]->send;
443 Coro::cede; 447 Coro::cede;
444 goto next_job; 448 goto next_job;
445 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 451 }
447 } 452 }
448 453
449 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 457 $signal->wait;
453 } else { 458 } else {
459 $busy = 0;
454 Coro::schedule; 460 Coro::schedule;
455 } 461 }
456 } 462 }
457}; 463};
458 464
459sub get_slot($;$$) { 465sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 466 return if tick_inhibit || $Coro::current == $Coro::main;
461 467
462 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
463 469
464 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
465 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
466 473
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
1303} 1310}
1304 1311
1305use File::Glob (); 1312use File::Glob ();
1306 1313
1307cf::player->attach ( 1314cf::player->attach (
1308 on_command => sub { 1315 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1310 1317
1311 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1312 or return; 1319 or return;
1313 1320
… …
1392 . "\n};\n1"; 1399 . "\n};\n1";
1393 1400
1394 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1395 } 1402 }
1396 1403
1404 my $pass = 0;
1397 my %done; 1405 my %done;
1398 while (%todo) { 1406 while (%todo) {
1399 my $progress; 1407 my $progress;
1400 1408
1409 ++$pass;
1410
1411 ext:
1401 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1414 next ext
1404 unless exists $done{$_}; 1415 unless exists $done{$_};
1405 } 1416 }
1406 1417
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1419
1409 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1424
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1426 if exists $v->{meta}{mandatory};
1417 1427 } else {
1418 warn $msg; 1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431
1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1419 } 1434 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1435 }
1425 1436
1426 skip: 1437 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1429 } 1445 }
1430 }; 1446 };
1431} 1447}
1432 1448
1433############################################################################# 1449#############################################################################
… …
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1770
1755 # mit "rum" bekleckern, nicht 1771 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1772 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1776 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1777 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2077 } 2093 }
2078 2094
2079 $self->post_load; 2095 $self->post_load;
2080} 2096}
2081 2097
2098# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath
2082sub customise_for { 2101sub customise_for {
2083 my ($self, $ob) = @_; 2102 my ($self, $ob) = @_;
2084 2103
2085 return find "~" . $ob->name . "/" . $self->{path} 2104 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2105 if $self->per_player;
… …
3115 3134
3116 $coro 3135 $coro
3117} 3136}
3118 3137
3119cf::client->attach ( 3138cf::client->attach (
3120 on_destroy => sub { 3139 on_client_destroy => sub {
3121 my ($ns) = @_; 3140 my ($ns) = @_;
3122 3141
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3143 },
3125); 3144);
… …
3522 reload_config; 3541 reload_config;
3523 db_init; 3542 db_init;
3524 3543
3525 cf::init_uuid; 3544 cf::init_uuid;
3526 cf::init_signals; 3545 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills; 3546 cf::init_skills;
3529 3547
3530 cf::init_beforeplay; 3548 cf::init_beforeplay;
3531 3549
3532 atomic; 3550 atomic;
… …
3557 }; 3575 };
3558 } 3576 }
3559} 3577}
3560 3578
3561sub write_runtime_sync { 3579sub write_runtime_sync {
3580 my $t0 = EV::time;
3581
3562 # first touch the runtime file to show we are still running: 3582 # first touch the runtime file to show we are still running:
3563 # the fsync below can take a very very long time. 3583 # the fsync below can take a very very long time.
3564 3584
3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3566 3586
3567 my $guard = cf::lock_acquire "write_runtime"; 3587 my $guard = cf::lock_acquire "write_runtime";
3568 3588
3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3589 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3570 or return; 3590 or return;
3571 3591
3572 my $value = $cf::RUNTIME + 90 + 10; 3592 my $value = $cf::RUNTIME + 90 + 10;
3573 # 10 is the runtime save interval, for a monotonic clock 3593 # 10 is the runtime save interval, for a monotonic clock
3574 # 60 allows for the watchdog to kill the server. 3594 # 60 allows for the watchdog to kill the server.
… …
3587 or return; 3607 or return;
3588 3608
3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3590 and return; 3610 and return;
3591 3611
3592 warn "runtime file written.\n"; 3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3593 3613
3594 1 3614 1
3595} 3615}
3596 3616
3597our $uuid_lock; 3617our $uuid_lock;
… …
3912 return; 3932 return;
3913 } 3933 }
3914 3934
3915 cf::server_tick; # one server iteration 3935 cf::server_tick; # one server iteration
3916 3936
3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3938
3917 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3939 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3918 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3919 Coro::async_pool { 3941 Coro::async_pool {
3920 $Coro::current->{desc} = "runtime saver"; 3942 $Coro::current->{desc} = "runtime saver";
3921 write_runtime_sync 3943 write_runtime_sync
… …
3943} 3965}
3944 3966
3945{ 3967{
3946 # configure BDB 3968 # configure BDB
3947 3969
3948 BDB::min_parallel 8; 3970 BDB::min_parallel 16;
3949 BDB::max_poll_reqs $TICK * 0.1; 3971 BDB::max_poll_reqs $TICK * 0.1;
3950 $AnyEvent::BDB::WATCHER->priority (1); 3972 $AnyEvent::BDB::WATCHER->priority (1);
3951 3973
3952 unless ($DB_ENV) { 3974 unless ($DB_ENV) {
3953 $DB_ENV = BDB::db_env_create; 3975 $DB_ENV = BDB::db_env_create;

Diff Legend

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