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.144 by root, Sun Jan 7 18:01:10 2007 UTC

… …
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
… …
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 path($) {
1090 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1091 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 cf::localdir, cf::playerdir,
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2
1095}
1096
1097sub find_active($) {
1098 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active
1100 and $cf::PLAYER{$_[0]}
1101}
1102
1103sub exists($) {
1104 my ($login) = @_;
1105
1106 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login }
1108}
1109
1110sub find($) {
1111 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0];
1113
1114 my $guard = cf::lock_acquire "user_find:$login";
1115
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1117 };
1118}
1119
1120sub save($) {
1121 my ($pl) = @_;
1122
1123 return if $pl->{deny_save};
1124
1125 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path";
1127
1128 return if $pl->{deny_save};
1129 $pl->{last_save} = $cf::RUNTIME;
1130
1131 Coro::cede;
1132 $pl->save_pl ($path);
1133 Coro::cede;
1134}
1135
1136sub new($) {
1137 my ($login) = @_;
1138
1139 my $self = create;
1140
1141 $self->ob->name ($login);
1142 $self->{deny_save} = 1;
1143
1144 $cf::PLAYER{$login} = $self;
1145
1146 $self
1092} 1147}
1093 1148
1094=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1095 1150
1096Sends an ext reply to the player. 1151Sends an ext reply to the player.
1097 1152
1098=cut 1153=cut
1099 1154
1100sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1101 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1102 1157
1103 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1104 1159
1105 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1106} 1161}
1162
1163package cf;
1107 1164
1108=back 1165=back
1109 1166
1110 1167
1111=head3 cf::map 1168=head3 cf::map
… …
1307 1364
1308 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1309 1366
1310 local $self->{last_access} = $self->last_access;#d# 1367 local $self->{last_access} = $self->last_access;#d#
1311 1368
1369 cf::async {
1370 $_->contr->save for $self->players;
1371 };
1372
1312 if ($uniq) { 1373 if ($uniq) {
1313 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1314 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1315 } else { 1376 } else {
1316 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1377 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
1413} 1474}
1414 1475
1415sub emergency_save { 1476sub emergency_save {
1416 my $freeze_guard = cf::freeze_mainloop; 1477 my $freeze_guard = cf::freeze_mainloop;
1417 1478
1418 warn "enter emergency map save\n"; 1479 warn "enter emergency perl save\n";
1419 1480
1420 cf::sync_job { 1481 cf::sync_job {
1482 warn "begin emergency player save\n";
1483 $_->save for values %cf::PLAYER;
1484 warn "end emergency player save\n";
1485
1421 warn "begin emergency map save\n"; 1486 warn "begin emergency map save\n";
1422 $_->save for values %cf::MAP; 1487 $_->save for values %cf::MAP;
1488 warn "end emergency map save\n";
1423 }; 1489 };
1424 1490
1425 warn "end emergency map save\n"; 1491 warn "leave emergency perl save\n";
1426} 1492}
1427 1493
1428package cf; 1494package cf;
1429 1495
1430=back 1496=back
… …
1529 ($x, $y) = ($map->enter_x, $map->enter_y) 1595 ($x, $y) = ($map->enter_x, $map->enter_y)
1530 if $x <=0 && $y <= 0; 1596 if $x <=0 && $y <= 0;
1531 1597
1532 $map->load; 1598 $map->load;
1533 1599
1600 return unless $self->contr->active;
1534 $self->activate_recursive; 1601 $self->activate_recursive;
1535 $self->enter_map ($map, $x, $y); 1602 $self->enter_map ($map, $x, $y);
1536} 1603}
1537 1604
1538cf::player->attach ( 1605cf::player->attach (
… …
1550 my ($pl) = @_; 1617 my ($pl) = @_;
1551 1618
1552 # try to abort aborted map switching on player login :) 1619 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes 1620 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) { 1621 if ($pl->ob->{_link_pos}) {
1555
1556 $pl->ob->enter_link; 1622 $pl->ob->enter_link;
1557 (async { 1623 (async {
1558 # we need this sleep as the login has a concurrent enter_exit running 1624 # 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 1625 # and this sleep increases chances of the player not ending up in scorn
1560 $pl->ob->reply (undef, 1626 $pl->ob->reply (undef,
… …
2106 cf::load_extensions; 2172 cf::load_extensions;
2107 2173
2108 # reattach attachments to objects 2174 # reattach attachments to objects
2109 warn "reattach"; 2175 warn "reattach";
2110 _global_reattach; 2176 _global_reattach;
2177 reattach $_ for values %MAP;
2111 }; 2178 };
2112 2179
2113 if ($@) { 2180 if ($@) {
2114 warn $@; 2181 warn $@;
2115 warn "error while reloading, exiting."; 2182 warn "error while reloading, exiting.";
… …
2131 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2198 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2132 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2199 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2133 2200
2134 # dirty hack because... archetypes are not yet loaded 2201 # dirty hack because... archetypes are not yet loaded
2135 Event->timer ( 2202 Event->timer (
2136 after => 2, 2203 after => 10,
2137 cb => sub { 2204 cb => sub {
2138 $_[0]->w->cancel; 2205 $_[0]->w->cancel;
2139 2206
2140 # provide some exits "home" 2207 # provide some exits "home"
2141 my $exit = cf::object::new "exit"; 2208 my $exit = cf::object::new "exit";

Diff Legend

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