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.132 by root, Thu Jan 4 01:35:56 2007 UTC vs.
Revision 1.154 by root, Tue Jan 9 15:36:19 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
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 29# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 30$YAML::Syck::ImplicitUnicode = 1;
30 31
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 32$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 33
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 34sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 35
35our %COMMAND = (); 36our %COMMAND = ();
36our %COMMAND_TIME = (); 37our %COMMAND_TIME = ();
… …
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 $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
57 58
58binmode STDOUT; 59binmode STDOUT;
59binmode STDERR; 60binmode STDERR;
60 61
61# read virtual server time, if available 62# read virtual server time, if available
… …
118 utf8::encode $msg; 119 utf8::encode $msg;
119 120
120 $msg .= "\n" 121 $msg .= "\n"
121 unless $msg =~ /\n$/; 122 unless $msg =~ /\n$/;
122 123
123 LOG llevError, "cfperl: $msg"; 124 LOG llevError, $msg;
124 }; 125 };
125} 126}
126 127
127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
154 155
155=head2 UTILITY FUNCTIONS 156=head2 UTILITY FUNCTIONS
156 157
157=over 4 158=over 4
158 159
160=item dumpval $ref
161
159=cut 162=cut
163
164sub dumpval {
165 eval {
166 local $SIG{__DIE__};
167 my $d;
168 if (1) {
169 $d = new Data::Dumper([$_[0]], ["*var"]);
170 $d->Terse(1);
171 $d->Indent(2);
172 $d->Quotekeys(0);
173 $d->Useqq(1);
174 #$d->Bless(...);
175 $d->Seen($_[1]) if @_ > 1;
176 $d = $d->Dump();
177 }
178 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
179 $d
180 } || "[unable to dump $_[0]: '$@']";
181}
160 182
161use JSON::Syck (); # TODO# replace by JSON::PC once working 183use JSON::Syck (); # TODO# replace by JSON::PC once working
162 184
163=item $ref = cf::from_json $json 185=item $ref = cf::from_json $json
164 186
… …
180sub to_json($) { 202sub to_json($) {
181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 203 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
182 JSON::Syck::Dump $_[0] 204 JSON::Syck::Dump $_[0]
183} 205}
184 206
185=item my $guard = cf::guard { BLOCK }
186
187Run the given callback when the guard object gets destroyed (useful for
188coroutine cancellations).
189
190You can call C<< ->cancel >> on the guard object to stop the block from
191being executed.
192
193=cut
194
195sub guard(&) {
196 bless \(my $cb = $_[0]), cf::guard::;
197}
198
199sub cf::guard::cancel {
200 ${$_[0]} = sub { };
201}
202
203sub cf::guard::DESTROY {
204 ${$_[0]}->();
205}
206
207=item cf::lock_wait $string 207=item cf::lock_wait $string
208 208
209Wait until the given lock is available. See cf::lock_acquire. 209Wait until the given lock is available. See cf::lock_acquire.
210 210
211=item my $lock = cf::lock_acquire $string 211=item my $lock = cf::lock_acquire $string
212 212
213Wait until the given lock is available and then acquires it and returns 213Wait until the given lock is available and then acquires it and returns
214a guard object. If the guard object gets destroyed (goes out of scope, 214a Coro::guard object. If the guard object gets destroyed (goes out of scope,
215for example when the coroutine gets canceled), the lock is automatically 215for example when the coroutine gets canceled), the lock is automatically
216returned. 216returned.
217 217
218Lock names should begin with a unique identifier (for example, find_map 218Lock names should begin with a unique identifier (for example, cf::map::find
219uses map_find and load_map uses map_load). 219uses map_find and cf::map::load uses map_load).
220 220
221=cut 221=cut
222 222
223our %LOCK; 223our %LOCK;
224 224
… …
238 # wait, to be sure we are not locked 238 # wait, to be sure we are not locked
239 lock_wait $key; 239 lock_wait $key;
240 240
241 $LOCK{$key} = []; 241 $LOCK{$key} = [];
242 242
243 cf::guard { 243 Coro::guard {
244 # wake up all waiters, to be on the safe side 244 # wake up all waiters, to be on the safe side
245 $_->ready for @{ delete $LOCK{$key} }; 245 $_->ready for @{ delete $LOCK{$key} };
246 } 246 }
247} 247}
248 248
249sub freeze_mainloop {
250 return unless $TICK_WATCHER->is_active;
251
252 my $guard = Coro::guard { $TICK_WATCHER->start };
253 $TICK_WATCHER->stop;
254 $guard
255}
256
249=item cf::async { BLOCK } 257=item cf::async { BLOCK }
250 258
251Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 259Currently the same as Coro::async_pool, meaning you cannot use
252error instead of exiting the server in case of a problem. 260C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
261thing you are allowed to do is call C<prio> on it.
253 262
254=cut 263=cut
255 264
256sub async(&) { 265BEGIN { *async = \&Coro::async_pool }
257 my ($cb) = @_;
258
259 Coro::async {
260 eval { $cb->() };
261 warn $@ if $@;
262 }
263}
264 266
265=item cf::sync_job { BLOCK } 267=item cf::sync_job { BLOCK }
266 268
267The design of crossfire+ requires that the main coro ($Coro::main) is 269The design of crossfire+ requires that the main coro ($Coro::main) is
268always able to handle events or runnable, as crossfire+ is only partly 270always able to handle events or runnable, as crossfire+ is only partly
… …
282 # this is the main coro, too bad, we have to block 284 # this is the main coro, too bad, we have to block
283 # till the operation succeeds, freezing the server :/ 285 # till the operation succeeds, freezing the server :/
284 286
285 # TODO: use suspend/resume instead 287 # TODO: use suspend/resume instead
286 # (but this is cancel-safe) 288 # (but this is cancel-safe)
287 local $FREEZE = 1; 289 my $freeze_guard = freeze_mainloop;
288 290
289 my $busy = 1; 291 my $busy = 1;
290 my @res; 292 my @res;
291 293
292 (Coro::async { 294 (async {
293 @res = eval { $job->() }; 295 @res = eval { $job->() };
294 warn $@ if $@; 296 warn $@ if $@;
295 undef $busy; 297 undef $busy;
296 })->prio (Coro::PRIO_MAX); 298 })->prio (Coro::PRIO_MAX);
297 299
298 while ($busy) { 300 while ($busy) {
299 Coro::cede_notself; 301 Coro::cede or Event::one_event;
300 Event::one_event unless Coro::nready;
301 } 302 }
302 303
303 wantarray ? @res : $res[0] 304 wantarray ? @res : $res[0]
304 } else { 305 } else {
305 # we are in another coroutine, how wonderful, everything just works 306 # we are in another coroutine, how wonderful, everything just works
306 307
307 $job->() 308 $job->()
308 } 309 }
309} 310}
310 311
311=item $coro = cf::coro { BLOCK } 312=item $coro = cf::async_ext { BLOCK }
312 313
313Creates and returns a new coro. This coro is automcatially being canceled 314Like async, but this coro is automcatially being canceled when the
314when the extension calling this is being unloaded. 315extension calling this is being unloaded.
315 316
316=cut 317=cut
317 318
318sub coro(&) { 319sub async_ext(&) {
319 my $cb = shift; 320 my $cb = shift;
320 321
321 my $coro = &cf::async ($cb); 322 my $coro = &Coro::async ($cb);
322 323
323 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
324 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
325 }); 326 });
326 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
… …
355=cut 356=cut
356 357
357############################################################################# 358#############################################################################
358 359
359package cf::path; 360package cf::path;
361
362# used to convert map paths into valid unix filenames by repalcing / by ∕
363our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
360 364
361sub new { 365sub new {
362 my ($class, $path, $base) = @_; 366 my ($class, $path, $base) = @_;
363 367
364 $path = $path->as_string if ref $path; 368 $path = $path->as_string if ref $path;
… …
428# } 432# }
429} 433}
430 434
431# escape the /'s in the path 435# escape the /'s in the path
432sub _escaped_path { 436sub _escaped_path {
433 # ∕ is U+2215
434 (my $path = $_[0]{path}) =~ s/\//∕/g; 437 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
435 $path 438 $path
436} 439}
437 440
438# the original (read-only) location 441# the original (read-only) location
439sub load_path { 442sub load_path {
… …
1093 1096
1094=head2 CORE EXTENSIONS 1097=head2 CORE EXTENSIONS
1095 1098
1096Functions and methods that extend core crossfire objects. 1099Functions and methods that extend core crossfire objects.
1097 1100
1101=cut
1102
1103package cf::player;
1104
1105use Coro::AIO;
1106
1098=head3 cf::player 1107=head3 cf::player
1099 1108
1100=over 4 1109=over 4
1101 1110
1102=item cf::player::exists $login 1111=item cf::player::find $login
1103 1112
1104Returns true when the given account exists. 1113Returns the given player object, loading it if necessary (might block).
1105 1114
1106=cut 1115=cut
1107 1116
1108sub cf::player::exists($) { 1117sub playerdir($) {
1109 cf::player::find $_[0] 1118 cf::localdir
1110 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1119 . "/"
1120 . cf::playerdir
1121 . "/"
1122 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1123}
1124
1125sub path($) {
1126 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1127
1128 (playerdir $login) . "/$login.pl"
1129}
1130
1131sub find_active($) {
1132 $cf::PLAYER{$_[0]}
1133 and $cf::PLAYER{$_[0]}->active
1134 and $cf::PLAYER{$_[0]}
1135}
1136
1137sub exists($) {
1138 my ($login) = @_;
1139
1140 $cf::PLAYER{$login}
1141 or cf::sync_job { !aio_stat $login }
1142}
1143
1144sub find($) {
1145 return $cf::PLAYER{$_[0]} || do {
1146 my $login = $_[0];
1147
1148 my $guard = cf::lock_acquire "user_find:$login";
1149
1150 $cf::PLAYER{$_[0]} || do {
1151 my $pl = load_pl path $login
1152 or return;
1153 $cf::PLAYER{$login} = $pl
1154 }
1155 }
1156}
1157
1158sub save($) {
1159 my ($pl) = @_;
1160
1161 return if $pl->{deny_save};
1162
1163 my $path = path $pl;
1164 my $guard = cf::lock_acquire "user_save:$path";
1165
1166 return if $pl->{deny_save};
1167
1168 aio_mkdir playerdir $pl, 0770;
1169 $pl->{last_save} = $cf::RUNTIME;
1170
1171 $pl->save_pl ($path);
1172 Coro::cede;
1173}
1174
1175sub new($) {
1176 my ($login) = @_;
1177
1178 my $self = create;
1179
1180 $self->ob->name ($login);
1181 $self->{deny_save} = 1;
1182
1183 $cf::PLAYER{$login} = $self;
1184
1185 $self
1186}
1187
1188=item $pl->quit_character
1189
1190Nukes the player without looking back. If logged in, the connection will
1191be destroyed. May block for a long time.
1192
1193=cut
1194
1195sub quit_character {
1196 my ($pl) = @_;
1197
1198 $pl->{deny_save} = 1;
1199 $pl->password ("*"); # this should lock out the player until we nuked the dir
1200
1201 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1202 $pl->deactivate;
1203 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1204 $pl->ns->destroy if $pl->ns;
1205
1206 my $path = playerdir $pl;
1207 my $temp = "$path~$cf::RUNTIME~deleting~";
1208 aio_rename $path, $temp;
1209 delete $cf::PLAYER{$pl->ob->name};
1210 $pl->destroy;
1211 IO::AIO::aio_rmtree $temp;
1212}
1213
1214=item cf::player::list_logins
1215
1216Returns am arrayref of all valid playernames in the system, can take a
1217while and may block, so not sync_job-capable, ever.
1218
1219=cut
1220
1221sub list_logins {
1222 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir
1223 or return [];
1224
1225 my @logins;
1226
1227 for my $login (@$dirs) {
1228 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next;
1229 aio_read $fh, 0, 512, my $buf, 0 or next;
1230 $buf !~ /^password -------------$/ or next; # official not-valid tag
1231
1232 utf8::decode $login;
1233 push @logins, $login;
1234 }
1235
1236 \@logins
1237}
1238
1239=item $player->maps
1240
1241Returns an arrayref of cf::path's of all maps that are private for this
1242player. May block.
1243
1244=cut
1245
1246sub maps($) {
1247 my ($pl) = @_;
1248
1249 my $files = aio_readdir playerdir $pl
1250 or return;
1251
1252 my @paths;
1253
1254 for (@$files) {
1255 utf8::decode $_;
1256 next if /\.(?:pl|pst)$/;
1257 next unless /^$PATH_SEP/;
1258
1259 s/$PATH_SEP/\//g;
1260 push @paths, new cf::path "~" . $pl->ob->name . "/" . $_;
1261 }
1262
1263 \@paths
1111} 1264}
1112 1265
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1266=item $player->ext_reply ($msgid, $msgtype, %msg)
1114 1267
1115Sends an ext reply to the player. 1268Sends an ext reply to the player.
1116 1269
1117=cut 1270=cut
1118 1271
1119sub cf::player::ext_reply($$$%) { 1272sub ext_reply($$$%) {
1120 my ($self, $id, %msg) = @_; 1273 my ($self, $id, %msg) = @_;
1121 1274
1122 $msg{msgid} = $id; 1275 $msg{msgid} = $id;
1123 1276
1124 $self->send ("ext " . to_json \%msg); 1277 $self->send ("ext " . cf::to_json \%msg);
1125} 1278}
1279
1280package cf;
1126 1281
1127=back 1282=back
1128 1283
1129 1284
1130=head3 cf::map 1285=head3 cf::map
… …
1136package cf::map; 1291package cf::map;
1137 1292
1138use Fcntl; 1293use Fcntl;
1139use Coro::AIO; 1294use Coro::AIO;
1140 1295
1141our $MAX_RESET = 7200; 1296our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1297our $DEFAULT_RESET = 3000;
1143 1298
1144sub generate_random_map { 1299sub generate_random_map {
1145 my ($path, $rmp) = @_; 1300 my ($path, $rmp) = @_;
1146 1301
1147 # mit "rum" bekleckern, nicht 1302 # mit "rum" bekleckern, nicht
… …
1177 or return; 1332 or return;
1178 1333
1179 my $map = cf::map::new 1334 my $map = cf::map::new
1180 or return; 1335 or return;
1181 1336
1337 # for better error messages only, will be overwritten
1338 $map->path ($path);
1339
1182 $map->load_header ($path) 1340 $map->load_header ($path)
1183 or return; 1341 or return;
1184 1342
1185 $map->{load_path} = $path; 1343 $map->{load_path} = $path;
1186 1344
1187 $map 1345 $map
1188} 1346}
1189 1347
1190sub find_map; 1348sub find;
1191sub find_map { 1349sub find {
1192 my ($path, $origin) = @_; 1350 my ($path, $origin) = @_;
1193 1351
1194 #warn "find_map<$path,$origin>\n";#d# 1352 #warn "find<$path,$origin>\n";#d#
1195 1353
1196 $path = new cf::path $path, $origin && $origin->path; 1354 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1355 my $key = $path->as_string;
1198 1356
1199 cf::lock_wait "map_find:$key"; 1357 cf::lock_wait "map_find:$key";
… …
1201 $cf::MAP{$key} || do { 1359 $cf::MAP{$key} || do {
1202 my $guard = cf::lock_acquire "map_find:$key"; 1360 my $guard = cf::lock_acquire "map_find:$key";
1203 1361
1204 # do it the slow way 1362 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1363 my $map = try_load_header $path->save_path;
1364
1365 Coro::cede;
1206 1366
1207 if ($map) { 1367 if ($map) {
1208 $map->last_access ((delete $map->{last_access}) 1368 $map->last_access ((delete $map->{last_access})
1209 || $cf::RUNTIME); #d# 1369 || $cf::RUNTIME); #d#
1210 # safety 1370 # safety
… …
1230 1390
1231 $map->path ($key); 1391 $map->path ($key);
1232 $map->{path} = $path; 1392 $map->{path} = $path;
1233 $map->{last_save} = $cf::RUNTIME; 1393 $map->{last_save} = $cf::RUNTIME;
1234 1394
1395 Coro::cede;
1396
1235 if ($map->should_reset) { 1397 if ($map->should_reset) {
1236 $map->reset; 1398 $map->reset;
1237 undef $guard; 1399 undef $guard;
1238 $map = find_map $path 1400 $map = find $path
1239 or return; 1401 or return;
1240 } 1402 }
1241 1403
1242 $cf::MAP{$key} = $map 1404 $cf::MAP{$key} = $map
1243 } 1405 }
… …
1265 if (aio_open $uniq, O_RDONLY, 0) { 1427 if (aio_open $uniq, O_RDONLY, 0) {
1266 $self->clear_unique_items; 1428 $self->clear_unique_items;
1267 $self->load_objects ($uniq, 0); 1429 $self->load_objects ($uniq, 0);
1268 } 1430 }
1269 } 1431 }
1432
1433 Coro::cede;
1270 1434
1271 # now do the right thing for maps 1435 # now do the right thing for maps
1272 $self->link_multipart_objects; 1436 $self->link_multipart_objects;
1273 1437
1274 if ($self->{path}->is_style_map) { 1438 if ($self->{path}->is_style_map) {
… …
1282 $self->difficulty ($self->estimate_difficulty) 1446 $self->difficulty ($self->estimate_difficulty)
1283 unless $self->difficulty; 1447 unless $self->difficulty;
1284 $self->activate; 1448 $self->activate;
1285 } 1449 }
1286 1450
1451 Coro::cede;
1452
1287 $self->in_memory (cf::MAP_IN_MEMORY); 1453 $self->in_memory (cf::MAP_IN_MEMORY);
1288} 1454}
1289 1455
1290sub load_map_sync { 1456sub find_sync {
1291 my ($path, $origin) = @_; 1457 my ($path, $origin) = @_;
1292 1458
1293 #warn "load_map_sync<$path, $origin>\n";#d# 1459 cf::sync_job { cf::map::find $path, $origin }
1460}
1294 1461
1295 cf::sync_job { 1462sub do_load_sync {
1296 my $map = cf::map::find_map $path, $origin 1463 my ($map) = @_;
1297 or return; 1464
1298 $map->load; 1465 cf::sync_job { $map->load };
1299 $map
1300 }
1301} 1466}
1302 1467
1303sub save { 1468sub save {
1304 my ($self) = @_; 1469 my ($self) = @_;
1305 1470
1471 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472
1306 $self->{last_save} = $cf::RUNTIME; 1473 $self->{last_save} = $cf::RUNTIME;
1307 1474
1308 return unless $self->dirty; 1475 return unless $self->dirty;
1309 1476
1310 my $save = $self->{path}->save_path; utf8::encode $save; 1477 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1313 $self->{load_path} = $save; 1480 $self->{load_path} = $save;
1314 1481
1315 return if $self->{deny_save}; 1482 return if $self->{deny_save};
1316 1483
1317 local $self->{last_access} = $self->last_access;#d# 1484 local $self->{last_access} = $self->last_access;#d#
1485
1486 cf::async {
1487 $_->contr->save for $self->players;
1488 };
1318 1489
1319 if ($uniq) { 1490 if ($uniq) {
1320 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1491 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1321 $self->save_objects ($uniq, cf::IO_UNIQUES); 1492 $self->save_objects ($uniq, cf::IO_UNIQUES);
1322 } else { 1493 } else {
… …
1328 my ($self) = @_; 1499 my ($self) = @_;
1329 1500
1330 # save first because save cedes 1501 # save first because save cedes
1331 $self->save; 1502 $self->save;
1332 1503
1504 my $lock = cf::lock_acquire "map_data:" . $self->path;
1505
1333 return if $self->players; 1506 return if $self->players;
1334 return if $self->in_memory != cf::MAP_IN_MEMORY; 1507 return if $self->in_memory != cf::MAP_IN_MEMORY;
1335 return if $self->{deny_save}; 1508 return if $self->{deny_save};
1336 1509
1337 $self->clear; 1510 $self->clear;
… …
1379} 1552}
1380 1553
1381sub reset { 1554sub reset {
1382 my ($self) = @_; 1555 my ($self) = @_;
1383 1556
1557 my $lock = cf::lock_acquire "map_data:" . $self->path;
1558
1384 return if $self->players; 1559 return if $self->players;
1385 return if $self->{path}{user_rel};#d# 1560 return if $self->{path}{user_rel};#d#
1386 1561
1387 warn "resetting map ", $self->path;#d# 1562 warn "resetting map ", $self->path;#d#
1388 1563
… …
1407 1582
1408sub customise_for { 1583sub customise_for {
1409 my ($map, $ob) = @_; 1584 my ($map, $ob) = @_;
1410 1585
1411 if ($map->per_player) { 1586 if ($map->per_player) {
1412 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1587 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1413 } 1588 }
1414 1589
1415 $map 1590 $map
1416} 1591}
1417 1592
1418sub emergency_save { 1593sub emergency_save {
1419 local $cf::FREEZE = 1; 1594 my $freeze_guard = cf::freeze_mainloop;
1420 1595
1421 warn "enter emergency map save\n"; 1596 warn "enter emergency perl save\n";
1422 1597
1423 cf::sync_job { 1598 cf::sync_job {
1599 warn "begin emergency player save\n";
1600 $_->save for values %cf::PLAYER;
1601 warn "end emergency player save\n";
1602
1424 warn "begin emergency map save\n"; 1603 warn "begin emergency map save\n";
1425 $_->save for values %cf::MAP; 1604 $_->save for values %cf::MAP;
1605 warn "end emergency map save\n";
1426 }; 1606 };
1427 1607
1428 warn "end emergency map save\n"; 1608 warn "leave emergency perl save\n";
1429} 1609}
1430 1610
1431package cf; 1611package cf;
1432 1612
1433=back 1613=back
… …
1514 my $link_pos = delete $self->{_link_pos}; 1694 my $link_pos = delete $self->{_link_pos};
1515 1695
1516 unless ($map) { 1696 unless ($map) {
1517 # restore original map position 1697 # restore original map position
1518 ($map, $x, $y) = @{ $link_pos || [] }; 1698 ($map, $x, $y) = @{ $link_pos || [] };
1519 $map = cf::map::find_map $map; 1699 $map = cf::map::find $map;
1520 1700
1521 unless ($map) { 1701 unless ($map) {
1522 ($map, $x, $y) = @$EMERGENCY_POSITION; 1702 ($map, $x, $y) = @$EMERGENCY_POSITION;
1523 $map = cf::map::find_map $map 1703 $map = cf::map::find $map
1524 or die "FATAL: cannot load emergency map\n"; 1704 or die "FATAL: cannot load emergency map\n";
1525 } 1705 }
1526 } 1706 }
1527 1707
1528 ($x, $y) = (-1, -1) 1708 ($x, $y) = (-1, -1)
… …
1532 ($x, $y) = ($map->enter_x, $map->enter_y) 1712 ($x, $y) = ($map->enter_x, $map->enter_y)
1533 if $x <=0 && $y <= 0; 1713 if $x <=0 && $y <= 0;
1534 1714
1535 $map->load; 1715 $map->load;
1536 1716
1717 return unless $self->contr->active;
1537 $self->activate_recursive; 1718 $self->activate_recursive;
1538 $self->enter_map ($map, $x, $y); 1719 $self->enter_map ($map, $x, $y);
1539} 1720}
1540 1721
1541cf::player->attach ( 1722cf::player->attach (
… …
1554 1735
1555 # try to abort aborted map switching on player login :) 1736 # try to abort aborted map switching on player login :)
1556 # should happen only on crashes 1737 # should happen only on crashes
1557 if ($pl->ob->{_link_pos}) { 1738 if ($pl->ob->{_link_pos}) {
1558 $pl->ob->enter_link; 1739 $pl->ob->enter_link;
1559 cf::async { 1740 (async {
1560 # we need this sleep as the login has a concurrent enter_exit running 1741 # we need this sleep as the login has a concurrent enter_exit running
1561 # and this sleep increases chances of the player not ending up in scorn 1742 # and this sleep increases chances of the player not ending up in scorn
1743 $pl->ob->reply (undef,
1744 "There was an internal problem at your last logout, "
1745 . "the server will try to bring you to your intended destination in a second.",
1746 cf::NDI_RED);
1562 Coro::Timer::sleep 1; 1747 Coro::Timer::sleep 1;
1563 $pl->ob->leave_link; 1748 $pl->ob->leave_link;
1564 }; 1749 })->prio (2);
1565 } 1750 }
1566 }, 1751 },
1567); 1752);
1568 1753
1569=item $player_object->goto_map ($path, $x, $y) 1754=item $player_object->goto ($path, $x, $y)
1570 1755
1571=cut 1756=cut
1572 1757
1573sub cf::object::player::goto_map { 1758sub cf::object::player::goto {
1574 my ($self, $path, $x, $y) = @_; 1759 my ($self, $path, $x, $y) = @_;
1575 1760
1761 $path = new cf::path $path;
1762 $path ne "/" or Carp::cluck ("oy");#d#
1763
1576 $self->enter_link; 1764 $self->enter_link;
1577 1765
1578 (cf::async { 1766 (async {
1579 $path = new cf::path $path;
1580
1581 my $map = cf::map::find_map $path->as_string; 1767 my $map = cf::map::find $path->as_string;
1582 $map = $map->customise_for ($self) if $map; 1768 $map = $map->customise_for ($self) if $map;
1583 1769
1584# warn "entering ", $map->path, " at ($x, $y)\n" 1770# warn "entering ", $map->path, " at ($x, $y)\n"
1585# if $map; 1771# if $map;
1586 1772
1587 $map or $self->message ("The exit is closed", cf::NDI_UNIQUE | cf::NDI_RED); 1773 $map or $self->message ("The exit to '" . ($path->visible_name) . "' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1588 1774
1589 $self->leave_link ($map, $x, $y); 1775 $self->leave_link ($map, $x, $y);
1590 })->prio (1); 1776 })->prio (1);
1591} 1777}
1592 1778
… …
1645 1831
1646 return unless $self->type == cf::PLAYER; 1832 return unless $self->type == cf::PLAYER;
1647 1833
1648 $self->enter_link; 1834 $self->enter_link;
1649 1835
1650 (cf::async { 1836 (async {
1837 $self->deactivate_recursive; # just to be sure
1651 unless (eval { 1838 unless (eval {
1652 prepare_random_map $exit 1839 prepare_random_map $exit
1653 if $exit->slaying eq "/!"; 1840 if $exit->slaying eq "/!";
1654 1841
1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1842 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1656 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1843 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1657 1844
1658 1; 1845 1;
1659 }) { 1846 }) {
1660 $self->message ("Something went wrong deep within the crossfire server. " 1847 $self->message ("Something went wrong deep within the crossfire server. "
1661 . "I'll try to bring you back to the map you were before. " 1848 . "I'll try to bring you back to the map you were before. "
… …
1735 } 1922 }
1736 } 1923 }
1737 }, 1924 },
1738); 1925);
1739 1926
1740=item $client->coro (\&cb) 1927=item $client->async (\&cb)
1741 1928
1742Create a new coroutine, running the specified callback. The coroutine will 1929Create a new coroutine, running the specified callback. The coroutine will
1743be automatically cancelled when the client gets destroyed (e.g. on logout, 1930be automatically cancelled when the client gets destroyed (e.g. on logout,
1744or loss of connection). 1931or loss of connection).
1745 1932
1746=cut 1933=cut
1747 1934
1748sub cf::client::coro { 1935sub cf::client::async {
1749 my ($self, $cb) = @_; 1936 my ($self, $cb) = @_;
1750 1937
1751 my $coro = &cf::async ($cb); 1938 my $coro = &Coro::async ($cb);
1752 1939
1753 $coro->on_destroy (sub { 1940 $coro->on_destroy (sub {
1754 delete $self->{_coro}{$coro+0}; 1941 delete $self->{_coro}{$coro+0};
1755 }); 1942 });
1756 1943
… …
1994 local $/; 2181 local $/;
1995 *CFG = YAML::Syck::Load <$fh>; 2182 *CFG = YAML::Syck::Load <$fh>;
1996 2183
1997 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1998 2185
2186 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2187 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2188
1999 if (exists $CFG{mlockall}) { 2189 if (exists $CFG{mlockall}) {
2000 eval { 2190 eval {
2001 $CFG{mlockall} ? &mlockall : &munlockall 2191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2002 and die "WARNING: m(un)lockall failed: $!\n"; 2192 and die "WARNING: m(un)lockall failed: $!\n";
2003 }; 2193 };
2004 warn $@ if $@; 2194 warn $@ if $@;
2005 } 2195 }
2006} 2196}
2007 2197
2008sub main { 2198sub main {
2009 # we must not ever block the main coroutine 2199 # we must not ever block the main coroutine
2010 local $Coro::idle = sub { 2200 local $Coro::idle = sub {
2011 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2201 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2012 (Coro::unblock_sub {
2013 Event::one_event; 2202 async { Event::one_event };
2014 })->();
2015 }; 2203 };
2016 2204
2017 cfg_load; 2205 cfg_load;
2018 db_load; 2206 db_load;
2019 load_extensions; 2207 load_extensions;
… …
2030 return; 2218 return;
2031 } 2219 }
2032 2220
2033 warn "reloading..."; 2221 warn "reloading...";
2034 2222
2035 local $FREEZE = 1; 2223 my $guard = freeze_mainloop;
2036 cf::emergency_save; 2224 cf::emergency_save;
2037 2225
2038 eval { 2226 eval {
2039 # if anything goes wrong in here, we should simply crash as we already saved 2227 # if anything goes wrong in here, we should simply crash as we already saved
2040 2228
… …
2102 cf::load_extensions; 2290 cf::load_extensions;
2103 2291
2104 # reattach attachments to objects 2292 # reattach attachments to objects
2105 warn "reattach"; 2293 warn "reattach";
2106 _global_reattach; 2294 _global_reattach;
2295 reattach $_ for values %MAP;
2107 }; 2296 };
2108 2297
2109 if ($@) { 2298 if ($@) {
2110 warn $@; 2299 warn $@;
2111 warn "error while reloading, exiting."; 2300 warn "error while reloading, exiting.";
… …
2127 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2316 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2128 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2317 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2129 2318
2130 # dirty hack because... archetypes are not yet loaded 2319 # dirty hack because... archetypes are not yet loaded
2131 Event->timer ( 2320 Event->timer (
2132 after => 2, 2321 after => 10,
2133 cb => sub { 2322 cb => sub {
2134 $_[0]->w->cancel; 2323 $_[0]->w->cancel;
2135 2324
2136 # provide some exits "home" 2325 # provide some exits "home"
2137 my $exit = cf::object::new "exit"; 2326 my $exit = cf::object::new "exit";
… …
2176 reentrant => 0, 2365 reentrant => 0,
2177 prio => 0, 2366 prio => 0,
2178 at => $NEXT_TICK || $TICK, 2367 at => $NEXT_TICK || $TICK,
2179 data => WF_AUTOCANCEL, 2368 data => WF_AUTOCANCEL,
2180 cb => sub { 2369 cb => sub {
2181 unless ($FREEZE) {
2182 cf::server_tick; # one server iteration 2370 cf::server_tick; # one server iteration
2183 $RUNTIME += $TICK; 2371 $RUNTIME += $TICK;
2184 }
2185
2186 $NEXT_TICK += $TICK; 2372 $NEXT_TICK += $TICK;
2187 2373
2188 # if we are delayed by four ticks or more, skip them all 2374 # if we are delayed by four ticks or more, skip them all
2189 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2375 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2190 2376

Diff Legend

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