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.136 by root, Fri Jan 5 01:06:28 2007 UTC vs.
Revision 1.151 by root, Mon Jan 8 20:59:15 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
… …
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';
… …
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{$_[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;
1096} 1179}
1097 1180
1098=item $player->ext_reply ($msgid, $msgtype, %msg) 1181=item $player->ext_reply ($msgid, $msgtype, %msg)
1099 1182
1100Sends an ext reply to the player. 1183Sends an ext reply to the player.
1101 1184
1102=cut 1185=cut
1103 1186
1104sub cf::player::ext_reply($$$%) { 1187sub ext_reply($$$%) {
1105 my ($self, $id, %msg) = @_; 1188 my ($self, $id, %msg) = @_;
1106 1189
1107 $msg{msgid} = $id; 1190 $msg{msgid} = $id;
1108 1191
1109 $self->send ("ext " . to_json \%msg); 1192 $self->send ("ext " . cf::to_json \%msg);
1110} 1193}
1194
1195package cf;
1111 1196
1112=back 1197=back
1113 1198
1114 1199
1115=head3 cf::map 1200=head3 cf::map
… …
1296} 1381}
1297 1382
1298sub save { 1383sub save {
1299 my ($self) = @_; 1384 my ($self) = @_;
1300 1385
1386 my $lock = cf::lock_acquire "map_data:" . $self->path;
1387
1301 $self->{last_save} = $cf::RUNTIME; 1388 $self->{last_save} = $cf::RUNTIME;
1302 1389
1303 return unless $self->dirty; 1390 return unless $self->dirty;
1304 1391
1305 my $save = $self->{path}->save_path; utf8::encode $save; 1392 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1308 $self->{load_path} = $save; 1395 $self->{load_path} = $save;
1309 1396
1310 return if $self->{deny_save}; 1397 return if $self->{deny_save};
1311 1398
1312 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 };
1313 1404
1314 if ($uniq) { 1405 if ($uniq) {
1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1406 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1316 $self->save_objects ($uniq, cf::IO_UNIQUES); 1407 $self->save_objects ($uniq, cf::IO_UNIQUES);
1317 } else { 1408 } else {
… …
1323 my ($self) = @_; 1414 my ($self) = @_;
1324 1415
1325 # save first because save cedes 1416 # save first because save cedes
1326 $self->save; 1417 $self->save;
1327 1418
1419 my $lock = cf::lock_acquire "map_data:" . $self->path;
1420
1328 return if $self->players; 1421 return if $self->players;
1329 return if $self->in_memory != cf::MAP_IN_MEMORY; 1422 return if $self->in_memory != cf::MAP_IN_MEMORY;
1330 return if $self->{deny_save}; 1423 return if $self->{deny_save};
1331 1424
1332 $self->clear; 1425 $self->clear;
… …
1374} 1467}
1375 1468
1376sub reset { 1469sub reset {
1377 my ($self) = @_; 1470 my ($self) = @_;
1378 1471
1472 my $lock = cf::lock_acquire "map_data:" . $self->path;
1473
1379 return if $self->players; 1474 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1475 return if $self->{path}{user_rel};#d#
1381 1476
1382 warn "resetting map ", $self->path;#d# 1477 warn "resetting map ", $self->path;#d#
1383 1478
… …
1411} 1506}
1412 1507
1413sub emergency_save { 1508sub emergency_save {
1414 my $freeze_guard = cf::freeze_mainloop; 1509 my $freeze_guard = cf::freeze_mainloop;
1415 1510
1416 warn "enter emergency map save\n"; 1511 warn "enter emergency perl save\n";
1417 1512
1418 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
1419 warn "begin emergency map save\n"; 1518 warn "begin emergency map save\n";
1420 $_->save for values %cf::MAP; 1519 $_->save for values %cf::MAP;
1520 warn "end emergency map save\n";
1421 }; 1521 };
1422 1522
1423 warn "end emergency map save\n"; 1523 warn "leave emergency perl save\n";
1424} 1524}
1425 1525
1426package cf; 1526package cf;
1427 1527
1428=back 1528=back
… …
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1627 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1628 if $x <=0 && $y <= 0;
1529 1629
1530 $map->load; 1630 $map->load;
1531 1631
1632 return unless $self->contr->active;
1532 $self->activate_recursive; 1633 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1634 $self->enter_map ($map, $x, $y);
1534} 1635}
1535 1636
1536cf::player->attach ( 1637cf::player->attach (
… …
1549 1650
1550 # try to abort aborted map switching on player login :) 1651 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1652 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1653 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1654 $pl->ob->enter_link;
1554 cf::async { 1655 (async {
1555 # 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
1556 # 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);
1557 Coro::Timer::sleep 1; 1662 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1663 $pl->ob->leave_link;
1559 }; 1664 })->prio (2);
1560 } 1665 }
1561 }, 1666 },
1562); 1667);
1563 1668
1564=item $player_object->goto ($path, $x, $y) 1669=item $player_object->goto ($path, $x, $y)
… …
1568sub cf::object::player::goto { 1673sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1674 my ($self, $path, $x, $y) = @_;
1570 1675
1571 $self->enter_link; 1676 $self->enter_link;
1572 1677
1573 (cf::async { 1678 (async {
1574 $path = new cf::path $path; 1679 $path = new cf::path $path;
1575 1680
1576 my $map = cf::map::find $path->as_string; 1681 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1682 $map = $map->customise_for ($self) if $map;
1578 1683
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1684# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1685# if $map;
1581 1686
1687 $map or $map->cluck ("oy");#d#
1582 $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);
1583 1689
1584 $self->leave_link ($map, $x, $y); 1690 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1691 })->prio (1);
1586} 1692}
1587 1693
… …
1640 1746
1641 return unless $self->type == cf::PLAYER; 1747 return unless $self->type == cf::PLAYER;
1642 1748
1643 $self->enter_link; 1749 $self->enter_link;
1644 1750
1645 (cf::async { 1751 (async {
1646 $self->deactivate_recursive; # just to be sure 1752 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1753 unless (eval {
1648 prepare_random_map $exit 1754 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1755 if $exit->slaying eq "/!";
1650 1756
… …
1731 } 1837 }
1732 } 1838 }
1733 }, 1839 },
1734); 1840);
1735 1841
1736=item $client->coro (\&cb) 1842=item $client->async (\&cb)
1737 1843
1738Create a new coroutine, running the specified callback. The coroutine will 1844Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1845be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1846or loss of connection).
1741 1847
1742=cut 1848=cut
1743 1849
1744sub cf::client::coro { 1850sub cf::client::async {
1745 my ($self, $cb) = @_; 1851 my ($self, $cb) = @_;
1746 1852
1747 my $coro = &cf::async ($cb); 1853 my $coro = &Coro::async ($cb);
1748 1854
1749 $coro->on_destroy (sub { 1855 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1856 delete $self->{_coro}{$coro+0};
1751 }); 1857 });
1752 1858
… …
1990 local $/; 2096 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2097 *CFG = YAML::Syck::Load <$fh>;
1992 2098
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2099 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2100
2101 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2102 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2103
1995 if (exists $CFG{mlockall}) { 2104 if (exists $CFG{mlockall}) {
1996 eval { 2105 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2106 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2107 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2108 };
2000 warn $@ if $@; 2109 warn $@ if $@;
2001 } 2110 }
2002} 2111}
2003 2112
2004sub main { 2113sub main {
2005 # we must not ever block the main coroutine 2114 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2115 local $Coro::idle = sub {
2007 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#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2117 async { Event::one_event };
2010 })->();
2011 }; 2118 };
2012 2119
2013 cfg_load; 2120 cfg_load;
2014 db_load; 2121 db_load;
2015 load_extensions; 2122 load_extensions;
… …
2098 cf::load_extensions; 2205 cf::load_extensions;
2099 2206
2100 # reattach attachments to objects 2207 # reattach attachments to objects
2101 warn "reattach"; 2208 warn "reattach";
2102 _global_reattach; 2209 _global_reattach;
2210 reattach $_ for values %MAP;
2103 }; 2211 };
2104 2212
2105 if ($@) { 2213 if ($@) {
2106 warn $@; 2214 warn $@;
2107 warn "error while reloading, exiting."; 2215 warn "error while reloading, exiting.";
… …
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2231 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2232 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2233
2126 # dirty hack because... archetypes are not yet loaded 2234 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2235 Event->timer (
2128 after => 2, 2236 after => 10,
2129 cb => sub { 2237 cb => sub {
2130 $_[0]->w->cancel; 2238 $_[0]->w->cancel;
2131 2239
2132 # provide some exits "home" 2240 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2241 my $exit = cf::object::new "exit";

Diff Legend

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