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.136 by root, Fri Jan 5 01:06:28 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.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
… …
221 # wake up all waiters, to be on the safe side 254 # wake up all waiters, to be on the safe side
222 $_->ready for @{ delete $LOCK{$key} }; 255 $_->ready for @{ delete $LOCK{$key} };
223 } 256 }
224} 257}
225 258
226=item cf::async { BLOCK }
227
228Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
229error instead of exiting the server in case of a problem.
230
231=cut
232
233sub async(&) {
234 my ($cb) = @_;
235
236 Coro::async {
237 eval { $cb->() };
238 warn $@ if $@;
239 }
240}
241
242sub freeze_mainloop { 259sub freeze_mainloop {
243 return unless $TICK_WATCHER->is_active; 260 return unless $TICK_WATCHER->is_active;
244 261
245 my $guard = Coro::guard { $TICK_WATCHER->start }; 262 my $guard = Coro::guard { $TICK_WATCHER->start };
246 $TICK_WATCHER->stop; 263 $TICK_WATCHER->stop;
247 $guard 264 $guard
248} 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 }
249 276
250=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
251 278
252The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
253always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
… …
272 my $freeze_guard = freeze_mainloop; 299 my $freeze_guard = freeze_mainloop;
273 300
274 my $busy = 1; 301 my $busy = 1;
275 my @res; 302 my @res;
276 303
277 (Coro::async { 304 (async {
278 @res = eval { $job->() }; 305 @res = eval { $job->() };
279 warn $@ if $@; 306 warn $@ if $@;
280 undef $busy; 307 undef $busy;
281 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
282 309
283 while ($busy) { 310 while ($busy) {
284 Coro::cede_notself; 311 Coro::cede or Event::one_event;
285 Event::one_event unless Coro::nready;
286 } 312 }
287 313
288 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
289 } else { 315 } else {
290 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
291 317
292 $job->() 318 $job->()
293 } 319 }
294} 320}
295 321
296=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
297 323
298Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automcatially being canceled when the
299when the extension calling this is being unloaded. 325extension calling this is being unloaded.
300 326
301=cut 327=cut
302 328
303sub coro(&) { 329sub async_ext(&) {
304 my $cb = shift; 330 my $cb = shift;
305 331
306 my $coro = &cf::async ($cb); 332 my $coro = &Coro::async ($cb);
307 333
308 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
309 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
310 }); 336 });
311 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
… …
340=cut 366=cut
341 367
342############################################################################# 368#############################################################################
343 369
344package 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
345 374
346sub new { 375sub new {
347 my ($class, $path, $base) = @_; 376 my ($class, $path, $base) = @_;
348 377
349 $path = $path->as_string if ref $path; 378 $path = $path->as_string if ref $path;
… …
413# } 442# }
414} 443}
415 444
416# escape the /'s in the path 445# escape the /'s in the path
417sub _escaped_path { 446sub _escaped_path {
418 # ∕ is U+2215
419 (my $path = $_[0]{path}) =~ s/\//∕/g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
420 $path 448 $path
421} 449}
422 450
423# the original (read-only) location 451# the original (read-only) location
424sub load_path { 452sub load_path {
… …
1051}; 1079};
1052 1080
1053cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1054 1082
1055############################################################################# 1083#############################################################################
1056# load/save perl data associated with player->ob objects
1057
1058sub all_objects(@) {
1059 @_, map all_objects ($_->inv), @_
1060}
1061
1062# TODO: compatibility cruft, remove when no longer needed
1063cf::player->attach (
1064 on_load => sub {
1065 my ($pl, $path) = @_;
1066
1067 for my $o (all_objects $pl->ob) {
1068 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1069 $o->set_ob_key_value ("_perl_data");
1070
1071 %$o = %{ Storable::thaw pack "H*", $value };
1072 }
1073 }
1074 },
1075);
1076
1077#############################################################################
1078 1084
1079=head2 CORE EXTENSIONS 1085=head2 CORE EXTENSIONS
1080 1086
1081Functions and methods that extend core crossfire objects. 1087Functions and methods that extend core crossfire objects.
1082 1088
1089=cut
1090
1091package cf::player;
1092
1093use Coro::AIO;
1094
1083=head3 cf::player 1095=head3 cf::player
1084 1096
1085=over 4 1097=over 4
1086 1098
1087=item cf::player::exists $login 1099=item cf::player::find $login
1088 1100
1089Returns true when the given account exists. 1101Returns the given player object, loading it if necessary (might block).
1090 1102
1091=cut 1103=cut
1092 1104
1093sub cf::player::exists($) { 1105sub playerdir($) {
1094 cf::player::find $_[0] 1106 cf::localdir
1095 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1107 . "/"
1108 . cf::playerdir
1109 . "/"
1110 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1111}
1112
1113sub path($) {
1114 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1115
1116 (playerdir $login) . "/$login.pl"
1117}
1118
1119sub find_active($) {
1120 $cf::PLAYER{$_[0]}
1121 and $cf::PLAYER{$_[0]}->active
1122 and $cf::PLAYER{$_[0]}
1123}
1124
1125sub exists($) {
1126 my ($login) = @_;
1127
1128 $cf::PLAYER{$login}
1129 or cf::sync_job { !aio_stat $login }
1130}
1131
1132sub find($) {
1133 return $cf::PLAYER{$_[0]} || do {
1134 my $login = $_[0];
1135
1136 my $guard = cf::lock_acquire "user_find:$login";
1137
1138 $cf::PLAYER{$_[0]} || do {
1139 my $pl = load_pl path $login
1140 or return;
1141 $cf::PLAYER{$login} = $pl
1142 }
1143 }
1144}
1145
1146sub save($) {
1147 my ($pl) = @_;
1148
1149 return if $pl->{deny_save};
1150
1151 my $path = path $pl;
1152 my $guard = cf::lock_acquire "user_save:$path";
1153
1154 return if $pl->{deny_save};
1155
1156 aio_mkdir playerdir $pl, 0770;
1157 $pl->{last_save} = $cf::RUNTIME;
1158
1159 $pl->save_pl ($path);
1160 Coro::cede;
1161}
1162
1163sub new($) {
1164 my ($login) = @_;
1165
1166 my $self = create;
1167
1168 $self->ob->name ($login);
1169 $self->{deny_save} = 1;
1170
1171 $cf::PLAYER{$login} = $self;
1172
1173 $self
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
1182
1183sub quit_character {
1184 my ($pl) = @_;
1185
1186 $pl->{deny_save} = 1;
1187 $pl->password ("*"); # this should lock out the player until we nuked the dir
1188
1189 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1190 $pl->deactivate;
1191 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1192 $pl->ns->destroy if $pl->ns;
1193
1194 my $path = playerdir $pl;
1195 my $temp = "$path~$cf::RUNTIME~deleting~";
1196 aio_rename $path, $temp;
1197 delete $cf::PLAYER{$pl->ob->name};
1198 $pl->destroy;
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
1096} 1252}
1097 1253
1098=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1099 1255
1100Sends an ext reply to the player. 1256Sends an ext reply to the player.
1101 1257
1102=cut 1258=cut
1103 1259
1104sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1105 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1106 1262
1107 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1108 1264
1109 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1110} 1266}
1267
1268package cf;
1111 1269
1112=back 1270=back
1113 1271
1114 1272
1115=head3 cf::map 1273=head3 cf::map
… …
1281 Coro::cede; 1439 Coro::cede;
1282 1440
1283 $self->in_memory (cf::MAP_IN_MEMORY); 1441 $self->in_memory (cf::MAP_IN_MEMORY);
1284} 1442}
1285 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
1286sub find_sync { 1468sub find_sync {
1287 my ($path, $origin) = @_; 1469 my ($path, $origin) = @_;
1288 1470
1289 cf::sync_job { cf::map::find $path, $origin } 1471 cf::sync_job { find $path, $origin }
1290} 1472}
1291 1473
1292sub do_load_sync { 1474sub do_load_sync {
1293 my ($map) = @_; 1475 my ($map) = @_;
1294 1476
1295 cf::sync_job { $map->load }; 1477 cf::sync_job { $map->load };
1296} 1478}
1297 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 ()
1510}
1511
1298sub save { 1512sub save {
1299 my ($self) = @_; 1513 my ($self) = @_;
1300 1514
1515 my $lock = cf::lock_acquire "map_data:" . $self->path;
1516
1301 $self->{last_save} = $cf::RUNTIME; 1517 $self->{last_save} = $cf::RUNTIME;
1302 1518
1303 return unless $self->dirty; 1519 return unless $self->dirty;
1304 1520
1305 my $save = $self->{path}->save_path; utf8::encode $save; 1521 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1308 $self->{load_path} = $save; 1524 $self->{load_path} = $save;
1309 1525
1310 return if $self->{deny_save}; 1526 return if $self->{deny_save};
1311 1527
1312 local $self->{last_access} = $self->last_access;#d# 1528 local $self->{last_access} = $self->last_access;#d#
1529
1530 cf::async {
1531 $_->contr->save for $self->players;
1532 };
1313 1533
1314 if ($uniq) { 1534 if ($uniq) {
1315 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1535 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1316 $self->save_objects ($uniq, cf::IO_UNIQUES); 1536 $self->save_objects ($uniq, cf::IO_UNIQUES);
1317 } else { 1537 } else {
… …
1323 my ($self) = @_; 1543 my ($self) = @_;
1324 1544
1325 # save first because save cedes 1545 # save first because save cedes
1326 $self->save; 1546 $self->save;
1327 1547
1548 my $lock = cf::lock_acquire "map_data:" . $self->path;
1549
1328 return if $self->players; 1550 return if $self->players;
1329 return if $self->in_memory != cf::MAP_IN_MEMORY; 1551 return if $self->in_memory != cf::MAP_IN_MEMORY;
1330 return if $self->{deny_save}; 1552 return if $self->{deny_save};
1331 1553
1332 $self->clear; 1554 $self->clear;
… …
1374} 1596}
1375 1597
1376sub reset { 1598sub reset {
1377 my ($self) = @_; 1599 my ($self) = @_;
1378 1600
1601 my $lock = cf::lock_acquire "map_data:" . $self->path;
1602
1379 return if $self->players; 1603 return if $self->players;
1380 return if $self->{path}{user_rel};#d# 1604 return if $self->{path}{user_rel};#d#
1381 1605
1382 warn "resetting map ", $self->path;#d# 1606 warn "resetting map ", $self->path;#d#
1383 1607
… …
1408 } 1632 }
1409 1633
1410 $map 1634 $map
1411} 1635}
1412 1636
1413sub emergency_save {
1414 my $freeze_guard = cf::freeze_mainloop;
1415
1416 warn "enter emergency map save\n";
1417
1418 cf::sync_job {
1419 warn "begin emergency map save\n";
1420 $_->save for values %cf::MAP;
1421 };
1422
1423 warn "end emergency map save\n";
1424}
1425
1426package cf; 1637package cf;
1427 1638
1428=back 1639=back
1429 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
1430 1667
1431=head3 cf::object::player 1668=head3 cf::object::player
1432 1669
1433=over 4 1670=over 4
1434 1671
… …
1526 # use -1 or undef as default coordinates, not 0, 0 1763 # use -1 or undef as default coordinates, not 0, 0
1527 ($x, $y) = ($map->enter_x, $map->enter_y) 1764 ($x, $y) = ($map->enter_x, $map->enter_y)
1528 if $x <=0 && $y <= 0; 1765 if $x <=0 && $y <= 0;
1529 1766
1530 $map->load; 1767 $map->load;
1768 $map->load_diag;
1531 1769
1770 return unless $self->contr->active;
1532 $self->activate_recursive; 1771 $self->activate_recursive;
1533 $self->enter_map ($map, $x, $y); 1772 $self->enter_map ($map, $x, $y);
1534} 1773}
1535 1774
1536cf::player->attach ( 1775cf::player->attach (
… …
1549 1788
1550 # try to abort aborted map switching on player login :) 1789 # try to abort aborted map switching on player login :)
1551 # should happen only on crashes 1790 # should happen only on crashes
1552 if ($pl->ob->{_link_pos}) { 1791 if ($pl->ob->{_link_pos}) {
1553 $pl->ob->enter_link; 1792 $pl->ob->enter_link;
1554 cf::async { 1793 (async {
1555 # we need this sleep as the login has a concurrent enter_exit running 1794 # we need this sleep as the login has a concurrent enter_exit running
1556 # and this sleep increases chances of the player not ending up in scorn 1795 # and this sleep increases chances of the player not ending up in scorn
1796 $pl->ob->reply (undef,
1797 "There was an internal problem at your last logout, "
1798 . "the server will try to bring you to your intended destination in a second.",
1799 cf::NDI_RED);
1557 Coro::Timer::sleep 1; 1800 Coro::Timer::sleep 1;
1558 $pl->ob->leave_link; 1801 $pl->ob->leave_link;
1559 }; 1802 })->prio (2);
1560 } 1803 }
1561 }, 1804 },
1562); 1805);
1563 1806
1564=item $player_object->goto ($path, $x, $y) 1807=item $player_object->goto ($path, $x, $y)
… …
1566=cut 1809=cut
1567 1810
1568sub cf::object::player::goto { 1811sub cf::object::player::goto {
1569 my ($self, $path, $x, $y) = @_; 1812 my ($self, $path, $x, $y) = @_;
1570 1813
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1571 $self->enter_link; 1817 $self->enter_link;
1572 1818
1573 (cf::async { 1819 (async {
1574 $path = new cf::path $path;
1575
1576 my $map = cf::map::find $path->as_string; 1820 my $map = cf::map::find $path->as_string;
1577 $map = $map->customise_for ($self) if $map; 1821 $map = $map->customise_for ($self) if $map;
1578 1822
1579# warn "entering ", $map->path, " at ($x, $y)\n" 1823# warn "entering ", $map->path, " at ($x, $y)\n"
1580# if $map; 1824# if $map;
1581 1825
1582 $map or $self->message ("The exit 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);
1583 1827
1584 $self->leave_link ($map, $x, $y); 1828 $self->leave_link ($map, $x, $y);
1585 })->prio (1); 1829 })->prio (1);
1586} 1830}
1587 1831
… …
1640 1884
1641 return unless $self->type == cf::PLAYER; 1885 return unless $self->type == cf::PLAYER;
1642 1886
1643 $self->enter_link; 1887 $self->enter_link;
1644 1888
1645 (cf::async { 1889 (async {
1646 $self->deactivate_recursive; # just to be sure 1890 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1891 unless (eval {
1648 prepare_random_map $exit 1892 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1893 if $exit->slaying eq "/!";
1650 1894
… …
1731 } 1975 }
1732 } 1976 }
1733 }, 1977 },
1734); 1978);
1735 1979
1736=item $client->coro (\&cb) 1980=item $client->async (\&cb)
1737 1981
1738Create a new coroutine, running the specified callback. The coroutine will 1982Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1983be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1984or loss of connection).
1741 1985
1742=cut 1986=cut
1743 1987
1744sub cf::client::coro { 1988sub cf::client::async {
1745 my ($self, $cb) = @_; 1989 my ($self, $cb) = @_;
1746 1990
1747 my $coro = &cf::async ($cb); 1991 my $coro = &Coro::async ($cb);
1748 1992
1749 $coro->on_destroy (sub { 1993 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1994 delete $self->{_coro}{$coro+0};
1751 }); 1995 });
1752 1996
… …
1990 local $/; 2234 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2235 *CFG = YAML::Syck::Load <$fh>;
1992 2236
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2237 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2238
2239 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2240 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2241
1995 if (exists $CFG{mlockall}) { 2242 if (exists $CFG{mlockall}) {
1996 eval { 2243 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2244 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2245 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2246 };
2000 warn $@ if $@; 2247 warn $@ if $@;
2001 } 2248 }
2002} 2249}
2003 2250
2004sub main { 2251sub main {
2005 # we must not ever block the main coroutine 2252 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2253 local $Coro::idle = sub {
2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2254 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2255 async { Event::one_event };
2010 })->();
2011 }; 2256 };
2012 2257
2013 cfg_load; 2258 cfg_load;
2014 db_load; 2259 db_load;
2015 load_extensions; 2260 load_extensions;
2016 Event::loop; 2261 Event::loop;
2017} 2262}
2018 2263
2019############################################################################# 2264#############################################################################
2020# 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}
2021 2308
2022sub reload() { 2309sub reload() {
2023 # can/must only be called in main 2310 # can/must only be called in main
2024 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
2025 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine\n";
… …
2098 cf::load_extensions; 2385 cf::load_extensions;
2099 2386
2100 # reattach attachments to objects 2387 # reattach attachments to objects
2101 warn "reattach"; 2388 warn "reattach";
2102 _global_reattach; 2389 _global_reattach;
2390 reattach $_ for values %MAP;
2103 }; 2391 };
2104 2392
2105 if ($@) { 2393 if ($@) {
2106 warn $@; 2394 warn $@;
2107 warn "error while reloading, exiting."; 2395 warn "error while reloading, exiting.";
… …
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2411 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2412 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2413
2126 # dirty hack because... archetypes are not yet loaded 2414 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2415 Event->timer (
2128 after => 2, 2416 after => 10,
2129 cb => sub { 2417 cb => sub {
2130 $_[0]->w->cancel; 2418 $_[0]->w->cancel;
2131 2419
2132 # provide some exits "home" 2420 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2421 my $exit = cf::object::new "exit";
… …
2175 data => WF_AUTOCANCEL, 2463 data => WF_AUTOCANCEL,
2176 cb => sub { 2464 cb => sub {
2177 cf::server_tick; # one server iteration 2465 cf::server_tick; # one server iteration
2178 $RUNTIME += $TICK; 2466 $RUNTIME += $TICK;
2179 $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;
2180 2471
2181 # 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
2182 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2473 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2183 2474
2184 $TICK_WATCHER->at ($NEXT_TICK); 2475 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

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