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.143 by root, Sun Jan 7 02:39:14 2007 UTC vs.
Revision 1.147 by root, Mon Jan 8 12:23:33 2007 UTC

… …
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
… …
118 utf8::encode $msg; 118 utf8::encode $msg;
119 119
120 $msg .= "\n" 120 $msg .= "\n"
121 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
122 122
123 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
124 }; 124 };
125} 125}
126 126
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
1086 1086
1087Returns the given player object, loading it if necessary (might block). 1087Returns the given player object, loading it if necessary (might block).
1088 1088
1089=cut 1089=cut
1090 1090
1091sub playerdir($) {
1092 cf::localdir
1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1091sub path($) { 1099sub path($) {
1092 sprintf "%s/%s/%s/%s.pl", 1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1093 cf::localdir, cf::playerdir, 1101
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2 1102 (playerdir $login) . "/$login.pl"
1095} 1103}
1096 1104
1097sub find_active($) { 1105sub find_active($) {
1098 $cf::PLAYER{$_[0]} 1106 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active 1107 and $cf::PLAYER{$_[0]}->active
… …
1124 1132
1125 my $path = path $pl; 1133 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path"; 1134 my $guard = cf::lock_acquire "user_save:$path";
1127 1135
1128 return if $pl->{deny_save}; 1136 return if $pl->{deny_save};
1137
1138 IO::AIO::aio_mkdir playerdir $pl, 0770;
1129 $pl->{last_save} = $cf::RUNTIME; 1139 $pl->{last_save} = $cf::RUNTIME;
1130 1140
1131 Coro::cede; 1141 Coro::cede;
1132 $pl->save_pl ($path); 1142 $pl->save_pl ($path);
1133 Coro::cede; 1143 Coro::cede;
… …
1142 $self->{deny_save} = 1; 1152 $self->{deny_save} = 1;
1143 1153
1144 $cf::PLAYER{$login} = $self; 1154 $cf::PLAYER{$login} = $self;
1145 1155
1146 $self 1156 $self
1157}
1158
1159sub quit_character {
1160 my ($pl) = @_;
1161
1162 $pl->{deny_save} = 1;
1163 $pl->password ("*"); # this should lock out the player until we nuked the dir
1164
1165 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1166 $pl->deactivate;
1167 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1168 $pl->ns->destroy if $pl->ns;
1169
1170 my $path = playerdir $pl;
1171 my $temp = "$path~$cf::RUNTIME~deleting~";
1172 IO::AIO::aio_rename $path, $temp, sub {
1173 delete $cf::PLAYER{$pl->ob->name};
1174 $pl->destroy;
1175
1176 IO::AIO::aio_rmtree $temp;
1177 };
1147} 1178}
1148 1179
1149=item $player->ext_reply ($msgid, $msgtype, %msg) 1180=item $player->ext_reply ($msgid, $msgtype, %msg)
1150 1181
1151Sends an ext reply to the player. 1182Sends an ext reply to the player.
… …
1474} 1505}
1475 1506
1476sub emergency_save { 1507sub emergency_save {
1477 my $freeze_guard = cf::freeze_mainloop; 1508 my $freeze_guard = cf::freeze_mainloop;
1478 1509
1479 warn "enter emergency map save\n"; 1510 warn "enter emergency perl save\n";
1480 1511
1481 cf::sync_job { 1512 cf::sync_job {
1513 warn "begin emergency player save\n";
1514 $_->save for values %cf::PLAYER;
1515 warn "end emergency player save\n";
1516
1482 warn "begin emergency map save\n"; 1517 warn "begin emergency map save\n";
1483 $_->save for values %cf::MAP; 1518 $_->save for values %cf::MAP;
1519 warn "end emergency map save\n";
1484 }; 1520 };
1485 1521
1486 warn "end emergency map save\n"; 1522 warn "leave emergency perl save\n";
1487} 1523}
1488 1524
1489package cf; 1525package cf;
1490 1526
1491=back 1527=back
… …
2063 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2099 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2064 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2100 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2065 2101
2066 if (exists $CFG{mlockall}) { 2102 if (exists $CFG{mlockall}) {
2067 eval { 2103 eval {
2068 $CFG{mlockall} ? &mlockall : &munlockall 2104 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2069 and die "WARNING: m(un)lockall failed: $!\n"; 2105 and die "WARNING: m(un)lockall failed: $!\n";
2070 }; 2106 };
2071 warn $@ if $@; 2107 warn $@ if $@;
2072 } 2108 }
2073} 2109}
… …
2167 cf::load_extensions; 2203 cf::load_extensions;
2168 2204
2169 # reattach attachments to objects 2205 # reattach attachments to objects
2170 warn "reattach"; 2206 warn "reattach";
2171 _global_reattach; 2207 _global_reattach;
2208 reattach $_ for values %MAP;
2172 }; 2209 };
2173 2210
2174 if ($@) { 2211 if ($@) {
2175 warn $@; 2212 warn $@;
2176 warn "error while reloading, exiting."; 2213 warn "error while reloading, exiting.";

Diff Legend

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