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.131 by root, Thu Jan 4 00:53:54 2007 UTC vs.
Revision 1.144 by root, Sun Jan 7 18:01:10 2007 UTC

… …
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
180sub to_json($) { 180sub to_json($) {
181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
182 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
183} 183}
184 184
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 185=item cf::lock_wait $string
208 186
209Wait until the given lock is available. See cf::lock_acquire. 187Wait until the given lock is available. See cf::lock_acquire.
210 188
211=item my $lock = cf::lock_acquire $string 189=item my $lock = cf::lock_acquire $string
212 190
213Wait until the given lock is available and then acquires it and returns 191Wait 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, 192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
215for example when the coroutine gets canceled), the lock is automatically 193for example when the coroutine gets canceled), the lock is automatically
216returned. 194returned.
217 195
218Lock names should begin with a unique identifier (for example, find_map 196Lock names should begin with a unique identifier (for example, cf::map::find
219uses map_find and load_map uses map_load). 197uses map_find and cf::map::load uses map_load).
220 198
221=cut 199=cut
222 200
223our %LOCK; 201our %LOCK;
224 202
… …
238 # wait, to be sure we are not locked 216 # wait, to be sure we are not locked
239 lock_wait $key; 217 lock_wait $key;
240 218
241 $LOCK{$key} = []; 219 $LOCK{$key} = [];
242 220
243 cf::guard { 221 Coro::guard {
244 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
245 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
246 } 224 }
247} 225}
248 226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
249=item cf::async { BLOCK } 235=item cf::async { BLOCK }
250 236
251Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 237Currently the same as Coro::async_pool, meaning you cannot use
252error instead of exiting the server in case of a problem. 238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
253 240
254=cut 241=cut
255 242
256sub async(&) { 243BEGIN { *async = \&Coro::async_pool }
257 my ($cb) = @_;
258
259 Coro::async {
260 eval { $cb->() };
261 warn $@ if $@;
262 }
263}
264 244
265=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
266 246
267The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
268always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
282 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
283 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
284 264
285 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
286 # (but this is cancel-safe) 266 # (but this is cancel-safe)
287 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
288 268
289 my $busy = 1; 269 my $busy = 1;
290 my @res; 270 my @res;
291 271
292 (Coro::async { 272 (async {
293 @res = eval { $job->() }; 273 @res = eval { $job->() };
294 warn $@ if $@; 274 warn $@ if $@;
295 undef $busy; 275 undef $busy;
296 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
297 277
298 while ($busy) { 278 while ($busy) {
299 Coro::cede_notself; 279 Coro::cede or Event::one_event;
300 Event::one_event unless Coro::nready;
301 } 280 }
302 281
303 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
304 } else { 283 } else {
305 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
306 285
307 $job->() 286 $job->()
308 } 287 }
309} 288}
310 289
311=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
312 291
313Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
314when the extension calling this is being unloaded. 293extension calling this is being unloaded.
315 294
316=cut 295=cut
317 296
318sub coro(&) { 297sub async_ext(&) {
319 my $cb = shift; 298 my $cb = shift;
320 299
321 my $coro = &cf::async ($cb); 300 my $coro = &Coro::async ($cb);
322 301
323 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
324 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
325 }); 304 });
326 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1093 1072
1094=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1095 1074
1096Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1097 1076
1077=cut
1078
1079package cf::player;
1080
1098=head3 cf::player 1081=head3 cf::player
1099 1082
1100=over 4 1083=over 4
1101 1084
1102=item cf::player::exists $login 1085=item cf::player::find $login
1103 1086
1104Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1105 1088
1106=cut 1089=cut
1107 1090
1108sub cf::player::exists($) { 1091sub path($) {
1109 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1110 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 cf::localdir, cf::playerdir,
1094 (ref $_[0] ? $_[0]->ob->name : $_[0]) x 2
1095}
1096
1097sub find_active($) {
1098 $cf::PLAYER{$_[0]}
1099 and $cf::PLAYER{$_[0]}->active
1100 and $cf::PLAYER{$_[0]}
1101}
1102
1103sub exists($) {
1104 my ($login) = @_;
1105
1106 $cf::PLAYER{$login}
1107 or cf::sync_job { !aio_stat $login }
1108}
1109
1110sub find($) {
1111 return $cf::PLAYER{$_[0]} || do {
1112 my $login = $_[0];
1113
1114 my $guard = cf::lock_acquire "user_find:$login";
1115
1116 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1117 };
1118}
1119
1120sub save($) {
1121 my ($pl) = @_;
1122
1123 return if $pl->{deny_save};
1124
1125 my $path = path $pl;
1126 my $guard = cf::lock_acquire "user_save:$path";
1127
1128 return if $pl->{deny_save};
1129 $pl->{last_save} = $cf::RUNTIME;
1130
1131 Coro::cede;
1132 $pl->save_pl ($path);
1133 Coro::cede;
1134}
1135
1136sub new($) {
1137 my ($login) = @_;
1138
1139 my $self = create;
1140
1141 $self->ob->name ($login);
1142 $self->{deny_save} = 1;
1143
1144 $cf::PLAYER{$login} = $self;
1145
1146 $self
1111} 1147}
1112 1148
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1114 1150
1115Sends an ext reply to the player. 1151Sends an ext reply to the player.
1116 1152
1117=cut 1153=cut
1118 1154
1119sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1120 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1121 1157
1122 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1123 1159
1124 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1125} 1161}
1162
1163package cf;
1126 1164
1127=back 1165=back
1128 1166
1129 1167
1130=head3 cf::map 1168=head3 cf::map
… …
1136package cf::map; 1174package cf::map;
1137 1175
1138use Fcntl; 1176use Fcntl;
1139use Coro::AIO; 1177use Coro::AIO;
1140 1178
1141our $MAX_RESET = 7200; 1179our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1180our $DEFAULT_RESET = 3000;
1143 1181
1144sub generate_random_map { 1182sub generate_random_map {
1145 my ($path, $rmp) = @_; 1183 my ($path, $rmp) = @_;
1146 1184
1147 # mit "rum" bekleckern, nicht 1185 # mit "rum" bekleckern, nicht
… …
1177 or return; 1215 or return;
1178 1216
1179 my $map = cf::map::new 1217 my $map = cf::map::new
1180 or return; 1218 or return;
1181 1219
1220 # for better error messages only, will be overwritten
1221 $map->path ($path);
1222
1182 $map->load_header ($path) 1223 $map->load_header ($path)
1183 or return; 1224 or return;
1184 1225
1185 $map->{load_path} = $path; 1226 $map->{load_path} = $path;
1186 1227
1187 $map 1228 $map
1188} 1229}
1189 1230
1190sub find_map; 1231sub find;
1191sub find_map { 1232sub find {
1192 my ($path, $origin) = @_; 1233 my ($path, $origin) = @_;
1193 1234
1194 #warn "find_map<$path,$origin>\n";#d# 1235 #warn "find<$path,$origin>\n";#d#
1195 1236
1196 $path = new cf::path $path, $origin && $origin->path; 1237 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1238 my $key = $path->as_string;
1198 1239
1199 cf::lock_wait "map_find:$key"; 1240 cf::lock_wait "map_find:$key";
… …
1202 my $guard = cf::lock_acquire "map_find:$key"; 1243 my $guard = cf::lock_acquire "map_find:$key";
1203 1244
1204 # do it the slow way 1245 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1246 my $map = try_load_header $path->save_path;
1206 1247
1248 Coro::cede;
1249
1207 if ($map) { 1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1208 # safety 1253 # safety
1209 $map->{instantiate_time} = $cf::RUNTIME 1254 $map->{instantiate_time} = $cf::RUNTIME
1210 if $map->{instantiate_time} > $cf::RUNTIME; 1255 if $map->{instantiate_time} > $cf::RUNTIME;
1211 } else { 1256 } else {
1212 if (my $rmp = $path->random_map_params) { 1257 if (my $rmp = $path->random_map_params) {
… …
1217 1262
1218 $map or return; 1263 $map or return;
1219 1264
1220 $map->{load_original} = 1; 1265 $map->{load_original} = 1;
1221 $map->{instantiate_time} = $cf::RUNTIME; 1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1222 $map->instantiate; 1268 $map->instantiate;
1223 1269
1224 # per-player maps become, after loading, normal maps 1270 # per-player maps become, after loading, normal maps
1225 $map->per_player (0) if $path->{user_rel}; 1271 $map->per_player (0) if $path->{user_rel};
1226 } 1272 }
1227 1273
1228 $map->path ($key); 1274 $map->path ($key);
1229 $map->{path} = $path; 1275 $map->{path} = $path;
1230 $map->{last_save} = $cf::RUNTIME; 1276 $map->{last_save} = $cf::RUNTIME;
1231 $map->last_access ($cf::RUNTIME); 1277
1278 Coro::cede;
1232 1279
1233 if ($map->should_reset) { 1280 if ($map->should_reset) {
1234 $map->reset; 1281 $map->reset;
1235 undef $guard; 1282 undef $guard;
1236 $map = find_map $path 1283 $map = find $path
1237 or return; 1284 or return;
1238 } 1285 }
1239 1286
1240 $cf::MAP{$key} = $map 1287 $cf::MAP{$key} = $map
1241 } 1288 }
… …
1263 if (aio_open $uniq, O_RDONLY, 0) { 1310 if (aio_open $uniq, O_RDONLY, 0) {
1264 $self->clear_unique_items; 1311 $self->clear_unique_items;
1265 $self->load_objects ($uniq, 0); 1312 $self->load_objects ($uniq, 0);
1266 } 1313 }
1267 } 1314 }
1315
1316 Coro::cede;
1268 1317
1269 # now do the right thing for maps 1318 # now do the right thing for maps
1270 $self->link_multipart_objects; 1319 $self->link_multipart_objects;
1271 1320
1272 if ($self->{path}->is_style_map) { 1321 if ($self->{path}->is_style_map) {
… …
1280 $self->difficulty ($self->estimate_difficulty) 1329 $self->difficulty ($self->estimate_difficulty)
1281 unless $self->difficulty; 1330 unless $self->difficulty;
1282 $self->activate; 1331 $self->activate;
1283 } 1332 }
1284 1333
1334 Coro::cede;
1335
1285 $self->in_memory (cf::MAP_IN_MEMORY); 1336 $self->in_memory (cf::MAP_IN_MEMORY);
1286} 1337}
1287 1338
1288sub load_map_sync { 1339sub find_sync {
1289 my ($path, $origin) = @_; 1340 my ($path, $origin) = @_;
1290 1341
1291 #warn "load_map_sync<$path, $origin>\n";#d# 1342 cf::sync_job { cf::map::find $path, $origin }
1343}
1292 1344
1293 cf::sync_job { 1345sub do_load_sync {
1294 my $map = cf::map::find_map $path, $origin 1346 my ($map) = @_;
1295 or return; 1347
1296 $map->load; 1348 cf::sync_job { $map->load };
1297 $map
1298 }
1299} 1349}
1300 1350
1301sub save { 1351sub save {
1302 my ($self) = @_; 1352 my ($self) = @_;
1303 1353
1354 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355
1304 $self->{last_save} = $cf::RUNTIME; 1356 $self->{last_save} = $cf::RUNTIME;
1305 1357
1306 return unless $self->dirty; 1358 return unless $self->dirty;
1307 1359
1308 my $save = $self->{path}->save_path; utf8::encode $save; 1360 my $save = $self->{path}->save_path; utf8::encode $save;
1309 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1310 1362
1311 $self->{load_path} = $save; 1363 $self->{load_path} = $save;
1312 1364
1313 return if $self->{deny_save}; 1365 return if $self->{deny_save};
1366
1367 local $self->{last_access} = $self->last_access;#d#
1368
1369 cf::async {
1370 $_->contr->save for $self->players;
1371 };
1314 1372
1315 if ($uniq) { 1373 if ($uniq) {
1316 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1317 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1318 } else { 1376 } else {
… …
1324 my ($self) = @_; 1382 my ($self) = @_;
1325 1383
1326 # save first because save cedes 1384 # save first because save cedes
1327 $self->save; 1385 $self->save;
1328 1386
1387 my $lock = cf::lock_acquire "map_data:" . $self->path;
1388
1329 return if $self->players; 1389 return if $self->players;
1330 return if $self->in_memory != cf::MAP_IN_MEMORY; 1390 return if $self->in_memory != cf::MAP_IN_MEMORY;
1331 return if $self->{deny_save}; 1391 return if $self->{deny_save};
1332 1392
1333 $self->clear; 1393 $self->clear;
… …
1375} 1435}
1376 1436
1377sub reset { 1437sub reset {
1378 my ($self) = @_; 1438 my ($self) = @_;
1379 1439
1440 my $lock = cf::lock_acquire "map_data:" . $self->path;
1441
1380 return if $self->players; 1442 return if $self->players;
1381 return if $self->{path}{user_rel};#d# 1443 return if $self->{path}{user_rel};#d#
1382 1444
1383 warn "resetting map ", $self->path;#d# 1445 warn "resetting map ", $self->path;#d#
1384 1446
… …
1403 1465
1404sub customise_for { 1466sub customise_for {
1405 my ($map, $ob) = @_; 1467 my ($map, $ob) = @_;
1406 1468
1407 if ($map->per_player) { 1469 if ($map->per_player) {
1408 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1409 } 1471 }
1410 1472
1411 $map 1473 $map
1412} 1474}
1413 1475
1414sub emergency_save { 1476sub emergency_save {
1415 local $cf::FREEZE = 1; 1477 my $freeze_guard = cf::freeze_mainloop;
1416 1478
1417 warn "enter emergency map save\n"; 1479 warn "enter emergency perl save\n";
1418 1480
1419 cf::sync_job { 1481 cf::sync_job {
1482 warn "begin emergency player save\n";
1483 $_->save for values %cf::PLAYER;
1484 warn "end emergency player save\n";
1485
1420 warn "begin emergency map save\n"; 1486 warn "begin emergency map save\n";
1421 $_->save for values %cf::MAP; 1487 $_->save for values %cf::MAP;
1488 warn "end emergency map save\n";
1422 }; 1489 };
1423 1490
1424 warn "end emergency map save\n"; 1491 warn "leave emergency perl save\n";
1425} 1492}
1426 1493
1427package cf; 1494package cf;
1428 1495
1429=back 1496=back
… …
1510 my $link_pos = delete $self->{_link_pos}; 1577 my $link_pos = delete $self->{_link_pos};
1511 1578
1512 unless ($map) { 1579 unless ($map) {
1513 # restore original map position 1580 # restore original map position
1514 ($map, $x, $y) = @{ $link_pos || [] }; 1581 ($map, $x, $y) = @{ $link_pos || [] };
1515 $map = cf::map::find_map $map; 1582 $map = cf::map::find $map;
1516 1583
1517 unless ($map) { 1584 unless ($map) {
1518 ($map, $x, $y) = @$EMERGENCY_POSITION; 1585 ($map, $x, $y) = @$EMERGENCY_POSITION;
1519 $map = cf::map::find_map $map 1586 $map = cf::map::find $map
1520 or die "FATAL: cannot load emergency map\n"; 1587 or die "FATAL: cannot load emergency map\n";
1521 } 1588 }
1522 } 1589 }
1523 1590
1524 ($x, $y) = (-1, -1) 1591 ($x, $y) = (-1, -1)
… …
1528 ($x, $y) = ($map->enter_x, $map->enter_y) 1595 ($x, $y) = ($map->enter_x, $map->enter_y)
1529 if $x <=0 && $y <= 0; 1596 if $x <=0 && $y <= 0;
1530 1597
1531 $map->load; 1598 $map->load;
1532 1599
1600 return unless $self->contr->active;
1533 $self->activate_recursive; 1601 $self->activate_recursive;
1534 $self->enter_map ($map, $x, $y); 1602 $self->enter_map ($map, $x, $y);
1535} 1603}
1536 1604
1537cf::player->attach ( 1605cf::player->attach (
… …
1550 1618
1551 # try to abort aborted map switching on player login :) 1619 # try to abort aborted map switching on player login :)
1552 # should happen only on crashes 1620 # should happen only on crashes
1553 if ($pl->ob->{_link_pos}) { 1621 if ($pl->ob->{_link_pos}) {
1554 $pl->ob->enter_link; 1622 $pl->ob->enter_link;
1555 cf::async { 1623 (async {
1556 # we need this sleep as the login has a concurrent enter_exit running 1624 # we need this sleep as the login has a concurrent enter_exit running
1557 # and this sleep increases chances of the player not ending up in scorn 1625 # and this sleep increases chances of the player not ending up in scorn
1626 $pl->ob->reply (undef,
1627 "There was an internal problem at your last logout, "
1628 . "the server will try to bring you to your intended destination in a second.",
1629 cf::NDI_RED);
1558 Coro::Timer::sleep 1; 1630 Coro::Timer::sleep 1;
1559 $pl->ob->leave_link; 1631 $pl->ob->leave_link;
1560 }; 1632 })->prio (2);
1561 } 1633 }
1562 }, 1634 },
1563); 1635);
1564 1636
1565=item $player_object->goto_map ($path, $x, $y) 1637=item $player_object->goto ($path, $x, $y)
1566 1638
1567=cut 1639=cut
1568 1640
1569sub cf::object::player::goto_map { 1641sub cf::object::player::goto {
1570 my ($self, $path, $x, $y) = @_; 1642 my ($self, $path, $x, $y) = @_;
1571 1643
1572 $self->enter_link; 1644 $self->enter_link;
1573 1645
1574 (cf::async { 1646 (async {
1575 $path = new cf::path $path; 1647 $path = new cf::path $path;
1576 1648
1577 my $map = cf::map::find_map $path->as_string; 1649 my $map = cf::map::find $path->as_string;
1578 $map = $map->customise_for ($self) if $map; 1650 $map = $map->customise_for ($self) if $map;
1579 1651
1580# warn "entering ", $map->path, " at ($x, $y)\n" 1652# warn "entering ", $map->path, " at ($x, $y)\n"
1581# if $map; 1653# if $map;
1582 1654
… …
1641 1713
1642 return unless $self->type == cf::PLAYER; 1714 return unless $self->type == cf::PLAYER;
1643 1715
1644 $self->enter_link; 1716 $self->enter_link;
1645 1717
1646 (cf::async { 1718 (async {
1719 $self->deactivate_recursive; # just to be sure
1647 unless (eval { 1720 unless (eval {
1648 prepare_random_map $exit 1721 prepare_random_map $exit
1649 if $exit->slaying eq "/!"; 1722 if $exit->slaying eq "/!";
1650 1723
1651 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1724 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1652 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1725 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1653 1726
1654 1; 1727 1;
1655 }) { 1728 }) {
1656 $self->message ("Something went wrong deep within the crossfire server. " 1729 $self->message ("Something went wrong deep within the crossfire server. "
1657 . "I'll try to bring you back to the map you were before. " 1730 . "I'll try to bring you back to the map you were before. "
… …
1731 } 1804 }
1732 } 1805 }
1733 }, 1806 },
1734); 1807);
1735 1808
1736=item $client->coro (\&cb) 1809=item $client->async (\&cb)
1737 1810
1738Create a new coroutine, running the specified callback. The coroutine will 1811Create a new coroutine, running the specified callback. The coroutine will
1739be automatically cancelled when the client gets destroyed (e.g. on logout, 1812be automatically cancelled when the client gets destroyed (e.g. on logout,
1740or loss of connection). 1813or loss of connection).
1741 1814
1742=cut 1815=cut
1743 1816
1744sub cf::client::coro { 1817sub cf::client::async {
1745 my ($self, $cb) = @_; 1818 my ($self, $cb) = @_;
1746 1819
1747 my $coro = &cf::async ($cb); 1820 my $coro = &Coro::async ($cb);
1748 1821
1749 $coro->on_destroy (sub { 1822 $coro->on_destroy (sub {
1750 delete $self->{_coro}{$coro+0}; 1823 delete $self->{_coro}{$coro+0};
1751 }); 1824 });
1752 1825
… …
1990 local $/; 2063 local $/;
1991 *CFG = YAML::Syck::Load <$fh>; 2064 *CFG = YAML::Syck::Load <$fh>;
1992 2065
1993 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2066 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1994 2067
2068 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2069 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2070
1995 if (exists $CFG{mlockall}) { 2071 if (exists $CFG{mlockall}) {
1996 eval { 2072 eval {
1997 $CFG{mlockall} ? &mlockall : &munlockall 2073 $CFG{mlockall} ? &mlockall : &munlockall
1998 and die "WARNING: m(un)lockall failed: $!\n"; 2074 and die "WARNING: m(un)lockall failed: $!\n";
1999 }; 2075 };
… …
2003 2079
2004sub main { 2080sub main {
2005 # we must not ever block the main coroutine 2081 # we must not ever block the main coroutine
2006 local $Coro::idle = sub { 2082 local $Coro::idle = sub {
2007 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2083 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2008 (Coro::unblock_sub {
2009 Event::one_event; 2084 async { Event::one_event };
2010 })->();
2011 }; 2085 };
2012 2086
2013 cfg_load; 2087 cfg_load;
2014 db_load; 2088 db_load;
2015 load_extensions; 2089 load_extensions;
… …
2026 return; 2100 return;
2027 } 2101 }
2028 2102
2029 warn "reloading..."; 2103 warn "reloading...";
2030 2104
2031 local $FREEZE = 1; 2105 my $guard = freeze_mainloop;
2032 cf::emergency_save; 2106 cf::emergency_save;
2033 2107
2034 eval { 2108 eval {
2035 # if anything goes wrong in here, we should simply crash as we already saved 2109 # if anything goes wrong in here, we should simply crash as we already saved
2036 2110
… …
2098 cf::load_extensions; 2172 cf::load_extensions;
2099 2173
2100 # reattach attachments to objects 2174 # reattach attachments to objects
2101 warn "reattach"; 2175 warn "reattach";
2102 _global_reattach; 2176 _global_reattach;
2177 reattach $_ for values %MAP;
2103 }; 2178 };
2104 2179
2105 if ($@) { 2180 if ($@) {
2106 warn $@; 2181 warn $@;
2107 warn "error while reloading, exiting."; 2182 warn "error while reloading, exiting.";
… …
2123 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2198 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2124 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2199 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2125 2200
2126 # dirty hack because... archetypes are not yet loaded 2201 # dirty hack because... archetypes are not yet loaded
2127 Event->timer ( 2202 Event->timer (
2128 after => 2, 2203 after => 10,
2129 cb => sub { 2204 cb => sub {
2130 $_[0]->w->cancel; 2205 $_[0]->w->cancel;
2131 2206
2132 # provide some exits "home" 2207 # provide some exits "home"
2133 my $exit = cf::object::new "exit"; 2208 my $exit = cf::object::new "exit";
… …
2172 reentrant => 0, 2247 reentrant => 0,
2173 prio => 0, 2248 prio => 0,
2174 at => $NEXT_TICK || $TICK, 2249 at => $NEXT_TICK || $TICK,
2175 data => WF_AUTOCANCEL, 2250 data => WF_AUTOCANCEL,
2176 cb => sub { 2251 cb => sub {
2177 unless ($FREEZE) {
2178 cf::server_tick; # one server iteration 2252 cf::server_tick; # one server iteration
2179 $RUNTIME += $TICK; 2253 $RUNTIME += $TICK;
2180 }
2181
2182 $NEXT_TICK += $TICK; 2254 $NEXT_TICK += $TICK;
2183 2255
2184 # if we are delayed by four ticks or more, skip them all 2256 # if we are delayed by four ticks or more, skip them all
2185 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2257 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2186 2258

Diff Legend

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