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.139 by root, Fri Jan 5 19:12:03 2007 UTC vs.
Revision 1.145 by root, Sun Jan 7 21:54:59 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
… …
229 my $guard = Coro::guard { $TICK_WATCHER->start }; 230 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop; 231 $TICK_WATCHER->stop;
231 $guard 232 $guard
232} 233}
233 234
235=item cf::async { BLOCK }
236
237Currently the same as Coro::async_pool, meaning you cannot use
238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
240
241=cut
242
243BEGIN { *async = \&Coro::async_pool }
244
234=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
235 246
236The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
237always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
238reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 249reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable.
… …
256 my $freeze_guard = freeze_mainloop; 267 my $freeze_guard = freeze_mainloop;
257 268
258 my $busy = 1; 269 my $busy = 1;
259 my @res; 270 my @res;
260 271
261 (Coro::async_pool { 272 (async {
262 @res = eval { $job->() }; 273 @res = eval { $job->() };
263 warn $@ if $@; 274 warn $@ if $@;
264 undef $busy; 275 undef $busy;
265 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
266 277
267 while ($busy) { 278 while ($busy) {
268 unless (Coro::cede) { 279 Coro::cede or Event::one_event;
269 Coro::nready ? Event::one_event 0 : Event::one_event;
270 Coro::cede_notself unless Coro::cede;
271 }
272 } 280 }
273 281
274 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
275 } else { 283 } else {
276 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
277 285
278 $job->() 286 $job->()
279 } 287 }
280} 288}
281 289
282=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
283 291
284Creates (and readies) and returns a new coro. This coro is automcatially 292Like async, but this coro is automcatially being canceled when the
285being canceled when the extension calling this is being unloaded. 293extension calling this is being unloaded.
286 294
287=cut 295=cut
288 296
289sub coro(&) { 297sub async_ext(&) {
290 my $cb = shift; 298 my $cb = shift;
291 299
292 my $coro = &Coro::async_pool ($cb); 300 my $coro = &Coro::async ($cb);
293 301
294 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
295 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
296 }); 304 });
297 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1064 1072
1065=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1066 1074
1067Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1068 1076
1077=cut
1078
1079package cf::player;
1080
1069=head3 cf::player 1081=head3 cf::player
1070 1082
1071=over 4 1083=over 4
1072 1084
1073=item cf::player::exists $login 1085=item cf::player::find $login
1074 1086
1075Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1076 1088
1077=cut 1089=cut
1078 1090
1079sub cf::player::exists($) { 1091sub playerdir($) {
1080 cf::player::find $_[0] 1092 cf::localdir
1081 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 $pl->{last_save} = $cf::RUNTIME;
1138
1139 Coro::cede;
1140 $pl->save_pl ($path);
1141 Coro::cede;
1142}
1143
1144sub new($) {
1145 my ($login) = @_;
1146
1147 my $self = create;
1148
1149 $self->ob->name ($login);
1150 $self->{deny_save} = 1;
1151
1152 $cf::PLAYER{$login} = $self;
1153
1154 $self
1155}
1156
1157sub quit_character {
1158 my ($pl) = @_;
1159
1160 $pl->{deny_save} = 1;
1161 $pl->password ("*"); # this should lock out the player until we nuked the dir
1162
1163 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1164 $pl->deactivate;
1165 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1166 $pl->ns->destroy if $pl->ns;
1167
1168 my $path = playerdir $pl;
1169 my $temp = "$path~$cf::RUNTIME~deleting~";
1170 IO::AIO::aio_rename $path, $temp, sub {
1171 delete $cf::PLAYER{$pl->ob->name};
1172 $pl->destroy;
1173
1174 IO::AIO::aio_rmtree $temp;
1175 };
1082} 1176}
1083 1177
1084=item $player->ext_reply ($msgid, $msgtype, %msg) 1178=item $player->ext_reply ($msgid, $msgtype, %msg)
1085 1179
1086Sends an ext reply to the player. 1180Sends an ext reply to the player.
1087 1181
1088=cut 1182=cut
1089 1183
1090sub cf::player::ext_reply($$$%) { 1184sub ext_reply($$$%) {
1091 my ($self, $id, %msg) = @_; 1185 my ($self, $id, %msg) = @_;
1092 1186
1093 $msg{msgid} = $id; 1187 $msg{msgid} = $id;
1094 1188
1095 $self->send ("ext " . to_json \%msg); 1189 $self->send ("ext " . cf::to_json \%msg);
1096} 1190}
1191
1192package cf;
1097 1193
1098=back 1194=back
1099 1195
1100 1196
1101=head3 cf::map 1197=head3 cf::map
… …
1270} 1366}
1271 1367
1272sub find_sync { 1368sub find_sync {
1273 my ($path, $origin) = @_; 1369 my ($path, $origin) = @_;
1274 1370
1275 cf::sync_job { 1371 cf::sync_job { cf::map::find $path, $origin }
1276 my $map = cf::map::find $path, $origin;
1277 $map
1278 }
1279} 1372}
1280 1373
1281sub do_load_sync { 1374sub do_load_sync {
1282 my ($map) = @_; 1375 my ($map) = @_;
1283 1376
… …
1299 $self->{load_path} = $save; 1392 $self->{load_path} = $save;
1300 1393
1301 return if $self->{deny_save}; 1394 return if $self->{deny_save};
1302 1395
1303 local $self->{last_access} = $self->last_access;#d# 1396 local $self->{last_access} = $self->last_access;#d#
1397
1398 cf::async {
1399 $_->contr->save for $self->players;
1400 };
1304 1401
1305 if ($uniq) { 1402 if ($uniq) {
1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1403 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1307 $self->save_objects ($uniq, cf::IO_UNIQUES); 1404 $self->save_objects ($uniq, cf::IO_UNIQUES);
1308 } else { 1405 } else {
… …
1406} 1503}
1407 1504
1408sub emergency_save { 1505sub emergency_save {
1409 my $freeze_guard = cf::freeze_mainloop; 1506 my $freeze_guard = cf::freeze_mainloop;
1410 1507
1411 warn "enter emergency map save\n"; 1508 warn "enter emergency perl save\n";
1412 1509
1413 cf::sync_job { 1510 cf::sync_job {
1511 warn "begin emergency player save\n";
1512 $_->save for values %cf::PLAYER;
1513 warn "end emergency player save\n";
1514
1414 warn "begin emergency map save\n"; 1515 warn "begin emergency map save\n";
1415 $_->save for values %cf::MAP; 1516 $_->save for values %cf::MAP;
1517 warn "end emergency map save\n";
1416 }; 1518 };
1417 1519
1418 warn "end emergency map save\n"; 1520 warn "leave emergency perl save\n";
1419} 1521}
1420 1522
1421package cf; 1523package cf;
1422 1524
1423=back 1525=back
… …
1522 ($x, $y) = ($map->enter_x, $map->enter_y) 1624 ($x, $y) = ($map->enter_x, $map->enter_y)
1523 if $x <=0 && $y <= 0; 1625 if $x <=0 && $y <= 0;
1524 1626
1525 $map->load; 1627 $map->load;
1526 1628
1629 return unless $self->contr->active;
1527 $self->activate_recursive; 1630 $self->activate_recursive;
1528 $self->enter_map ($map, $x, $y); 1631 $self->enter_map ($map, $x, $y);
1529} 1632}
1530 1633
1531cf::player->attach ( 1634cf::player->attach (
… …
1543 my ($pl) = @_; 1646 my ($pl) = @_;
1544 1647
1545 # try to abort aborted map switching on player login :) 1648 # try to abort aborted map switching on player login :)
1546 # should happen only on crashes 1649 # should happen only on crashes
1547 if ($pl->ob->{_link_pos}) { 1650 if ($pl->ob->{_link_pos}) {
1548
1549 $pl->ob->enter_link; 1651 $pl->ob->enter_link;
1550 (Coro::async_pool { 1652 (async {
1551 # we need this sleep as the login has a concurrent enter_exit running 1653 # we need this sleep as the login has a concurrent enter_exit running
1552 # and this sleep increases chances of the player not ending up in scorn 1654 # and this sleep increases chances of the player not ending up in scorn
1655 $pl->ob->reply (undef,
1656 "There was an internal problem at your last logout, "
1657 . "the server will try to bring you to your intended destination in a second.",
1658 cf::NDI_RED);
1553 Coro::Timer::sleep 1; 1659 Coro::Timer::sleep 1;
1554 $pl->ob->leave_link; 1660 $pl->ob->leave_link;
1555 })->prio (2); 1661 })->prio (2);
1556 } 1662 }
1557 }, 1663 },
… …
1564sub cf::object::player::goto { 1670sub cf::object::player::goto {
1565 my ($self, $path, $x, $y) = @_; 1671 my ($self, $path, $x, $y) = @_;
1566 1672
1567 $self->enter_link; 1673 $self->enter_link;
1568 1674
1569 (Coro::async_pool { 1675 (async {
1570 $path = new cf::path $path; 1676 $path = new cf::path $path;
1571 1677
1572 my $map = cf::map::find $path->as_string; 1678 my $map = cf::map::find $path->as_string;
1573 $map = $map->customise_for ($self) if $map; 1679 $map = $map->customise_for ($self) if $map;
1574 1680
… …
1636 1742
1637 return unless $self->type == cf::PLAYER; 1743 return unless $self->type == cf::PLAYER;
1638 1744
1639 $self->enter_link; 1745 $self->enter_link;
1640 1746
1641 (Coro::async_pool { 1747 (async {
1642 $self->deactivate_recursive; # just to be sure 1748 $self->deactivate_recursive; # just to be sure
1643 unless (eval { 1749 unless (eval {
1644 prepare_random_map $exit 1750 prepare_random_map $exit
1645 if $exit->slaying eq "/!"; 1751 if $exit->slaying eq "/!";
1646 1752
… …
1727 } 1833 }
1728 } 1834 }
1729 }, 1835 },
1730); 1836);
1731 1837
1732=item $client->coro (\&cb) 1838=item $client->async (\&cb)
1733 1839
1734Create a new coroutine, running the specified callback. The coroutine will 1840Create a new coroutine, running the specified callback. The coroutine will
1735be automatically cancelled when the client gets destroyed (e.g. on logout, 1841be automatically cancelled when the client gets destroyed (e.g. on logout,
1736or loss of connection). 1842or loss of connection).
1737 1843
1738=cut 1844=cut
1739 1845
1740sub cf::client::coro { 1846sub cf::client::async {
1741 my ($self, $cb) = @_; 1847 my ($self, $cb) = @_;
1742 1848
1743 my $coro = &Coro::async_pool ($cb); 1849 my $coro = &Coro::async ($cb);
1744 1850
1745 $coro->on_destroy (sub { 1851 $coro->on_destroy (sub {
1746 delete $self->{_coro}{$coro+0}; 1852 delete $self->{_coro}{$coro+0};
1747 }); 1853 });
1748 1854
… …
2002 2108
2003sub main { 2109sub main {
2004 # we must not ever block the main coroutine 2110 # we must not ever block the main coroutine
2005 local $Coro::idle = sub { 2111 local $Coro::idle = sub {
2006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2112 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2007 Coro::async_pool { Event::one_event }; 2113 async { Event::one_event };
2008 }; 2114 };
2009 2115
2010 cfg_load; 2116 cfg_load;
2011 db_load; 2117 db_load;
2012 load_extensions; 2118 load_extensions;
… …
2095 cf::load_extensions; 2201 cf::load_extensions;
2096 2202
2097 # reattach attachments to objects 2203 # reattach attachments to objects
2098 warn "reattach"; 2204 warn "reattach";
2099 _global_reattach; 2205 _global_reattach;
2206 reattach $_ for values %MAP;
2100 }; 2207 };
2101 2208
2102 if ($@) { 2209 if ($@) {
2103 warn $@; 2210 warn $@;
2104 warn "error while reloading, exiting."; 2211 warn "error while reloading, exiting.";
… …
2120 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2121 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2122 2229
2123 # dirty hack because... archetypes are not yet loaded 2230 # dirty hack because... archetypes are not yet loaded
2124 Event->timer ( 2231 Event->timer (
2125 after => 2, 2232 after => 10,
2126 cb => sub { 2233 cb => sub {
2127 $_[0]->w->cancel; 2234 $_[0]->w->cancel;
2128 2235
2129 # provide some exits "home" 2236 # provide some exits "home"
2130 my $exit = cf::object::new "exit"; 2237 my $exit = cf::object::new "exit";

Diff Legend

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