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.140 by root, Fri Jan 5 20:04:02 2007 UTC vs.
Revision 1.150 by root, Mon Jan 8 19:25:53 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
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
56 57
57binmode STDOUT; 58binmode STDOUT;
58binmode STDERR; 59binmode STDERR;
59 60
60# read virtual server time, if available 61# read virtual server time, if available
… …
117 utf8::encode $msg; 118 utf8::encode $msg;
118 119
119 $msg .= "\n" 120 $msg .= "\n"
120 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
121 122
122 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
123 }; 124 };
124} 125}
125 126
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
273 warn $@ if $@; 274 warn $@ if $@;
274 undef $busy; 275 undef $busy;
275 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
276 277
277 while ($busy) { 278 while ($busy) {
278 unless (Coro::cede) { 279 Coro::cede or Event::one_event;
279 Coro::nready ? Event::one_event 0 : Event::one_event;
280 Coro::cede_notself unless Coro::cede;
281 }
282 } 280 }
283 281
284 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
285 } else { 283 } else {
286 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
… …
1074 1072
1075=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1076 1074
1077Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1078 1076
1077=cut
1078
1079package cf::player;
1080
1079=head3 cf::player 1081=head3 cf::player
1080 1082
1081=over 4 1083=over 4
1082 1084
1083=item cf::player::exists $login 1085=item cf::player::find $login
1084 1086
1085Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1086 1088
1087=cut 1089=cut
1088 1090
1089sub cf::player::exists($) { 1091sub playerdir($) {
1090 cf::player::find $_[0] 1092 cf::localdir
1091 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137
1138 Coro::AIO::aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME;
1140
1141 $pl->save_pl ($path);
1142 Coro::cede;
1143}
1144
1145sub new($) {
1146 my ($login) = @_;
1147
1148 my $self = create;
1149
1150 $self->ob->name ($login);
1151 $self->{deny_save} = 1;
1152
1153 $cf::PLAYER{$login} = $self;
1154
1155 $self
1156}
1157
1158sub quit_character {
1159 my ($pl) = @_;
1160
1161 $pl->{deny_save} = 1;
1162 $pl->password ("*"); # this should lock out the player until we nuked the dir
1163
1164 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1165 $pl->deactivate;
1166 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1167 $pl->ns->destroy if $pl->ns;
1168
1169 my $path = playerdir $pl;
1170 my $temp = "$path~$cf::RUNTIME~deleting~";
1171 Coro::AIO::aio_rename $path, $temp;
1172 delete $cf::PLAYER{$pl->ob->name};
1173 $pl->destroy;
1174 IO::AIO::aio_rmtree $temp;
1092} 1175}
1093 1176
1094=item $player->ext_reply ($msgid, $msgtype, %msg) 1177=item $player->ext_reply ($msgid, $msgtype, %msg)
1095 1178
1096Sends an ext reply to the player. 1179Sends an ext reply to the player.
1097 1180
1098=cut 1181=cut
1099 1182
1100sub cf::player::ext_reply($$$%) { 1183sub ext_reply($$$%) {
1101 my ($self, $id, %msg) = @_; 1184 my ($self, $id, %msg) = @_;
1102 1185
1103 $msg{msgid} = $id; 1186 $msg{msgid} = $id;
1104 1187
1105 $self->send ("ext " . to_json \%msg); 1188 $self->send ("ext " . cf::to_json \%msg);
1106} 1189}
1190
1191package cf;
1107 1192
1108=back 1193=back
1109 1194
1110 1195
1111=head3 cf::map 1196=head3 cf::map
… …
1307 1392
1308 return if $self->{deny_save}; 1393 return if $self->{deny_save};
1309 1394
1310 local $self->{last_access} = $self->last_access;#d# 1395 local $self->{last_access} = $self->last_access;#d#
1311 1396
1397 cf::async {
1398 $_->contr->save for $self->players;
1399 };
1400
1312 if ($uniq) { 1401 if ($uniq) {
1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1402 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1314 $self->save_objects ($uniq, cf::IO_UNIQUES); 1403 $self->save_objects ($uniq, cf::IO_UNIQUES);
1315 } else { 1404 } else {
1316 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1405 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
1413} 1502}
1414 1503
1415sub emergency_save { 1504sub emergency_save {
1416 my $freeze_guard = cf::freeze_mainloop; 1505 my $freeze_guard = cf::freeze_mainloop;
1417 1506
1418 warn "enter emergency map save\n"; 1507 warn "enter emergency perl save\n";
1419 1508
1420 cf::sync_job { 1509 cf::sync_job {
1510 warn "begin emergency player save\n";
1511 $_->save for values %cf::PLAYER;
1512 warn "end emergency player save\n";
1513
1421 warn "begin emergency map save\n"; 1514 warn "begin emergency map save\n";
1422 $_->save for values %cf::MAP; 1515 $_->save for values %cf::MAP;
1516 warn "end emergency map save\n";
1423 }; 1517 };
1424 1518
1425 warn "end emergency map save\n"; 1519 warn "leave emergency perl save\n";
1426} 1520}
1427 1521
1428package cf; 1522package cf;
1429 1523
1430=back 1524=back
… …
1529 ($x, $y) = ($map->enter_x, $map->enter_y) 1623 ($x, $y) = ($map->enter_x, $map->enter_y)
1530 if $x <=0 && $y <= 0; 1624 if $x <=0 && $y <= 0;
1531 1625
1532 $map->load; 1626 $map->load;
1533 1627
1628 return unless $self->contr->active;
1534 $self->activate_recursive; 1629 $self->activate_recursive;
1535 $self->enter_map ($map, $x, $y); 1630 $self->enter_map ($map, $x, $y);
1536} 1631}
1537 1632
1538cf::player->attach ( 1633cf::player->attach (
… …
1550 my ($pl) = @_; 1645 my ($pl) = @_;
1551 1646
1552 # try to abort aborted map switching on player login :) 1647 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes 1648 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) { 1649 if ($pl->ob->{_link_pos}) {
1555
1556 $pl->ob->enter_link; 1650 $pl->ob->enter_link;
1557 (async { 1651 (async {
1558 # we need this sleep as the login has a concurrent enter_exit running 1652 # we need this sleep as the login has a concurrent enter_exit running
1559 # and this sleep increases chances of the player not ending up in scorn 1653 # and this sleep increases chances of the player not ending up in scorn
1560 $pl->ob->reply (undef, 1654 $pl->ob->reply (undef,
… …
1584 $map = $map->customise_for ($self) if $map; 1678 $map = $map->customise_for ($self) if $map;
1585 1679
1586# warn "entering ", $map->path, " at ($x, $y)\n" 1680# warn "entering ", $map->path, " at ($x, $y)\n"
1587# if $map; 1681# if $map;
1588 1682
1683 $map or $map->cluck ("oy");#d#
1589 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1684 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1590 1685
1591 $self->leave_link ($map, $x, $y); 1686 $self->leave_link ($map, $x, $y);
1592 })->prio (1); 1687 })->prio (1);
1593} 1688}
1594 1689
… …
2002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2097 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2098 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2004 2099
2005 if (exists $CFG{mlockall}) { 2100 if (exists $CFG{mlockall}) {
2006 eval { 2101 eval {
2007 $CFG{mlockall} ? &mlockall : &munlockall 2102 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2008 and die "WARNING: m(un)lockall failed: $!\n"; 2103 and die "WARNING: m(un)lockall failed: $!\n";
2009 }; 2104 };
2010 warn $@ if $@; 2105 warn $@ if $@;
2011 } 2106 }
2012} 2107}
… …
2106 cf::load_extensions; 2201 cf::load_extensions;
2107 2202
2108 # reattach attachments to objects 2203 # reattach attachments to objects
2109 warn "reattach"; 2204 warn "reattach";
2110 _global_reattach; 2205 _global_reattach;
2206 reattach $_ for values %MAP;
2111 }; 2207 };
2112 2208
2113 if ($@) { 2209 if ($@) {
2114 warn $@; 2210 warn $@;
2115 warn "error while reloading, exiting."; 2211 warn "error while reloading, exiting.";
… …
2131 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2132 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2133 2229
2134 # dirty hack because... archetypes are not yet loaded 2230 # dirty hack because... archetypes are not yet loaded
2135 Event->timer ( 2231 Event->timer (
2136 after => 2, 2232 after => 10,
2137 cb => sub { 2233 cb => sub {
2138 $_[0]->w->cancel; 2234 $_[0]->w->cancel;
2139 2235
2140 # provide some exits "home" 2236 # provide some exits "home"
2141 my $exit = cf::object::new "exit"; 2237 my $exit = cf::object::new "exit";

Diff Legend

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