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.504 by root, Sat Jan 30 23:50:16 2010 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 2010 UTC

… …
1310} 1310}
1311 1311
1312use File::Glob (); 1312use File::Glob ();
1313 1313
1314cf::player->attach ( 1314cf::player->attach (
1315 on_command => sub { 1315 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1317 1317
1318 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1319 or return; 1319 or return;
1320 1320
… …
1399 . "\n};\n1"; 1399 . "\n};\n1";
1400 1400
1401 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1402 } 1402 }
1403 1403
1404 my $pass = 0;
1404 my %done; 1405 my %done;
1405 while (%todo) { 1406 while (%todo) {
1406 my $progress; 1407 my $progress;
1407 1408
1409 ++$pass;
1410
1411 ext:
1408 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1414 next ext
1411 unless exists $done{$_}; 1415 unless exists $done{$_};
1412 } 1416 }
1413 1417
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1419
1416 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1424
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1426 if exists $v->{meta}{mandatory};
1424 1427 } else {
1425 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;
1426 } 1434 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1435 }
1432 1436
1433 skip: 1437 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 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 }
1436 } 1445 }
1437 }; 1446 };
1438} 1447}
1439 1448
1440############################################################################# 1449#############################################################################
… …
1524 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1525 } 1534 }
1526 } 1535 }
1527} 1536}
1528 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1529sub save($) { 1551sub save($) {
1530 my ($pl) = @_; 1552 my ($pl) = @_;
1531 1553
1532 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1533 1555
… …
1538 1560
1539 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1541 1563
1542 cf::get_slot 0.01; 1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1543 1568
1544 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1570 cf::cede_to_tick;
1546} 1571}
1547 1572
… …
1760 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1761 1786
1762 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1788 $self->_create_random_map (
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
2084 } 2109 }
2085 2110
2086 $self->post_load; 2111 $self->post_load;
2087} 2112}
2088 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2089sub customise_for { 2117sub customise_for {
2090 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2091 2119
2092 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2121 if $self->per_player;
… …
3122 3150
3123 $coro 3151 $coro
3124} 3152}
3125 3153
3126cf::client->attach ( 3154cf::client->attach (
3127 on_destroy => sub { 3155 on_client_destroy => sub {
3128 my ($ns) = @_; 3156 my ($ns) = @_;
3129 3157
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3159 },
3132); 3160);
… …
3529 reload_config; 3557 reload_config;
3530 db_init; 3558 db_init;
3531 3559
3532 cf::init_uuid; 3560 cf::init_uuid;
3533 cf::init_signals; 3561 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3562 cf::init_skills;
3536 3563
3537 cf::init_beforeplay; 3564 cf::init_beforeplay;
3538 3565
3539 atomic; 3566 atomic;
… …
3564 }; 3591 };
3565 } 3592 }
3566} 3593}
3567 3594
3568sub write_runtime_sync { 3595sub write_runtime_sync {
3596 my $t0 = EV::time;
3597
3569 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3571 3600
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3602
3574 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3575 3604
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3606 or return;
3578 3607
3579 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3623 or return;
3595 3624
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3626 and return;
3598 3627
3599 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3600 3629
3601 1 3630 1
3602} 3631}
3603 3632
3604our $uuid_lock; 3633our $uuid_lock;

Diff Legend

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