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.154 by root, Tue Jan 9 15:36:19 2007 UTC

… …
15use Coro::Timer; 15use Coro::Timer;
16use Coro::Signal; 16use Coro::Signal;
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Data::Dumper;
20use Digest::MD5; 21use Digest::MD5;
21use Fcntl; 22use Fcntl;
22use IO::AIO 2.31 (); 23use IO::AIO 2.32 ();
23use YAML::Syck (); 24use YAML::Syck ();
24use Time::HiRes; 25use Time::HiRes;
25 26
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 27use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 28
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 29# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 30$YAML::Syck::ImplicitUnicode = 1;
30 31
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 32$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 33
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 34sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
… …
47our %CFG; 48our %CFG;
48 49
49our $UPTIME; $UPTIME ||= time; 50our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 51our $RUNTIME;
51 52
53our %PLAYER; # all users
52our %MAP; # all maps 54our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
54our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
56 58
57binmode STDOUT; 59binmode STDOUT;
58binmode STDERR; 60binmode STDERR;
59 61
60# read virtual server time, if available 62# read virtual server time, if available
… …
117 utf8::encode $msg; 119 utf8::encode $msg;
118 120
119 $msg .= "\n" 121 $msg .= "\n"
120 unless $msg =~ /\n$/; 122 unless $msg =~ /\n$/;
121 123
122 LOG llevError, "cfperl: $msg"; 124 LOG llevError, $msg;
123 }; 125 };
124} 126}
125 127
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
153 155
154=head2 UTILITY FUNCTIONS 156=head2 UTILITY FUNCTIONS
155 157
156=over 4 158=over 4
157 159
160=item dumpval $ref
161
158=cut 162=cut
163
164sub dumpval {
165 eval {
166 local $SIG{__DIE__};
167 my $d;
168 if (1) {
169 $d = new Data::Dumper([$_[0]], ["*var"]);
170 $d->Terse(1);
171 $d->Indent(2);
172 $d->Quotekeys(0);
173 $d->Useqq(1);
174 #$d->Bless(...);
175 $d->Seen($_[1]) if @_ > 1;
176 $d = $d->Dump();
177 }
178 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
179 $d
180 } || "[unable to dump $_[0]: '$@']";
181}
159 182
160use JSON::Syck (); # TODO# replace by JSON::PC once working 183use JSON::Syck (); # TODO# replace by JSON::PC once working
161 184
162=item $ref = cf::from_json $json 185=item $ref = cf::from_json $json
163 186
… …
228 251
229 my $guard = Coro::guard { $TICK_WATCHER->start }; 252 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop; 253 $TICK_WATCHER->stop;
231 $guard 254 $guard
232} 255}
256
257=item cf::async { BLOCK }
258
259Currently the same as Coro::async_pool, meaning you cannot use
260C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
261thing you are allowed to do is call C<prio> on it.
262
263=cut
264
265BEGIN { *async = \&Coro::async_pool }
233 266
234=item cf::sync_job { BLOCK } 267=item cf::sync_job { BLOCK }
235 268
236The design of crossfire+ requires that the main coro ($Coro::main) is 269The design of crossfire+ requires that the main coro ($Coro::main) is
237always able to handle events or runnable, as crossfire+ is only partly 270always able to handle events or runnable, as crossfire+ is only partly
… …
256 my $freeze_guard = freeze_mainloop; 289 my $freeze_guard = freeze_mainloop;
257 290
258 my $busy = 1; 291 my $busy = 1;
259 my @res; 292 my @res;
260 293
261 (Coro::async_pool { 294 (async {
262 @res = eval { $job->() }; 295 @res = eval { $job->() };
263 warn $@ if $@; 296 warn $@ if $@;
264 undef $busy; 297 undef $busy;
265 })->prio (Coro::PRIO_MAX); 298 })->prio (Coro::PRIO_MAX);
266 299
267 while ($busy) { 300 while ($busy) {
268 Coro::cede_notself; 301 Coro::cede or Event::one_event;
269 Event::one_event unless Coro::nready;
270 } 302 }
271 303
272 wantarray ? @res : $res[0] 304 wantarray ? @res : $res[0]
273 } else { 305 } else {
274 # we are in another coroutine, how wonderful, everything just works 306 # we are in another coroutine, how wonderful, everything just works
275 307
276 $job->() 308 $job->()
277 } 309 }
278} 310}
279 311
280=item $coro = cf::coro { BLOCK } 312=item $coro = cf::async_ext { BLOCK }
281 313
282Creates (and readies) and returns a new coro. This coro is automcatially 314Like async, but this coro is automcatially being canceled when the
283being canceled when the extension calling this is being unloaded. 315extension calling this is being unloaded.
284 316
285=cut 317=cut
286 318
287sub coro(&) { 319sub async_ext(&) {
288 my $cb = shift; 320 my $cb = shift;
289 321
290 my $coro = &Coro::async_pool ($cb); 322 my $coro = &Coro::async ($cb);
291 323
292 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
293 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
294 }); 326 });
295 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
… …
324=cut 356=cut
325 357
326############################################################################# 358#############################################################################
327 359
328package cf::path; 360package cf::path;
361
362# used to convert map paths into valid unix filenames by repalcing / by ∕
363our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
329 364
330sub new { 365sub new {
331 my ($class, $path, $base) = @_; 366 my ($class, $path, $base) = @_;
332 367
333 $path = $path->as_string if ref $path; 368 $path = $path->as_string if ref $path;
… …
397# } 432# }
398} 433}
399 434
400# escape the /'s in the path 435# escape the /'s in the path
401sub _escaped_path { 436sub _escaped_path {
402 # ∕ is U+2215
403 (my $path = $_[0]{path}) =~ s/\//∕/g; 437 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
404 $path 438 $path
405} 439}
406 440
407# the original (read-only) location 441# the original (read-only) location
408sub load_path { 442sub load_path {
… …
1062 1096
1063=head2 CORE EXTENSIONS 1097=head2 CORE EXTENSIONS
1064 1098
1065Functions and methods that extend core crossfire objects. 1099Functions and methods that extend core crossfire objects.
1066 1100
1101=cut
1102
1103package cf::player;
1104
1105use Coro::AIO;
1106
1067=head3 cf::player 1107=head3 cf::player
1068 1108
1069=over 4 1109=over 4
1070 1110
1071=item cf::player::exists $login 1111=item cf::player::find $login
1072 1112
1073Returns true when the given account exists. 1113Returns the given player object, loading it if necessary (might block).
1074 1114
1075=cut 1115=cut
1076 1116
1077sub cf::player::exists($) { 1117sub playerdir($) {
1078 cf::player::find $_[0] 1118 cf::localdir
1079 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1119 . "/"
1120 . cf::playerdir
1121 . "/"
1122 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1123}
1124
1125sub path($) {
1126 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1127
1128 (playerdir $login) . "/$login.pl"
1129}
1130
1131sub find_active($) {
1132 $cf::PLAYER{$_[0]}
1133 and $cf::PLAYER{$_[0]}->active
1134 and $cf::PLAYER{$_[0]}
1135}
1136
1137sub exists($) {
1138 my ($login) = @_;
1139
1140 $cf::PLAYER{$login}
1141 or cf::sync_job { !aio_stat $login }
1142}
1143
1144sub find($) {
1145 return $cf::PLAYER{$_[0]} || do {
1146 my $login = $_[0];
1147
1148 my $guard = cf::lock_acquire "user_find:$login";
1149
1150 $cf::PLAYER{$_[0]} || do {
1151 my $pl = load_pl path $login
1152 or return;
1153 $cf::PLAYER{$login} = $pl
1154 }
1155 }
1156}
1157
1158sub save($) {
1159 my ($pl) = @_;
1160
1161 return if $pl->{deny_save};
1162
1163 my $path = path $pl;
1164 my $guard = cf::lock_acquire "user_save:$path";
1165
1166 return if $pl->{deny_save};
1167
1168 aio_mkdir playerdir $pl, 0770;
1169 $pl->{last_save} = $cf::RUNTIME;
1170
1171 $pl->save_pl ($path);
1172 Coro::cede;
1173}
1174
1175sub new($) {
1176 my ($login) = @_;
1177
1178 my $self = create;
1179
1180 $self->ob->name ($login);
1181 $self->{deny_save} = 1;
1182
1183 $cf::PLAYER{$login} = $self;
1184
1185 $self
1186}
1187
1188=item $pl->quit_character
1189
1190Nukes the player without looking back. If logged in, the connection will
1191be destroyed. May block for a long time.
1192
1193=cut
1194
1195sub quit_character {
1196 my ($pl) = @_;
1197
1198 $pl->{deny_save} = 1;
1199 $pl->password ("*"); # this should lock out the player until we nuked the dir
1200
1201 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1202 $pl->deactivate;
1203 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1204 $pl->ns->destroy if $pl->ns;
1205
1206 my $path = playerdir $pl;
1207 my $temp = "$path~$cf::RUNTIME~deleting~";
1208 aio_rename $path, $temp;
1209 delete $cf::PLAYER{$pl->ob->name};
1210 $pl->destroy;
1211 IO::AIO::aio_rmtree $temp;
1212}
1213
1214=item cf::player::list_logins
1215
1216Returns am arrayref of all valid playernames in the system, can take a
1217while and may block, so not sync_job-capable, ever.
1218
1219=cut
1220
1221sub list_logins {
1222 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1223 or return [];
1224
1225 my @logins;
1226
1227 for my $login (@$dirs) {
1228 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1229 aio_read $fh, 0, 512, my $buf, 0 or next;
1230 $buf !~ /^password -------------$/ or next; # official not-valid tag
1231
1232 utf8::decode $login;
1233 push @logins, $login;
1234 }
1235
1236 \@logins
1237}
1238
1239=item $player->maps
1240
1241Returns an arrayref of cf::path's of all maps that are private for this
1242player. May block.
1243
1244=cut
1245
1246sub maps($) {
1247 my ($pl) = @_;
1248
1249 my $files = aio_readdir playerdir $pl
1250 or return;
1251
1252 my @paths;
1253
1254 for (@$files) {
1255 utf8::decode $_;
1256 next if /\.(?:pl|pst)$/;
1257 next unless /^$PATH_SEP/;
1258
1259 s/$PATH_SEP/\//g;
1260 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1261 }
1262
1263 \@paths
1080} 1264}
1081 1265
1082=item $player->ext_reply ($msgid, $msgtype, %msg) 1266=item $player->ext_reply ($msgid, $msgtype, %msg)
1083 1267
1084Sends an ext reply to the player. 1268Sends an ext reply to the player.
1085 1269
1086=cut 1270=cut
1087 1271
1088sub cf::player::ext_reply($$$%) { 1272sub ext_reply($$$%) {
1089 my ($self, $id, %msg) = @_; 1273 my ($self, $id, %msg) = @_;
1090 1274
1091 $msg{msgid} = $id; 1275 $msg{msgid} = $id;
1092 1276
1093 $self->send ("ext " . to_json \%msg); 1277 $self->send ("ext " . cf::to_json \%msg);
1094} 1278}
1279
1280package cf;
1095 1281
1096=back 1282=back
1097 1283
1098 1284
1099=head3 cf::map 1285=head3 cf::map
… …
1295 1481
1296 return if $self->{deny_save}; 1482 return if $self->{deny_save};
1297 1483
1298 local $self->{last_access} = $self->last_access;#d# 1484 local $self->{last_access} = $self->last_access;#d#
1299 1485
1486 cf::async {
1487 $_->contr->save for $self->players;
1488 };
1489
1300 if ($uniq) { 1490 if ($uniq) {
1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1491 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1302 $self->save_objects ($uniq, cf::IO_UNIQUES); 1492 $self->save_objects ($uniq, cf::IO_UNIQUES);
1303 } else { 1493 } else {
1304 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 1494 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
1401} 1591}
1402 1592
1403sub emergency_save { 1593sub emergency_save {
1404 my $freeze_guard = cf::freeze_mainloop; 1594 my $freeze_guard = cf::freeze_mainloop;
1405 1595
1406 warn "enter emergency map save\n"; 1596 warn "enter emergency perl save\n";
1407 1597
1408 cf::sync_job { 1598 cf::sync_job {
1599 warn "begin emergency player save\n";
1600 $_->save for values %cf::PLAYER;
1601 warn "end emergency player save\n";
1602
1409 warn "begin emergency map save\n"; 1603 warn "begin emergency map save\n";
1410 $_->save for values %cf::MAP; 1604 $_->save for values %cf::MAP;
1605 warn "end emergency map save\n";
1411 }; 1606 };
1412 1607
1413 warn "end emergency map save\n"; 1608 warn "leave emergency perl save\n";
1414} 1609}
1415 1610
1416package cf; 1611package cf;
1417 1612
1418=back 1613=back
… …
1517 ($x, $y) = ($map->enter_x, $map->enter_y) 1712 ($x, $y) = ($map->enter_x, $map->enter_y)
1518 if $x <=0 && $y <= 0; 1713 if $x <=0 && $y <= 0;
1519 1714
1520 $map->load; 1715 $map->load;
1521 1716
1717 return unless $self->contr->active;
1522 $self->activate_recursive; 1718 $self->activate_recursive;
1523 $self->enter_map ($map, $x, $y); 1719 $self->enter_map ($map, $x, $y);
1524} 1720}
1525 1721
1526cf::player->attach ( 1722cf::player->attach (
… …
1539 1735
1540 # try to abort aborted map switching on player login :) 1736 # try to abort aborted map switching on player login :)
1541 # should happen only on crashes 1737 # should happen only on crashes
1542 if ($pl->ob->{_link_pos}) { 1738 if ($pl->ob->{_link_pos}) {
1543 $pl->ob->enter_link; 1739 $pl->ob->enter_link;
1544 Coro::async_pool { 1740 (async {
1545 # we need this sleep as the login has a concurrent enter_exit running 1741 # 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 1742 # and this sleep increases chances of the player not ending up in scorn
1743 $pl->ob->reply (undef,
1744 "There was an internal problem at your last logout, "
1745 . "the server will try to bring you to your intended destination in a second.",
1746 cf::NDI_RED);
1547 Coro::Timer::sleep 1; 1747 Coro::Timer::sleep 1;
1548 $pl->ob->leave_link; 1748 $pl->ob->leave_link;
1549 }; 1749 })->prio (2);
1550 } 1750 }
1551 }, 1751 },
1552); 1752);
1553 1753
1554=item $player_object->goto ($path, $x, $y) 1754=item $player_object->goto ($path, $x, $y)
… …
1556=cut 1756=cut
1557 1757
1558sub cf::object::player::goto { 1758sub cf::object::player::goto {
1559 my ($self, $path, $x, $y) = @_; 1759 my ($self, $path, $x, $y) = @_;
1560 1760
1761 $path = new cf::path $path;
1762 $path ne "/" or Carp::cluck ("oy");#d#
1763
1561 $self->enter_link; 1764 $self->enter_link;
1562 1765
1563 (Coro::async_pool { 1766 (async {
1564 $path = new cf::path $path;
1565
1566 my $map = cf::map::find $path->as_string; 1767 my $map = cf::map::find $path->as_string;
1567 $map = $map->customise_for ($self) if $map; 1768 $map = $map->customise_for ($self) if $map;
1568 1769
1569# warn "entering ", $map->path, " at ($x, $y)\n" 1770# warn "entering ", $map->path, " at ($x, $y)\n"
1570# if $map; 1771# if $map;
1571 1772
1572 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1773 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1573 1774
1574 $self->leave_link ($map, $x, $y); 1775 $self->leave_link ($map, $x, $y);
1575 })->prio (1); 1776 })->prio (1);
1576} 1777}
1577 1778
… …
1630 1831
1631 return unless $self->type == cf::PLAYER; 1832 return unless $self->type == cf::PLAYER;
1632 1833
1633 $self->enter_link; 1834 $self->enter_link;
1634 1835
1635 (Coro::async_pool { 1836 (async {
1636 $self->deactivate_recursive; # just to be sure 1837 $self->deactivate_recursive; # just to be sure
1637 unless (eval { 1838 unless (eval {
1638 prepare_random_map $exit 1839 prepare_random_map $exit
1639 if $exit->slaying eq "/!"; 1840 if $exit->slaying eq "/!";
1640 1841
… …
1721 } 1922 }
1722 } 1923 }
1723 }, 1924 },
1724); 1925);
1725 1926
1726=item $client->coro (\&cb) 1927=item $client->async (\&cb)
1727 1928
1728Create a new coroutine, running the specified callback. The coroutine will 1929Create a new coroutine, running the specified callback. The coroutine will
1729be automatically cancelled when the client gets destroyed (e.g. on logout, 1930be automatically cancelled when the client gets destroyed (e.g. on logout,
1730or loss of connection). 1931or loss of connection).
1731 1932
1732=cut 1933=cut
1733 1934
1734sub cf::client::coro { 1935sub cf::client::async {
1735 my ($self, $cb) = @_; 1936 my ($self, $cb) = @_;
1736 1937
1737 my $coro = &Coro::async_pool ($cb); 1938 my $coro = &Coro::async ($cb);
1738 1939
1739 $coro->on_destroy (sub { 1940 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 1941 delete $self->{_coro}{$coro+0};
1741 }); 1942 });
1742 1943
… …
1980 local $/; 2181 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 2182 *CFG = YAML::Syck::Load <$fh>;
1982 2183
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984 2185
2186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2187 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2188
1985 if (exists $CFG{mlockall}) { 2189 if (exists $CFG{mlockall}) {
1986 eval { 2190 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall 2191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1988 and die "WARNING: m(un)lockall failed: $!\n"; 2192 and die "WARNING: m(un)lockall failed: $!\n";
1989 }; 2193 };
1990 warn $@ if $@; 2194 warn $@ if $@;
1991 } 2195 }
1992} 2196}
1993 2197
1994sub main { 2198sub main {
1995 # we must not ever block the main coroutine 2199 # we must not ever block the main coroutine
1996 local $Coro::idle = sub { 2200 local $Coro::idle = sub {
1997 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1998 (Coro::unblock_sub {
1999 Event::one_event; 2202 async { Event::one_event };
2000 })->();
2001 }; 2203 };
2002 2204
2003 cfg_load; 2205 cfg_load;
2004 db_load; 2206 db_load;
2005 load_extensions; 2207 load_extensions;
… …
2088 cf::load_extensions; 2290 cf::load_extensions;
2089 2291
2090 # reattach attachments to objects 2292 # reattach attachments to objects
2091 warn "reattach"; 2293 warn "reattach";
2092 _global_reattach; 2294 _global_reattach;
2295 reattach $_ for values %MAP;
2093 }; 2296 };
2094 2297
2095 if ($@) { 2298 if ($@) {
2096 warn $@; 2299 warn $@;
2097 warn "error while reloading, exiting."; 2300 warn "error while reloading, exiting.";
… …
2113 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2316 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2114 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2317 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2115 2318
2116 # dirty hack because... archetypes are not yet loaded 2319 # dirty hack because... archetypes are not yet loaded
2117 Event->timer ( 2320 Event->timer (
2118 after => 2, 2321 after => 10,
2119 cb => sub { 2322 cb => sub {
2120 $_[0]->w->cancel; 2323 $_[0]->w->cancel;
2121 2324
2122 # provide some exits "home" 2325 # provide some exits "home"
2123 my $exit = cf::object::new "exit"; 2326 my $exit = cf::object::new "exit";

Diff Legend

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