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.133 by root, Thu Jan 4 16:19:32 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
… …
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
372# used to convert map paths into valid unix filenames by repalcing / by ∕
373our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
367 374
368sub new { 375sub new {
369 my ($class, $path, $base) = @_; 376 my ($class, $path, $base) = @_;
370 377
371 $path = $path->as_string if ref $path; 378 $path = $path->as_string if ref $path;
… …
435# } 442# }
436} 443}
437 444
438# escape the /'s in the path 445# escape the /'s in the path
439sub _escaped_path { 446sub _escaped_path {
440 # ∕ is U+2215
441 (my $path = $_[0]{path}) =~ s/\//∕/g; 447 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
442 $path 448 $path
443} 449}
444 450
445# the original (read-only) location 451# the original (read-only) location
446sub load_path { 452sub load_path {
… …
1073}; 1079};
1074 1080
1075cf::map->attach (prio => -10000, package => cf::mapsupport::); 1081cf::map->attach (prio => -10000, package => cf::mapsupport::);
1076 1082
1077############################################################################# 1083#############################################################################
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 1084
1101=head2 CORE EXTENSIONS 1085=head2 CORE EXTENSIONS
1102 1086
1103Functions and methods that extend core crossfire objects. 1087Functions and methods that extend core crossfire objects.
1104 1088
1089=cut
1090
1091package cf::player;
1092
1093use Coro::AIO;
1094
1105=head3 cf::player 1095=head3 cf::player
1106 1096
1107=over 4 1097=over 4
1108 1098
1109=item cf::player::exists $login 1099=item cf::player::find $login
1110 1100
1111Returns true when the given account exists. 1101Returns the given player object, loading it if necessary (might block).
1112 1102
1113=cut 1103=cut
1114 1104
1115sub cf::player::exists($) { 1105sub playerdir($) {
1116 cf::player::find $_[0] 1106 cf::localdir
1117 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
1118} 1252}
1119 1253
1120=item $player->ext_reply ($msgid, $msgtype, %msg) 1254=item $player->ext_reply ($msgid, $msgtype, %msg)
1121 1255
1122Sends an ext reply to the player. 1256Sends an ext reply to the player.
1123 1257
1124=cut 1258=cut
1125 1259
1126sub cf::player::ext_reply($$$%) { 1260sub ext_reply($$$%) {
1127 my ($self, $id, %msg) = @_; 1261 my ($self, $id, %msg) = @_;
1128 1262
1129 $msg{msgid} = $id; 1263 $msg{msgid} = $id;
1130 1264
1131 $self->send ("ext " . to_json \%msg); 1265 $self->send ("ext " . cf::to_json \%msg);
1132} 1266}
1267
1268package cf;
1133 1269
1134=back 1270=back
1135 1271
1136 1272
1137=head3 cf::map 1273=head3 cf::map
… …
1184 or return; 1320 or return;
1185 1321
1186 my $map = cf::map::new 1322 my $map = cf::map::new
1187 or return; 1323 or return;
1188 1324
1325 # for better error messages only, will be overwritten
1326 $map->path ($path);
1327
1189 $map->load_header ($path) 1328 $map->load_header ($path)
1190 or return; 1329 or return;
1191 1330
1192 $map->{load_path} = $path; 1331 $map->{load_path} = $path;
1193 1332
… …
1208 $cf::MAP{$key} || do { 1347 $cf::MAP{$key} || do {
1209 my $guard = cf::lock_acquire "map_find:$key"; 1348 my $guard = cf::lock_acquire "map_find:$key";
1210 1349
1211 # do it the slow way 1350 # do it the slow way
1212 my $map = try_load_header $path->save_path; 1351 my $map = try_load_header $path->save_path;
1352
1353 Coro::cede;
1213 1354
1214 if ($map) { 1355 if ($map) {
1215 $map->last_access ((delete $map->{last_access}) 1356 $map->last_access ((delete $map->{last_access})
1216 || $cf::RUNTIME); #d# 1357 || $cf::RUNTIME); #d#
1217 # safety 1358 # safety
… …
1237 1378
1238 $map->path ($key); 1379 $map->path ($key);
1239 $map->{path} = $path; 1380 $map->{path} = $path;
1240 $map->{last_save} = $cf::RUNTIME; 1381 $map->{last_save} = $cf::RUNTIME;
1241 1382
1383 Coro::cede;
1384
1242 if ($map->should_reset) { 1385 if ($map->should_reset) {
1243 $map->reset; 1386 $map->reset;
1244 undef $guard; 1387 undef $guard;
1245 $map = find $path 1388 $map = find $path
1246 or return; 1389 or return;
… …
1272 if (aio_open $uniq, O_RDONLY, 0) { 1415 if (aio_open $uniq, O_RDONLY, 0) {
1273 $self->clear_unique_items; 1416 $self->clear_unique_items;
1274 $self->load_objects ($uniq, 0); 1417 $self->load_objects ($uniq, 0);
1275 } 1418 }
1276 } 1419 }
1420
1421 Coro::cede;
1277 1422
1278 # now do the right thing for maps 1423 # now do the right thing for maps
1279 $self->link_multipart_objects; 1424 $self->link_multipart_objects;
1280 1425
1281 if ($self->{path}->is_style_map) { 1426 if ($self->{path}->is_style_map) {
… …
1289 $self->difficulty ($self->estimate_difficulty) 1434 $self->difficulty ($self->estimate_difficulty)
1290 unless $self->difficulty; 1435 unless $self->difficulty;
1291 $self->activate; 1436 $self->activate;
1292 } 1437 }
1293 1438
1439 Coro::cede;
1440
1294 $self->in_memory (cf::MAP_IN_MEMORY); 1441 $self->in_memory (cf::MAP_IN_MEMORY);
1442}
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 }
1295} 1466}
1296 1467
1297sub find_sync { 1468sub find_sync {
1298 my ($path, $origin) = @_; 1469 my ($path, $origin) = @_;
1299 1470
1300 cf::sync_job { cf::map::find $path, $origin } 1471 cf::sync_job { find $path, $origin }
1301} 1472}
1302 1473
1303sub do_load_sync { 1474sub do_load_sync {
1304 my ($map) = @_; 1475 my ($map) = @_;
1305 1476
1306 cf::sync_job { $map->load }; 1477 cf::sync_job { $map->load };
1307} 1478}
1308 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
1309sub save { 1512sub save {
1310 my ($self) = @_; 1513 my ($self) = @_;
1311 1514
1515 my $lock = cf::lock_acquire "map_data:" . $self->path;
1516
1312 $self->{last_save} = $cf::RUNTIME; 1517 $self->{last_save} = $cf::RUNTIME;
1313 1518
1314 return unless $self->dirty; 1519 return unless $self->dirty;
1315 1520
1316 my $save = $self->{path}->save_path; utf8::encode $save; 1521 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1319 $self->{load_path} = $save; 1524 $self->{load_path} = $save;
1320 1525
1321 return if $self->{deny_save}; 1526 return if $self->{deny_save};
1322 1527
1323 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 };
1324 1533
1325 if ($uniq) { 1534 if ($uniq) {
1326 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1535 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1327 $self->save_objects ($uniq, cf::IO_UNIQUES); 1536 $self->save_objects ($uniq, cf::IO_UNIQUES);
1328 } else { 1537 } else {
… …
1334 my ($self) = @_; 1543 my ($self) = @_;
1335 1544
1336 # save first because save cedes 1545 # save first because save cedes
1337 $self->save; 1546 $self->save;
1338 1547
1548 my $lock = cf::lock_acquire "map_data:" . $self->path;
1549
1339 return if $self->players; 1550 return if $self->players;
1340 return if $self->in_memory != cf::MAP_IN_MEMORY; 1551 return if $self->in_memory != cf::MAP_IN_MEMORY;
1341 return if $self->{deny_save}; 1552 return if $self->{deny_save};
1342 1553
1343 $self->clear; 1554 $self->clear;
… …
1385} 1596}
1386 1597
1387sub reset { 1598sub reset {
1388 my ($self) = @_; 1599 my ($self) = @_;
1389 1600
1601 my $lock = cf::lock_acquire "map_data:" . $self->path;
1602
1390 return if $self->players; 1603 return if $self->players;
1391 return if $self->{path}{user_rel};#d# 1604 return if $self->{path}{user_rel};#d#
1392 1605
1393 warn "resetting map ", $self->path;#d# 1606 warn "resetting map ", $self->path;#d#
1394 1607
… …
1419 } 1632 }
1420 1633
1421 $map 1634 $map
1422} 1635}
1423 1636
1424sub emergency_save {
1425 my $freeze_guard = cf::freeze_mainloop;
1426
1427 warn "enter emergency map save\n";
1428
1429 cf::sync_job {
1430 warn "begin emergency map save\n";
1431 $_->save for values %cf::MAP;
1432 };
1433
1434 warn "end emergency map save\n";
1435}
1436
1437package cf; 1637package cf;
1438 1638
1439=back 1639=back
1440 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
1441 1667
1442=head3 cf::object::player 1668=head3 cf::object::player
1443 1669
1444=over 4 1670=over 4
1445 1671
… …
1537 # use -1 or undef as default coordinates, not 0, 0 1763 # use -1 or undef as default coordinates, not 0, 0
1538 ($x, $y) = ($map->enter_x, $map->enter_y) 1764 ($x, $y) = ($map->enter_x, $map->enter_y)
1539 if $x <=0 && $y <= 0; 1765 if $x <=0 && $y <= 0;
1540 1766
1541 $map->load; 1767 $map->load;
1768 $map->load_diag;
1542 1769
1770 return unless $self->contr->active;
1543 $self->activate_recursive; 1771 $self->activate_recursive;
1544 $self->enter_map ($map, $x, $y); 1772 $self->enter_map ($map, $x, $y);
1545} 1773}
1546 1774
1547cf::player->attach ( 1775cf::player->attach (
… …
1560 1788
1561 # try to abort aborted map switching on player login :) 1789 # try to abort aborted map switching on player login :)
1562 # should happen only on crashes 1790 # should happen only on crashes
1563 if ($pl->ob->{_link_pos}) { 1791 if ($pl->ob->{_link_pos}) {
1564 $pl->ob->enter_link; 1792 $pl->ob->enter_link;
1565 cf::async { 1793 (async {
1566 # 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
1567 # 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);
1568 Coro::Timer::sleep 1; 1800 Coro::Timer::sleep 1;
1569 $pl->ob->leave_link; 1801 $pl->ob->leave_link;
1570 }; 1802 })->prio (2);
1571 } 1803 }
1572 }, 1804 },
1573); 1805);
1574 1806
1575=item $player_object->goto_map ($path, $x, $y) 1807=item $player_object->goto ($path, $x, $y)
1576 1808
1577=cut 1809=cut
1578 1810
1579sub cf::object::player::goto_map { 1811sub cf::object::player::goto {
1580 my ($self, $path, $x, $y) = @_; 1812 my ($self, $path, $x, $y) = @_;
1581 1813
1814 $path = new cf::path $path;
1815 $path ne "/" or Carp::cluck ("oy");#d#
1816
1582 $self->enter_link; 1817 $self->enter_link;
1583 1818
1584 (cf::async { 1819 (async {
1585 $path = new cf::path $path;
1586
1587 my $map = cf::map::find $path->as_string; 1820 my $map = cf::map::find $path->as_string;
1588 $map = $map->customise_for ($self) if $map; 1821 $map = $map->customise_for ($self) if $map;
1589 1822
1590# warn "entering ", $map->path, " at ($x, $y)\n" 1823# warn "entering ", $map->path, " at ($x, $y)\n"
1591# if $map; 1824# if $map;
1592 1825
1593 $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);
1594 1827
1595 $self->leave_link ($map, $x, $y); 1828 $self->leave_link ($map, $x, $y);
1596 })->prio (1); 1829 })->prio (1);
1597} 1830}
1598 1831
… …
1651 1884
1652 return unless $self->type == cf::PLAYER; 1885 return unless $self->type == cf::PLAYER;
1653 1886
1654 $self->enter_link; 1887 $self->enter_link;
1655 1888
1656 (cf::async { 1889 (async {
1657 $self->deactivate_recursive; # just to be sure 1890 $self->deactivate_recursive; # just to be sure
1658 unless (eval { 1891 unless (eval {
1659 prepare_random_map $exit 1892 prepare_random_map $exit
1660 if $exit->slaying eq "/!"; 1893 if $exit->slaying eq "/!";
1661 1894
1662 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1895 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1663 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1896 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1664 1897
1665 1; 1898 1;
1666 }) { 1899 }) {
1667 $self->message ("Something went wrong deep within the crossfire server. " 1900 $self->message ("Something went wrong deep within the crossfire server. "
1668 . "I'll try to bring you back to the map you were before. " 1901 . "I'll try to bring you back to the map you were before. "
… …
1742 } 1975 }
1743 } 1976 }
1744 }, 1977 },
1745); 1978);
1746 1979
1747=item $client->coro (\&cb) 1980=item $client->async (\&cb)
1748 1981
1749Create a new coroutine, running the specified callback. The coroutine will 1982Create a new coroutine, running the specified callback. The coroutine will
1750be automatically cancelled when the client gets destroyed (e.g. on logout, 1983be automatically cancelled when the client gets destroyed (e.g. on logout,
1751or loss of connection). 1984or loss of connection).
1752 1985
1753=cut 1986=cut
1754 1987
1755sub cf::client::coro { 1988sub cf::client::async {
1756 my ($self, $cb) = @_; 1989 my ($self, $cb) = @_;
1757 1990
1758 my $coro = &cf::async ($cb); 1991 my $coro = &Coro::async ($cb);
1759 1992
1760 $coro->on_destroy (sub { 1993 $coro->on_destroy (sub {
1761 delete $self->{_coro}{$coro+0}; 1994 delete $self->{_coro}{$coro+0};
1762 }); 1995 });
1763 1996
… …
2001 local $/; 2234 local $/;
2002 *CFG = YAML::Syck::Load <$fh>; 2235 *CFG = YAML::Syck::Load <$fh>;
2003 2236
2004 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2237 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2005 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
2006 if (exists $CFG{mlockall}) { 2242 if (exists $CFG{mlockall}) {
2007 eval { 2243 eval {
2008 $CFG{mlockall} ? &mlockall : &munlockall 2244 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2009 and die "WARNING: m(un)lockall failed: $!\n"; 2245 and die "WARNING: m(un)lockall failed: $!\n";
2010 }; 2246 };
2011 warn $@ if $@; 2247 warn $@ if $@;
2012 } 2248 }
2013} 2249}
2014 2250
2015sub main { 2251sub main {
2016 # we must not ever block the main coroutine 2252 # we must not ever block the main coroutine
2017 local $Coro::idle = sub { 2253 local $Coro::idle = sub {
2018 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#
2019 (Coro::unblock_sub {
2020 Event::one_event; 2255 async { Event::one_event };
2021 })->();
2022 }; 2256 };
2023 2257
2024 cfg_load; 2258 cfg_load;
2025 db_load; 2259 db_load;
2026 load_extensions; 2260 load_extensions;
2027 Event::loop; 2261 Event::loop;
2028} 2262}
2029 2263
2030############################################################################# 2264#############################################################################
2031# 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}
2032 2308
2033sub reload() { 2309sub reload() {
2034 # can/must only be called in main 2310 # can/must only be called in main
2035 if ($Coro::current != $Coro::main) { 2311 if ($Coro::current != $Coro::main) {
2036 warn "can only reload from main coroutine\n"; 2312 warn "can only reload from main coroutine\n";
… …
2109 cf::load_extensions; 2385 cf::load_extensions;
2110 2386
2111 # reattach attachments to objects 2387 # reattach attachments to objects
2112 warn "reattach"; 2388 warn "reattach";
2113 _global_reattach; 2389 _global_reattach;
2390 reattach $_ for values %MAP;
2114 }; 2391 };
2115 2392
2116 if ($@) { 2393 if ($@) {
2117 warn $@; 2394 warn $@;
2118 warn "error while reloading, exiting."; 2395 warn "error while reloading, exiting.";
… …
2134 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2411 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2135 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2412 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2136 2413
2137 # dirty hack because... archetypes are not yet loaded 2414 # dirty hack because... archetypes are not yet loaded
2138 Event->timer ( 2415 Event->timer (
2139 after => 2, 2416 after => 10,
2140 cb => sub { 2417 cb => sub {
2141 $_[0]->w->cancel; 2418 $_[0]->w->cancel;
2142 2419
2143 # provide some exits "home" 2420 # provide some exits "home"
2144 my $exit = cf::object::new "exit"; 2421 my $exit = cf::object::new "exit";
… …
2186 data => WF_AUTOCANCEL, 2463 data => WF_AUTOCANCEL,
2187 cb => sub { 2464 cb => sub {
2188 cf::server_tick; # one server iteration 2465 cf::server_tick; # one server iteration
2189 $RUNTIME += $TICK; 2466 $RUNTIME += $TICK;
2190 $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;
2191 2471
2192 # 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
2193 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2473 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2194 2474
2195 $TICK_WATCHER->at ($NEXT_TICK); 2475 $TICK_WATCHER->at ($NEXT_TICK);

Diff Legend

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