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.152 by root, Mon Jan 8 22:32:10 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';
… …
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{$_[0]} || do {
1125 my $pl = load_pl path $login
1126 or return;
1127 $cf::PLAYER{$login} = $pl
1128 }
1129 }
1130}
1131
1132sub save($) {
1133 my ($pl) = @_;
1134
1135 return if $pl->{deny_save};
1136
1137 my $path = path $pl;
1138 my $guard = cf::lock_acquire "user_save:$path";
1139
1140 return if $pl->{deny_save};
1141
1142 Coro::AIO::aio_mkdir playerdir $pl, 0770;
1143 $pl->{last_save} = $cf::RUNTIME;
1144
1145 $pl->save_pl ($path);
1146 Coro::cede;
1147}
1148
1149sub new($) {
1150 my ($login) = @_;
1151
1152 my $self = create;
1153
1154 $self->ob->name ($login);
1155 $self->{deny_save} = 1;
1156
1157 $cf::PLAYER{$login} = $self;
1158
1159 $self
1160}
1161
1162sub quit_character {
1163 my ($pl) = @_;
1164
1165 $pl->{deny_save} = 1;
1166 $pl->password ("*"); # this should lock out the player until we nuked the dir
1167
1168 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1169 $pl->deactivate;
1170 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1171 $pl->ns->destroy if $pl->ns;
1172
1173 my $path = playerdir $pl;
1174 my $temp = "$path~$cf::RUNTIME~deleting~";
1175 Coro::AIO::aio_rename $path, $temp;
1176 delete $cf::PLAYER{$pl->ob->name};
1177 $pl->destroy;
1178 IO::AIO::aio_rmtree $temp;
1082} 1179}
1083 1180
1084=item $player->ext_reply ($msgid, $msgtype, %msg) 1181=item $player->ext_reply ($msgid, $msgtype, %msg)
1085 1182
1086Sends an ext reply to the player. 1183Sends an ext reply to the player.
1087 1184
1088=cut 1185=cut
1089 1186
1090sub cf::player::ext_reply($$$%) { 1187sub ext_reply($$$%) {
1091 my ($self, $id, %msg) = @_; 1188 my ($self, $id, %msg) = @_;
1092 1189
1093 $msg{msgid} = $id; 1190 $msg{msgid} = $id;
1094 1191
1095 $self->send ("ext " . to_json \%msg); 1192 $self->send ("ext " . cf::to_json \%msg);
1096} 1193}
1194
1195package cf;
1097 1196
1098=back 1197=back
1099 1198
1100 1199
1101=head3 cf::map 1200=head3 cf::map
… …
1270} 1369}
1271 1370
1272sub find_sync { 1371sub find_sync {
1273 my ($path, $origin) = @_; 1372 my ($path, $origin) = @_;
1274 1373
1275 cf::sync_job { 1374 cf::sync_job { cf::map::find $path, $origin }
1276 my $map = cf::map::find $path, $origin;
1277 $map
1278 }
1279} 1375}
1280 1376
1281sub do_load_sync { 1377sub do_load_sync {
1282 my ($map) = @_; 1378 my ($map) = @_;
1283 1379
… …
1299 $self->{load_path} = $save; 1395 $self->{load_path} = $save;
1300 1396
1301 return if $self->{deny_save}; 1397 return if $self->{deny_save};
1302 1398
1303 local $self->{last_access} = $self->last_access;#d# 1399 local $self->{last_access} = $self->last_access;#d#
1400
1401 cf::async {
1402 $_->contr->save for $self->players;
1403 };
1304 1404
1305 if ($uniq) { 1405 if ($uniq) {
1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1406 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1307 $self->save_objects ($uniq, cf::IO_UNIQUES); 1407 $self->save_objects ($uniq, cf::IO_UNIQUES);
1308 } else { 1408 } else {
… …
1406} 1506}
1407 1507
1408sub emergency_save { 1508sub emergency_save {
1409 my $freeze_guard = cf::freeze_mainloop; 1509 my $freeze_guard = cf::freeze_mainloop;
1410 1510
1411 warn "enter emergency map save\n"; 1511 warn "enter emergency perl save\n";
1412 1512
1413 cf::sync_job { 1513 cf::sync_job {
1514 warn "begin emergency player save\n";
1515 $_->save for values %cf::PLAYER;
1516 warn "end emergency player save\n";
1517
1414 warn "begin emergency map save\n"; 1518 warn "begin emergency map save\n";
1415 $_->save for values %cf::MAP; 1519 $_->save for values %cf::MAP;
1520 warn "end emergency map save\n";
1416 }; 1521 };
1417 1522
1418 warn "end emergency map save\n"; 1523 warn "leave emergency perl save\n";
1419} 1524}
1420 1525
1421package cf; 1526package cf;
1422 1527
1423=back 1528=back
… …
1522 ($x, $y) = ($map->enter_x, $map->enter_y) 1627 ($x, $y) = ($map->enter_x, $map->enter_y)
1523 if $x <=0 && $y <= 0; 1628 if $x <=0 && $y <= 0;
1524 1629
1525 $map->load; 1630 $map->load;
1526 1631
1632 return unless $self->contr->active;
1527 $self->activate_recursive; 1633 $self->activate_recursive;
1528 $self->enter_map ($map, $x, $y); 1634 $self->enter_map ($map, $x, $y);
1529} 1635}
1530 1636
1531cf::player->attach ( 1637cf::player->attach (
… …
1543 my ($pl) = @_; 1649 my ($pl) = @_;
1544 1650
1545 # try to abort aborted map switching on player login :) 1651 # try to abort aborted map switching on player login :)
1546 # should happen only on crashes 1652 # should happen only on crashes
1547 if ($pl->ob->{_link_pos}) { 1653 if ($pl->ob->{_link_pos}) {
1548
1549 $pl->ob->enter_link; 1654 $pl->ob->enter_link;
1550 (Coro::async_pool { 1655 (async {
1551 # we need this sleep as the login has a concurrent enter_exit running 1656 # 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 1657 # and this sleep increases chances of the player not ending up in scorn
1658 $pl->ob->reply (undef,
1659 "There was an internal problem at your last logout, "
1660 . "the server will try to bring you to your intended destination in a second.",
1661 cf::NDI_RED);
1553 Coro::Timer::sleep 1; 1662 Coro::Timer::sleep 1;
1554 $pl->ob->leave_link; 1663 $pl->ob->leave_link;
1555 })->prio (2); 1664 })->prio (2);
1556 } 1665 }
1557 }, 1666 },
… …
1564sub cf::object::player::goto { 1673sub cf::object::player::goto {
1565 my ($self, $path, $x, $y) = @_; 1674 my ($self, $path, $x, $y) = @_;
1566 1675
1567 $self->enter_link; 1676 $self->enter_link;
1568 1677
1569 (Coro::async_pool { 1678 (async {
1570 $path = new cf::path $path; 1679 $path = new cf::path $path;
1571 1680
1572 my $map = cf::map::find $path->as_string; 1681 my $map = cf::map::find $path->as_string;
1573 $map = $map->customise_for ($self) if $map; 1682 $map = $map->customise_for ($self) if $map;
1574 1683
1575# warn "entering ", $map->path, " at ($x, $y)\n" 1684# warn "entering ", $map->path, " at ($x, $y)\n"
1576# if $map; 1685# if $map;
1577 1686
1687 $map or Carp::cluck ("oy");#d#
1578 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1688 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1579 1689
1580 $self->leave_link ($map, $x, $y); 1690 $self->leave_link ($map, $x, $y);
1581 })->prio (1); 1691 })->prio (1);
1582} 1692}
1583 1693
… …
1636 1746
1637 return unless $self->type == cf::PLAYER; 1747 return unless $self->type == cf::PLAYER;
1638 1748
1639 $self->enter_link; 1749 $self->enter_link;
1640 1750
1641 (Coro::async_pool { 1751 (async {
1642 $self->deactivate_recursive; # just to be sure 1752 $self->deactivate_recursive; # just to be sure
1643 unless (eval { 1753 unless (eval {
1644 prepare_random_map $exit 1754 prepare_random_map $exit
1645 if $exit->slaying eq "/!"; 1755 if $exit->slaying eq "/!";
1646 1756
… …
1727 } 1837 }
1728 } 1838 }
1729 }, 1839 },
1730); 1840);
1731 1841
1732=item $client->coro (\&cb) 1842=item $client->async (\&cb)
1733 1843
1734Create a new coroutine, running the specified callback. The coroutine will 1844Create a new coroutine, running the specified callback. The coroutine will
1735be automatically cancelled when the client gets destroyed (e.g. on logout, 1845be automatically cancelled when the client gets destroyed (e.g. on logout,
1736or loss of connection). 1846or loss of connection).
1737 1847
1738=cut 1848=cut
1739 1849
1740sub cf::client::coro { 1850sub cf::client::async {
1741 my ($self, $cb) = @_; 1851 my ($self, $cb) = @_;
1742 1852
1743 my $coro = &Coro::async_pool ($cb); 1853 my $coro = &Coro::async ($cb);
1744 1854
1745 $coro->on_destroy (sub { 1855 $coro->on_destroy (sub {
1746 delete $self->{_coro}{$coro+0}; 1856 delete $self->{_coro}{$coro+0};
1747 }); 1857 });
1748 1858
… …
1991 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2101 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
1992 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2102 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
1993 2103
1994 if (exists $CFG{mlockall}) { 2104 if (exists $CFG{mlockall}) {
1995 eval { 2105 eval {
1996 $CFG{mlockall} ? &mlockall : &munlockall 2106 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1997 and die "WARNING: m(un)lockall failed: $!\n"; 2107 and die "WARNING: m(un)lockall failed: $!\n";
1998 }; 2108 };
1999 warn $@ if $@; 2109 warn $@ if $@;
2000 } 2110 }
2001} 2111}
2002 2112
2003sub main { 2113sub main {
2004 # we must not ever block the main coroutine 2114 # we must not ever block the main coroutine
2005 local $Coro::idle = sub { 2115 local $Coro::idle = sub {
2006 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2116 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2007 Coro::async_pool { Event::one_event }; 2117 async { Event::one_event };
2008 }; 2118 };
2009 2119
2010 cfg_load; 2120 cfg_load;
2011 db_load; 2121 db_load;
2012 load_extensions; 2122 load_extensions;
… …
2095 cf::load_extensions; 2205 cf::load_extensions;
2096 2206
2097 # reattach attachments to objects 2207 # reattach attachments to objects
2098 warn "reattach"; 2208 warn "reattach";
2099 _global_reattach; 2209 _global_reattach;
2210 reattach $_ for values %MAP;
2100 }; 2211 };
2101 2212
2102 if ($@) { 2213 if ($@) {
2103 warn $@; 2214 warn $@;
2104 warn "error while reloading, exiting."; 2215 warn "error while reloading, exiting.";
… …
2120 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2231 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2121 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2232 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2122 2233
2123 # dirty hack because... archetypes are not yet loaded 2234 # dirty hack because... archetypes are not yet loaded
2124 Event->timer ( 2235 Event->timer (
2125 after => 2, 2236 after => 10,
2126 cb => sub { 2237 cb => sub {
2127 $_[0]->w->cancel; 2238 $_[0]->w->cancel;
2128 2239
2129 # provide some exits "home" 2240 # provide some exits "home"
2130 my $exit = cf::object::new "exit"; 2241 my $exit = cf::object::new "exit";

Diff Legend

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