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.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
… …
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 path($) {
1080 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1081 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
1082} 1147}
1083 1148
1084=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1085 1150
1086Sends an ext reply to the player. 1151Sends an ext reply to the player.
1087 1152
1088=cut 1153=cut
1089 1154
1090sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1091 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1092 1157
1093 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1094 1159
1095 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1096} 1161}
1162
1163package cf;
1097 1164
1098=back 1165=back
1099 1166
1100 1167
1101=head3 cf::map 1168=head3 cf::map
… …
1270} 1337}
1271 1338
1272sub find_sync { 1339sub find_sync {
1273 my ($path, $origin) = @_; 1340 my ($path, $origin) = @_;
1274 1341
1275 cf::sync_job { 1342 cf::sync_job { cf::map::find $path, $origin }
1276 my $map = cf::map::find $path, $origin;
1277 $map
1278 }
1279} 1343}
1280 1344
1281sub do_load_sync { 1345sub do_load_sync {
1282 my ($map) = @_; 1346 my ($map) = @_;
1283 1347
… …
1299 $self->{load_path} = $save; 1363 $self->{load_path} = $save;
1300 1364
1301 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1302 1366
1303 local $self->{last_access} = $self->last_access;#d# 1367 local $self->{last_access} = $self->last_access;#d#
1368
1369 cf::async {
1370 $_->contr->save for $self->players;
1371 };
1304 1372
1305 if ($uniq) { 1373 if ($uniq) {
1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1307 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1308 } else { 1376 } else {
… …
1406} 1474}
1407 1475
1408sub emergency_save { 1476sub emergency_save {
1409 my $freeze_guard = cf::freeze_mainloop; 1477 my $freeze_guard = cf::freeze_mainloop;
1410 1478
1411 warn "enter emergency map save\n"; 1479 warn "enter emergency perl save\n";
1412 1480
1413 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
1414 warn "begin emergency map save\n"; 1486 warn "begin emergency map save\n";
1415 $_->save for values %cf::MAP; 1487 $_->save for values %cf::MAP;
1488 warn "end emergency map save\n";
1416 }; 1489 };
1417 1490
1418 warn "end emergency map save\n"; 1491 warn "leave emergency perl save\n";
1419} 1492}
1420 1493
1421package cf; 1494package cf;
1422 1495
1423=back 1496=back
… …
1522 ($x, $y) = ($map->enter_x, $map->enter_y) 1595 ($x, $y) = ($map->enter_x, $map->enter_y)
1523 if $x <=0 && $y <= 0; 1596 if $x <=0 && $y <= 0;
1524 1597
1525 $map->load; 1598 $map->load;
1526 1599
1600 return unless $self->contr->active;
1527 $self->activate_recursive; 1601 $self->activate_recursive;
1528 $self->enter_map ($map, $x, $y); 1602 $self->enter_map ($map, $x, $y);
1529} 1603}
1530 1604
1531cf::player->attach ( 1605cf::player->attach (
… …
1543 my ($pl) = @_; 1617 my ($pl) = @_;
1544 1618
1545 # try to abort aborted map switching on player login :) 1619 # try to abort aborted map switching on player login :)
1546 # should happen only on crashes 1620 # should happen only on crashes
1547 if ($pl->ob->{_link_pos}) { 1621 if ($pl->ob->{_link_pos}) {
1548
1549 $pl->ob->enter_link; 1622 $pl->ob->enter_link;
1550 (Coro::async_pool { 1623 (async {
1551 # 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
1552 # 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
1626 $pl->ob->reply (undef,
1627 "There was an internal problem at your last logout, "
1628 . "the server will try to bring you to your intended destination in a second.",
1629 cf::NDI_RED);
1553 Coro::Timer::sleep 1; 1630 Coro::Timer::sleep 1;
1554 $pl->ob->leave_link; 1631 $pl->ob->leave_link;
1555 })->prio (2); 1632 })->prio (2);
1556 } 1633 }
1557 }, 1634 },
… …
1564sub cf::object::player::goto { 1641sub cf::object::player::goto {
1565 my ($self, $path, $x, $y) = @_; 1642 my ($self, $path, $x, $y) = @_;
1566 1643
1567 $self->enter_link; 1644 $self->enter_link;
1568 1645
1569 (Coro::async_pool { 1646 (async {
1570 $path = new cf::path $path; 1647 $path = new cf::path $path;
1571 1648
1572 my $map = cf::map::find $path->as_string; 1649 my $map = cf::map::find $path->as_string;
1573 $map = $map->customise_for ($self) if $map; 1650 $map = $map->customise_for ($self) if $map;
1574 1651
… …
1636 1713
1637 return unless $self->type == cf::PLAYER; 1714 return unless $self->type == cf::PLAYER;
1638 1715
1639 $self->enter_link; 1716 $self->enter_link;
1640 1717
1641 (Coro::async_pool { 1718 (async {
1642 $self->deactivate_recursive; # just to be sure 1719 $self->deactivate_recursive; # just to be sure
1643 unless (eval { 1720 unless (eval {
1644 prepare_random_map $exit 1721 prepare_random_map $exit
1645 if $exit->slaying eq "/!"; 1722 if $exit->slaying eq "/!";
1646 1723
… …
1727 } 1804 }
1728 } 1805 }
1729 }, 1806 },
1730); 1807);
1731 1808
1732=item $client->coro (\&cb) 1809=item $client->async (\&cb)
1733 1810
1734Create a new coroutine, running the specified callback. The coroutine will 1811Create a new coroutine, running the specified callback. The coroutine will
1735be automatically cancelled when the client gets destroyed (e.g. on logout, 1812be automatically cancelled when the client gets destroyed (e.g. on logout,
1736or loss of connection). 1813or loss of connection).
1737 1814
1738=cut 1815=cut
1739 1816
1740sub cf::client::coro { 1817sub cf::client::async {
1741 my ($self, $cb) = @_; 1818 my ($self, $cb) = @_;
1742 1819
1743 my $coro = &Coro::async_pool ($cb); 1820 my $coro = &Coro::async ($cb);
1744 1821
1745 $coro->on_destroy (sub { 1822 $coro->on_destroy (sub {
1746 delete $self->{_coro}{$coro+0}; 1823 delete $self->{_coro}{$coro+0};
1747 }); 1824 });
1748 1825
… …
2002 2079
2003sub main { 2080sub main {
2004 # we must not ever block the main coroutine 2081 # we must not ever block the main coroutine
2005 local $Coro::idle = sub { 2082 local $Coro::idle = sub {
2006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2083 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2007 Coro::async_pool { Event::one_event }; 2084 async { Event::one_event };
2008 }; 2085 };
2009 2086
2010 cfg_load; 2087 cfg_load;
2011 db_load; 2088 db_load;
2012 load_extensions; 2089 load_extensions;
… …
2095 cf::load_extensions; 2172 cf::load_extensions;
2096 2173
2097 # reattach attachments to objects 2174 # reattach attachments to objects
2098 warn "reattach"; 2175 warn "reattach";
2099 _global_reattach; 2176 _global_reattach;
2177 reattach $_ for values %MAP;
2100 }; 2178 };
2101 2179
2102 if ($@) { 2180 if ($@) {
2103 warn $@; 2181 warn $@;
2104 warn "error while reloading, exiting."; 2182 warn "error while reloading, exiting.";
… …
2120 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2198 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2121 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2199 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2122 2200
2123 # dirty hack because... archetypes are not yet loaded 2201 # dirty hack because... archetypes are not yet loaded
2124 Event->timer ( 2202 Event->timer (
2125 after => 2, 2203 after => 10,
2126 cb => sub { 2204 cb => sub {
2127 $_[0]->w->cancel; 2205 $_[0]->w->cancel;
2128 2206
2129 # provide some exits "home" 2207 # provide some exits "home"
2130 my $exit = cf::object::new "exit"; 2208 my $exit = cf::object::new "exit";

Diff Legend

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