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.138 by root, Fri Jan 5 17:07:17 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
… …
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 Coro::cede_notself; 279 Coro::cede or Event::one_event;
269 Event::one_event unless Coro::nready;
270 } 280 }
271 281
272 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
273 } else { 283 } else {
274 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
275 285
276 $job->() 286 $job->()
277 } 287 }
278} 288}
279 289
280=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
281 291
282Creates (and readies) and returns a new coro. This coro is automcatially 292Like async, but this coro is automcatially being canceled when the
283being canceled when the extension calling this is being unloaded. 293extension calling this is being unloaded.
284 294
285=cut 295=cut
286 296
287sub coro(&) { 297sub async_ext(&) {
288 my $cb = shift; 298 my $cb = shift;
289 299
290 my $coro = &Coro::async_pool ($cb); 300 my $coro = &Coro::async ($cb);
291 301
292 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
293 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
294 }); 304 });
295 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1062 1072
1063=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1064 1074
1065Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1066 1076
1077=cut
1078
1079package cf::player;
1080
1067=head3 cf::player 1081=head3 cf::player
1068 1082
1069=over 4 1083=over 4
1070 1084
1071=item cf::player::exists $login 1085=item cf::player::find $login
1072 1086
1073Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1074 1088
1075=cut 1089=cut
1076 1090
1077sub cf::player::exists($) { 1091sub path($) {
1078 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1079 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
1080} 1147}
1081 1148
1082=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1083 1150
1084Sends an ext reply to the player. 1151Sends an ext reply to the player.
1085 1152
1086=cut 1153=cut
1087 1154
1088sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1089 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1090 1157
1091 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1092 1159
1093 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1094} 1161}
1162
1163package cf;
1095 1164
1096=back 1165=back
1097 1166
1098 1167
1099=head3 cf::map 1168=head3 cf::map
… …
1295 1364
1296 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1297 1366
1298 local $self->{last_access} = $self->last_access;#d# 1367 local $self->{last_access} = $self->last_access;#d#
1299 1368
1369 cf::async {
1370 $_->contr->save for $self->players;
1371 };
1372
1300 if ($uniq) { 1373 if ($uniq) {
1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1302 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1303 } else { 1376 } else {
1304 $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);
… …
1401} 1474}
1402 1475
1403sub emergency_save { 1476sub emergency_save {
1404 my $freeze_guard = cf::freeze_mainloop; 1477 my $freeze_guard = cf::freeze_mainloop;
1405 1478
1406 warn "enter emergency map save\n"; 1479 warn "enter emergency perl save\n";
1407 1480
1408 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
1409 warn "begin emergency map save\n"; 1486 warn "begin emergency map save\n";
1410 $_->save for values %cf::MAP; 1487 $_->save for values %cf::MAP;
1488 warn "end emergency map save\n";
1411 }; 1489 };
1412 1490
1413 warn "end emergency map save\n"; 1491 warn "leave emergency perl save\n";
1414} 1492}
1415 1493
1416package cf; 1494package cf;
1417 1495
1418=back 1496=back
… …
1517 ($x, $y) = ($map->enter_x, $map->enter_y) 1595 ($x, $y) = ($map->enter_x, $map->enter_y)
1518 if $x <=0 && $y <= 0; 1596 if $x <=0 && $y <= 0;
1519 1597
1520 $map->load; 1598 $map->load;
1521 1599
1600 return unless $self->contr->active;
1522 $self->activate_recursive; 1601 $self->activate_recursive;
1523 $self->enter_map ($map, $x, $y); 1602 $self->enter_map ($map, $x, $y);
1524} 1603}
1525 1604
1526cf::player->attach ( 1605cf::player->attach (
… …
1539 1618
1540 # try to abort aborted map switching on player login :) 1619 # try to abort aborted map switching on player login :)
1541 # should happen only on crashes 1620 # should happen only on crashes
1542 if ($pl->ob->{_link_pos}) { 1621 if ($pl->ob->{_link_pos}) {
1543 $pl->ob->enter_link; 1622 $pl->ob->enter_link;
1544 Coro::async_pool { 1623 (async {
1545 # 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
1546 # 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);
1547 Coro::Timer::sleep 1; 1630 Coro::Timer::sleep 1;
1548 $pl->ob->leave_link; 1631 $pl->ob->leave_link;
1549 }; 1632 })->prio (2);
1550 } 1633 }
1551 }, 1634 },
1552); 1635);
1553 1636
1554=item $player_object->goto ($path, $x, $y) 1637=item $player_object->goto ($path, $x, $y)
… …
1558sub cf::object::player::goto { 1641sub cf::object::player::goto {
1559 my ($self, $path, $x, $y) = @_; 1642 my ($self, $path, $x, $y) = @_;
1560 1643
1561 $self->enter_link; 1644 $self->enter_link;
1562 1645
1563 (Coro::async_pool { 1646 (async {
1564 $path = new cf::path $path; 1647 $path = new cf::path $path;
1565 1648
1566 my $map = cf::map::find $path->as_string; 1649 my $map = cf::map::find $path->as_string;
1567 $map = $map->customise_for ($self) if $map; 1650 $map = $map->customise_for ($self) if $map;
1568 1651
… …
1630 1713
1631 return unless $self->type == cf::PLAYER; 1714 return unless $self->type == cf::PLAYER;
1632 1715
1633 $self->enter_link; 1716 $self->enter_link;
1634 1717
1635 (Coro::async_pool { 1718 (async {
1636 $self->deactivate_recursive; # just to be sure 1719 $self->deactivate_recursive; # just to be sure
1637 unless (eval { 1720 unless (eval {
1638 prepare_random_map $exit 1721 prepare_random_map $exit
1639 if $exit->slaying eq "/!"; 1722 if $exit->slaying eq "/!";
1640 1723
… …
1721 } 1804 }
1722 } 1805 }
1723 }, 1806 },
1724); 1807);
1725 1808
1726=item $client->coro (\&cb) 1809=item $client->async (\&cb)
1727 1810
1728Create a new coroutine, running the specified callback. The coroutine will 1811Create a new coroutine, running the specified callback. The coroutine will
1729be automatically cancelled when the client gets destroyed (e.g. on logout, 1812be automatically cancelled when the client gets destroyed (e.g. on logout,
1730or loss of connection). 1813or loss of connection).
1731 1814
1732=cut 1815=cut
1733 1816
1734sub cf::client::coro { 1817sub cf::client::async {
1735 my ($self, $cb) = @_; 1818 my ($self, $cb) = @_;
1736 1819
1737 my $coro = &Coro::async_pool ($cb); 1820 my $coro = &Coro::async ($cb);
1738 1821
1739 $coro->on_destroy (sub { 1822 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1823 delete $self->{_coro}{$coro+0};
1741 }); 1824 });
1742 1825
… …
1980 local $/; 2063 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 2064 *CFG = YAML::Syck::Load <$fh>;
1982 2065
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2066 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984 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
1985 if (exists $CFG{mlockall}) { 2071 if (exists $CFG{mlockall}) {
1986 eval { 2072 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall 2073 $CFG{mlockall} ? &mlockall : &munlockall
1988 and die "WARNING: m(un)lockall failed: $!\n"; 2074 and die "WARNING: m(un)lockall failed: $!\n";
1989 }; 2075 };
… …
1993 2079
1994sub main { 2080sub main {
1995 # we must not ever block the main coroutine 2081 # we must not ever block the main coroutine
1996 local $Coro::idle = sub { 2082 local $Coro::idle = sub {
1997 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#
1998 (Coro::unblock_sub {
1999 Event::one_event; 2084 async { Event::one_event };
2000 })->();
2001 }; 2085 };
2002 2086
2003 cfg_load; 2087 cfg_load;
2004 db_load; 2088 db_load;
2005 load_extensions; 2089 load_extensions;
… …
2088 cf::load_extensions; 2172 cf::load_extensions;
2089 2173
2090 # reattach attachments to objects 2174 # reattach attachments to objects
2091 warn "reattach"; 2175 warn "reattach";
2092 _global_reattach; 2176 _global_reattach;
2177 reattach $_ for values %MAP;
2093 }; 2178 };
2094 2179
2095 if ($@) { 2180 if ($@) {
2096 warn $@; 2181 warn $@;
2097 warn "error while reloading, exiting."; 2182 warn "error while reloading, exiting.";
… …
2113 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2198 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2114 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2199 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2115 2200
2116 # dirty hack because... archetypes are not yet loaded 2201 # dirty hack because... archetypes are not yet loaded
2117 Event->timer ( 2202 Event->timer (
2118 after => 2, 2203 after => 10,
2119 cb => sub { 2204 cb => sub {
2120 $_[0]->w->cancel; 2205 $_[0]->w->cancel;
2121 2206
2122 # provide some exits "home" 2207 # provide some exits "home"
2123 my $exit = cf::object::new "exit"; 2208 my $exit = cf::object::new "exit";

Diff Legend

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