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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.374 by root, Wed Sep 19 22:07:16 2007 UTC

… …
354our @SLOT_QUEUE; 354our @SLOT_QUEUE;
355our $SLOT_QUEUE; 355our $SLOT_QUEUE;
356 356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
359 my $signal = new Coro::Signal; 361 my $signal = new Coro::Signal;
360 362
361 while () { 363 while () {
362 next_job: 364 next_job:
363 my $avail = cf::till_tick; 365 my $avail = cf::till_tick;
… …
433 435
434 my $busy = 1; 436 my $busy = 1;
435 my @res; 437 my @res;
436 438
437 (async { 439 (async {
440 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 441 @res = eval { $job->() };
439 warn $@ if $@; 442 warn $@ if $@;
440 undef $busy; 443 undef $busy;
441 })->prio (Coro::PRIO_MAX); 444 })->prio (Coro::PRIO_MAX);
442 445
… …
1025 }, 1028 },
1026); 1029);
1027 1030
1028sub object_freezer_save { 1031sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1032 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1033
1033 sync_job { 1034 sync_job {
1034 if (length $$rdata) { 1035 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1036 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1037 warn sprintf "saving %s (%d,%d)\n",
… …
1062 } else { 1063 } else {
1063 aio_unlink $filename; 1064 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1065 aio_unlink "$filename.pst";
1065 } 1066 }
1066 }; 1067 };
1067
1068 undef $guard;
1069} 1068}
1070 1069
1071sub object_freezer_as_string { 1070sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1071 my ($rdata, $objs) = @_;
1073 1072
… …
1078 1077
1079sub object_thawer_load { 1078sub object_thawer_load {
1080 my ($filename) = @_; 1079 my ($filename) = @_;
1081 1080
1082 my ($data, $av); 1081 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1082
1086 (aio_load $filename, $data) >= 0 1083 (aio_load $filename, $data) >= 0
1087 or return; 1084 or return;
1088 1085
1089 unless (aio_stat "$filename.pst") { 1086 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1087 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1088 or return;
1092 1089
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1090 $av = eval { (Storable::thaw $av)->{objs} };
1095 } 1091 }
1096 1092
1097 utf8::decode (my $decname = $filename); 1093 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1094 warn sprintf "loading %s (%d,%d)\n",
… …
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1349 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1350
1355 my $f = new_from_file cf::object::thawer path $login 1351 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1352 or return;
1357 1353
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1354 my $pl = cf::player::load_pl $f
1360 or return; 1355 or return;
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1356 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1357 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1358 $cf::PLAYER{$login} = $pl
… …
2044 } 2039 }
2045 2040
2046 $MAP_PREFETCH{$path} |= $load; 2041 $MAP_PREFETCH{$path} |= $load;
2047 2042
2048 $MAP_PREFETCHER ||= cf::async { 2043 $MAP_PREFETCHER ||= cf::async {
2044 $Coro::current->{desc} = "map prefetcher";
2045
2049 while (%MAP_PREFETCH) { 2046 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2047 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2048 if (my $map = find $k) {
2052 $map->load if $v; 2049 $map->load if $v;
2053 } 2050 }
… …
2079 return if $self->{deny_save}; 2076 return if $self->{deny_save};
2080 2077
2081 local $self->{last_access} = $self->last_access;#d# 2078 local $self->{last_access} = $self->last_access;#d#
2082 2079
2083 cf::async { 2080 cf::async {
2081 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2082 $_->contr->save for $self->players;
2085 }; 2083 };
2086 2084
2087 if ($uniq) { 2085 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2458
2461 $self->enter_link; 2459 $self->enter_link;
2462 2460
2463 (async { 2461 (async {
2462 $Coro::current->{desc} = "player::goto $path $x $y";
2463
2464 # *tag paths override both path and x|y 2464 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2465 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2466 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2467 my $ob = $obs[rand @obs];
2468 2468
… …
2585 # if exit is damned, update players death & WoR home-position 2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp) 2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED); 2587 if $exit->flag (FLAG_DAMNED);
2588 2588
2589 (async { 2589 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2591
2590 $self->deactivate_recursive; # just to be sure 2592 $self->deactivate_recursive; # just to be sure
2591 unless (eval { 2593 unless (eval {
2592 $self->goto ($slaying, $hp, $sp); 2594 $self->goto ($slaying, $hp, $sp);
2593 2595
2594 1; 2596 1;
… …
3183sub main { 3185sub main {
3184 # we must not ever block the main coroutine 3186 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3187 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3188 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3189 (async {
3190 $Coro::current->{desc} = "IDLE BUG HANDLER";
3188 Event::one_event; 3191 Event::one_event;
3189 })->prio (Coro::PRIO_MAX); 3192 })->prio (Coro::PRIO_MAX);
3190 }; 3193 };
3191 3194
3192 reload_config; 3195 reload_config;
… …
3436register_command "reload" => sub { 3439register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3440 my ($who, $arg) = @_;
3438 3441
3439 if ($who->flag (FLAG_WIZ)) { 3442 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3443 $who->message ("reloading server.");
3444 async {
3445 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3446 reload_perl;
3447 };
3442 } 3448 }
3443}; 3449};
3444 3450
3445unshift @INC, $LIBDIR; 3451unshift @INC, $LIBDIR;
3446 3452
… …
3488 $NEXT_TICK += $TICK; 3494 $NEXT_TICK += $TICK;
3489 3495
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3496 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3497 $NEXT_RUNTIME_WRITE = $NOW + 10;
3492 Coro::async_pool { 3498 Coro::async_pool {
3499 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3500 write_runtime
3494 or warn "ERROR: unable to write runtime file: $!"; 3501 or warn "ERROR: unable to write runtime file: $!";
3495 }; 3502 };
3496 } 3503 }
3497 3504
… …
3623 3630
3624 # limit the # of concurrent backtraces 3631 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3632 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3633 ++$_log_backtrace;
3627 async { 3634 async {
3635 $Coro::current->{desc} = "abt $msg";
3636
3628 my @bt = fork_call { 3637 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3638 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3639 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3640 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3641 or die "addr2line: $!";

Diff Legend

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