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.134 by root, Thu Jan 4 17:28:49 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
179sub to_json($) { 212sub to_json($) {
180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 213 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
181 JSON::Syck::Dump $_[0] 214 JSON::Syck::Dump $_[0]
182} 215}
183 216
184=item my $guard = cf::guard { BLOCK }
185
186Run the given callback when the guard object gets destroyed (useful for
187coroutine cancellations).
188
189You can call C<< ->cancel >> on the guard object to stop the block from
190being executed.
191
192=cut
193
194sub guard(&) {
195 bless \(my $cb = $_[0]), cf::guard::;
196}
197
198sub cf::guard::cancel {
199 ${$_[0]} = sub { };
200}
201
202sub cf::guard::DESTROY {
203 ${$_[0]}->();
204}
205
206=item cf::lock_wait $string 217=item cf::lock_wait $string
207 218
208Wait until the given lock is available. See cf::lock_acquire. 219Wait until the given lock is available. See cf::lock_acquire.
209 220
210=item my $lock = cf::lock_acquire $string 221=item my $lock = cf::lock_acquire $string
211 222
212Wait until the given lock is available and then acquires it and returns 223Wait until the given lock is available and then acquires it and returns
213a guard object. If the guard object gets destroyed (goes out of scope, 224a Coro::guard object. If the guard object gets destroyed (goes out of scope,
214for example when the coroutine gets canceled), the lock is automatically 225for example when the coroutine gets canceled), the lock is automatically
215returned. 226returned.
216 227
217Lock names should begin with a unique identifier (for example, cf::map::find 228Lock names should begin with a unique identifier (for example, cf::map::find
218uses map_find and cf::map::load uses map_load). 229uses map_find and cf::map::load uses map_load).
237 # wait, to be sure we are not locked 248 # wait, to be sure we are not locked
238 lock_wait $key; 249 lock_wait $key;
239 250
240 $LOCK{$key} = []; 251 $LOCK{$key} = [];
241 252
242 cf::guard { 253 Coro::guard {
243 # wake up all waiters, to be on the safe side 254 # wake up all waiters, to be on the safe side
244 $_->ready for @{ delete $LOCK{$key} }; 255 $_->ready for @{ delete $LOCK{$key} };
245 } 256 }
246} 257}
247 258
248=item cf::async { BLOCK }
249
250Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the
251error instead of exiting the server in case of a problem.
252
253=cut
254
255sub async(&) {
256 my ($cb) = @_;
257
258 Coro::async {
259 eval { $cb->() };
260 warn $@ if $@;
261 }
262}
263
264sub freeze_mainloop { 259sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 260 return unless $TICK_WATCHER->is_active;
266 261
267 my $guard = guard { $TICK_WATCHER->start }; 262 my $guard = Coro::guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop; 263 $TICK_WATCHER->stop;
269 $guard 264 $guard
270} 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 }
271 276
272=item cf::sync_job { BLOCK } 277=item cf::sync_job { BLOCK }
273 278
274The design of crossfire+ requires that the main coro ($Coro::main) is 279The design of crossfire+ requires that the main coro ($Coro::main) is
275always able to handle events or runnable, as crossfire+ is only partly 280always able to handle events or runnable, as crossfire+ is only partly
294 my $freeze_guard = freeze_mainloop; 299 my $freeze_guard = freeze_mainloop;
295 300
296 my $busy = 1; 301 my $busy = 1;
297 my @res; 302 my @res;
298 303
299 (Coro::async { 304 (async {
300 @res = eval { $job->() }; 305 @res = eval { $job->() };
301 warn $@ if $@; 306 warn $@ if $@;
302 undef $busy; 307 undef $busy;
303 })->prio (Coro::PRIO_MAX); 308 })->prio (Coro::PRIO_MAX);
304 309
305 while ($busy) { 310 while ($busy) {
306 Coro::cede_notself; 311 Coro::cede or Event::one_event;
307 Event::one_event unless Coro::nready;
308 } 312 }
309 313
310 wantarray ? @res : $res[0] 314 wantarray ? @res : $res[0]
311 } else { 315 } else {
312 # we are in another coroutine, how wonderful, everything just works 316 # we are in another coroutine, how wonderful, everything just works
313 317
314 $job->() 318 $job->()
315 } 319 }
316} 320}
317 321
318=item $coro = cf::coro { BLOCK } 322=item $coro = cf::async_ext { BLOCK }
319 323
320Creates and returns a new coro. This coro is automcatially being canceled 324Like async, but this coro is automcatially being canceled when the
321when the extension calling this is being unloaded. 325extension calling this is being unloaded.
322 326
323=cut 327=cut
324 328
325sub coro(&) { 329sub async_ext(&) {
326 my $cb = shift; 330 my $cb = shift;
327 331
328 my $coro = &cf::async ($cb); 332 my $coro = &Coro::async ($cb);
329 333
330 $coro->on_destroy (sub { 334 $coro->on_destroy (sub {
331 delete $EXT_CORO{$coro+0}; 335 delete $EXT_CORO{$coro+0};
332 }); 336 });
333 $EXT_CORO{$coro+0} = $coro; 337 $EXT_CORO{$coro+0} = $coro;
362=cut 366=cut
363 367
364############################################################################# 368#############################################################################
365 369
366package 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
367 377
368sub new { 378sub new {
369 my ($class, $path, $base) = @_; 379 my ($class, $path, $base) = @_;
370 380
371 $path = $path->as_string if ref $path; 381 $path = $path->as_string if ref $path;
377 # ?random/... random maps 387 # ?random/... random maps
378 # /! non-realised random map exit 388 # /! non-realised random map exit
379 # /... normal maps 389 # /... normal maps
380 # ~/... per-player maps without a specific player (DO NOT USE) 390 # ~/... per-player maps without a specific player (DO NOT USE)
381 # ~user/... per-player map of a specific user 391 # ~user/... per-player map of a specific user
392
393 $path =~ s/$PATH_SEP/\//go;
382 394
383 if ($path =~ /^{/) { 395 if ($path =~ /^{/) {
384 # fine as it is 396 # fine as it is
385 } elsif ($path =~ s{^\?random/}{}) { 397 } elsif ($path =~ s{^\?random/}{}) {
386 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data; 398 Coro::AIO::aio_load "$cf::RANDOM_MAPS/$path.meta", my $data;
435# } 447# }
436} 448}
437 449
438# escape the /'s in the path 450# escape the /'s in the path
439sub _escaped_path { 451sub _escaped_path {
440 # ∕ is U+2215
441 (my $path = $_[0]{path}) =~ s/\///g; 452 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
442 $path 453 $path
443} 454}
444 455
445# the original (read-only) location 456# the original (read-only) location
446sub load_path { 457sub load_path {
1073}; 1084};
1074 1085
1075cf::map->attach (prio => -10000, package => cf::mapsupport::); 1086cf::map->attach (prio => -10000, package => cf::mapsupport::);
1076 1087
1077############################################################################# 1088#############################################################################
1078# load/save perl data associated with player->ob objects
1079
1080sub all_objects(@) {
1081 @_, map all_objects ($_->inv), @_
1082}
1083
1084# TODO: compatibility cruft, remove when no longer needed
1085cf::player->attach (
1086 on_load => sub {
1087 my ($pl, $path) = @_;
1088
1089 for my $o (all_objects $pl->ob) {
1090 if (my $value = $o->get_ob_key_value ("_perl_data")) {
1091 $o->set_ob_key_value ("_perl_data");
1092
1093 %$o = %{ Storable::thaw pack "H*", $value };
1094 }
1095 }
1096 },
1097);
1098
1099#############################################################################
1100 1089
1101=head2 CORE EXTENSIONS 1090=head2 CORE EXTENSIONS
1102 1091
1103Functions and methods that extend core crossfire objects. 1092Functions and methods that extend core crossfire objects.
1104 1093
1094=cut
1095
1096package cf::player;
1097
1098use Coro::AIO;
1099
1105=head3 cf::player 1100=head3 cf::player
1106 1101
1107=over 4 1102=over 4
1108 1103
1109=item cf::player::exists $login 1104=item cf::player::find $login
1110 1105
1111Returns true when the given account exists. 1106Returns the given player object, loading it if necessary (might block).
1112 1107
1113=cut 1108=cut
1114 1109
1115sub cf::player::exists($) { 1110sub playerdir($) {
1116 cf::player::find $_[0] 1111 cf::localdir
1117 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
1118} 1256}
1119 1257
1120=item $player->ext_reply ($msgid, $msgtype, %msg) 1258=item $player->ext_reply ($msgid, $msgtype, %msg)
1121 1259
1122Sends an ext reply to the player. 1260Sends an ext reply to the player.
1123 1261
1124=cut 1262=cut
1125 1263
1126sub cf::player::ext_reply($$$%) { 1264sub ext_reply($$$%) {
1127 my ($self, $id, %msg) = @_; 1265 my ($self, $id, %msg) = @_;
1128 1266
1129 $msg{msgid} = $id; 1267 $msg{msgid} = $id;
1130 1268
1131 $self->send ("ext " . to_json \%msg); 1269 $self->send ("ext " . cf::to_json \%msg);
1132} 1270}
1271
1272package cf;
1133 1273
1134=back 1274=back
1135 1275
1136 1276
1137=head3 cf::map 1277=head3 cf::map
1184 or return; 1324 or return;
1185 1325
1186 my $map = cf::map::new 1326 my $map = cf::map::new
1187 or return; 1327 or return;
1188 1328
1329 # for better error messages only, will be overwritten
1330 $map->path ($path);
1331
1189 $map->load_header ($path) 1332 $map->load_header ($path)
1190 or return; 1333 or return;
1191 1334
1192 $map->{load_path} = $path; 1335 $map->{load_path} = $path;
1193 1336
1300 Coro::cede; 1443 Coro::cede;
1301 1444
1302 $self->in_memory (cf::MAP_IN_MEMORY); 1445 $self->in_memory (cf::MAP_IN_MEMORY);
1303} 1446}
1304 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
1305sub find_sync { 1472sub find_sync {
1306 my ($path, $origin) = @_; 1473 my ($path, $origin) = @_;
1307 1474
1308 cf::sync_job { cf::map::find $path, $origin } 1475 cf::sync_job { find $path, $origin }
1309} 1476}
1310 1477
1311sub do_load_sync { 1478sub do_load_sync {
1312 my ($map) = @_; 1479 my ($map) = @_;
1313 1480
1314 cf::sync_job { $map->load }; 1481 cf::sync_job { $map->load };
1315} 1482}
1316 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
1317sub save { 1516sub save {
1318 my ($self) = @_; 1517 my ($self) = @_;
1319 1518
1519 my $lock = cf::lock_acquire "map_data:" . $self->path;
1520
1320 $self->{last_save} = $cf::RUNTIME; 1521 $self->{last_save} = $cf::RUNTIME;
1321 1522
1322 return unless $self->dirty; 1523 return unless $self->dirty;
1323 1524
1324 my $save = $self->{path}->save_path; utf8::encode $save; 1525 my $save = $self->{path}->save_path; utf8::encode $save;
1327 $self->{load_path} = $save; 1528 $self->{load_path} = $save;
1328 1529
1329 return if $self->{deny_save}; 1530 return if $self->{deny_save};
1330 1531
1331 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 };
1332 1537
1333 if ($uniq) { 1538 if ($uniq) {
1334 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1539 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1335 $self->save_objects ($uniq, cf::IO_UNIQUES); 1540 $self->save_objects ($uniq, cf::IO_UNIQUES);
1336 } else { 1541 } else {
1342 my ($self) = @_; 1547 my ($self) = @_;
1343 1548
1344 # save first because save cedes 1549 # save first because save cedes
1345 $self->save; 1550 $self->save;
1346 1551
1552 my $lock = cf::lock_acquire "map_data:" . $self->path;
1553
1347 return if $self->players; 1554 return if $self->players;
1348 return if $self->in_memory != cf::MAP_IN_MEMORY; 1555 return if $self->in_memory != cf::MAP_IN_MEMORY;
1349 return if $self->{deny_save}; 1556 return if $self->{deny_save};
1350 1557
1351 $self->clear; 1558 $self->clear;
1393} 1600}
1394 1601
1395sub reset { 1602sub reset {
1396 my ($self) = @_; 1603 my ($self) = @_;
1397 1604
1605 my $lock = cf::lock_acquire "map_data:" . $self->path;
1606
1398 return if $self->players; 1607 return if $self->players;
1399 return if $self->{path}{user_rel};#d# 1608 return if $self->{path}{user_rel};#d#
1400 1609
1401 warn "resetting map ", $self->path;#d# 1610 warn "resetting map ", $self->path;#d#
1402 1611
1427 } 1636 }
1428 1637
1429 $map 1638 $map
1430} 1639}
1431 1640
1432sub emergency_save { 1641=item cf::map::unique_maps
1433 my $freeze_guard = cf::freeze_mainloop;
1434 1642
1435 warn "enter emergency map save\n"; 1643Returns an arrayref of cf::path's of all shared maps that have
1644instantiated unique items. May block.
1436 1645
1437 cf::sync_job { 1646=cut
1438 warn "begin emergency map save\n"; 1647
1439 $_->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 $_;
1440 }; 1660 }
1441 1661
1442 warn "end emergency map save\n"; 1662 \@paths
1443} 1663}
1444 1664
1445package cf; 1665package cf;
1446 1666
1447=back 1667=back
1448 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
1449 1695
1450=head3 cf::object::player 1696=head3 cf::object::player
1451 1697
1452=over 4 1698=over 4
1453 1699
1545 # use -1 or undef as default coordinates, not 0, 0 1791 # use -1 or undef as default coordinates, not 0, 0
1546 ($x, $y) = ($map->enter_x, $map->enter_y) 1792 ($x, $y) = ($map->enter_x, $map->enter_y)
1547 if $x <=0 && $y <= 0; 1793 if $x <=0 && $y <= 0;
1548 1794
1549 $map->load; 1795 $map->load;
1796 $map->load_diag;
1550 1797
1798 return unless $self->contr->active;
1551 $self->activate_recursive; 1799 $self->activate_recursive;
1552 $self->enter_map ($map, $x, $y); 1800 $self->enter_map ($map, $x, $y);
1553} 1801}
1554 1802
1555cf::player->attach ( 1803cf::player->attach (
1568 1816
1569 # try to abort aborted map switching on player login :) 1817 # try to abort aborted map switching on player login :)
1570 # should happen only on crashes 1818 # should happen only on crashes
1571 if ($pl->ob->{_link_pos}) { 1819 if ($pl->ob->{_link_pos}) {
1572 $pl->ob->enter_link; 1820 $pl->ob->enter_link;
1573 cf::async { 1821 (async {
1574 # 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
1575 # 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);
1576 Coro::Timer::sleep 1; 1828 Coro::Timer::sleep 1;
1577 $pl->ob->leave_link; 1829 $pl->ob->leave_link;
1578 }; 1830 })->prio (2);
1579 } 1831 }
1580 }, 1832 },
1581); 1833);
1582 1834
1583=item $player_object->goto_map ($path, $x, $y) 1835=item $player_object->goto ($path, $x, $y)
1584 1836
1585=cut 1837=cut
1586 1838
1587sub cf::object::player::goto_map { 1839sub cf::object::player::goto {
1588 my ($self, $path, $x, $y) = @_; 1840 my ($self, $path, $x, $y) = @_;
1589 1841
1842 $path = new cf::path $path;
1843
1590 $self->enter_link; 1844 $self->enter_link;
1591 1845
1592 (cf::async { 1846 (async {
1593 $path = new cf::path $path;
1594
1595 my $map = cf::map::find $path->as_string; 1847 my $map = cf::map::find $path->as_string;
1596 $map = $map->customise_for ($self) if $map; 1848 $map = $map->customise_for ($self) if $map;
1597 1849
1598# warn "entering ", $map->path, " at ($x, $y)\n" 1850# warn "entering ", $map->path, " at ($x, $y)\n"
1599# if $map; 1851# if $map;
1600 1852
1601 $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);
1602 1854
1603 $self->leave_link ($map, $x, $y); 1855 $self->leave_link ($map, $x, $y);
1604 })->prio (1); 1856 })->prio (1);
1605} 1857}
1606 1858
1659 1911
1660 return unless $self->type == cf::PLAYER; 1912 return unless $self->type == cf::PLAYER;
1661 1913
1662 $self->enter_link; 1914 $self->enter_link;
1663 1915
1664 (cf::async { 1916 (async {
1665 $self->deactivate_recursive; # just to be sure 1917 $self->deactivate_recursive; # just to be sure
1666 unless (eval { 1918 unless (eval {
1667 prepare_random_map $exit 1919 prepare_random_map $exit
1668 if $exit->slaying eq "/!"; 1920 if $exit->slaying eq "/!";
1669 1921
1670 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1922 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1671 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1923 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1672 1924
1673 1; 1925 1;
1674 }) { 1926 }) {
1675 $self->message ("Something went wrong deep within the crossfire server. " 1927 $self->message ("Something went wrong deep within the crossfire server. "
1676 . "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. "
1677 . "Please report this to the dungeon master", 1929 . "Please report this to the dungeon master!",
1678 cf::NDI_UNIQUE | cf::NDI_RED); 1930 cf::NDI_UNIQUE | cf::NDI_RED);
1679 1931
1680 warn "ERROR in enter_exit: $@"; 1932 warn "ERROR in enter_exit: $@";
1681 $self->leave_link; 1933 $self->leave_link;
1682 } 1934 }
1750 } 2002 }
1751 } 2003 }
1752 }, 2004 },
1753); 2005);
1754 2006
1755=item $client->coro (\&cb) 2007=item $client->async (\&cb)
1756 2008
1757Create a new coroutine, running the specified callback. The coroutine will 2009Create a new coroutine, running the specified callback. The coroutine will
1758be automatically cancelled when the client gets destroyed (e.g. on logout, 2010be automatically cancelled when the client gets destroyed (e.g. on logout,
1759or loss of connection). 2011or loss of connection).
1760 2012
1761=cut 2013=cut
1762 2014
1763sub cf::client::coro { 2015sub cf::client::async {
1764 my ($self, $cb) = @_; 2016 my ($self, $cb) = @_;
1765 2017
1766 my $coro = &cf::async ($cb); 2018 my $coro = &Coro::async ($cb);
1767 2019
1768 $coro->on_destroy (sub { 2020 $coro->on_destroy (sub {
1769 delete $self->{_coro}{$coro+0}; 2021 delete $self->{_coro}{$coro+0};
1770 }); 2022 });
1771 2023
2009 local $/; 2261 local $/;
2010 *CFG = YAML::Syck::Load <$fh>; 2262 *CFG = YAML::Syck::Load <$fh>;
2011 2263
2012 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2264 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2013 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
2014 if (exists $CFG{mlockall}) { 2269 if (exists $CFG{mlockall}) {
2015 eval { 2270 eval {
2016 $CFG{mlockall} ? &mlockall : &munlockall 2271 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2017 and die "WARNING: m(un)lockall failed: $!\n"; 2272 and die "WARNING: m(un)lockall failed: $!\n";
2018 }; 2273 };
2019 warn $@ if $@; 2274 warn $@ if $@;
2020 } 2275 }
2021} 2276}
2022 2277
2023sub main { 2278sub main {
2024 # we must not ever block the main coroutine 2279 # we must not ever block the main coroutine
2025 local $Coro::idle = sub { 2280 local $Coro::idle = sub {
2026 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#
2027 (Coro::unblock_sub {
2028 Event::one_event; 2282 async { Event::one_event };
2029 })->();
2030 }; 2283 };
2031 2284
2032 cfg_load; 2285 cfg_load;
2033 db_load; 2286 db_load;
2034 load_extensions; 2287 load_extensions;
2035 Event::loop; 2288 Event::loop;
2036} 2289}
2037 2290
2038############################################################################# 2291#############################################################################
2039# 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}
2040 2335
2041sub reload() { 2336sub reload() {
2042 # can/must only be called in main 2337 # can/must only be called in main
2043 if ($Coro::current != $Coro::main) { 2338 if ($Coro::current != $Coro::main) {
2044 warn "can only reload from main coroutine\n"; 2339 warn "can only reload from main coroutine\n";
2117 cf::load_extensions; 2412 cf::load_extensions;
2118 2413
2119 # reattach attachments to objects 2414 # reattach attachments to objects
2120 warn "reattach"; 2415 warn "reattach";
2121 _global_reattach; 2416 _global_reattach;
2417 reattach $_ for values %MAP;
2122 }; 2418 };
2123 2419
2124 if ($@) { 2420 if ($@) {
2125 warn $@; 2421 warn $@;
2126 warn "error while reloading, exiting."; 2422 warn "error while reloading, exiting.";
2142 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2438 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2143 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2439 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2144 2440
2145 # dirty hack because... archetypes are not yet loaded 2441 # dirty hack because... archetypes are not yet loaded
2146 Event->timer ( 2442 Event->timer (
2147 after => 2, 2443 after => 10,
2148 cb => sub { 2444 cb => sub {
2149 $_[0]->w->cancel; 2445 $_[0]->w->cancel;
2150 2446
2151 # provide some exits "home" 2447 # provide some exits "home"
2152 my $exit = cf::object::new "exit"; 2448 my $exit = cf::object::new "exit";
2194 data => WF_AUTOCANCEL, 2490 data => WF_AUTOCANCEL,
2195 cb => sub { 2491 cb => sub {
2196 cf::server_tick; # one server iteration 2492 cf::server_tick; # one server iteration
2197 $RUNTIME += $TICK; 2493 $RUNTIME += $TICK;
2198 $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;
2199 2498
2200 # 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
2201 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2500 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2202 2501
2203 $TICK_WATCHER->at ($NEXT_TICK); 2502 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines