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.130 by root, Thu Jan 4 00:08:08 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
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 185=item cf::lock_wait $string
209 186
210Wait until the given lock is available. See cf::lock_acquire. 187Wait until the given lock is available. See cf::lock_acquire.
211 188
212=item my $lock = cf::lock_acquire $string 189=item my $lock = cf::lock_acquire $string
213 190
214Wait 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
215a 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,
216for example when the coroutine gets canceled), the lock is automatically 193for example when the coroutine gets canceled), the lock is automatically
217returned. 194returned.
218 195
219Lock names should begin with a unique identifier (for example, find_map 196Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 197uses map_find and cf::map::load uses map_load).
221 198
222=cut 199=cut
223 200
224our %LOCK; 201our %LOCK;
225 202
… …
239 # wait, to be sure we are not locked 216 # wait, to be sure we are not locked
240 lock_wait $key; 217 lock_wait $key;
241 218
242 $LOCK{$key} = []; 219 $LOCK{$key} = [];
243 220
244 cf::guard { 221 Coro::guard {
245 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
247 } 224 }
248} 225}
249 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
250=item cf::async { BLOCK } 235=item cf::async { BLOCK }
251 236
252Like 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
253error 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.
254 240
255=cut 241=cut
256 242
257sub async(&) { 243BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 244
266=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
267 246
268The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
283 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
285 264
286 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 266 # (but this is cancel-safe)
288 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
289 268
290 my $busy = 1; 269 my $busy = 1;
291 my @res; 270 my @res;
292 271
293 (Coro::async { 272 (async {
294 @res = eval { $job->() }; 273 @res = eval { $job->() };
295 warn $@ if $@; 274 warn $@ if $@;
296 undef $busy; 275 undef $busy;
297 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
298 277
299 while ($busy) { 278 while ($busy) {
300 Coro::cede_notself; 279 Coro::cede or Event::one_event;
301 Event::one_event unless Coro::nready;
302 } 280 }
303 281
304 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
305 } else { 283 } else {
306 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
307 285
308 $job->() 286 $job->()
309 } 287 }
310} 288}
311 289
312=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
313 291
314Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
315when the extension calling this is being unloaded. 293extension calling this is being unloaded.
316 294
317=cut 295=cut
318 296
319sub coro(&) { 297sub async_ext(&) {
320 my $cb = shift; 298 my $cb = shift;
321 299
322 my $coro = &cf::async ($cb); 300 my $coro = &Coro::async ($cb);
323 301
324 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
326 }); 304 });
327 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1094 1072
1095=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1096 1074
1097Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1098 1076
1077=cut
1078
1079package cf::player;
1080
1099=head3 cf::player 1081=head3 cf::player
1100 1082
1101=over 4 1083=over 4
1102 1084
1103=item cf::player::exists $login 1085=item cf::player::find $login
1104 1086
1105Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1106 1088
1107=cut 1089=cut
1108 1090
1109sub cf::player::exists($) { 1091sub path($) {
1110 cf::player::find $_[0] 1092 sprintf "%s/%s/%s/%s.pl",
1111 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
1112} 1147}
1113 1148
1114=item $player->ext_reply ($msgid, $msgtype, %msg) 1149=item $player->ext_reply ($msgid, $msgtype, %msg)
1115 1150
1116Sends an ext reply to the player. 1151Sends an ext reply to the player.
1117 1152
1118=cut 1153=cut
1119 1154
1120sub cf::player::ext_reply($$$%) { 1155sub ext_reply($$$%) {
1121 my ($self, $id, %msg) = @_; 1156 my ($self, $id, %msg) = @_;
1122 1157
1123 $msg{msgid} = $id; 1158 $msg{msgid} = $id;
1124 1159
1125 $self->send ("ext " . to_json \%msg); 1160 $self->send ("ext " . cf::to_json \%msg);
1126} 1161}
1162
1163package cf;
1127 1164
1128=back 1165=back
1129 1166
1130 1167
1131=head3 cf::map 1168=head3 cf::map
… …
1137package cf::map; 1174package cf::map;
1138 1175
1139use Fcntl; 1176use Fcntl;
1140use Coro::AIO; 1177use Coro::AIO;
1141 1178
1142our $MAX_RESET = 7200; 1179our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1180our $DEFAULT_RESET = 3000;
1144 1181
1145sub generate_random_map { 1182sub generate_random_map {
1146 my ($path, $rmp) = @_; 1183 my ($path, $rmp) = @_;
1147 1184
1148 # mit "rum" bekleckern, nicht 1185 # mit "rum" bekleckern, nicht
… …
1178 or return; 1215 or return;
1179 1216
1180 my $map = cf::map::new 1217 my $map = cf::map::new
1181 or return; 1218 or return;
1182 1219
1220 # for better error messages only, will be overwritten
1221 $map->path ($path);
1222
1183 $map->load_header ($path) 1223 $map->load_header ($path)
1184 or return; 1224 or return;
1185 1225
1186 $map->{load_path} = $path; 1226 $map->{load_path} = $path;
1187 1227
1188 $map 1228 $map
1189} 1229}
1190 1230
1191sub find_map; 1231sub find;
1192sub find_map { 1232sub find {
1193 my ($path, $origin) = @_; 1233 my ($path, $origin) = @_;
1194 1234
1195 #warn "find_map<$path,$origin>\n";#d# 1235 #warn "find<$path,$origin>\n";#d#
1196 1236
1197 $path = new cf::path $path, $origin && $origin->path; 1237 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1238 my $key = $path->as_string;
1199 1239
1200 cf::lock_wait "map_find:$key"; 1240 cf::lock_wait "map_find:$key";
… …
1203 my $guard = cf::lock_acquire "map_find:$key"; 1243 my $guard = cf::lock_acquire "map_find:$key";
1204 1244
1205 # do it the slow way 1245 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1246 my $map = try_load_header $path->save_path;
1207 1247
1248 Coro::cede;
1249
1208 if ($map) { 1250 if ($map) {
1251 $map->last_access ((delete $map->{last_access})
1252 || $cf::RUNTIME); #d#
1209 # safety 1253 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1254 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1255 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1256 } else {
1213 if (my $rmp = $path->random_map_params) { 1257 if (my $rmp = $path->random_map_params) {
… …
1218 1262
1219 $map or return; 1263 $map or return;
1220 1264
1221 $map->{load_original} = 1; 1265 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1266 $map->{instantiate_time} = $cf::RUNTIME;
1267 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1268 $map->instantiate;
1224 1269
1225 # per-player maps become, after loading, normal maps 1270 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1271 $map->per_player (0) if $path->{user_rel};
1227 } 1272 }
1228 1273
1229 $map->path ($key); 1274 $map->path ($key);
1230 $map->{path} = $path; 1275 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1276 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1277
1278 Coro::cede;
1233 1279
1234 if ($map->should_reset) { 1280 if ($map->should_reset) {
1235 $map->reset; 1281 $map->reset;
1236 undef $guard; 1282 undef $guard;
1237 $map = find_map $path 1283 $map = find $path
1238 or return; 1284 or return;
1239 } 1285 }
1240 1286
1241 $cf::MAP{$key} = $map 1287 $cf::MAP{$key} = $map
1242 } 1288 }
… …
1264 if (aio_open $uniq, O_RDONLY, 0) { 1310 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1311 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1312 $self->load_objects ($uniq, 0);
1267 } 1313 }
1268 } 1314 }
1315
1316 Coro::cede;
1269 1317
1270 # now do the right thing for maps 1318 # now do the right thing for maps
1271 $self->link_multipart_objects; 1319 $self->link_multipart_objects;
1272 1320
1273 if ($self->{path}->is_style_map) { 1321 if ($self->{path}->is_style_map) {
… …
1281 $self->difficulty ($self->estimate_difficulty) 1329 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1330 unless $self->difficulty;
1283 $self->activate; 1331 $self->activate;
1284 } 1332 }
1285 1333
1334 Coro::cede;
1335
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1336 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1337}
1288 1338
1289sub load_map_sync { 1339sub find_sync {
1290 my ($path, $origin) = @_; 1340 my ($path, $origin) = @_;
1291 1341
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1342 cf::sync_job { cf::map::find $path, $origin }
1343}
1293 1344
1294 cf::sync_job { 1345sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1346 my ($map) = @_;
1296 or return; 1347
1297 $map->load; 1348 cf::sync_job { $map->load };
1298 $map
1299 }
1300} 1349}
1301 1350
1302sub save { 1351sub save {
1303 my ($self) = @_; 1352 my ($self) = @_;
1304 1353
1354 my $lock = cf::lock_acquire "map_data:" . $self->path;
1355
1305 $self->{last_save} = $cf::RUNTIME; 1356 $self->{last_save} = $cf::RUNTIME;
1306 1357
1307 return unless $self->dirty; 1358 return unless $self->dirty;
1308 1359
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1360 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1361 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1362
1312 $self->{load_path} = $save; 1363 $self->{load_path} = $save;
1313 1364
1314 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 };
1315 1372
1316 if ($uniq) { 1373 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1374 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1375 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1376 } else {
… …
1325 my ($self) = @_; 1382 my ($self) = @_;
1326 1383
1327 # save first because save cedes 1384 # save first because save cedes
1328 $self->save; 1385 $self->save;
1329 1386
1387 my $lock = cf::lock_acquire "map_data:" . $self->path;
1388
1330 return if $self->players; 1389 return if $self->players;
1331 return if $self->in_memory != cf::MAP_IN_MEMORY; 1390 return if $self->in_memory != cf::MAP_IN_MEMORY;
1332 return if $self->{deny_save}; 1391 return if $self->{deny_save};
1333 1392
1334 $self->clear; 1393 $self->clear;
… …
1376} 1435}
1377 1436
1378sub reset { 1437sub reset {
1379 my ($self) = @_; 1438 my ($self) = @_;
1380 1439
1440 my $lock = cf::lock_acquire "map_data:" . $self->path;
1441
1381 return if $self->players; 1442 return if $self->players;
1382 return if $self->{path}{user_rel};#d# 1443 return if $self->{path}{user_rel};#d#
1383 1444
1384 warn "resetting map ", $self->path;#d# 1445 warn "resetting map ", $self->path;#d#
1385 1446
… …
1404 1465
1405sub customise_for { 1466sub customise_for {
1406 my ($map, $ob) = @_; 1467 my ($map, $ob) = @_;
1407 1468
1408 if ($map->per_player) { 1469 if ($map->per_player) {
1409 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1470 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1410 } 1471 }
1411 1472
1412 $map 1473 $map
1413} 1474}
1414 1475
1415sub emergency_save { 1476sub emergency_save {
1416 local $cf::FREEZE = 1; 1477 my $freeze_guard = cf::freeze_mainloop;
1417 1478
1418 warn "enter emergency map save\n"; 1479 warn "enter emergency perl save\n";
1419 1480
1420 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
1421 warn "begin emergency map save\n"; 1486 warn "begin emergency map save\n";
1422 $_->save for values %cf::MAP; 1487 $_->save for values %cf::MAP;
1488 warn "end emergency map save\n";
1423 }; 1489 };
1424 1490
1425 warn "end emergency map save\n"; 1491 warn "leave emergency perl save\n";
1426} 1492}
1427 1493
1428package cf; 1494package cf;
1429 1495
1430=back 1496=back
… …
1511 my $link_pos = delete $self->{_link_pos}; 1577 my $link_pos = delete $self->{_link_pos};
1512 1578
1513 unless ($map) { 1579 unless ($map) {
1514 # restore original map position 1580 # restore original map position
1515 ($map, $x, $y) = @{ $link_pos || [] }; 1581 ($map, $x, $y) = @{ $link_pos || [] };
1516 $map = cf::map::find_map $map; 1582 $map = cf::map::find $map;
1517 1583
1518 unless ($map) { 1584 unless ($map) {
1519 ($map, $x, $y) = @$EMERGENCY_POSITION; 1585 ($map, $x, $y) = @$EMERGENCY_POSITION;
1520 $map = cf::map::find_map $map 1586 $map = cf::map::find $map
1521 or die "FATAL: cannot load emergency map\n"; 1587 or die "FATAL: cannot load emergency map\n";
1522 } 1588 }
1523 } 1589 }
1524 1590
1525 ($x, $y) = (-1, -1) 1591 ($x, $y) = (-1, -1)
… …
1529 ($x, $y) = ($map->enter_x, $map->enter_y) 1595 ($x, $y) = ($map->enter_x, $map->enter_y)
1530 if $x <=0 && $y <= 0; 1596 if $x <=0 && $y <= 0;
1531 1597
1532 $map->load; 1598 $map->load;
1533 1599
1600 return unless $self->contr->active;
1534 $self->activate_recursive; 1601 $self->activate_recursive;
1535 $self->enter_map ($map, $x, $y); 1602 $self->enter_map ($map, $x, $y);
1536} 1603}
1537 1604
1538cf::player->attach ( 1605cf::player->attach (
… …
1551 1618
1552 # try to abort aborted map switching on player login :) 1619 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes 1620 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) { 1621 if ($pl->ob->{_link_pos}) {
1555 $pl->ob->enter_link; 1622 $pl->ob->enter_link;
1556 cf::async { 1623 (async {
1557 # 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
1558 # 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);
1559 Coro::Timer::sleep 1; 1630 Coro::Timer::sleep 1;
1560 $pl->ob->leave_link; 1631 $pl->ob->leave_link;
1561 }; 1632 })->prio (2);
1562 } 1633 }
1563 }, 1634 },
1564); 1635);
1565 1636
1566=item $player_object->goto_map ($path, $x, $y) 1637=item $player_object->goto ($path, $x, $y)
1567 1638
1568=cut 1639=cut
1569 1640
1570sub cf::object::player::goto_map { 1641sub cf::object::player::goto {
1571 my ($self, $path, $x, $y) = @_; 1642 my ($self, $path, $x, $y) = @_;
1572 1643
1573 $self->enter_link; 1644 $self->enter_link;
1574 1645
1575 (cf::async { 1646 (async {
1576 $path = new cf::path $path; 1647 $path = new cf::path $path;
1577 1648
1578 my $map = cf::map::find_map $path->as_string; 1649 my $map = cf::map::find $path->as_string;
1579 $map = $map->customise_for ($self) if $map; 1650 $map = $map->customise_for ($self) if $map;
1580 1651
1581# warn "entering ", $map->path, " at ($x, $y)\n" 1652# warn "entering ", $map->path, " at ($x, $y)\n"
1582# if $map; 1653# if $map;
1583 1654
… …
1642 1713
1643 return unless $self->type == cf::PLAYER; 1714 return unless $self->type == cf::PLAYER;
1644 1715
1645 $self->enter_link; 1716 $self->enter_link;
1646 1717
1647 (cf::async { 1718 (async {
1719 $self->deactivate_recursive; # just to be sure
1648 unless (eval { 1720 unless (eval {
1649 prepare_random_map $exit 1721 prepare_random_map $exit
1650 if $exit->slaying eq "/!"; 1722 if $exit->slaying eq "/!";
1651 1723
1652 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;
1653 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1725 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1654 1726
1655 1; 1727 1;
1656 }) { 1728 }) {
1657 $self->message ("Something went wrong deep within the crossfire server. " 1729 $self->message ("Something went wrong deep within the crossfire server. "
1658 . "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. "
… …
1732 } 1804 }
1733 } 1805 }
1734 }, 1806 },
1735); 1807);
1736 1808
1737=item $client->coro (\&cb) 1809=item $client->async (\&cb)
1738 1810
1739Create a new coroutine, running the specified callback. The coroutine will 1811Create a new coroutine, running the specified callback. The coroutine will
1740be automatically cancelled when the client gets destroyed (e.g. on logout, 1812be automatically cancelled when the client gets destroyed (e.g. on logout,
1741or loss of connection). 1813or loss of connection).
1742 1814
1743=cut 1815=cut
1744 1816
1745sub cf::client::coro { 1817sub cf::client::async {
1746 my ($self, $cb) = @_; 1818 my ($self, $cb) = @_;
1747 1819
1748 my $coro = &cf::async ($cb); 1820 my $coro = &Coro::async ($cb);
1749 1821
1750 $coro->on_destroy (sub { 1822 $coro->on_destroy (sub {
1751 delete $self->{_coro}{$coro+0}; 1823 delete $self->{_coro}{$coro+0};
1752 }); 1824 });
1753 1825
… …
1988 open my $fh, "<:utf8", cf::confdir . "/config" 2060 open my $fh, "<:utf8", cf::confdir . "/config"
1989 or return; 2061 or return;
1990 2062
1991 local $/; 2063 local $/;
1992 *CFG = YAML::Syck::Load <$fh>; 2064 *CFG = YAML::Syck::Load <$fh>;
2065
2066 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
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
2071 if (exists $CFG{mlockall}) {
2072 eval {
2073 $CFG{mlockall} ? &mlockall : &munlockall
2074 and die "WARNING: m(un)lockall failed: $!\n";
2075 };
2076 warn $@ if $@;
2077 }
1993} 2078}
1994 2079
1995sub main { 2080sub main {
1996 # we must not ever block the main coroutine 2081 # we must not ever block the main coroutine
1997 local $Coro::idle = sub { 2082 local $Coro::idle = sub {
1998 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#
1999 (Coro::unblock_sub {
2000 Event::one_event; 2084 async { Event::one_event };
2001 })->();
2002 }; 2085 };
2003 2086
2004 cfg_load; 2087 cfg_load;
2005 db_load; 2088 db_load;
2006 load_extensions; 2089 load_extensions;
… …
2017 return; 2100 return;
2018 } 2101 }
2019 2102
2020 warn "reloading..."; 2103 warn "reloading...";
2021 2104
2022 local $FREEZE = 1; 2105 my $guard = freeze_mainloop;
2023 cf::emergency_save; 2106 cf::emergency_save;
2024 2107
2025 eval { 2108 eval {
2026 # 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
2027 2110
… …
2089 cf::load_extensions; 2172 cf::load_extensions;
2090 2173
2091 # reattach attachments to objects 2174 # reattach attachments to objects
2092 warn "reattach"; 2175 warn "reattach";
2093 _global_reattach; 2176 _global_reattach;
2177 reattach $_ for values %MAP;
2094 }; 2178 };
2095 2179
2096 if ($@) { 2180 if ($@) {
2097 warn $@; 2181 warn $@;
2098 warn "error while reloading, exiting."; 2182 warn "error while reloading, exiting.";
… …
2114 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2198 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2115 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2199 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2116 2200
2117 # dirty hack because... archetypes are not yet loaded 2201 # dirty hack because... archetypes are not yet loaded
2118 Event->timer ( 2202 Event->timer (
2119 after => 2, 2203 after => 10,
2120 cb => sub { 2204 cb => sub {
2121 $_[0]->w->cancel; 2205 $_[0]->w->cancel;
2122 2206
2123 # provide some exits "home" 2207 # provide some exits "home"
2124 my $exit = cf::object::new "exit"; 2208 my $exit = cf::object::new "exit";
… …
2163 reentrant => 0, 2247 reentrant => 0,
2164 prio => 0, 2248 prio => 0,
2165 at => $NEXT_TICK || $TICK, 2249 at => $NEXT_TICK || $TICK,
2166 data => WF_AUTOCANCEL, 2250 data => WF_AUTOCANCEL,
2167 cb => sub { 2251 cb => sub {
2168 unless ($FREEZE) {
2169 cf::server_tick; # one server iteration 2252 cf::server_tick; # one server iteration
2170 $RUNTIME += $TICK; 2253 $RUNTIME += $TICK;
2171 }
2172
2173 $NEXT_TICK += $TICK; 2254 $NEXT_TICK += $TICK;
2174 2255
2175 # 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
2176 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2257 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2177 2258

Diff Legend

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