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.147 by root, Mon Jan 8 12:23:33 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';
… …
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 playerdir($) {
1078 cf::player::find $_[0] 1092 cf::localdir
1079 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
1138 IO::AIO::aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME;
1140
1141 Coro::cede;
1142 $pl->save_pl ($path);
1143 Coro::cede;
1144}
1145
1146sub new($) {
1147 my ($login) = @_;
1148
1149 my $self = create;
1150
1151 $self->ob->name ($login);
1152 $self->{deny_save} = 1;
1153
1154 $cf::PLAYER{$login} = $self;
1155
1156 $self
1157}
1158
1159sub quit_character {
1160 my ($pl) = @_;
1161
1162 $pl->{deny_save} = 1;
1163 $pl->password ("*"); # this should lock out the player until we nuked the dir
1164
1165 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1166 $pl->deactivate;
1167 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1168 $pl->ns->destroy if $pl->ns;
1169
1170 my $path = playerdir $pl;
1171 my $temp = "$path~$cf::RUNTIME~deleting~";
1172 IO::AIO::aio_rename $path, $temp, sub {
1173 delete $cf::PLAYER{$pl->ob->name};
1174 $pl->destroy;
1175
1176 IO::AIO::aio_rmtree $temp;
1177 };
1080} 1178}
1081 1179
1082=item $player->ext_reply ($msgid, $msgtype, %msg) 1180=item $player->ext_reply ($msgid, $msgtype, %msg)
1083 1181
1084Sends an ext reply to the player. 1182Sends an ext reply to the player.
1085 1183
1086=cut 1184=cut
1087 1185
1088sub cf::player::ext_reply($$$%) { 1186sub ext_reply($$$%) {
1089 my ($self, $id, %msg) = @_; 1187 my ($self, $id, %msg) = @_;
1090 1188
1091 $msg{msgid} = $id; 1189 $msg{msgid} = $id;
1092 1190
1093 $self->send ("ext " . to_json \%msg); 1191 $self->send ("ext " . cf::to_json \%msg);
1094} 1192}
1193
1194package cf;
1095 1195
1096=back 1196=back
1097 1197
1098 1198
1099=head3 cf::map 1199=head3 cf::map
… …
1295 1395
1296 return if $self->{deny_save}; 1396 return if $self->{deny_save};
1297 1397
1298 local $self->{last_access} = $self->last_access;#d# 1398 local $self->{last_access} = $self->last_access;#d#
1299 1399
1400 cf::async {
1401 $_->contr->save for $self->players;
1402 };
1403
1300 if ($uniq) { 1404 if ($uniq) {
1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1405 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1302 $self->save_objects ($uniq, cf::IO_UNIQUES); 1406 $self->save_objects ($uniq, cf::IO_UNIQUES);
1303 } else { 1407 } else {
1304 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1408 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
1401} 1505}
1402 1506
1403sub emergency_save { 1507sub emergency_save {
1404 my $freeze_guard = cf::freeze_mainloop; 1508 my $freeze_guard = cf::freeze_mainloop;
1405 1509
1406 warn "enter emergency map save\n"; 1510 warn "enter emergency perl save\n";
1407 1511
1408 cf::sync_job { 1512 cf::sync_job {
1513 warn "begin emergency player save\n";
1514 $_->save for values %cf::PLAYER;
1515 warn "end emergency player save\n";
1516
1409 warn "begin emergency map save\n"; 1517 warn "begin emergency map save\n";
1410 $_->save for values %cf::MAP; 1518 $_->save for values %cf::MAP;
1519 warn "end emergency map save\n";
1411 }; 1520 };
1412 1521
1413 warn "end emergency map save\n"; 1522 warn "leave emergency perl save\n";
1414} 1523}
1415 1524
1416package cf; 1525package cf;
1417 1526
1418=back 1527=back
… …
1517 ($x, $y) = ($map->enter_x, $map->enter_y) 1626 ($x, $y) = ($map->enter_x, $map->enter_y)
1518 if $x <=0 && $y <= 0; 1627 if $x <=0 && $y <= 0;
1519 1628
1520 $map->load; 1629 $map->load;
1521 1630
1631 return unless $self->contr->active;
1522 $self->activate_recursive; 1632 $self->activate_recursive;
1523 $self->enter_map ($map, $x, $y); 1633 $self->enter_map ($map, $x, $y);
1524} 1634}
1525 1635
1526cf::player->attach ( 1636cf::player->attach (
… …
1539 1649
1540 # try to abort aborted map switching on player login :) 1650 # try to abort aborted map switching on player login :)
1541 # should happen only on crashes 1651 # should happen only on crashes
1542 if ($pl->ob->{_link_pos}) { 1652 if ($pl->ob->{_link_pos}) {
1543 $pl->ob->enter_link; 1653 $pl->ob->enter_link;
1544 Coro::async_pool { 1654 (async {
1545 # we need this sleep as the login has a concurrent enter_exit running 1655 # 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 1656 # and this sleep increases chances of the player not ending up in scorn
1657 $pl->ob->reply (undef,
1658 "There was an internal problem at your last logout, "
1659 . "the server will try to bring you to your intended destination in a second.",
1660 cf::NDI_RED);
1547 Coro::Timer::sleep 1; 1661 Coro::Timer::sleep 1;
1548 $pl->ob->leave_link; 1662 $pl->ob->leave_link;
1549 }; 1663 })->prio (2);
1550 } 1664 }
1551 }, 1665 },
1552); 1666);
1553 1667
1554=item $player_object->goto ($path, $x, $y) 1668=item $player_object->goto ($path, $x, $y)
… …
1558sub cf::object::player::goto { 1672sub cf::object::player::goto {
1559 my ($self, $path, $x, $y) = @_; 1673 my ($self, $path, $x, $y) = @_;
1560 1674
1561 $self->enter_link; 1675 $self->enter_link;
1562 1676
1563 (Coro::async_pool { 1677 (async {
1564 $path = new cf::path $path; 1678 $path = new cf::path $path;
1565 1679
1566 my $map = cf::map::find $path->as_string; 1680 my $map = cf::map::find $path->as_string;
1567 $map = $map->customise_for ($self) if $map; 1681 $map = $map->customise_for ($self) if $map;
1568 1682
… …
1630 1744
1631 return unless $self->type == cf::PLAYER; 1745 return unless $self->type == cf::PLAYER;
1632 1746
1633 $self->enter_link; 1747 $self->enter_link;
1634 1748
1635 (Coro::async_pool { 1749 (async {
1636 $self->deactivate_recursive; # just to be sure 1750 $self->deactivate_recursive; # just to be sure
1637 unless (eval { 1751 unless (eval {
1638 prepare_random_map $exit 1752 prepare_random_map $exit
1639 if $exit->slaying eq "/!"; 1753 if $exit->slaying eq "/!";
1640 1754
… …
1721 } 1835 }
1722 } 1836 }
1723 }, 1837 },
1724); 1838);
1725 1839
1726=item $client->coro (\&cb) 1840=item $client->async (\&cb)
1727 1841
1728Create a new coroutine, running the specified callback. The coroutine will 1842Create a new coroutine, running the specified callback. The coroutine will
1729be automatically cancelled when the client gets destroyed (e.g. on logout, 1843be automatically cancelled when the client gets destroyed (e.g. on logout,
1730or loss of connection). 1844or loss of connection).
1731 1845
1732=cut 1846=cut
1733 1847
1734sub cf::client::coro { 1848sub cf::client::async {
1735 my ($self, $cb) = @_; 1849 my ($self, $cb) = @_;
1736 1850
1737 my $coro = &Coro::async_pool ($cb); 1851 my $coro = &Coro::async ($cb);
1738 1852
1739 $coro->on_destroy (sub { 1853 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1854 delete $self->{_coro}{$coro+0};
1741 }); 1855 });
1742 1856
… …
1980 local $/; 2094 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 2095 *CFG = YAML::Syck::Load <$fh>;
1982 2096
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2097 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984 2098
2099 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2100 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2101
1985 if (exists $CFG{mlockall}) { 2102 if (exists $CFG{mlockall}) {
1986 eval { 2103 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall 2104 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1988 and die "WARNING: m(un)lockall failed: $!\n"; 2105 and die "WARNING: m(un)lockall failed: $!\n";
1989 }; 2106 };
1990 warn $@ if $@; 2107 warn $@ if $@;
1991 } 2108 }
1992} 2109}
1993 2110
1994sub main { 2111sub main {
1995 # we must not ever block the main coroutine 2112 # we must not ever block the main coroutine
1996 local $Coro::idle = sub { 2113 local $Coro::idle = sub {
1997 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2114 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1998 (Coro::unblock_sub {
1999 Event::one_event; 2115 async { Event::one_event };
2000 })->();
2001 }; 2116 };
2002 2117
2003 cfg_load; 2118 cfg_load;
2004 db_load; 2119 db_load;
2005 load_extensions; 2120 load_extensions;
… …
2088 cf::load_extensions; 2203 cf::load_extensions;
2089 2204
2090 # reattach attachments to objects 2205 # reattach attachments to objects
2091 warn "reattach"; 2206 warn "reattach";
2092 _global_reattach; 2207 _global_reattach;
2208 reattach $_ for values %MAP;
2093 }; 2209 };
2094 2210
2095 if ($@) { 2211 if ($@) {
2096 warn $@; 2212 warn $@;
2097 warn "error while reloading, exiting."; 2213 warn "error while reloading, exiting.";
… …
2113 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2229 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2114 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2230 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2115 2231
2116 # dirty hack because... archetypes are not yet loaded 2232 # dirty hack because... archetypes are not yet loaded
2117 Event->timer ( 2233 Event->timer (
2118 after => 2, 2234 after => 10,
2119 cb => sub { 2235 cb => sub {
2120 $_[0]->w->cancel; 2236 $_[0]->w->cancel;
2121 2237
2122 # provide some exits "home" 2238 # provide some exits "home"
2123 my $exit = cf::object::new "exit"; 2239 my $exit = cf::object::new "exit";

Diff Legend

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