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.139 by root, Fri Jan 5 19:12:03 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 (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
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 unless (Coro::cede) { 311 Coro::cede or Event::one_event;
269 Coro::nready ? Event::one_event 0 : Event::one_event;
270 Coro::cede_notself unless Coro::cede;
271 }
272 } 312 }
273 313
274 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
275 } else { 315 } else {
276 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
277 317
278 $job->() 318 $job->()
279 } 319 }
280} 320}
281 321
282=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
283 323
284Creates (and readies) and returns a new coro. This coro is automcatially 324Like async, but this coro is automcatially being canceled when the
285being canceled when the extension calling this is being unloaded. 325extension calling this is being unloaded.
286 326
287=cut 327=cut
288 328
289sub coro(&) { 329sub async_ext(&) {
290 my $cb = shift; 330 my $cb = shift;
291 331
292 my $coro = &Coro::async_pool ($cb); 332 my $coro = &Coro::async ($cb);
293 333
294 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
295 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
296 }); 336 });
297 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
326=cut 366=cut
327 367
328############################################################################# 368#############################################################################
329 369
330package 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
331 377
332sub new { 378sub new {
333 my ($class, $path, $base) = @_; 379 my ($class, $path, $base) = @_;
334 380
335 $path = $path->as_string if ref $path; 381 $path = $path->as_string if ref $path;
341 # ?random/... random maps 387 # ?random/... random maps
342 # /! non-realised random map exit 388 # /! non-realised random map exit
343 # /... normal maps 389 # /... normal maps
344 # ~/... per-player maps without a specific player (DO NOT USE) 390 # ~/... per-player maps without a specific player (DO NOT USE)
345 # ~user/... per-player map of a specific user 391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
346 394
347 if ($path =~ /^{/) { 395 if ($path =~ /^{/) {
348 # fine as it is 396 # fine as it is
349 } elsif ($path =~ s{^\?random/}{}) { 397 } elsif ($path =~ s{^\?random/}{}) {
350 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
399# } 447# }
400} 448}
401 449
402# escape the /'s in the path 450# escape the /'s in the path
403sub _escaped_path { 451sub _escaped_path {
404 # ∕ is U+2215
405 (my $path = $_[0]{path}) =~ s/\///g; 452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
406 $path 453 $path
407} 454}
408 455
409# the original (read-only) location 456# the original (read-only) location
410sub load_path { 457sub load_path {
1037}; 1084};
1038 1085
1039cf::map->attach (prio => -10000, package => cf::mapsupport::); 1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1040 1087
1041############################################################################# 1088#############################################################################
1042# load/save perl data associated with player->ob objects
1043
1044sub all_objects(@) {
1045 @_, map all_objects ($_->inv), @_
1046}
1047
1048# TODO: compatibility cruft, remove when no longer needed
1049cf::player->attach (
1050 on_load => sub {
1051 my ($pl, $path) = @_;
1052
1053 for my $o (all_objects $pl->ob) {
1054 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1055 $o->set_ob_key_value ("_perl_data");
1056
1057 %$o = %{ Storable::thaw pack "H*", $value };
1058 }
1059 }
1060 },
1061);
1062
1063#############################################################################
1064 1089
1065=head2 CORE EXTENSIONS 1090=head2 CORE EXTENSIONS
1066 1091
1067Functions and methods that extend core crossfire objects. 1092Functions and methods that extend core crossfire objects.
1068 1093
1094=cut
1095
1096package cf::player;
1097
1098use Coro::AIO;
1099
1069=head3 cf::player 1100=head3 cf::player
1070 1101
1071=over 4 1102=over 4
1072 1103
1073=item cf::player::exists $login 1104=item cf::player::find $login
1074 1105
1075Returns true when the given account exists. 1106Returns the given player object, loading it if necessary (might block).
1076 1107
1077=cut 1108=cut
1078 1109
1079sub cf::player::exists($) { 1110sub playerdir($) {
1080 cf::player::find $_[0] 1111 cf::localdir
1081 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
1082} 1256}
1083 1257
1084=item $player->ext_reply ($msgid, $msgtype, %msg) 1258=item $player->ext_reply ($msgid, $msgtype, %msg)
1085 1259
1086Sends an ext reply to the player. 1260Sends an ext reply to the player.
1087 1261
1088=cut 1262=cut
1089 1263
1090sub cf::player::ext_reply($$$%) { 1264sub ext_reply($$$%) {
1091 my ($self, $id, %msg) = @_; 1265 my ($self, $id, %msg) = @_;
1092 1266
1093 $msg{msgid} = $id; 1267 $msg{msgid} = $id;
1094 1268
1095 $self->send ("ext " . to_json \%msg); 1269 $self->send ("ext " . cf::to_json \%msg);
1096} 1270}
1271
1272package cf;
1097 1273
1098=back 1274=back
1099 1275
1100 1276
1101=head3 cf::map 1277=head3 cf::map
1267 Coro::cede; 1443 Coro::cede;
1268 1444
1269 $self->in_memory (cf::MAP_IN_MEMORY); 1445 $self->in_memory (cf::MAP_IN_MEMORY);
1270} 1446}
1271 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
1272sub find_sync { 1472sub find_sync {
1273 my ($path, $origin) = @_; 1473 my ($path, $origin) = @_;
1274 1474
1275 cf::sync_job { 1475 cf::sync_job { find $path, $origin }
1276 my $map = cf::map::find $path, $origin;
1277 $map
1278 }
1279} 1476}
1280 1477
1281sub do_load_sync { 1478sub do_load_sync {
1282 my ($map) = @_; 1479 my ($map) = @_;
1283 1480
1284 cf::sync_job { $map->load }; 1481 cf::sync_job { $map->load };
1285} 1482}
1286 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
1287sub save { 1516sub save {
1288 my ($self) = @_; 1517 my ($self) = @_;
1289 1518
1290 my $lock = cf::lock_acquire "map_data:" . $self->path; 1519 my $lock = cf::lock_acquire "map_data:" . $self->path;
1291 1520
1299 $self->{load_path} = $save; 1528 $self->{load_path} = $save;
1300 1529
1301 return if $self->{deny_save}; 1530 return if $self->{deny_save};
1302 1531
1303 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 };
1304 1537
1305 if ($uniq) { 1538 if ($uniq) {
1306 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1307 $self->save_objects ($uniq, cf::IO_UNIQUES); 1540 $self->save_objects ($uniq, cf::IO_UNIQUES);
1308 } else { 1541 } else {
1403 } 1636 }
1404 1637
1405 $map 1638 $map
1406} 1639}
1407 1640
1408sub emergency_save { 1641=item cf::map::unique_maps
1409 my $freeze_guard = cf::freeze_mainloop;
1410 1642
1411 warn "enter emergency map save\n"; 1643Returns an arrayref of cf::path's of all shared maps that have
1644instantiated unique items. May block.
1412 1645
1413 cf::sync_job { 1646=cut
1414 warn "begin emergency map save\n"; 1647
1415 $_->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 $_;
1416 }; 1660 }
1417 1661
1418 warn "end emergency map save\n"; 1662 \@paths
1419} 1663}
1420 1664
1421package cf; 1665package cf;
1422 1666
1423=back 1667=back
1424 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
1425 1695
1426=head3 cf::object::player 1696=head3 cf::object::player
1427 1697
1428=over 4 1698=over 4
1429 1699
1521 # use -1 or undef as default coordinates, not 0, 0 1791 # use -1 or undef as default coordinates, not 0, 0
1522 ($x, $y) = ($map->enter_x, $map->enter_y) 1792 ($x, $y) = ($map->enter_x, $map->enter_y)
1523 if $x <=0 && $y <= 0; 1793 if $x <=0 && $y <= 0;
1524 1794
1525 $map->load; 1795 $map->load;
1796 $map->load_diag;
1526 1797
1798 return unless $self->contr->active;
1527 $self->activate_recursive; 1799 $self->activate_recursive;
1528 $self->enter_map ($map, $x, $y); 1800 $self->enter_map ($map, $x, $y);
1529} 1801}
1530 1802
1531cf::player->attach ( 1803cf::player->attach (
1543 my ($pl) = @_; 1815 my ($pl) = @_;
1544 1816
1545 # try to abort aborted map switching on player login :) 1817 # try to abort aborted map switching on player login :)
1546 # should happen only on crashes 1818 # should happen only on crashes
1547 if ($pl->ob->{_link_pos}) { 1819 if ($pl->ob->{_link_pos}) {
1548
1549 $pl->ob->enter_link; 1820 $pl->ob->enter_link;
1550 (Coro::async_pool { 1821 (async {
1551 # 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
1552 # 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);
1553 Coro::Timer::sleep 1; 1828 Coro::Timer::sleep 1;
1554 $pl->ob->leave_link; 1829 $pl->ob->leave_link;
1555 })->prio (2); 1830 })->prio (2);
1556 } 1831 }
1557 }, 1832 },
1562=cut 1837=cut
1563 1838
1564sub cf::object::player::goto { 1839sub cf::object::player::goto {
1565 my ($self, $path, $x, $y) = @_; 1840 my ($self, $path, $x, $y) = @_;
1566 1841
1842 $path = new cf::path $path;
1843
1567 $self->enter_link; 1844 $self->enter_link;
1568 1845
1569 (Coro::async_pool { 1846 (async {
1570 $path = new cf::path $path;
1571
1572 my $map = cf::map::find $path->as_string; 1847 my $map = cf::map::find $path->as_string;
1573 $map = $map->customise_for ($self) if $map; 1848 $map = $map->customise_for ($self) if $map;
1574 1849
1575# warn "entering ", $map->path, " at ($x, $y)\n" 1850# warn "entering ", $map->path, " at ($x, $y)\n"
1576# if $map; 1851# if $map;
1577 1852
1578 $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);
1579 1854
1580 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1581 })->prio (1); 1856 })->prio (1);
1582} 1857}
1583 1858
1636 1911
1637 return unless $self->type == cf::PLAYER; 1912 return unless $self->type == cf::PLAYER;
1638 1913
1639 $self->enter_link; 1914 $self->enter_link;
1640 1915
1641 (Coro::async_pool { 1916 (async {
1642 $self->deactivate_recursive; # just to be sure 1917 $self->deactivate_recursive; # just to be sure
1643 unless (eval { 1918 unless (eval {
1644 prepare_random_map $exit 1919 prepare_random_map $exit
1645 if $exit->slaying eq "/!"; 1920 if $exit->slaying eq "/!";
1646 1921
1649 1924
1650 1; 1925 1;
1651 }) { 1926 }) {
1652 $self->message ("Something went wrong deep within the crossfire server. " 1927 $self->message ("Something went wrong deep within the crossfire server. "
1653 . "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. "
1654 . "Please report this to the dungeon master", 1929 . "Please report this to the dungeon master!",
1655 cf::NDI_UNIQUE | cf::NDI_RED); 1930 cf::NDI_UNIQUE | cf::NDI_RED);
1656 1931
1657 warn "ERROR in enter_exit: $@"; 1932 warn "ERROR in enter_exit: $@";
1658 $self->leave_link; 1933 $self->leave_link;
1659 } 1934 }
1727 } 2002 }
1728 } 2003 }
1729 }, 2004 },
1730); 2005);
1731 2006
1732=item $client->coro (\&cb) 2007=item $client->async (\&cb)
1733 2008
1734Create a new coroutine, running the specified callback. The coroutine will 2009Create a new coroutine, running the specified callback. The coroutine will
1735be automatically cancelled when the client gets destroyed (e.g. on logout, 2010be automatically cancelled when the client gets destroyed (e.g. on logout,
1736or loss of connection). 2011or loss of connection).
1737 2012
1738=cut 2013=cut
1739 2014
1740sub cf::client::coro { 2015sub cf::client::async {
1741 my ($self, $cb) = @_; 2016 my ($self, $cb) = @_;
1742 2017
1743 my $coro = &Coro::async_pool ($cb); 2018 my $coro = &Coro::async ($cb);
1744 2019
1745 $coro->on_destroy (sub { 2020 $coro->on_destroy (sub {
1746 delete $self->{_coro}{$coro+0}; 2021 delete $self->{_coro}{$coro+0};
1747 }); 2022 });
1748 2023
1991 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 2266 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
1992 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 2267 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
1993 2268
1994 if (exists $CFG{mlockall}) { 2269 if (exists $CFG{mlockall}) {
1995 eval { 2270 eval {
1996 $CFG{mlockall} ? &mlockall : &munlockall 2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1997 and die "WARNING: m(un)lockall failed: $!\n"; 2272 and die "WARNING: m(un)lockall failed: $!\n";
1998 }; 2273 };
1999 warn $@ if $@; 2274 warn $@ if $@;
2000 } 2275 }
2001} 2276}
2002 2277
2003sub main { 2278sub main {
2004 # we must not ever block the main coroutine 2279 # we must not ever block the main coroutine
2005 local $Coro::idle = sub { 2280 local $Coro::idle = sub {
2006 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#
2007 Coro::async_pool { Event::one_event }; 2282 async { Event::one_event };
2008 }; 2283 };
2009 2284
2010 cfg_load; 2285 cfg_load;
2011 db_load; 2286 db_load;
2012 load_extensions; 2287 load_extensions;
2013 Event::loop; 2288 Event::loop;
2014} 2289}
2015 2290
2016############################################################################# 2291#############################################################################
2017# 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}
2018 2335
2019sub reload() { 2336sub reload() {
2020 # can/must only be called in main 2337 # can/must only be called in main
2021 if ($Coro::current != $Coro::main) { 2338 if ($Coro::current != $Coro::main) {
2022 warn "can only reload from main coroutine\n"; 2339 warn "can only reload from main coroutine\n";
2095 cf::load_extensions; 2412 cf::load_extensions;
2096 2413
2097 # reattach attachments to objects 2414 # reattach attachments to objects
2098 warn "reattach"; 2415 warn "reattach";
2099 _global_reattach; 2416 _global_reattach;
2417 reattach $_ for values %MAP;
2100 }; 2418 };
2101 2419
2102 if ($@) { 2420 if ($@) {
2103 warn $@; 2421 warn $@;
2104 warn "error while reloading, exiting."; 2422 warn "error while reloading, exiting.";
2120 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2121 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2122 2440
2123 # dirty hack because... archetypes are not yet loaded 2441 # dirty hack because... archetypes are not yet loaded
2124 Event->timer ( 2442 Event->timer (
2125 after => 2, 2443 after => 10,
2126 cb => sub { 2444 cb => sub {
2127 $_[0]->w->cancel; 2445 $_[0]->w->cancel;
2128 2446
2129 # provide some exits "home" 2447 # provide some exits "home"
2130 my $exit = cf::object::new "exit"; 2448 my $exit = cf::object::new "exit";
2172 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2173 cb => sub { 2491 cb => sub {
2174 cf::server_tick; # one server iteration 2492 cf::server_tick; # one server iteration
2175 $RUNTIME += $TICK; 2493 $RUNTIME += $TICK;
2176 $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;
2177 2498
2178 # 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
2179 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2500 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2180 2501
2181 $TICK_WATCHER->at ($NEXT_TICK); 2502 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines