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.143 by root, Sun Jan 7 02:39:14 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
… …
1296} 1349}
1297 1350
1298sub save { 1351sub save {
1299 my ($self) = @_; 1352 my ($self) = @_;
1300 1353
1354 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355
1301 $self->{last_save} = $cf::RUNTIME; 1356 $self->{last_save} = $cf::RUNTIME;
1302 1357
1303 return unless $self->dirty; 1358 return unless $self->dirty;
1304 1359
1305 my $save = $self->{path}->save_path; utf8::encode $save; 1360 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1308 $self->{load_path} = $save; 1363 $self->{load_path} = $save;
1309 1364
1310 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1311 1366
1312 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 };
1313 1372
1314 if ($uniq) { 1373 if ($uniq) {
1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1316 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1317 } else { 1376 } else {
… …
1323 my ($self) = @_; 1382 my ($self) = @_;
1324 1383
1325 # save first because save cedes 1384 # save first because save cedes
1326 $self->save; 1385 $self->save;
1327 1386
1387 my $lock = cf::lock_acquire "map_data:" . $self->path;
1388
1328 return if $self->players; 1389 return if $self->players;
1329 return if $self->in_memory != cf::MAP_IN_MEMORY; 1390 return if $self->in_memory != cf::MAP_IN_MEMORY;
1330 return if $self->{deny_save}; 1391 return if $self->{deny_save};
1331 1392
1332 $self->clear; 1393 $self->clear;
… …
1373 $self->save; 1434 $self->save;
1374} 1435}
1375 1436
1376sub reset { 1437sub reset {
1377 my ($self) = @_; 1438 my ($self) = @_;
1439
1440 my $lock = cf::lock_acquire "map_data:" . $self->path;
1378 1441
1379 return if $self->players; 1442 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1443 return if $self->{path}{user_rel};#d#
1381 1444
1382 warn "resetting map ", $self->path;#d# 1445 warn "resetting map ", $self->path;#d#
… …
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1590 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1591 if $x <=0 && $y <= 0;
1529 1592
1530 $map->load; 1593 $map->load;
1531 1594
1595 return unless $self->contr->active;
1532 $self->activate_recursive; 1596 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1597 $self->enter_map ($map, $x, $y);
1534} 1598}
1535 1599
1536cf::player->attach ( 1600cf::player->attach (
… …
1549 1613
1550 # try to abort aborted map switching on player login :) 1614 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1615 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1616 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1617 $pl->ob->enter_link;
1554 cf::async { 1618 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1619 # 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 1620 # and this sleep increases chances of the player not ending up in scorn
1621 $pl->ob->reply (undef,
1622 "There was an internal problem at your last logout, "
1623 . "the server will try to bring you to your intended destination in a second.",
1624 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1625 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1626 $pl->ob->leave_link;
1559 }; 1627 })->prio (2);
1560 } 1628 }
1561 }, 1629 },
1562); 1630);
1563 1631
1564=item $player_object->goto ($path, $x, $y) 1632=item $player_object->goto ($path, $x, $y)
… …
1568sub cf::object::player::goto { 1636sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1637 my ($self, $path, $x, $y) = @_;
1570 1638
1571 $self->enter_link; 1639 $self->enter_link;
1572 1640
1573 (cf::async { 1641 (async {
1574 $path = new cf::path $path; 1642 $path = new cf::path $path;
1575 1643
1576 my $map = cf::map::find $path->as_string; 1644 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1645 $map = $map->customise_for ($self) if $map;
1578 1646
… …
1640 1708
1641 return unless $self->type == cf::PLAYER; 1709 return unless $self->type == cf::PLAYER;
1642 1710
1643 $self->enter_link; 1711 $self->enter_link;
1644 1712
1645 (cf::async { 1713 (async {
1646 $self->deactivate_recursive; # just to be sure 1714 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1715 unless (eval {
1648 prepare_random_map $exit 1716 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1717 if $exit->slaying eq "/!";
1650 1718
… …
1731 } 1799 }
1732 } 1800 }
1733 }, 1801 },
1734); 1802);
1735 1803
1736=item $client->coro (\&cb) 1804=item $client->async (\&cb)
1737 1805
1738Create a new coroutine, running the specified callback. The coroutine will 1806Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1807be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1808or loss of connection).
1741 1809
1742=cut 1810=cut
1743 1811
1744sub cf::client::coro { 1812sub cf::client::async {
1745 my ($self, $cb) = @_; 1813 my ($self, $cb) = @_;
1746 1814
1747 my $coro = &cf::async ($cb); 1815 my $coro = &Coro::async ($cb);
1748 1816
1749 $coro->on_destroy (sub { 1817 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1818 delete $self->{_coro}{$coro+0};
1751 }); 1819 });
1752 1820
… …
1990 local $/; 2058 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2059 *CFG = YAML::Syck::Load <$fh>;
1992 2060
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2061 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2062
2063 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2064 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2065
1995 if (exists $CFG{mlockall}) { 2066 if (exists $CFG{mlockall}) {
1996 eval { 2067 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2068 $CFG{mlockall} ? &mlockall : &munlockall
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2069 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2070 };
… …
2003 2074
2004sub main { 2075sub main {
2005 # we must not ever block the main coroutine 2076 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2077 local $Coro::idle = sub {
2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2078 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2079 async { Event::one_event };
2010 })->();
2011 }; 2080 };
2012 2081
2013 cfg_load; 2082 cfg_load;
2014 db_load; 2083 db_load;
2015 load_extensions; 2084 load_extensions;
… …
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2192 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2193 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2194
2126 # dirty hack because... archetypes are not yet loaded 2195 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2196 Event->timer (
2128 after => 2, 2197 after => 10,
2129 cb => sub { 2198 cb => sub {
2130 $_[0]->w->cancel; 2199 $_[0]->w->cancel;
2131 2200
2132 # provide some exits "home" 2201 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2202 my $exit = cf::object::new "exit";

Diff Legend

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