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.137 by root, Fri Jan 5 10:23:05 2007 UTC vs.
Revision 1.144 by root, Sun Jan 7 18:01:10 2007 UTC

… …
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 path($) {
1094 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1095 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
1096} 1147}
1097 1148
1098=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1099 1150
1100Sends an ext reply to the player. 1151Sends an ext reply to the player.
1101 1152
1102=cut 1153=cut
1103 1154
1104sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1105 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1106 1157
1107 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1108 1159
1109 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1110} 1161}
1162
1163package cf;
1111 1164
1112=back 1165=back
1113 1166
1114 1167
1115=head3 cf::map 1168=head3 cf::map
… …
1311 1364
1312 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1313 1366
1314 local $self->{last_access} = $self->last_access;#d# 1367 local $self->{last_access} = $self->last_access;#d#
1315 1368
1369 cf::async {
1370 $_->contr->save for $self->players;
1371 };
1372
1316 if ($uniq) { 1373 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1376 } else {
1320 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1377 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
1417} 1474}
1418 1475
1419sub emergency_save { 1476sub emergency_save {
1420 my $freeze_guard = cf::freeze_mainloop; 1477 my $freeze_guard = cf::freeze_mainloop;
1421 1478
1422 warn "enter emergency map save\n"; 1479 warn "enter emergency perl save\n";
1423 1480
1424 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
1425 warn "begin emergency map save\n"; 1486 warn "begin emergency map save\n";
1426 $_->save for values %cf::MAP; 1487 $_->save for values %cf::MAP;
1488 warn "end emergency map save\n";
1427 }; 1489 };
1428 1490
1429 warn "end emergency map save\n"; 1491 warn "leave emergency perl save\n";
1430} 1492}
1431 1493
1432package cf; 1494package cf;
1433 1495
1434=back 1496=back
… …
1533 ($x, $y) = ($map->enter_x, $map->enter_y) 1595 ($x, $y) = ($map->enter_x, $map->enter_y)
1534 if $x <=0 && $y <= 0; 1596 if $x <=0 && $y <= 0;
1535 1597
1536 $map->load; 1598 $map->load;
1537 1599
1600 return unless $self->contr->active;
1538 $self->activate_recursive; 1601 $self->activate_recursive;
1539 $self->enter_map ($map, $x, $y); 1602 $self->enter_map ($map, $x, $y);
1540} 1603}
1541 1604
1542cf::player->attach ( 1605cf::player->attach (
… …
1555 1618
1556 # try to abort aborted map switching on player login :) 1619 # try to abort aborted map switching on player login :)
1557 # should happen only on crashes 1620 # should happen only on crashes
1558 if ($pl->ob->{_link_pos}) { 1621 if ($pl->ob->{_link_pos}) {
1559 $pl->ob->enter_link; 1622 $pl->ob->enter_link;
1560 cf::async { 1623 (async {
1561 # 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
1562 # 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);
1563 Coro::Timer::sleep 1; 1630 Coro::Timer::sleep 1;
1564 $pl->ob->leave_link; 1631 $pl->ob->leave_link;
1565 }; 1632 })->prio (2);
1566 } 1633 }
1567 }, 1634 },
1568); 1635);
1569 1636
1570=item $player_object->goto ($path, $x, $y) 1637=item $player_object->goto ($path, $x, $y)
… …
1574sub cf::object::player::goto { 1641sub cf::object::player::goto {
1575 my ($self, $path, $x, $y) = @_; 1642 my ($self, $path, $x, $y) = @_;
1576 1643
1577 $self->enter_link; 1644 $self->enter_link;
1578 1645
1579 (cf::async { 1646 (async {
1580 $path = new cf::path $path; 1647 $path = new cf::path $path;
1581 1648
1582 my $map = cf::map::find $path->as_string; 1649 my $map = cf::map::find $path->as_string;
1583 $map = $map->customise_for ($self) if $map; 1650 $map = $map->customise_for ($self) if $map;
1584 1651
… …
1646 1713
1647 return unless $self->type == cf::PLAYER; 1714 return unless $self->type == cf::PLAYER;
1648 1715
1649 $self->enter_link; 1716 $self->enter_link;
1650 1717
1651 (cf::async { 1718 (async {
1652 $self->deactivate_recursive; # just to be sure 1719 $self->deactivate_recursive; # just to be sure
1653 unless (eval { 1720 unless (eval {
1654 prepare_random_map $exit 1721 prepare_random_map $exit
1655 if $exit->slaying eq "/!"; 1722 if $exit->slaying eq "/!";
1656 1723
… …
1737 } 1804 }
1738 } 1805 }
1739 }, 1806 },
1740); 1807);
1741 1808
1742=item $client->coro (\&cb) 1809=item $client->async (\&cb)
1743 1810
1744Create a new coroutine, running the specified callback. The coroutine will 1811Create a new coroutine, running the specified callback. The coroutine will
1745be automatically cancelled when the client gets destroyed (e.g. on logout, 1812be automatically cancelled when the client gets destroyed (e.g. on logout,
1746or loss of connection). 1813or loss of connection).
1747 1814
1748=cut 1815=cut
1749 1816
1750sub cf::client::coro { 1817sub cf::client::async {
1751 my ($self, $cb) = @_; 1818 my ($self, $cb) = @_;
1752 1819
1753 my $coro = &cf::async ($cb); 1820 my $coro = &Coro::async ($cb);
1754 1821
1755 $coro->on_destroy (sub { 1822 $coro->on_destroy (sub {
1756 delete $self->{_coro}{$coro+0}; 1823 delete $self->{_coro}{$coro+0};
1757 }); 1824 });
1758 1825
… …
1996 local $/; 2063 local $/;
1997 *CFG = YAML::Syck::Load <$fh>; 2064 *CFG = YAML::Syck::Load <$fh>;
1998 2065
1999 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2066 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2000 2067
2068 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2069 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2070
2001 if (exists $CFG{mlockall}) { 2071 if (exists $CFG{mlockall}) {
2002 eval { 2072 eval {
2003 $CFG{mlockall} ? &mlockall : &munlockall 2073 $CFG{mlockall} ? &mlockall : &munlockall
2004 and die "WARNING: m(un)lockall failed: $!\n"; 2074 and die "WARNING: m(un)lockall failed: $!\n";
2005 }; 2075 };
… …
2009 2079
2010sub main { 2080sub main {
2011 # we must not ever block the main coroutine 2081 # we must not ever block the main coroutine
2012 local $Coro::idle = sub { 2082 local $Coro::idle = sub {
2013 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#
2014 (Coro::unblock_sub {
2015 Event::one_event; 2084 async { Event::one_event };
2016 })->();
2017 }; 2085 };
2018 2086
2019 cfg_load; 2087 cfg_load;
2020 db_load; 2088 db_load;
2021 load_extensions; 2089 load_extensions;
… …
2104 cf::load_extensions; 2172 cf::load_extensions;
2105 2173
2106 # reattach attachments to objects 2174 # reattach attachments to objects
2107 warn "reattach"; 2175 warn "reattach";
2108 _global_reattach; 2176 _global_reattach;
2177 reattach $_ for values %MAP;
2109 }; 2178 };
2110 2179
2111 if ($@) { 2180 if ($@) {
2112 warn $@; 2181 warn $@;
2113 warn "error while reloading, exiting."; 2182 warn "error while reloading, exiting.";
… …
2129 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2198 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2130 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2199 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2131 2200
2132 # dirty hack because... archetypes are not yet loaded 2201 # dirty hack because... archetypes are not yet loaded
2133 Event->timer ( 2202 Event->timer (
2134 after => 2, 2203 after => 10,
2135 cb => sub { 2204 cb => sub {
2136 $_[0]->w->cancel; 2205 $_[0]->w->cancel;
2137 2206
2138 # provide some exits "home" 2207 # provide some exits "home"
2139 my $exit = cf::object::new "exit"; 2208 my $exit = cf::object::new "exit";

Diff Legend

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