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.368 by root, Wed Sep 12 11:18:25 2007 UTC vs.
Revision 1.370 by root, Thu Sep 13 10:59:41 2007 UTC

… …
2466 my $ob = $obs[rand @obs]; 2466 my $ob = $obs[rand @obs];
2467 2467
2468 # see if we actually can go there 2468 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) { 2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs]; 2470 $ob = $obs[rand @obs];
2471 } else {
2472 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 } 2473 }
2472 # else put him there anyways for now #d# 2474 # else put us there anyways for now #d#
2473 2475
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2476 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2477 } else {
2478 ($path, $x, $y) = (undef, undef, undef);
2475 } 2479 }
2476 } 2480 }
2477 2481
2478 my $map = eval { 2482 my $map = eval {
2479 my $map = cf::map::find $path; 2483 my $map = defined $path ? cf::map::find $path : undef;
2480 2484
2481 if ($map) { 2485 if ($map) {
2482 $map = $map->customise_for ($self); 2486 $map = $map->customise_for ($self);
2483 $map = $check->($map) if $check && $map; 2487 $map = $check->($map) if $check && $map;
2484 } else { 2488 } else {
2485 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2489 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2486 } 2490 }
2487 2491
2488 $map 2492 $map
2489 }; 2493 };
2490 2494
… …
3460 my $signal = new Coro::Signal; 3464 my $signal = new Coro::Signal;
3461 push @WAIT_FOR_TICK_BEGIN, $signal; 3465 push @WAIT_FOR_TICK_BEGIN, $signal;
3462 $signal->wait; 3466 $signal->wait;
3463} 3467}
3464 3468
3465our $stat_fh;
3466sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3467
3468$TICK_WATCHER = Event->timer ( 3469$TICK_WATCHER = Event->timer (
3469 reentrant => 0, 3470 reentrant => 0,
3470 parked => 1, 3471 parked => 1,
3471 prio => 0, 3472 prio => 0,
3472 at => $NEXT_TICK || $TICK, 3473 at => $NEXT_TICK || $TICK,
… …
3476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3477 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3477 unless ++$bug_warning > 10; 3478 unless ++$bug_warning > 10;
3478 return; 3479 return;
3479 } 3480 }
3480 3481
3481 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3482
3483 $NOW = $tick_start = Event::time; 3482 $NOW = $tick_start = Event::time;
3484 3483
3485 cf::server_tick; # one server iteration 3484 cf::server_tick; # one server iteration
3486 3485
3487 $RUNTIME += $TICK; 3486 $RUNTIME += $TICK;
… …
3493 write_runtime 3492 write_runtime
3494 or warn "ERROR: unable to write runtime file: $!"; 3493 or warn "ERROR: unable to write runtime file: $!";
3495 }; 3494 };
3496 } 3495 }
3497 3496
3498# my $AFTER = Event::time;
3499# warn $AFTER - $NOW;#d#
3500
3501 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3497 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3502 $sig->send; 3498 $sig->send;
3503 } 3499 }
3504 while (my $sig = shift @WAIT_FOR_TICK) { 3500 while (my $sig = shift @WAIT_FOR_TICK) {
3505 $sig->send; 3501 $sig->send;
… …
3515 3511
3516 $LOAD = ($NOW - $tick_start) / $TICK; 3512 $LOAD = ($NOW - $tick_start) / $TICK;
3517 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3513 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3518 3514
3519 _post_tick; 3515 _post_tick;
3520
3521 # gather some statistics#d#
3522 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d#
3523 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d#
3524 }, 3516 },
3525); 3517);
3526 3518
3527{ 3519{
3528 BDB::min_parallel 8; 3520 BDB::min_parallel 8;

Diff Legend

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