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.135 by root, Thu Jan 4 20:29:46 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
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
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
… …
221 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
223 } 224 }
224} 225}
225 226
226=item cf::async { BLOCK }
227
228Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
229error instead of exiting the server in case of a problem.
230
231=cut
232
233sub async(&) {
234 my ($cb) = @_;
235
236 Coro::async {
237 eval { $cb->() };
238 warn $@ if $@;
239 }
240}
241
242sub freeze_mainloop { 227sub freeze_mainloop {
243 return unless $TICK_WATCHER->is_active; 228 return unless $TICK_WATCHER->is_active;
244 229
245 my $guard = Coro::guard { $TICK_WATCHER->start }; 230 my $guard = Coro::guard { $TICK_WATCHER->start };
246 $TICK_WATCHER->stop; 231 $TICK_WATCHER->stop;
247 $guard 232 $guard
248} 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 }
249 244
250=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
251 246
252The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
272 my $freeze_guard = freeze_mainloop; 267 my $freeze_guard = freeze_mainloop;
273 268
274 my $busy = 1; 269 my $busy = 1;
275 my @res; 270 my @res;
276 271
277 (Coro::async { 272 (async {
278 @res = eval { $job->() }; 273 @res = eval { $job->() };
279 warn $@ if $@; 274 warn $@ if $@;
280 undef $busy; 275 undef $busy;
281 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
282 277
283 while ($busy) { 278 while ($busy) {
284 Coro::cede_notself; 279 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 280 }
287 281
288 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
289 } else { 283 } else {
290 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
291 285
292 $job->() 286 $job->()
293 } 287 }
294} 288}
295 289
296=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
297 291
298Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
299when the extension calling this is being unloaded. 293extension calling this is being unloaded.
300 294
301=cut 295=cut
302 296
303sub coro(&) { 297sub async_ext(&) {
304 my $cb = shift; 298 my $cb = shift;
305 299
306 my $coro = &cf::async ($cb); 300 my $coro = &Coro::async ($cb);
307 301
308 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
309 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
310 }); 304 });
311 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1078 1072
1079=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1080 1074
1081Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1082 1076
1077=cut
1078
1079package cf::player;
1080
1083=head3 cf::player 1081=head3 cf::player
1084 1082
1085=over 4 1083=over 4
1086 1084
1087=item cf::player::exists $login 1085=item cf::player::find $login
1088 1086
1089Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1090 1088
1091=cut 1089=cut
1092 1090
1093sub cf::player::exists($) { 1091sub playerdir($) {
1094 cf::player::find $_[0] 1092 cf::localdir
1095 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 };
1096} 1176}
1097 1177
1098=item $player->ext_reply ($msgid, $msgtype, %msg) 1178=item $player->ext_reply ($msgid, $msgtype, %msg)
1099 1179
1100Sends an ext reply to the player. 1180Sends an ext reply to the player.
1101 1181
1102=cut 1182=cut
1103 1183
1104sub cf::player::ext_reply($$$%) { 1184sub ext_reply($$$%) {
1105 my ($self, $id, %msg) = @_; 1185 my ($self, $id, %msg) = @_;
1106 1186
1107 $msg{msgid} = $id; 1187 $msg{msgid} = $id;
1108 1188
1109 $self->send ("ext " . to_json \%msg); 1189 $self->send ("ext " . cf::to_json \%msg);
1110} 1190}
1191
1192package cf;
1111 1193
1112=back 1194=back
1113 1195
1114 1196
1115=head3 cf::map 1197=head3 cf::map
… …
1296} 1378}
1297 1379
1298sub save { 1380sub save {
1299 my ($self) = @_; 1381 my ($self) = @_;
1300 1382
1383 my $lock = cf::lock_acquire "map_data:" . $self->path;
1384
1301 $self->{last_save} = $cf::RUNTIME; 1385 $self->{last_save} = $cf::RUNTIME;
1302 1386
1303 return unless $self->dirty; 1387 return unless $self->dirty;
1304 1388
1305 my $save = $self->{path}->save_path; utf8::encode $save; 1389 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1308 $self->{load_path} = $save; 1392 $self->{load_path} = $save;
1309 1393
1310 return if $self->{deny_save}; 1394 return if $self->{deny_save};
1311 1395
1312 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 };
1313 1401
1314 if ($uniq) { 1402 if ($uniq) {
1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1403 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1316 $self->save_objects ($uniq, cf::IO_UNIQUES); 1404 $self->save_objects ($uniq, cf::IO_UNIQUES);
1317 } else { 1405 } else {
… …
1323 my ($self) = @_; 1411 my ($self) = @_;
1324 1412
1325 # save first because save cedes 1413 # save first because save cedes
1326 $self->save; 1414 $self->save;
1327 1415
1416 my $lock = cf::lock_acquire "map_data:" . $self->path;
1417
1328 return if $self->players; 1418 return if $self->players;
1329 return if $self->in_memory != cf::MAP_IN_MEMORY; 1419 return if $self->in_memory != cf::MAP_IN_MEMORY;
1330 return if $self->{deny_save}; 1420 return if $self->{deny_save};
1331 1421
1332 $self->clear; 1422 $self->clear;
… …
1374} 1464}
1375 1465
1376sub reset { 1466sub reset {
1377 my ($self) = @_; 1467 my ($self) = @_;
1378 1468
1469 my $lock = cf::lock_acquire "map_data:" . $self->path;
1470
1379 return if $self->players; 1471 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1472 return if $self->{path}{user_rel};#d#
1381 1473
1382 warn "resetting map ", $self->path;#d# 1474 warn "resetting map ", $self->path;#d#
1383 1475
… …
1411} 1503}
1412 1504
1413sub emergency_save { 1505sub emergency_save {
1414 my $freeze_guard = cf::freeze_mainloop; 1506 my $freeze_guard = cf::freeze_mainloop;
1415 1507
1416 warn "enter emergency map save\n"; 1508 warn "enter emergency perl save\n";
1417 1509
1418 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
1419 warn "begin emergency map save\n"; 1515 warn "begin emergency map save\n";
1420 $_->save for values %cf::MAP; 1516 $_->save for values %cf::MAP;
1517 warn "end emergency map save\n";
1421 }; 1518 };
1422 1519
1423 warn "end emergency map save\n"; 1520 warn "leave emergency perl save\n";
1424} 1521}
1425 1522
1426package cf; 1523package cf;
1427 1524
1428=back 1525=back
… …
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1624 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1625 if $x <=0 && $y <= 0;
1529 1626
1530 $map->load; 1627 $map->load;
1531 1628
1629 return unless $self->contr->active;
1532 $self->activate_recursive; 1630 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1631 $self->enter_map ($map, $x, $y);
1534} 1632}
1535 1633
1536cf::player->attach ( 1634cf::player->attach (
… …
1549 1647
1550 # try to abort aborted map switching on player login :) 1648 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1649 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1650 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1651 $pl->ob->enter_link;
1554 cf::async { 1652 (async {
1555 # 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
1556 # 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);
1557 Coro::Timer::sleep 1; 1659 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1660 $pl->ob->leave_link;
1559 }; 1661 })->prio (2);
1560 } 1662 }
1561 }, 1663 },
1562); 1664);
1563 1665
1564=item $player_object->goto_map ($path, $x, $y) 1666=item $player_object->goto ($path, $x, $y)
1565 1667
1566=cut 1668=cut
1567 1669
1568sub cf::object::player::goto_map { 1670sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1671 my ($self, $path, $x, $y) = @_;
1570 1672
1571 $self->enter_link; 1673 $self->enter_link;
1572 1674
1573 (cf::async { 1675 (async {
1574 $path = new cf::path $path; 1676 $path = new cf::path $path;
1575 1677
1576 my $map = cf::map::find $path->as_string; 1678 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1679 $map = $map->customise_for ($self) if $map;
1578 1680
… …
1640 1742
1641 return unless $self->type == cf::PLAYER; 1743 return unless $self->type == cf::PLAYER;
1642 1744
1643 $self->enter_link; 1745 $self->enter_link;
1644 1746
1645 (cf::async { 1747 (async {
1646 $self->deactivate_recursive; # just to be sure 1748 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1749 unless (eval {
1648 prepare_random_map $exit 1750 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1751 if $exit->slaying eq "/!";
1650 1752
1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1753 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1754 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1653 1755
1654 1; 1756 1;
1655 }) { 1757 }) {
1656 $self->message ("Something went wrong deep within the crossfire server. " 1758 $self->message ("Something went wrong deep within the crossfire server. "
1657 . "I'll try to bring you back to the map you were before. " 1759 . "I'll try to bring you back to the map you were before. "
… …
1731 } 1833 }
1732 } 1834 }
1733 }, 1835 },
1734); 1836);
1735 1837
1736=item $client->coro (\&cb) 1838=item $client->async (\&cb)
1737 1839
1738Create a new coroutine, running the specified callback. The coroutine will 1840Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1841be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1842or loss of connection).
1741 1843
1742=cut 1844=cut
1743 1845
1744sub cf::client::coro { 1846sub cf::client::async {
1745 my ($self, $cb) = @_; 1847 my ($self, $cb) = @_;
1746 1848
1747 my $coro = &cf::async ($cb); 1849 my $coro = &Coro::async ($cb);
1748 1850
1749 $coro->on_destroy (sub { 1851 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1852 delete $self->{_coro}{$coro+0};
1751 }); 1853 });
1752 1854
… …
1990 local $/; 2092 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2093 *CFG = YAML::Syck::Load <$fh>;
1992 2094
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2095 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2096
2097 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2098 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2099
1995 if (exists $CFG{mlockall}) { 2100 if (exists $CFG{mlockall}) {
1996 eval { 2101 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2102 $CFG{mlockall} ? &mlockall : &munlockall
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2103 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2104 };
… …
2003 2108
2004sub main { 2109sub main {
2005 # we must not ever block the main coroutine 2110 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2111 local $Coro::idle = sub {
2007 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#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2113 async { Event::one_event };
2010 })->();
2011 }; 2114 };
2012 2115
2013 cfg_load; 2116 cfg_load;
2014 db_load; 2117 db_load;
2015 load_extensions; 2118 load_extensions;
… …
2098 cf::load_extensions; 2201 cf::load_extensions;
2099 2202
2100 # reattach attachments to objects 2203 # reattach attachments to objects
2101 warn "reattach"; 2204 warn "reattach";
2102 _global_reattach; 2205 _global_reattach;
2206 reattach $_ for values %MAP;
2103 }; 2207 };
2104 2208
2105 if ($@) { 2209 if ($@) {
2106 warn $@; 2210 warn $@;
2107 warn "error while reloading, exiting."; 2211 warn "error while reloading, exiting.";
… …
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2229
2126 # dirty hack because... archetypes are not yet loaded 2230 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2231 Event->timer (
2128 after => 2, 2232 after => 10,
2129 cb => sub { 2233 cb => sub {
2130 $_[0]->w->cancel; 2234 $_[0]->w->cancel;
2131 2235
2132 # provide some exits "home" 2236 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2237 my $exit = cf::object::new "exit";

Diff Legend

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