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.152 by root, Mon Jan 8 22:32:10 2007 UTC vs.
Revision 1.157 by root, Wed Jan 10 01:16:54 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.32 (); 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
29sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
30
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 31# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 32$YAML::Syck::ImplicitUnicode = 1;
30 33
31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 34$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
37our %EXTCMD = (); 38our %EXTCMD = ();
38 39
… …
53our %MAP; # all maps 54our %MAP; # all maps
54our $LINK_MAP; # the special {link} map 55our $LINK_MAP; # the special {link} map
55our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; # coroutines bound to extensions 57our %EXT_CORO; # coroutines bound to extensions
57 58
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
61
58binmode STDOUT; 62binmode STDOUT;
59binmode STDERR; 63binmode STDERR;
60 64
61# read virtual server time, if available 65# read virtual server time, if available
62unless ($RUNTIME || !-e cf::localdir . "/runtime") { 66unless ($RUNTIME || !-e cf::localdir . "/runtime") {
… …
105 109
106=item %cf::CFG 110=item %cf::CFG
107 111
108Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
109from wherever your confdir points to. 113from wherever your confdir points to.
114
115=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE
116
117These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK)
118or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick
119processing has been done. Call C<< ->wait >> on them to maximise the
120window of cpu time available, or simply to synchronise to the server tick.
110 121
111=back 122=back
112 123
113=cut 124=cut
114 125
… …
154 165
155=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
156 167
157=over 4 168=over 4
158 169
170=item dumpval $ref
171
159=cut 172=cut
173
174sub dumpval {
175 eval {
176 local $SIG{__DIE__};
177 my $d;
178 if (1) {
179 $d = new Data::Dumper([$_[0]], ["*var"]);
180 $d->Terse(1);
181 $d->Indent(2);
182 $d->Quotekeys(0);
183 $d->Useqq(1);
184 #$d->Bless(...);
185 $d->Seen($_[1]) if @_ > 1;
186 $d = $d->Dump();
187 }
188 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
189 $d
190 } || "[unable to dump $_[0]: '$@']";
191}
160 192
161use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
162 194
163=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
164 196
… …
334=cut 366=cut
335 367
336############################################################################# 368#############################################################################
337 369
338package cf::path; 370package cf::path;
371
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
339 374
340sub new { 375sub new {
341 my ($class, $path, $base) = @_; 376 my ($class, $path, $base) = @_;
342 377
343 $path = $path->as_string if ref $path; 378 $path = $path->as_string if ref $path;
… …
407# } 442# }
408} 443}
409 444
410# escape the /'s in the path 445# escape the /'s in the path
411sub _escaped_path { 446sub _escaped_path {
412 # ∕ is U+2215
413 (my $path = $_[0]{path}) =~ s/\//∕/g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
414 $path 448 $path
415} 449}
416 450
417# the original (read-only) location 451# the original (read-only) location
418sub load_path { 452sub load_path {
… …
1045}; 1079};
1046 1080
1047cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1048 1082
1049############################################################################# 1083#############################################################################
1050# load/save perl data associated with player->ob objects
1051
1052sub all_objects(@) {
1053 @_, map all_objects ($_->inv), @_
1054}
1055
1056# TODO: compatibility cruft, remove when no longer needed
1057cf::player->attach (
1058 on_load => sub {
1059 my ($pl, $path) = @_;
1060
1061 for my $o (all_objects $pl->ob) {
1062 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1063 $o->set_ob_key_value ("_perl_data");
1064
1065 %$o = %{ Storable::thaw pack "H*", $value };
1066 }
1067 }
1068 },
1069);
1070
1071#############################################################################
1072 1084
1073=head2 CORE EXTENSIONS 1085=head2 CORE EXTENSIONS
1074 1086
1075Functions and methods that extend core crossfire objects. 1087Functions and methods that extend core crossfire objects.
1076 1088
1077=cut 1089=cut
1078 1090
1079package cf::player; 1091package cf::player;
1092
1093use Coro::AIO;
1080 1094
1081=head3 cf::player 1095=head3 cf::player
1082 1096
1083=over 4 1097=over 4
1084 1098
… …
1137 my $path = path $pl; 1151 my $path = path $pl;
1138 my $guard = cf::lock_acquire "user_save:$path"; 1152 my $guard = cf::lock_acquire "user_save:$path";
1139 1153
1140 return if $pl->{deny_save}; 1154 return if $pl->{deny_save};
1141 1155
1142 Coro::AIO::aio_mkdir playerdir $pl, 0770; 1156 aio_mkdir playerdir $pl, 0770;
1143 $pl->{last_save} = $cf::RUNTIME; 1157 $pl->{last_save} = $cf::RUNTIME;
1144 1158
1145 $pl->save_pl ($path); 1159 $pl->save_pl ($path);
1146 Coro::cede; 1160 Coro::cede;
1147} 1161}
… …
1156 1170
1157 $cf::PLAYER{$login} = $self; 1171 $cf::PLAYER{$login} = $self;
1158 1172
1159 $self 1173 $self
1160} 1174}
1175
1176=item $pl->quit_character
1177
1178Nukes the player without looking back. If logged in, the connection will
1179be destroyed. May block for a long time.
1180
1181=cut
1161 1182
1162sub quit_character { 1183sub quit_character {
1163 my ($pl) = @_; 1184 my ($pl) = @_;
1164 1185
1165 $pl->{deny_save} = 1; 1186 $pl->{deny_save} = 1;
… …
1170 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1191 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1171 $pl->ns->destroy if $pl->ns; 1192 $pl->ns->destroy if $pl->ns;
1172 1193
1173 my $path = playerdir $pl; 1194 my $path = playerdir $pl;
1174 my $temp = "$path~$cf::RUNTIME~deleting~"; 1195 my $temp = "$path~$cf::RUNTIME~deleting~";
1175 Coro::AIO::aio_rename $path, $temp; 1196 aio_rename $path, $temp;
1176 delete $cf::PLAYER{$pl->ob->name}; 1197 delete $cf::PLAYER{$pl->ob->name};
1177 $pl->destroy; 1198 $pl->destroy;
1178 IO::AIO::aio_rmtree $temp; 1199 IO::AIO::aio_rmtree $temp;
1200}
1201
1202=item cf::player::list_logins
1203
1204Returns am arrayref of all valid playernames in the system, can take a
1205while and may block, so not sync_job-capable, ever.
1206
1207=cut
1208
1209sub list_logins {
1210 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1211 or return [];
1212
1213 my @logins;
1214
1215 for my $login (@$dirs) {
1216 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1217 aio_read $fh, 0, 512, my $buf, 0 or next;
1218 $buf !~ /^password -------------$/m or next; # official not-valid tag
1219
1220 utf8::decode $login;
1221 push @logins, $login;
1222 }
1223
1224 \@logins
1225}
1226
1227=item $player->maps
1228
1229Returns an arrayref of cf::path's of all maps that are private for this
1230player. May block.
1231
1232=cut
1233
1234sub maps($) {
1235 my ($pl) = @_;
1236
1237 my $files = aio_readdir playerdir $pl
1238 or return;
1239
1240 my @paths;
1241
1242 for (@$files) {
1243 utf8::decode $_;
1244 next if /\.(?:pl|pst)$/;
1245 next unless /^$PATH_SEP/;
1246
1247 s/$PATH_SEP/\//g;
1248 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1249 }
1250
1251 \@paths
1179} 1252}
1180 1253
1181=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1182 1255
1183Sends an ext reply to the player. 1256Sends an ext reply to the player.
… …
1366 Coro::cede; 1439 Coro::cede;
1367 1440
1368 $self->in_memory (cf::MAP_IN_MEMORY); 1441 $self->in_memory (cf::MAP_IN_MEMORY);
1369} 1442}
1370 1443
1444# find and load all maps in the 3x3 area around a map
1445sub load_diag {
1446 my ($map) = @_;
1447
1448 my @diag; # diagonal neighbours
1449
1450 for (0 .. 3) {
1451 my $neigh = $map->tile_path ($_)
1452 or next;
1453 $neigh = find $neigh, $map
1454 or next;
1455 $neigh->load;
1456
1457 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1458 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1459 }
1460
1461 for (@diag) {
1462 my $neigh = find @$_
1463 or next;
1464 $neigh->load;
1465 }
1466}
1467
1371sub find_sync { 1468sub find_sync {
1372 my ($path, $origin) = @_; 1469 my ($path, $origin) = @_;
1373 1470
1374 cf::sync_job { cf::map::find $path, $origin } 1471 cf::sync_job { find $path, $origin }
1375} 1472}
1376 1473
1377sub do_load_sync { 1474sub do_load_sync {
1378 my ($map) = @_; 1475 my ($map) = @_;
1379 1476
1380 cf::sync_job { $map->load }; 1477 cf::sync_job { $map->load };
1478}
1479
1480our %MAP_PREFETCH;
1481our $MAP_PREFETCHER = Coro::async {
1482 while () {
1483 while (%MAP_PREFETCH) {
1484 my $key = each %MAP_PREFETCH
1485 or next;
1486 my $path = delete $MAP_PREFETCH{$key};
1487
1488 my $map = find $path
1489 or next;
1490 $map->load;
1491 }
1492 Coro::schedule;
1493 }
1494};
1495
1496sub find_async {
1497 my ($path, $origin) = @_;
1498
1499 $path = new cf::path $path, $origin && $origin->path;
1500 my $key = $path->as_string;
1501
1502 if (my $map = $cf::MAP{$key}) {
1503 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1504 }
1505
1506 $MAP_PREFETCH{$key} = $path;
1507 $MAP_PREFETCHER->ready;
1508
1509 ()
1381} 1510}
1382 1511
1383sub save { 1512sub save {
1384 my ($self) = @_; 1513 my ($self) = @_;
1385 1514
… …
1503 } 1632 }
1504 1633
1505 $map 1634 $map
1506} 1635}
1507 1636
1508sub emergency_save {
1509 my $freeze_guard = cf::freeze_mainloop;
1510
1511 warn "enter emergency perl save\n";
1512
1513 cf::sync_job {
1514 warn "begin emergency player save\n";
1515 $_->save for values %cf::PLAYER;
1516 warn "end emergency player save\n";
1517
1518 warn "begin emergency map save\n";
1519 $_->save for values %cf::MAP;
1520 warn "end emergency map save\n";
1521 };
1522
1523 warn "leave emergency perl save\n";
1524}
1525
1526package cf; 1637package cf;
1527 1638
1528=back 1639=back
1529 1640
1641=head3 cf::object
1642
1643=cut
1644
1645package cf::object;
1646
1647=over 4
1648
1649=item $ob->inv_recursive
1650
1651Returns the inventory of the object _and_ their inventories, recursively.
1652
1653=cut
1654
1655sub inv_recursive_;
1656sub inv_recursive_ {
1657 map { $_, inv_recursive_ $_->inv } @_
1658}
1659
1660sub inv_recursive {
1661 inv_recursive_ inv $_[0]
1662}
1663
1664package cf;
1665
1666=back
1530 1667
1531=head3 cf::object::player 1668=head3 cf::object::player
1532 1669
1533=over 4 1670=over 4
1534 1671
… …
1626 # use -1 or undef as default coordinates, not 0, 0 1763 # use -1 or undef as default coordinates, not 0, 0
1627 ($x, $y) = ($map->enter_x, $map->enter_y) 1764 ($x, $y) = ($map->enter_x, $map->enter_y)
1628 if $x <=0 && $y <= 0; 1765 if $x <=0 && $y <= 0;
1629 1766
1630 $map->load; 1767 $map->load;
1768 $map->load_diag;
1631 1769
1632 return unless $self->contr->active; 1770 return unless $self->contr->active;
1633 $self->activate_recursive; 1771 $self->activate_recursive;
1634 $self->enter_map ($map, $x, $y); 1772 $self->enter_map ($map, $x, $y);
1635} 1773}
… …
1671=cut 1809=cut
1672 1810
1673sub cf::object::player::goto { 1811sub cf::object::player::goto {
1674 my ($self, $path, $x, $y) = @_; 1812 my ($self, $path, $x, $y) = @_;
1675 1813
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1676 $self->enter_link; 1817 $self->enter_link;
1677 1818
1678 (async { 1819 (async {
1679 $path = new cf::path $path;
1680
1681 my $map = cf::map::find $path->as_string; 1820 my $map = cf::map::find $path->as_string;
1682 $map = $map->customise_for ($self) if $map; 1821 $map = $map->customise_for ($self) if $map;
1683 1822
1684# warn "entering ", $map->path, " at ($x, $y)\n" 1823# warn "entering ", $map->path, " at ($x, $y)\n"
1685# if $map; 1824# if $map;
1686 1825
1687 $map or Carp::cluck ("oy");#d#
1688 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1826 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1689 1827
1690 $self->leave_link ($map, $x, $y); 1828 $self->leave_link ($map, $x, $y);
1691 })->prio (1); 1829 })->prio (1);
1692} 1830}
… …
2122 load_extensions; 2260 load_extensions;
2123 Event::loop; 2261 Event::loop;
2124} 2262}
2125 2263
2126############################################################################# 2264#############################################################################
2127# initialisation 2265# initialisation and cleanup
2266
2267# install some emergency cleanup handlers
2268BEGIN {
2269 for my $signal (qw(INT HUP TERM)) {
2270 Event->signal (
2271 data => WF_AUTOCANCEL,
2272 signal => $signal,
2273 cb => sub {
2274 cf::cleanup "SIG$signal";
2275 },
2276 );
2277 }
2278}
2279
2280sub emergency_save() {
2281 my $freeze_guard = cf::freeze_mainloop;
2282
2283 warn "enter emergency perl save\n";
2284
2285 cf::sync_job {
2286 # use a peculiar iteration method to avoid tripping on perl
2287 # refcount bugs in for. also avoids problems with players
2288 # and maps saved/Destroyed asynchronously.
2289 warn "begin emergency player save\n";
2290 for my $login (keys %cf::PLAYER) {
2291 my $pl = $cf::PLAYER{$login} or next;
2292 $pl->valid or next;
2293 $pl->save;
2294 }
2295 warn "end emergency player save\n";
2296
2297 warn "begin emergency map save\n";
2298 for my $path (keys %cf::MAP) {
2299 my $map = $cf::MAP{$path} or next;
2300 $map->valid or next;
2301 $map->save;
2302 }
2303 warn "end emergency map save\n";
2304 };
2305
2306 warn "leave emergency perl save\n";
2307}
2128 2308
2129sub reload() { 2309sub reload() {
2130 # can/must only be called in main 2310 # can/must only be called in main
2131 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
2132 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine\n";
… …
2283 data => WF_AUTOCANCEL, 2463 data => WF_AUTOCANCEL,
2284 cb => sub { 2464 cb => sub {
2285 cf::server_tick; # one server iteration 2465 cf::server_tick; # one server iteration
2286 $RUNTIME += $TICK; 2466 $RUNTIME += $TICK;
2287 $NEXT_TICK += $TICK; 2467 $NEXT_TICK += $TICK;
2468
2469 $WAIT_FOR_TICK->broadcast;
2470 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2288 2471
2289 # if we are delayed by four ticks or more, skip them all 2472 # if we are delayed by four ticks or more, skip them all
2290 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2473 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2291 2474
2292 $TICK_WATCHER->at ($NEXT_TICK); 2475 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

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