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.145 by root, Sun Jan 7 21:54:59 2007 UTC

… …
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
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 playerdir($) {
1109 cf::player::find $_[0] 1092 cf::localdir
1110 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137 $pl->{last_save} = $cf::RUNTIME;
1138
1139 Coro::cede;
1140 $pl->save_pl ($path);
1141 Coro::cede;
1142}
1143
1144sub new($) {
1145 my ($login) = @_;
1146
1147 my $self = create;
1148
1149 $self->ob->name ($login);
1150 $self->{deny_save} = 1;
1151
1152 $cf::PLAYER{$login} = $self;
1153
1154 $self
1155}
1156
1157sub quit_character {
1158 my ($pl) = @_;
1159
1160 $pl->{deny_save} = 1;
1161 $pl->password ("*"); # this should lock out the player until we nuked the dir
1162
1163 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1164 $pl->deactivate;
1165 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1166 $pl->ns->destroy if $pl->ns;
1167
1168 my $path = playerdir $pl;
1169 my $temp = "$path~$cf::RUNTIME~deleting~";
1170 IO::AIO::aio_rename $path, $temp, sub {
1171 delete $cf::PLAYER{$pl->ob->name};
1172 $pl->destroy;
1173
1174 IO::AIO::aio_rmtree $temp;
1175 };
1111} 1176}
1112 1177
1113=item $player->ext_reply ($msgid, $msgtype, %msg) 1178=item $player->ext_reply ($msgid, $msgtype, %msg)
1114 1179
1115Sends an ext reply to the player. 1180Sends an ext reply to the player.
1116 1181
1117=cut 1182=cut
1118 1183
1119sub cf::player::ext_reply($$$%) { 1184sub ext_reply($$$%) {
1120 my ($self, $id, %msg) = @_; 1185 my ($self, $id, %msg) = @_;
1121 1186
1122 $msg{msgid} = $id; 1187 $msg{msgid} = $id;
1123 1188
1124 $self->send ("ext " . to_json \%msg); 1189 $self->send ("ext " . cf::to_json \%msg);
1125} 1190}
1191
1192package cf;
1126 1193
1127=back 1194=back
1128 1195
1129 1196
1130=head3 cf::map 1197=head3 cf::map
… …
1136package cf::map; 1203package cf::map;
1137 1204
1138use Fcntl; 1205use Fcntl;
1139use Coro::AIO; 1206use Coro::AIO;
1140 1207
1141our $MAX_RESET = 7200; 1208our $MAX_RESET = 3600;
1142our $DEFAULT_RESET = 3600; 1209our $DEFAULT_RESET = 3000;
1143 1210
1144sub generate_random_map { 1211sub generate_random_map {
1145 my ($path, $rmp) = @_; 1212 my ($path, $rmp) = @_;
1146 1213
1147 # mit "rum" bekleckern, nicht 1214 # mit "rum" bekleckern, nicht
… …
1177 or return; 1244 or return;
1178 1245
1179 my $map = cf::map::new 1246 my $map = cf::map::new
1180 or return; 1247 or return;
1181 1248
1249 # for better error messages only, will be overwritten
1250 $map->path ($path);
1251
1182 $map->load_header ($path) 1252 $map->load_header ($path)
1183 or return; 1253 or return;
1184 1254
1185 $map->{load_path} = $path; 1255 $map->{load_path} = $path;
1186 1256
1187 $map 1257 $map
1188} 1258}
1189 1259
1190sub find_map; 1260sub find;
1191sub find_map { 1261sub find {
1192 my ($path, $origin) = @_; 1262 my ($path, $origin) = @_;
1193 1263
1194 #warn "find_map<$path,$origin>\n";#d# 1264 #warn "find<$path,$origin>\n";#d#
1195 1265
1196 $path = new cf::path $path, $origin && $origin->path; 1266 $path = new cf::path $path, $origin && $origin->path;
1197 my $key = $path->as_string; 1267 my $key = $path->as_string;
1198 1268
1199 cf::lock_wait "map_find:$key"; 1269 cf::lock_wait "map_find:$key";
… …
1201 $cf::MAP{$key} || do { 1271 $cf::MAP{$key} || do {
1202 my $guard = cf::lock_acquire "map_find:$key"; 1272 my $guard = cf::lock_acquire "map_find:$key";
1203 1273
1204 # do it the slow way 1274 # do it the slow way
1205 my $map = try_load_header $path->save_path; 1275 my $map = try_load_header $path->save_path;
1276
1277 Coro::cede;
1206 1278
1207 if ($map) { 1279 if ($map) {
1208 $map->last_access ((delete $map->{last_access}) 1280 $map->last_access ((delete $map->{last_access})
1209 || $cf::RUNTIME); #d# 1281 || $cf::RUNTIME); #d#
1210 # safety 1282 # safety
… …
1230 1302
1231 $map->path ($key); 1303 $map->path ($key);
1232 $map->{path} = $path; 1304 $map->{path} = $path;
1233 $map->{last_save} = $cf::RUNTIME; 1305 $map->{last_save} = $cf::RUNTIME;
1234 1306
1307 Coro::cede;
1308
1235 if ($map->should_reset) { 1309 if ($map->should_reset) {
1236 $map->reset; 1310 $map->reset;
1237 undef $guard; 1311 undef $guard;
1238 $map = find_map $path 1312 $map = find $path
1239 or return; 1313 or return;
1240 } 1314 }
1241 1315
1242 $cf::MAP{$key} = $map 1316 $cf::MAP{$key} = $map
1243 } 1317 }
… …
1265 if (aio_open $uniq, O_RDONLY, 0) { 1339 if (aio_open $uniq, O_RDONLY, 0) {
1266 $self->clear_unique_items; 1340 $self->clear_unique_items;
1267 $self->load_objects ($uniq, 0); 1341 $self->load_objects ($uniq, 0);
1268 } 1342 }
1269 } 1343 }
1344
1345 Coro::cede;
1270 1346
1271 # now do the right thing for maps 1347 # now do the right thing for maps
1272 $self->link_multipart_objects; 1348 $self->link_multipart_objects;
1273 1349
1274 if ($self->{path}->is_style_map) { 1350 if ($self->{path}->is_style_map) {
… …
1282 $self->difficulty ($self->estimate_difficulty) 1358 $self->difficulty ($self->estimate_difficulty)
1283 unless $self->difficulty; 1359 unless $self->difficulty;
1284 $self->activate; 1360 $self->activate;
1285 } 1361 }
1286 1362
1363 Coro::cede;
1364
1287 $self->in_memory (cf::MAP_IN_MEMORY); 1365 $self->in_memory (cf::MAP_IN_MEMORY);
1288} 1366}
1289 1367
1290sub load_map_sync { 1368sub find_sync {
1291 my ($path, $origin) = @_; 1369 my ($path, $origin) = @_;
1292 1370
1293 #warn "load_map_sync<$path, $origin>\n";#d# 1371 cf::sync_job { cf::map::find $path, $origin }
1372}
1294 1373
1295 cf::sync_job { 1374sub do_load_sync {
1296 my $map = cf::map::find_map $path, $origin 1375 my ($map) = @_;
1297 or return; 1376
1298 $map->load; 1377 cf::sync_job { $map->load };
1299 $map
1300 }
1301} 1378}
1302 1379
1303sub save { 1380sub save {
1304 my ($self) = @_; 1381 my ($self) = @_;
1305 1382
1383 my $lock = cf::lock_acquire "map_data:" . $self->path;
1384
1306 $self->{last_save} = $cf::RUNTIME; 1385 $self->{last_save} = $cf::RUNTIME;
1307 1386
1308 return unless $self->dirty; 1387 return unless $self->dirty;
1309 1388
1310 my $save = $self->{path}->save_path; utf8::encode $save; 1389 my $save = $self->{path}->save_path; utf8::encode $save;
… …
1313 $self->{load_path} = $save; 1392 $self->{load_path} = $save;
1314 1393
1315 return if $self->{deny_save}; 1394 return if $self->{deny_save};
1316 1395
1317 local $self->{last_access} = $self->last_access;#d# 1396 local $self->{last_access} = $self->last_access;#d#
1397
1398 cf::async {
1399 $_->contr->save for $self->players;
1400 };
1318 1401
1319 if ($uniq) { 1402 if ($uniq) {
1320 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1403 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1321 $self->save_objects ($uniq, cf::IO_UNIQUES); 1404 $self->save_objects ($uniq, cf::IO_UNIQUES);
1322 } else { 1405 } else {
… …
1328 my ($self) = @_; 1411 my ($self) = @_;
1329 1412
1330 # save first because save cedes 1413 # save first because save cedes
1331 $self->save; 1414 $self->save;
1332 1415
1416 my $lock = cf::lock_acquire "map_data:" . $self->path;
1417
1333 return if $self->players; 1418 return if $self->players;
1334 return if $self->in_memory != cf::MAP_IN_MEMORY; 1419 return if $self->in_memory != cf::MAP_IN_MEMORY;
1335 return if $self->{deny_save}; 1420 return if $self->{deny_save};
1336 1421
1337 $self->clear; 1422 $self->clear;
… …
1379} 1464}
1380 1465
1381sub reset { 1466sub reset {
1382 my ($self) = @_; 1467 my ($self) = @_;
1383 1468
1469 my $lock = cf::lock_acquire "map_data:" . $self->path;
1470
1384 return if $self->players; 1471 return if $self->players;
1385 return if $self->{path}{user_rel};#d# 1472 return if $self->{path}{user_rel};#d#
1386 1473
1387 warn "resetting map ", $self->path;#d# 1474 warn "resetting map ", $self->path;#d#
1388 1475
… …
1407 1494
1408sub customise_for { 1495sub customise_for {
1409 my ($map, $ob) = @_; 1496 my ($map, $ob) = @_;
1410 1497
1411 if ($map->per_player) { 1498 if ($map->per_player) {
1412 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1499 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1413 } 1500 }
1414 1501
1415 $map 1502 $map
1416} 1503}
1417 1504
1418sub emergency_save { 1505sub emergency_save {
1419 local $cf::FREEZE = 1; 1506 my $freeze_guard = cf::freeze_mainloop;
1420 1507
1421 warn "enter emergency map save\n"; 1508 warn "enter emergency perl save\n";
1422 1509
1423 cf::sync_job { 1510 cf::sync_job {
1511 warn "begin emergency player save\n";
1512 $_->save for values %cf::PLAYER;
1513 warn "end emergency player save\n";
1514
1424 warn "begin emergency map save\n"; 1515 warn "begin emergency map save\n";
1425 $_->save for values %cf::MAP; 1516 $_->save for values %cf::MAP;
1517 warn "end emergency map save\n";
1426 }; 1518 };
1427 1519
1428 warn "end emergency map save\n"; 1520 warn "leave emergency perl save\n";
1429} 1521}
1430 1522
1431package cf; 1523package cf;
1432 1524
1433=back 1525=back
… …
1514 my $link_pos = delete $self->{_link_pos}; 1606 my $link_pos = delete $self->{_link_pos};
1515 1607
1516 unless ($map) { 1608 unless ($map) {
1517 # restore original map position 1609 # restore original map position
1518 ($map, $x, $y) = @{ $link_pos || [] }; 1610 ($map, $x, $y) = @{ $link_pos || [] };
1519 $map = cf::map::find_map $map; 1611 $map = cf::map::find $map;
1520 1612
1521 unless ($map) { 1613 unless ($map) {
1522 ($map, $x, $y) = @$EMERGENCY_POSITION; 1614 ($map, $x, $y) = @$EMERGENCY_POSITION;
1523 $map = cf::map::find_map $map 1615 $map = cf::map::find $map
1524 or die "FATAL: cannot load emergency map\n"; 1616 or die "FATAL: cannot load emergency map\n";
1525 } 1617 }
1526 } 1618 }
1527 1619
1528 ($x, $y) = (-1, -1) 1620 ($x, $y) = (-1, -1)
… …
1532 ($x, $y) = ($map->enter_x, $map->enter_y) 1624 ($x, $y) = ($map->enter_x, $map->enter_y)
1533 if $x <=0 && $y <= 0; 1625 if $x <=0 && $y <= 0;
1534 1626
1535 $map->load; 1627 $map->load;
1536 1628
1629 return unless $self->contr->active;
1537 $self->activate_recursive; 1630 $self->activate_recursive;
1538 $self->enter_map ($map, $x, $y); 1631 $self->enter_map ($map, $x, $y);
1539} 1632}
1540 1633
1541cf::player->attach ( 1634cf::player->attach (
… …
1554 1647
1555 # try to abort aborted map switching on player login :) 1648 # try to abort aborted map switching on player login :)
1556 # should happen only on crashes 1649 # should happen only on crashes
1557 if ($pl->ob->{_link_pos}) { 1650 if ($pl->ob->{_link_pos}) {
1558 $pl->ob->enter_link; 1651 $pl->ob->enter_link;
1559 cf::async { 1652 (async {
1560 # we need this sleep as the login has a concurrent enter_exit running 1653 # 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 1654 # and this sleep increases chances of the player not ending up in scorn
1655 $pl->ob->reply (undef,
1656 "There was an internal problem at your last logout, "
1657 . "the server will try to bring you to your intended destination in a second.",
1658 cf::NDI_RED);
1562 Coro::Timer::sleep 1; 1659 Coro::Timer::sleep 1;
1563 $pl->ob->leave_link; 1660 $pl->ob->leave_link;
1564 }; 1661 })->prio (2);
1565 } 1662 }
1566 }, 1663 },
1567); 1664);
1568 1665
1569=item $player_object->goto_map ($path, $x, $y) 1666=item $player_object->goto ($path, $x, $y)
1570 1667
1571=cut 1668=cut
1572 1669
1573sub cf::object::player::goto_map { 1670sub cf::object::player::goto {
1574 my ($self, $path, $x, $y) = @_; 1671 my ($self, $path, $x, $y) = @_;
1575 1672
1576 $self->enter_link; 1673 $self->enter_link;
1577 1674
1578 (cf::async { 1675 (async {
1579 $path = new cf::path $path; 1676 $path = new cf::path $path;
1580 1677
1581 my $map = cf::map::find_map $path->as_string; 1678 my $map = cf::map::find $path->as_string;
1582 $map = $map->customise_for ($self) if $map; 1679 $map = $map->customise_for ($self) if $map;
1583 1680
1584# warn "entering ", $map->path, " at ($x, $y)\n" 1681# warn "entering ", $map->path, " at ($x, $y)\n"
1585# if $map; 1682# if $map;
1586 1683
… …
1645 1742
1646 return unless $self->type == cf::PLAYER; 1743 return unless $self->type == cf::PLAYER;
1647 1744
1648 $self->enter_link; 1745 $self->enter_link;
1649 1746
1650 (cf::async { 1747 (async {
1748 $self->deactivate_recursive; # just to be sure
1651 unless (eval { 1749 unless (eval {
1652 prepare_random_map $exit 1750 prepare_random_map $exit
1653 if $exit->slaying eq "/!"; 1751 if $exit->slaying eq "/!";
1654 1752
1655 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1753 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1656 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1754 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1657 1755
1658 1; 1756 1;
1659 }) { 1757 }) {
1660 $self->message ("Something went wrong deep within the crossfire server. " 1758 $self->message ("Something went wrong deep within the crossfire server. "
1661 . "I'll try to bring you back to the map you were before. " 1759 . "I'll try to bring you back to the map you were before. "
… …
1735 } 1833 }
1736 } 1834 }
1737 }, 1835 },
1738); 1836);
1739 1837
1740=item $client->coro (\&cb) 1838=item $client->async (\&cb)
1741 1839
1742Create a new coroutine, running the specified callback. The coroutine will 1840Create a new coroutine, running the specified callback. The coroutine will
1743be automatically cancelled when the client gets destroyed (e.g. on logout, 1841be automatically cancelled when the client gets destroyed (e.g. on logout,
1744or loss of connection). 1842or loss of connection).
1745 1843
1746=cut 1844=cut
1747 1845
1748sub cf::client::coro { 1846sub cf::client::async {
1749 my ($self, $cb) = @_; 1847 my ($self, $cb) = @_;
1750 1848
1751 my $coro = &cf::async ($cb); 1849 my $coro = &Coro::async ($cb);
1752 1850
1753 $coro->on_destroy (sub { 1851 $coro->on_destroy (sub {
1754 delete $self->{_coro}{$coro+0}; 1852 delete $self->{_coro}{$coro+0};
1755 }); 1853 });
1756 1854
… …
1994 local $/; 2092 local $/;
1995 *CFG = YAML::Syck::Load <$fh>; 2093 *CFG = YAML::Syck::Load <$fh>;
1996 2094
1997 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 2095 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
1998 2096
2097 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2098 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2099
1999 if (exists $CFG{mlockall}) { 2100 if (exists $CFG{mlockall}) {
2000 eval { 2101 eval {
2001 $CFG{mlockall} ? &mlockall : &munlockall 2102 $CFG{mlockall} ? &mlockall : &munlockall
2002 and die "WARNING: m(un)lockall failed: $!\n"; 2103 and die "WARNING: m(un)lockall failed: $!\n";
2003 }; 2104 };
… …
2007 2108
2008sub main { 2109sub main {
2009 # we must not ever block the main coroutine 2110 # we must not ever block the main coroutine
2010 local $Coro::idle = sub { 2111 local $Coro::idle = sub {
2011 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2112 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2012 (Coro::unblock_sub {
2013 Event::one_event; 2113 async { Event::one_event };
2014 })->();
2015 }; 2114 };
2016 2115
2017 cfg_load; 2116 cfg_load;
2018 db_load; 2117 db_load;
2019 load_extensions; 2118 load_extensions;
… …
2030 return; 2129 return;
2031 } 2130 }
2032 2131
2033 warn "reloading..."; 2132 warn "reloading...";
2034 2133
2035 local $FREEZE = 1; 2134 my $guard = freeze_mainloop;
2036 cf::emergency_save; 2135 cf::emergency_save;
2037 2136
2038 eval { 2137 eval {
2039 # if anything goes wrong in here, we should simply crash as we already saved 2138 # if anything goes wrong in here, we should simply crash as we already saved
2040 2139
… …
2102 cf::load_extensions; 2201 cf::load_extensions;
2103 2202
2104 # reattach attachments to objects 2203 # reattach attachments to objects
2105 warn "reattach"; 2204 warn "reattach";
2106 _global_reattach; 2205 _global_reattach;
2206 reattach $_ for values %MAP;
2107 }; 2207 };
2108 2208
2109 if ($@) { 2209 if ($@) {
2110 warn $@; 2210 warn $@;
2111 warn "error while reloading, exiting."; 2211 warn "error while reloading, exiting.";
… …
2127 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2227 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2128 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2228 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2129 2229
2130 # dirty hack because... archetypes are not yet loaded 2230 # dirty hack because... archetypes are not yet loaded
2131 Event->timer ( 2231 Event->timer (
2132 after => 2, 2232 after => 10,
2133 cb => sub { 2233 cb => sub {
2134 $_[0]->w->cancel; 2234 $_[0]->w->cancel;
2135 2235
2136 # provide some exits "home" 2236 # provide some exits "home"
2137 my $exit = cf::object::new "exit"; 2237 my $exit = cf::object::new "exit";
… …
2176 reentrant => 0, 2276 reentrant => 0,
2177 prio => 0, 2277 prio => 0,
2178 at => $NEXT_TICK || $TICK, 2278 at => $NEXT_TICK || $TICK,
2179 data => WF_AUTOCANCEL, 2279 data => WF_AUTOCANCEL,
2180 cb => sub { 2280 cb => sub {
2181 unless ($FREEZE) {
2182 cf::server_tick; # one server iteration 2281 cf::server_tick; # one server iteration
2183 $RUNTIME += $TICK; 2282 $RUNTIME += $TICK;
2184 }
2185
2186 $NEXT_TICK += $TICK; 2283 $NEXT_TICK += $TICK;
2187 2284
2188 # if we are delayed by four ticks or more, skip them all 2285 # if we are delayed by four ticks or more, skip them all
2189 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2286 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2190 2287

Diff Legend

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