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.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 $RANDOM_MAPS = cf::localdir . "/random"; 56our $RANDOM_MAPS = cf::localdir . "/random";
55our %EXT_CORO; 57our %EXT_CORO; # coroutines bound to extensions
56 58
57binmode STDOUT; 59binmode STDOUT;
58binmode STDERR; 60binmode STDERR;
59 61
60# read virtual server time, if available 62# read virtual server time, if available
… …
117 utf8::encode $msg; 119 utf8::encode $msg;
118 120
119 $msg .= "\n" 121 $msg .= "\n"
120 unless $msg =~ /\n$/; 122 unless $msg =~ /\n$/;
121 123
122 LOG llevError, "cfperl: $msg"; 124 LOG llevError, $msg;
123 }; 125 };
124} 126}
125 127
126@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
127@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
153 155
154=head2 UTILITY FUNCTIONS 156=head2 UTILITY FUNCTIONS
155 157
156=over 4 158=over 4
157 159
160=item dumpval $ref
161
158=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}
159 182
160use JSON::Syck (); # TODO# replace by JSON::PC once working 183use JSON::Syck (); # TODO# replace by JSON::PC once working
161 184
162=item $ref = cf::from_json $json 185=item $ref = cf::from_json $json
163 186
… …
179sub to_json($) { 202sub to_json($) {
180 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 203 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
181 JSON::Syck::Dump $_[0] 204 JSON::Syck::Dump $_[0]
182} 205}
183 206
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 207=item cf::lock_wait $string
207 208
208Wait until the given lock is available. See cf::lock_acquire. 209Wait until the given lock is available. See cf::lock_acquire.
209 210
210=item my $lock = cf::lock_acquire $string 211=item my $lock = cf::lock_acquire $string
211 212
212Wait 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
213a 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,
214for example when the coroutine gets canceled), the lock is automatically 215for example when the coroutine gets canceled), the lock is automatically
215returned. 216returned.
216 217
217Lock names should begin with a unique identifier (for example, cf::map::find 218Lock names should begin with a unique identifier (for example, cf::map::find
218uses map_find and cf::map::load uses map_load). 219uses map_find and cf::map::load uses map_load).
… …
237 # wait, to be sure we are not locked 238 # wait, to be sure we are not locked
238 lock_wait $key; 239 lock_wait $key;
239 240
240 $LOCK{$key} = []; 241 $LOCK{$key} = [];
241 242
242 cf::guard { 243 Coro::guard {
243 # wake up all waiters, to be on the safe side 244 # wake up all waiters, to be on the safe side
244 $_->ready for @{ delete $LOCK{$key} }; 245 $_->ready for @{ delete $LOCK{$key} };
245 } 246 }
246} 247}
247 248
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 { 249sub freeze_mainloop {
265 return unless $TICK_WATCHER->is_active; 250 return unless $TICK_WATCHER->is_active;
266 251
267 my $guard = guard { $TICK_WATCHER->start }; 252 my $guard = Coro::guard { $TICK_WATCHER->start };
268 $TICK_WATCHER->stop; 253 $TICK_WATCHER->stop;
269 $guard 254 $guard
270} 255}
256
257=item cf::async { BLOCK }
258
259Currently the same as Coro::async_pool, meaning you cannot use
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.
262
263=cut
264
265BEGIN { *async = \&Coro::async_pool }
271 266
272=item cf::sync_job { BLOCK } 267=item cf::sync_job { BLOCK }
273 268
274The design of crossfire+ requires that the main coro ($Coro::main) is 269The design of crossfire+ requires that the main coro ($Coro::main) is
275always able to handle events or runnable, as crossfire+ is only partly 270always able to handle events or runnable, as crossfire+ is only partly
… …
294 my $freeze_guard = freeze_mainloop; 289 my $freeze_guard = freeze_mainloop;
295 290
296 my $busy = 1; 291 my $busy = 1;
297 my @res; 292 my @res;
298 293
299 (Coro::async { 294 (async {
300 @res = eval { $job->() }; 295 @res = eval { $job->() };
301 warn $@ if $@; 296 warn $@ if $@;
302 undef $busy; 297 undef $busy;
303 })->prio (Coro::PRIO_MAX); 298 })->prio (Coro::PRIO_MAX);
304 299
305 while ($busy) { 300 while ($busy) {
306 Coro::cede_notself; 301 Coro::cede or Event::one_event;
307 Event::one_event unless Coro::nready;
308 } 302 }
309 303
310 wantarray ? @res : $res[0] 304 wantarray ? @res : $res[0]
311 } else { 305 } else {
312 # we are in another coroutine, how wonderful, everything just works 306 # we are in another coroutine, how wonderful, everything just works
313 307
314 $job->() 308 $job->()
315 } 309 }
316} 310}
317 311
318=item $coro = cf::coro { BLOCK } 312=item $coro = cf::async_ext { BLOCK }
319 313
320Creates and returns a new coro. This coro is automcatially being canceled 314Like async, but this coro is automcatially being canceled when the
321when the extension calling this is being unloaded. 315extension calling this is being unloaded.
322 316
323=cut 317=cut
324 318
325sub coro(&) { 319sub async_ext(&) {
326 my $cb = shift; 320 my $cb = shift;
327 321
328 my $coro = &cf::async ($cb); 322 my $coro = &Coro::async ($cb);
329 323
330 $coro->on_destroy (sub { 324 $coro->on_destroy (sub {
331 delete $EXT_CORO{$coro+0}; 325 delete $EXT_CORO{$coro+0};
332 }); 326 });
333 $EXT_CORO{$coro+0} = $coro; 327 $EXT_CORO{$coro+0} = $coro;
… …
362=cut 356=cut
363 357
364############################################################################# 358#############################################################################
365 359
366package 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
367 364
368sub new { 365sub new {
369 my ($class, $path, $base) = @_; 366 my ($class, $path, $base) = @_;
370 367
371 $path = $path->as_string if ref $path; 368 $path = $path->as_string if ref $path;
… …
435# } 432# }
436} 433}
437 434
438# escape the /'s in the path 435# escape the /'s in the path
439sub _escaped_path { 436sub _escaped_path {
440 # ∕ is U+2215
441 (my $path = $_[0]{path}) =~ s/\//∕/g; 437 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
442 $path 438 $path
443} 439}
444 440
445# the original (read-only) location 441# the original (read-only) location
446sub load_path { 442sub load_path {
… …
1100 1096
1101=head2 CORE EXTENSIONS 1097=head2 CORE EXTENSIONS
1102 1098
1103Functions and methods that extend core crossfire objects. 1099Functions and methods that extend core crossfire objects.
1104 1100
1101=cut
1102
1103package cf::player;
1104
1105use Coro::AIO;
1106
1105=head3 cf::player 1107=head3 cf::player
1106 1108
1107=over 4 1109=over 4
1108 1110
1109=item cf::player::exists $login 1111=item cf::player::find $login
1110 1112
1111Returns true when the given account exists. 1113Returns the given player object, loading it if necessary (might block).
1112 1114
1113=cut 1115=cut
1114 1116
1115sub cf::player::exists($) { 1117sub playerdir($) {
1116 cf::player::find $_[0] 1118 cf::localdir
1117 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
1118} 1264}
1119 1265
1120=item $player->ext_reply ($msgid, $msgtype, %msg) 1266=item $player->ext_reply ($msgid, $msgtype, %msg)
1121 1267
1122Sends an ext reply to the player. 1268Sends an ext reply to the player.
1123 1269
1124=cut 1270=cut
1125 1271
1126sub cf::player::ext_reply($$$%) { 1272sub ext_reply($$$%) {
1127 my ($self, $id, %msg) = @_; 1273 my ($self, $id, %msg) = @_;
1128 1274
1129 $msg{msgid} = $id; 1275 $msg{msgid} = $id;
1130 1276
1131 $self->send ("ext " . to_json \%msg); 1277 $self->send ("ext " . cf::to_json \%msg);
1132} 1278}
1279
1280package cf;
1133 1281
1134=back 1282=back
1135 1283
1136 1284
1137=head3 cf::map 1285=head3 cf::map
… …
1184 or return; 1332 or return;
1185 1333
1186 my $map = cf::map::new 1334 my $map = cf::map::new
1187 or return; 1335 or return;
1188 1336
1337 # for better error messages only, will be overwritten
1338 $map->path ($path);
1339
1189 $map->load_header ($path) 1340 $map->load_header ($path)
1190 or return; 1341 or return;
1191 1342
1192 $map->{load_path} = $path; 1343 $map->{load_path} = $path;
1193 1344
… …
1208 $cf::MAP{$key} || do { 1359 $cf::MAP{$key} || do {
1209 my $guard = cf::lock_acquire "map_find:$key"; 1360 my $guard = cf::lock_acquire "map_find:$key";
1210 1361
1211 # do it the slow way 1362 # do it the slow way
1212 my $map = try_load_header $path->save_path; 1363 my $map = try_load_header $path->save_path;
1364
1365 Coro::cede;
1213 1366
1214 if ($map) { 1367 if ($map) {
1215 $map->last_access ((delete $map->{last_access}) 1368 $map->last_access ((delete $map->{last_access})
1216 || $cf::RUNTIME); #d# 1369 || $cf::RUNTIME); #d#
1217 # safety 1370 # safety
… …
1237 1390
1238 $map->path ($key); 1391 $map->path ($key);
1239 $map->{path} = $path; 1392 $map->{path} = $path;
1240 $map->{last_save} = $cf::RUNTIME; 1393 $map->{last_save} = $cf::RUNTIME;
1241 1394
1395 Coro::cede;
1396
1242 if ($map->should_reset) { 1397 if ($map->should_reset) {
1243 $map->reset; 1398 $map->reset;
1244 undef $guard; 1399 undef $guard;
1245 $map = find $path 1400 $map = find $path
1246 or return; 1401 or return;
… …
1272 if (aio_open $uniq, O_RDONLY, 0) { 1427 if (aio_open $uniq, O_RDONLY, 0) {
1273 $self->clear_unique_items; 1428 $self->clear_unique_items;
1274 $self->load_objects ($uniq, 0); 1429 $self->load_objects ($uniq, 0);
1275 } 1430 }
1276 } 1431 }
1432
1433 Coro::cede;
1277 1434
1278 # now do the right thing for maps 1435 # now do the right thing for maps
1279 $self->link_multipart_objects; 1436 $self->link_multipart_objects;
1280 1437
1281 if ($self->{path}->is_style_map) { 1438 if ($self->{path}->is_style_map) {
… …
1289 $self->difficulty ($self->estimate_difficulty) 1446 $self->difficulty ($self->estimate_difficulty)
1290 unless $self->difficulty; 1447 unless $self->difficulty;
1291 $self->activate; 1448 $self->activate;
1292 } 1449 }
1293 1450
1451 Coro::cede;
1452
1294 $self->in_memory (cf::MAP_IN_MEMORY); 1453 $self->in_memory (cf::MAP_IN_MEMORY);
1295} 1454}
1296 1455
1297sub find_sync { 1456sub find_sync {
1298 my ($path, $origin) = @_; 1457 my ($path, $origin) = @_;
… …
1307} 1466}
1308 1467
1309sub save { 1468sub save {
1310 my ($self) = @_; 1469 my ($self) = @_;
1311 1470
1471 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472
1312 $self->{last_save} = $cf::RUNTIME; 1473 $self->{last_save} = $cf::RUNTIME;
1313 1474
1314 return unless $self->dirty; 1475 return unless $self->dirty;
1315 1476
1316 my $save = $self->{path}->save_path; utf8::encode $save; 1477 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1319 $self->{load_path} = $save; 1480 $self->{load_path} = $save;
1320 1481
1321 return if $self->{deny_save}; 1482 return if $self->{deny_save};
1322 1483
1323 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 };
1324 1489
1325 if ($uniq) { 1490 if ($uniq) {
1326 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1491 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1327 $self->save_objects ($uniq, cf::IO_UNIQUES); 1492 $self->save_objects ($uniq, cf::IO_UNIQUES);
1328 } else { 1493 } else {
… …
1334 my ($self) = @_; 1499 my ($self) = @_;
1335 1500
1336 # save first because save cedes 1501 # save first because save cedes
1337 $self->save; 1502 $self->save;
1338 1503
1504 my $lock = cf::lock_acquire "map_data:" . $self->path;
1505
1339 return if $self->players; 1506 return if $self->players;
1340 return if $self->in_memory != cf::MAP_IN_MEMORY; 1507 return if $self->in_memory != cf::MAP_IN_MEMORY;
1341 return if $self->{deny_save}; 1508 return if $self->{deny_save};
1342 1509
1343 $self->clear; 1510 $self->clear;
… …
1385} 1552}
1386 1553
1387sub reset { 1554sub reset {
1388 my ($self) = @_; 1555 my ($self) = @_;
1389 1556
1557 my $lock = cf::lock_acquire "map_data:" . $self->path;
1558
1390 return if $self->players; 1559 return if $self->players;
1391 return if $self->{path}{user_rel};#d# 1560 return if $self->{path}{user_rel};#d#
1392 1561
1393 warn "resetting map ", $self->path;#d# 1562 warn "resetting map ", $self->path;#d#
1394 1563
… …
1422} 1591}
1423 1592
1424sub emergency_save { 1593sub emergency_save {
1425 my $freeze_guard = cf::freeze_mainloop; 1594 my $freeze_guard = cf::freeze_mainloop;
1426 1595
1427 warn "enter emergency map save\n"; 1596 warn "enter emergency perl save\n";
1428 1597
1429 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
1430 warn "begin emergency map save\n"; 1603 warn "begin emergency map save\n";
1431 $_->save for values %cf::MAP; 1604 $_->save for values %cf::MAP;
1605 warn "end emergency map save\n";
1432 }; 1606 };
1433 1607
1434 warn "end emergency map save\n"; 1608 warn "leave emergency perl save\n";
1435} 1609}
1436 1610
1437package cf; 1611package cf;
1438 1612
1439=back 1613=back
… …
1538 ($x, $y) = ($map->enter_x, $map->enter_y) 1712 ($x, $y) = ($map->enter_x, $map->enter_y)
1539 if $x <=0 && $y <= 0; 1713 if $x <=0 && $y <= 0;
1540 1714
1541 $map->load; 1715 $map->load;
1542 1716
1717 return unless $self->contr->active;
1543 $self->activate_recursive; 1718 $self->activate_recursive;
1544 $self->enter_map ($map, $x, $y); 1719 $self->enter_map ($map, $x, $y);
1545} 1720}
1546 1721
1547cf::player->attach ( 1722cf::player->attach (
… …
1560 1735
1561 # try to abort aborted map switching on player login :) 1736 # try to abort aborted map switching on player login :)
1562 # should happen only on crashes 1737 # should happen only on crashes
1563 if ($pl->ob->{_link_pos}) { 1738 if ($pl->ob->{_link_pos}) {
1564 $pl->ob->enter_link; 1739 $pl->ob->enter_link;
1565 cf::async { 1740 (async {
1566 # 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
1567 # 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);
1568 Coro::Timer::sleep 1; 1747 Coro::Timer::sleep 1;
1569 $pl->ob->leave_link; 1748 $pl->ob->leave_link;
1570 }; 1749 })->prio (2);
1571 } 1750 }
1572 }, 1751 },
1573); 1752);
1574 1753
1575=item $player_object->goto_map ($path, $x, $y) 1754=item $player_object->goto ($path, $x, $y)
1576 1755
1577=cut 1756=cut
1578 1757
1579sub cf::object::player::goto_map { 1758sub cf::object::player::goto {
1580 my ($self, $path, $x, $y) = @_; 1759 my ($self, $path, $x, $y) = @_;
1581 1760
1761 $path = new cf::path $path;
1762 $path ne "/" or Carp::cluck ("oy");#d#
1763
1582 $self->enter_link; 1764 $self->enter_link;
1583 1765
1584 (cf::async { 1766 (async {
1585 $path = new cf::path $path;
1586
1587 my $map = cf::map::find $path->as_string; 1767 my $map = cf::map::find $path->as_string;
1588 $map = $map->customise_for ($self) if $map; 1768 $map = $map->customise_for ($self) if $map;
1589 1769
1590# warn "entering ", $map->path, " at ($x, $y)\n" 1770# warn "entering ", $map->path, " at ($x, $y)\n"
1591# if $map; 1771# if $map;
1592 1772
1593 $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);
1594 1774
1595 $self->leave_link ($map, $x, $y); 1775 $self->leave_link ($map, $x, $y);
1596 })->prio (1); 1776 })->prio (1);
1597} 1777}
1598 1778
… …
1651 1831
1652 return unless $self->type == cf::PLAYER; 1832 return unless $self->type == cf::PLAYER;
1653 1833
1654 $self->enter_link; 1834 $self->enter_link;
1655 1835
1656 (cf::async { 1836 (async {
1657 $self->deactivate_recursive; # just to be sure 1837 $self->deactivate_recursive; # just to be sure
1658 unless (eval { 1838 unless (eval {
1659 prepare_random_map $exit 1839 prepare_random_map $exit
1660 if $exit->slaying eq "/!"; 1840 if $exit->slaying eq "/!";
1661 1841
1662 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;
1663 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1843 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1664 1844
1665 1; 1845 1;
1666 }) { 1846 }) {
1667 $self->message ("Something went wrong deep within the crossfire server. " 1847 $self->message ("Something went wrong deep within the crossfire server. "
1668 . "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. "
… …
1742 } 1922 }
1743 } 1923 }
1744 }, 1924 },
1745); 1925);
1746 1926
1747=item $client->coro (\&cb) 1927=item $client->async (\&cb)
1748 1928
1749Create a new coroutine, running the specified callback. The coroutine will 1929Create a new coroutine, running the specified callback. The coroutine will
1750be automatically cancelled when the client gets destroyed (e.g. on logout, 1930be automatically cancelled when the client gets destroyed (e.g. on logout,
1751or loss of connection). 1931or loss of connection).
1752 1932
1753=cut 1933=cut
1754 1934
1755sub cf::client::coro { 1935sub cf::client::async {
1756 my ($self, $cb) = @_; 1936 my ($self, $cb) = @_;
1757 1937
1758 my $coro = &cf::async ($cb); 1938 my $coro = &Coro::async ($cb);
1759 1939
1760 $coro->on_destroy (sub { 1940 $coro->on_destroy (sub {
1761 delete $self->{_coro}{$coro+0}; 1941 delete $self->{_coro}{$coro+0};
1762 }); 1942 });
1763 1943
… …
2001 local $/; 2181 local $/;
2002 *CFG = YAML::Syck::Load <$fh>; 2182 *CFG = YAML::Syck::Load <$fh>;
2003 2183
2004 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2184 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2005 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
2006 if (exists $CFG{mlockall}) { 2189 if (exists $CFG{mlockall}) {
2007 eval { 2190 eval {
2008 $CFG{mlockall} ? &mlockall : &munlockall 2191 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2009 and die "WARNING: m(un)lockall failed: $!\n"; 2192 and die "WARNING: m(un)lockall failed: $!\n";
2010 }; 2193 };
2011 warn $@ if $@; 2194 warn $@ if $@;
2012 } 2195 }
2013} 2196}
2014 2197
2015sub main { 2198sub main {
2016 # we must not ever block the main coroutine 2199 # we must not ever block the main coroutine
2017 local $Coro::idle = sub { 2200 local $Coro::idle = sub {
2018 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#
2019 (Coro::unblock_sub {
2020 Event::one_event; 2202 async { Event::one_event };
2021 })->();
2022 }; 2203 };
2023 2204
2024 cfg_load; 2205 cfg_load;
2025 db_load; 2206 db_load;
2026 load_extensions; 2207 load_extensions;
… …
2109 cf::load_extensions; 2290 cf::load_extensions;
2110 2291
2111 # reattach attachments to objects 2292 # reattach attachments to objects
2112 warn "reattach"; 2293 warn "reattach";
2113 _global_reattach; 2294 _global_reattach;
2295 reattach $_ for values %MAP;
2114 }; 2296 };
2115 2297
2116 if ($@) { 2298 if ($@) {
2117 warn $@; 2299 warn $@;
2118 warn "error while reloading, exiting."; 2300 warn "error while reloading, exiting.";
… …
2134 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2316 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2135 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2317 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2136 2318
2137 # dirty hack because... archetypes are not yet loaded 2319 # dirty hack because... archetypes are not yet loaded
2138 Event->timer ( 2320 Event->timer (
2139 after => 2, 2321 after => 10,
2140 cb => sub { 2322 cb => sub {
2141 $_[0]->w->cancel; 2323 $_[0]->w->cancel;
2142 2324
2143 # provide some exits "home" 2325 # provide some exits "home"
2144 my $exit = cf::object::new "exit"; 2326 my $exit = cf::object::new "exit";

Diff Legend

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