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.158 by root, Wed Jan 10 19:52:43 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
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 (2); # 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
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
58
59our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
60our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
56 61
57binmode STDOUT; 62binmode STDOUT;
58binmode STDERR; 63binmode STDERR;
59 64
60# read virtual server time, if available 65# read virtual server time, if available
105=item %cf::CFG 110=item %cf::CFG
106 111
107Configuration for the server, loaded from C</etc/crossfire/config>, or 112Configuration for the server, loaded from C</etc/crossfire/config>, or
108from wherever your confdir points to. 113from wherever your confdir points to.
109 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.
121
110=back 122=back
111 123
112=cut 124=cut
113 125
114BEGIN { 126BEGIN {
117 utf8::encode $msg; 129 utf8::encode $msg;
118 130
119 $msg .= "\n" 131 $msg .= "\n"
120 unless $msg =~ /\n$/; 132 unless $msg =~ /\n$/;
121 133
122 LOG llevError, "cfperl: $msg"; 134 LOG llevError, $msg;
123 }; 135 };
124} 136}
125 137
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 138@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 139@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
153 165
154=head2 UTILITY FUNCTIONS 166=head2 UTILITY FUNCTIONS
155 167
156=over 4 168=over 4
157 169
170=item dumpval $ref
171
158=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}
159 192
160use JSON::Syck (); # TODO# replace by JSON::PC once working 193use JSON::Syck (); # TODO# replace by JSON::PC once working
161 194
162=item $ref = cf::from_json $json 195=item $ref = cf::from_json $json
163 196
228 261
229 my $guard = Coro::guard { $TICK_WATCHER->start }; 262 my $guard = Coro::guard { $TICK_WATCHER->start };
230 $TICK_WATCHER->stop; 263 $TICK_WATCHER->stop;
231 $guard 264 $guard
232} 265}
266
267=item cf::async { BLOCK }
268
269Currently the same as Coro::async_pool, meaning you cannot use
270C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
271thing you are allowed to do is call C<prio> on it.
272
273=cut
274
275BEGIN { *async = \&Coro::async_pool }
233 276
234=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
235 278
236The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
237always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
256 my $freeze_guard = freeze_mainloop; 299 my $freeze_guard = freeze_mainloop;
257 300
258 my $busy = 1; 301 my $busy = 1;
259 my @res; 302 my @res;
260 303
261 (Coro::async_pool { 304 (async {
262 @res = eval { $job->() }; 305 @res = eval { $job->() };
263 warn $@ if $@; 306 warn $@ if $@;
264 undef $busy; 307 undef $busy;
265 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
266 309
267 while ($busy) { 310 while ($busy) {
268 Coro::cede_notself; 311 Coro::cede or Event::one_event;
269 Event::one_event unless Coro::nready;
270 } 312 }
271 313
272 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
273 } else { 315 } else {
274 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
275 317
276 $job->() 318 $job->()
277 } 319 }
278} 320}
279 321
280=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
281 323
282Creates (and readies) and returns a new coro. This coro is automcatially 324Like async, but this coro is automcatially being canceled when the
283being canceled when the extension calling this is being unloaded. 325extension calling this is being unloaded.
284 326
285=cut 327=cut
286 328
287sub coro(&) { 329sub async_ext(&) {
288 my $cb = shift; 330 my $cb = shift;
289 331
290 my $coro = &Coro::async_pool ($cb); 332 my $coro = &Coro::async ($cb);
291 333
292 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
293 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
294 }); 336 });
295 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
324=cut 366=cut
325 367
326############################################################################# 368#############################################################################
327 369
328package cf::path; 370package cf::path;
371
372use overload
373 '""' => \&as_string;
374
375# used to convert map paths into valid unix filenames by repalcing / by ∕
376our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
329 377
330sub new { 378sub new {
331 my ($class, $path, $base) = @_; 379 my ($class, $path, $base) = @_;
332 380
333 $path = $path->as_string if ref $path; 381 $path = $path->as_string if ref $path;
339 # ?random/... random maps 387 # ?random/... random maps
340 # /! non-realised random map exit 388 # /! non-realised random map exit
341 # /... normal maps 389 # /... normal maps
342 # ~/... per-player maps without a specific player (DO NOT USE) 390 # ~/... per-player maps without a specific player (DO NOT USE)
343 # ~user/... per-player map of a specific user 391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
344 394
345 if ($path =~ /^{/) { 395 if ($path =~ /^{/) {
346 # fine as it is 396 # fine as it is
347 } elsif ($path =~ s{^\?random/}{}) { 397 } elsif ($path =~ s{^\?random/}{}) {
348 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
397# } 447# }
398} 448}
399 449
400# escape the /'s in the path 450# escape the /'s in the path
401sub _escaped_path { 451sub _escaped_path {
402 # ∕ is U+2215
403 (my $path = $_[0]{path}) =~ s/\///g; 452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
404 $path 453 $path
405} 454}
406 455
407# the original (read-only) location 456# the original (read-only) location
408sub load_path { 457sub load_path {
1035}; 1084};
1036 1085
1037cf::map->attach (prio => -10000, package => cf::mapsupport::); 1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1038 1087
1039############################################################################# 1088#############################################################################
1040# load/save perl data associated with player->ob objects
1041
1042sub all_objects(@) {
1043 @_, map all_objects ($_->inv), @_
1044}
1045
1046# TODO: compatibility cruft, remove when no longer needed
1047cf::player->attach (
1048 on_load => sub {
1049 my ($pl, $path) = @_;
1050
1051 for my $o (all_objects $pl->ob) {
1052 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1053 $o->set_ob_key_value ("_perl_data");
1054
1055 %$o = %{ Storable::thaw pack "H*", $value };
1056 }
1057 }
1058 },
1059);
1060
1061#############################################################################
1062 1089
1063=head2 CORE EXTENSIONS 1090=head2 CORE EXTENSIONS
1064 1091
1065Functions and methods that extend core crossfire objects. 1092Functions and methods that extend core crossfire objects.
1066 1093
1094=cut
1095
1096package cf::player;
1097
1098use Coro::AIO;
1099
1067=head3 cf::player 1100=head3 cf::player
1068 1101
1069=over 4 1102=over 4
1070 1103
1071=item cf::player::exists $login 1104=item cf::player::find $login
1072 1105
1073Returns true when the given account exists. 1106Returns the given player object, loading it if necessary (might block).
1074 1107
1075=cut 1108=cut
1076 1109
1077sub cf::player::exists($) { 1110sub playerdir($) {
1078 cf::player::find $_[0] 1111 cf::localdir
1079 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1112 . "/"
1113 . cf::playerdir
1114 . "/"
1115 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1116}
1117
1118sub path($) {
1119 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1120
1121 (playerdir $login) . "/$login.pl"
1122}
1123
1124sub find_active($) {
1125 $cf::PLAYER{$_[0]}
1126 and $cf::PLAYER{$_[0]}->active
1127 and $cf::PLAYER{$_[0]}
1128}
1129
1130sub exists($) {
1131 my ($login) = @_;
1132
1133 $cf::PLAYER{$login}
1134 or cf::sync_job { !aio_stat $login }
1135}
1136
1137sub find($) {
1138 return $cf::PLAYER{$_[0]} || do {
1139 my $login = $_[0];
1140
1141 my $guard = cf::lock_acquire "user_find:$login";
1142
1143 $cf::PLAYER{$_[0]} || do {
1144 my $pl = load_pl path $login
1145 or return;
1146 $cf::PLAYER{$login} = $pl
1147 }
1148 }
1149}
1150
1151sub save($) {
1152 my ($pl) = @_;
1153
1154 return if $pl->{deny_save};
1155
1156 my $path = path $pl;
1157 my $guard = cf::lock_acquire "user_save:$path";
1158
1159 return if $pl->{deny_save};
1160
1161 aio_mkdir playerdir $pl, 0770;
1162 $pl->{last_save} = $cf::RUNTIME;
1163
1164 $pl->save_pl ($path);
1165 Coro::cede;
1166}
1167
1168sub new($) {
1169 my ($login) = @_;
1170
1171 my $self = create;
1172
1173 $self->ob->name ($login);
1174 $self->{deny_save} = 1;
1175
1176 $cf::PLAYER{$login} = $self;
1177
1178 $self
1179}
1180
1181=item $pl->quit_character
1182
1183Nukes the player without looking back. If logged in, the connection will
1184be destroyed. May block for a long time.
1185
1186=cut
1187
1188sub quit_character {
1189 my ($pl) = @_;
1190
1191 $pl->{deny_save} = 1;
1192 $pl->password ("*"); # this should lock out the player until we nuked the dir
1193
1194 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1195 $pl->deactivate;
1196 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1197 $pl->ns->destroy if $pl->ns;
1198
1199 my $path = playerdir $pl;
1200 my $temp = "$path~$cf::RUNTIME~deleting~";
1201 aio_rename $path, $temp;
1202 delete $cf::PLAYER{$pl->ob->name};
1203 $pl->destroy;
1204 IO::AIO::aio_rmtree $temp;
1205}
1206
1207=item cf::player::list_logins
1208
1209Returns am arrayref of all valid playernames in the system, can take a
1210while and may block, so not sync_job-capable, ever.
1211
1212=cut
1213
1214sub list_logins {
1215 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1216 or return [];
1217
1218 my @logins;
1219
1220 for my $login (@$dirs) {
1221 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1222 aio_read $fh, 0, 512, my $buf, 0 or next;
1223 $buf !~ /^password -------------$/m or next; # official not-valid tag
1224
1225 utf8::decode $login;
1226 push @logins, $login;
1227 }
1228
1229 \@logins
1230}
1231
1232=item $player->maps
1233
1234Returns an arrayref of cf::path's of all maps that are private for this
1235player. May block.
1236
1237=cut
1238
1239sub maps($) {
1240 my ($pl) = @_;
1241
1242 my $files = aio_readdir playerdir $pl
1243 or return;
1244
1245 my @paths;
1246
1247 for (@$files) {
1248 utf8::decode $_;
1249 next if /\.(?:pl|pst)$/;
1250 next unless /^$PATH_SEP/o;
1251
1252 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1253 }
1254
1255 \@paths
1080} 1256}
1081 1257
1082=item $player->ext_reply ($msgid, $msgtype, %msg) 1258=item $player->ext_reply ($msgid, $msgtype, %msg)
1083 1259
1084Sends an ext reply to the player. 1260Sends an ext reply to the player.
1085 1261
1086=cut 1262=cut
1087 1263
1088sub cf::player::ext_reply($$$%) { 1264sub ext_reply($$$%) {
1089 my ($self, $id, %msg) = @_; 1265 my ($self, $id, %msg) = @_;
1090 1266
1091 $msg{msgid} = $id; 1267 $msg{msgid} = $id;
1092 1268
1093 $self->send ("ext " . to_json \%msg); 1269 $self->send ("ext " . cf::to_json \%msg);
1094} 1270}
1271
1272package cf;
1095 1273
1096=back 1274=back
1097 1275
1098 1276
1099=head3 cf::map 1277=head3 cf::map
1265 Coro::cede; 1443 Coro::cede;
1266 1444
1267 $self->in_memory (cf::MAP_IN_MEMORY); 1445 $self->in_memory (cf::MAP_IN_MEMORY);
1268} 1446}
1269 1447
1448# find and load all maps in the 3x3 area around a map
1449sub load_diag {
1450 my ($map) = @_;
1451
1452 my @diag; # diagonal neighbours
1453
1454 for (0 .. 3) {
1455 my $neigh = $map->tile_path ($_)
1456 or next;
1457 $neigh = find $neigh, $map
1458 or next;
1459 $neigh->load;
1460
1461 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh],
1462 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1463 }
1464
1465 for (@diag) {
1466 my $neigh = find @$_
1467 or next;
1468 $neigh->load;
1469 }
1470}
1471
1270sub find_sync { 1472sub find_sync {
1271 my ($path, $origin) = @_; 1473 my ($path, $origin) = @_;
1272 1474
1273 cf::sync_job { cf::map::find $path, $origin } 1475 cf::sync_job { find $path, $origin }
1274} 1476}
1275 1477
1276sub do_load_sync { 1478sub do_load_sync {
1277 my ($map) = @_; 1479 my ($map) = @_;
1278 1480
1279 cf::sync_job { $map->load }; 1481 cf::sync_job { $map->load };
1280} 1482}
1281 1483
1484our %MAP_PREFETCH;
1485our $MAP_PREFETCHER = Coro::async {
1486 while () {
1487 while (%MAP_PREFETCH) {
1488 my $key = each %MAP_PREFETCH
1489 or next;
1490 my $path = delete $MAP_PREFETCH{$key};
1491
1492 my $map = find $path
1493 or next;
1494 $map->load;
1495 }
1496 Coro::schedule;
1497 }
1498};
1499
1500sub find_async {
1501 my ($path, $origin) = @_;
1502
1503 $path = new cf::path $path, $origin && $origin->path;
1504 my $key = $path->as_string;
1505
1506 if (my $map = $cf::MAP{$key}) {
1507 return $map if $map->in_memory == cf::MAP_IN_MEMORY;
1508 }
1509
1510 $MAP_PREFETCH{$key} = $path;
1511 $MAP_PREFETCHER->ready;
1512
1513 ()
1514}
1515
1282sub save { 1516sub save {
1283 my ($self) = @_; 1517 my ($self) = @_;
1284 1518
1285 my $lock = cf::lock_acquire "map_data:" . $self->path; 1519 my $lock = cf::lock_acquire "map_data:" . $self->path;
1286 1520
1294 $self->{load_path} = $save; 1528 $self->{load_path} = $save;
1295 1529
1296 return if $self->{deny_save}; 1530 return if $self->{deny_save};
1297 1531
1298 local $self->{last_access} = $self->last_access;#d# 1532 local $self->{last_access} = $self->last_access;#d#
1533
1534 cf::async {
1535 $_->contr->save for $self->players;
1536 };
1299 1537
1300 if ($uniq) { 1538 if ($uniq) {
1301 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1302 $self->save_objects ($uniq, cf::IO_UNIQUES); 1540 $self->save_objects ($uniq, cf::IO_UNIQUES);
1303 } else { 1541 } else {
1398 } 1636 }
1399 1637
1400 $map 1638 $map
1401} 1639}
1402 1640
1403sub emergency_save { 1641=item cf::map::unique_maps
1404 my $freeze_guard = cf::freeze_mainloop;
1405 1642
1406 warn "enter emergency map save\n"; 1643Returns an arrayref of cf::path's of all shared maps that have
1644instantiated unique items. May block.
1407 1645
1408 cf::sync_job { 1646=cut
1409 warn "begin emergency map save\n"; 1647
1410 $_->save for values %cf::MAP; 1648sub unique_maps() {
1649 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir
1650 or return;
1651
1652 my @paths;
1653
1654 for (@$files) {
1655 utf8::decode $_;
1656 next if /\.pst$/;
1657 next unless /^$PATH_SEP/o;
1658
1659 push @paths, new cf::path $_;
1411 }; 1660 }
1412 1661
1413 warn "end emergency map save\n"; 1662 \@paths
1414} 1663}
1415 1664
1416package cf; 1665package cf;
1417 1666
1418=back 1667=back
1419 1668
1669=head3 cf::object
1670
1671=cut
1672
1673package cf::object;
1674
1675=over 4
1676
1677=item $ob->inv_recursive
1678
1679Returns the inventory of the object _and_ their inventories, recursively.
1680
1681=cut
1682
1683sub inv_recursive_;
1684sub inv_recursive_ {
1685 map { $_, inv_recursive_ $_->inv } @_
1686}
1687
1688sub inv_recursive {
1689 inv_recursive_ inv $_[0]
1690}
1691
1692package cf;
1693
1694=back
1420 1695
1421=head3 cf::object::player 1696=head3 cf::object::player
1422 1697
1423=over 4 1698=over 4
1424 1699
1516 # use -1 or undef as default coordinates, not 0, 0 1791 # use -1 or undef as default coordinates, not 0, 0
1517 ($x, $y) = ($map->enter_x, $map->enter_y) 1792 ($x, $y) = ($map->enter_x, $map->enter_y)
1518 if $x <=0 && $y <= 0; 1793 if $x <=0 && $y <= 0;
1519 1794
1520 $map->load; 1795 $map->load;
1796 $map->load_diag;
1521 1797
1798 return unless $self->contr->active;
1522 $self->activate_recursive; 1799 $self->activate_recursive;
1523 $self->enter_map ($map, $x, $y); 1800 $self->enter_map ($map, $x, $y);
1524} 1801}
1525 1802
1526cf::player->attach ( 1803cf::player->attach (
1539 1816
1540 # try to abort aborted map switching on player login :) 1817 # try to abort aborted map switching on player login :)
1541 # should happen only on crashes 1818 # should happen only on crashes
1542 if ($pl->ob->{_link_pos}) { 1819 if ($pl->ob->{_link_pos}) {
1543 $pl->ob->enter_link; 1820 $pl->ob->enter_link;
1544 Coro::async_pool { 1821 (async {
1545 # we need this sleep as the login has a concurrent enter_exit running 1822 # 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 1823 # and this sleep increases chances of the player not ending up in scorn
1824 $pl->ob->reply (undef,
1825 "There was an internal problem at your last logout, "
1826 . "the server will try to bring you to your intended destination in a second.",
1827 cf::NDI_RED);
1547 Coro::Timer::sleep 1; 1828 Coro::Timer::sleep 1;
1548 $pl->ob->leave_link; 1829 $pl->ob->leave_link;
1549 }; 1830 })->prio (2);
1550 } 1831 }
1551 }, 1832 },
1552); 1833);
1553 1834
1554=item $player_object->goto ($path, $x, $y) 1835=item $player_object->goto ($path, $x, $y)
1556=cut 1837=cut
1557 1838
1558sub cf::object::player::goto { 1839sub cf::object::player::goto {
1559 my ($self, $path, $x, $y) = @_; 1840 my ($self, $path, $x, $y) = @_;
1560 1841
1842 $path = new cf::path $path;
1843
1561 $self->enter_link; 1844 $self->enter_link;
1562 1845
1563 (Coro::async_pool { 1846 (async {
1564 $path = new cf::path $path;
1565
1566 my $map = cf::map::find $path->as_string; 1847 my $map = cf::map::find $path->as_string;
1567 $map = $map->customise_for ($self) if $map; 1848 $map = $map->customise_for ($self) if $map;
1568 1849
1569# warn "entering ", $map->path, " at ($x, $y)\n" 1850# warn "entering ", $map->path, " at ($x, $y)\n"
1570# if $map; 1851# if $map;
1571 1852
1572 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1853 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1573 1854
1574 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1575 })->prio (1); 1856 })->prio (1);
1576} 1857}
1577 1858
1630 1911
1631 return unless $self->type == cf::PLAYER; 1912 return unless $self->type == cf::PLAYER;
1632 1913
1633 $self->enter_link; 1914 $self->enter_link;
1634 1915
1635 (Coro::async_pool { 1916 (async {
1636 $self->deactivate_recursive; # just to be sure 1917 $self->deactivate_recursive; # just to be sure
1637 unless (eval { 1918 unless (eval {
1638 prepare_random_map $exit 1919 prepare_random_map $exit
1639 if $exit->slaying eq "/!"; 1920 if $exit->slaying eq "/!";
1640 1921
1643 1924
1644 1; 1925 1;
1645 }) { 1926 }) {
1646 $self->message ("Something went wrong deep within the crossfire server. " 1927 $self->message ("Something went wrong deep within the crossfire server. "
1647 . "I'll try to bring you back to the map you were before. " 1928 . "I'll try to bring you back to the map you were before. "
1648 . "Please report this to the dungeon master", 1929 . "Please report this to the dungeon master!",
1649 cf::NDI_UNIQUE | cf::NDI_RED); 1930 cf::NDI_UNIQUE | cf::NDI_RED);
1650 1931
1651 warn "ERROR in enter_exit: $@"; 1932 warn "ERROR in enter_exit: $@";
1652 $self->leave_link; 1933 $self->leave_link;
1653 } 1934 }
1721 } 2002 }
1722 } 2003 }
1723 }, 2004 },
1724); 2005);
1725 2006
1726=item $client->coro (\&cb) 2007=item $client->async (\&cb)
1727 2008
1728Create a new coroutine, running the specified callback. The coroutine will 2009Create a new coroutine, running the specified callback. The coroutine will
1729be automatically cancelled when the client gets destroyed (e.g. on logout, 2010be automatically cancelled when the client gets destroyed (e.g. on logout,
1730or loss of connection). 2011or loss of connection).
1731 2012
1732=cut 2013=cut
1733 2014
1734sub cf::client::coro { 2015sub cf::client::async {
1735 my ($self, $cb) = @_; 2016 my ($self, $cb) = @_;
1736 2017
1737 my $coro = &Coro::async_pool ($cb); 2018 my $coro = &Coro::async ($cb);
1738 2019
1739 $coro->on_destroy (sub { 2020 $coro->on_destroy (sub {
1740 delete $self->{_coro}{$coro+0}; 2021 delete $self->{_coro}{$coro+0};
1741 }); 2022 });
1742 2023
1980 local $/; 2261 local $/;
1981 *CFG = YAML::Syck::Load <$fh>; 2262 *CFG = YAML::Syck::Load <$fh>;
1982 2263
1983 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2264 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1984 2265
2266 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2267 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2268
1985 if (exists $CFG{mlockall}) { 2269 if (exists $CFG{mlockall}) {
1986 eval { 2270 eval {
1987 $CFG{mlockall} ? &mlockall : &munlockall 2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1988 and die "WARNING: m(un)lockall failed: $!\n"; 2272 and die "WARNING: m(un)lockall failed: $!\n";
1989 }; 2273 };
1990 warn $@ if $@; 2274 warn $@ if $@;
1991 } 2275 }
1992} 2276}
1993 2277
1994sub main { 2278sub main {
1995 # we must not ever block the main coroutine 2279 # we must not ever block the main coroutine
1996 local $Coro::idle = sub { 2280 local $Coro::idle = sub {
1997 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2281 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1998 (Coro::unblock_sub {
1999 Event::one_event; 2282 async { Event::one_event };
2000 })->();
2001 }; 2283 };
2002 2284
2003 cfg_load; 2285 cfg_load;
2004 db_load; 2286 db_load;
2005 load_extensions; 2287 load_extensions;
2006 Event::loop; 2288 Event::loop;
2007} 2289}
2008 2290
2009############################################################################# 2291#############################################################################
2010# initialisation 2292# initialisation and cleanup
2293
2294# install some emergency cleanup handlers
2295BEGIN {
2296 for my $signal (qw(INT HUP TERM)) {
2297 Event->signal (
2298 data => WF_AUTOCANCEL,
2299 signal => $signal,
2300 cb => sub {
2301 cf::cleanup "SIG$signal";
2302 },
2303 );
2304 }
2305}
2306
2307sub emergency_save() {
2308 my $freeze_guard = cf::freeze_mainloop;
2309
2310 warn "enter emergency perl save\n";
2311
2312 cf::sync_job {
2313 # use a peculiar iteration method to avoid tripping on perl
2314 # refcount bugs in for. also avoids problems with players
2315 # and maps saved/Destroyed asynchronously.
2316 warn "begin emergency player save\n";
2317 for my $login (keys %cf::PLAYER) {
2318 my $pl = $cf::PLAYER{$login} or next;
2319 $pl->valid or next;
2320 $pl->save;
2321 }
2322 warn "end emergency player save\n";
2323
2324 warn "begin emergency map save\n";
2325 for my $path (keys %cf::MAP) {
2326 my $map = $cf::MAP{$path} or next;
2327 $map->valid or next;
2328 $map->save;
2329 }
2330 warn "end emergency map save\n";
2331 };
2332
2333 warn "leave emergency perl save\n";
2334}
2011 2335
2012sub reload() { 2336sub reload() {
2013 # can/must only be called in main 2337 # can/must only be called in main
2014 if ($Coro::current != $Coro::main) { 2338 if ($Coro::current != $Coro::main) {
2015 warn "can only reload from main coroutine\n"; 2339 warn "can only reload from main coroutine\n";
2088 cf::load_extensions; 2412 cf::load_extensions;
2089 2413
2090 # reattach attachments to objects 2414 # reattach attachments to objects
2091 warn "reattach"; 2415 warn "reattach";
2092 _global_reattach; 2416 _global_reattach;
2417 reattach $_ for values %MAP;
2093 }; 2418 };
2094 2419
2095 if ($@) { 2420 if ($@) {
2096 warn $@; 2421 warn $@;
2097 warn "error while reloading, exiting."; 2422 warn "error while reloading, exiting.";
2113 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2114 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2115 2440
2116 # dirty hack because... archetypes are not yet loaded 2441 # dirty hack because... archetypes are not yet loaded
2117 Event->timer ( 2442 Event->timer (
2118 after => 2, 2443 after => 10,
2119 cb => sub { 2444 cb => sub {
2120 $_[0]->w->cancel; 2445 $_[0]->w->cancel;
2121 2446
2122 # provide some exits "home" 2447 # provide some exits "home"
2123 my $exit = cf::object::new "exit"; 2448 my $exit = cf::object::new "exit";
2165 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2166 cb => sub { 2491 cb => sub {
2167 cf::server_tick; # one server iteration 2492 cf::server_tick; # one server iteration
2168 $RUNTIME += $TICK; 2493 $RUNTIME += $TICK;
2169 $NEXT_TICK += $TICK; 2494 $NEXT_TICK += $TICK;
2495
2496 $WAIT_FOR_TICK->broadcast;
2497 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2170 2498
2171 # if we are delayed by four ticks or more, skip them all 2499 # if we are delayed by four ticks or more, skip them all
2172 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2500 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2173 2501
2174 $TICK_WATCHER->at ($NEXT_TICK); 2502 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines